diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index cbd8a74ba..d3f303f2a 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -1,5 +1,5 @@ <<<<<<< HEAD - -======= - + + ======= + - -@endauth ->>>>>>> 04e370917 (main: fix for various bugs) + + @endauth + >>>>>>> 04e370917 (main: fix for various bugs) \ No newline at end of file diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php index ac8266d69..a5d3cddd8 100644 --- a/resources/views/livewire/boarding/index.blade.php +++ b/resources/views/livewire/boarding/index.blade.php @@ -31,7 +31,7 @@ and much much more.

- +

You do not to manage your servers too much. This does @@ -50,12 +50,9 @@ @if ($currentState === 'select-server-type') - Do you want to deploy your resources on your - or on a ? + Do you want to deploy your resources on your ? - Localhost - Remote Server @@ -74,12 +71,10 @@

Servers are the main building blocks, as they will host your applications, databases, - services, called resources. Any CPU intensive process will use the server's CPU where you + services, called "resources." Any CPU intensive process will use the server's CPU where you are deploying your resources.

-

Localhost is the server where Last Hour Cloud is running on. It is not recommended to use one server - for everything.

Remote Server is a server reachable through SSH. It can be hosted at home, or from any cloud - provider.

+ provider, including us: VPS hosting.

@endif @@ -250,13 +245,9 @@ @if ($currentState === 'select-server-type') - Do you want to deploy your resources on your - or on a ? + Do you want to deploy your resources on a ? - Localhost - - Remote Server @if (!$serverReachable) @@ -276,10 +267,8 @@

Servers are the main building blocks, as they will host your applications, databases, services, called resources. Any CPU intensive process will use the server's CPU where you are deploying your resources.

-

Localhost is the server where Last Hour Cloud is running on. It is not recommended to use one server - for everything.

Remote Server is a server reachable through SSH. It can be hosted at home, or from any cloud - provider.

+ provider, including us: VPS hosting.

@endif