From e2bcfbadf896fbca19ae8cd128060101c003cc62 Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 25 Jul 2024 13:14:23 -0700 Subject: [PATCH] main: modify copy on guided tour blade. --- .../views/livewire/boarding/index.blade.php | 358 +++++++++--------- 1 file changed, 180 insertions(+), 178 deletions(-) diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php index 2e5fa41c9..ad4c5d94b 100644 --- a/resources/views/livewire/boarding/index.blade.php +++ b/resources/views/livewire/boarding/index.blade.php @@ -1,123 +1,118 @@ @php use App\Enums\ProxyTypes; @endphp Onboarding | Coolify - -
-
- @if ($currentState === 'welcome') -

Welcome to Coolify

-
Let me help you set up the basics.
+ +
+
+ @if ($currentState === 'welcome') +

Welcome to your Last Hour Cloud

+

Let's help you to set up the basics and show you around.

- Get - Started + Let's Start
- @elseif ($currentState === 'explanation') - + @endif +
+
+ @if ($currentState === 'explanation') + - Coolify is an all-in-one application to automate tasks on your servers, deploy application with - Git - integrations, deploy databases and services, monitor these resources with notifications and - alerts + Last Hour Cloud is an all-in-one application to automate tasks on your servers, deploy application with Git + integrations, deploy databases and services, monitor these resources with notifications and alerts without vendor lock-in - and much much more. + and much much more.

- +
-

You don't need to manage your servers anymore. - Coolify does +

You do not to manage your servers too much. This does it for you.

-

All configurations are stored on your servers, so - everything works without a connection to Coolify (except integrations and automations).

-

You can get notified on your favourite platforms - (Discord, - Telegram, Email, etc.) when something goes wrong, or an action is needed from your side.

+

All configurations are stored on your server, so + everything works without this (except integrations and automations).

+

You will get notified on your favourite platform (Discord, + Telegram, Email, etc.) when something goes wrong, or if an action is needed from your side.

- Next + Next
- @elseif ($currentState === 'select-server-type') + @endif + @if ($currentState === 'select-server-type') - Do you want to deploy your resources to your - or to a ? + Do you want to deploy your resources on your + or on a ? - Localhost + Localhost - Remote Server + Remote Server @if (!$serverReachable) - Localhost is not reachable with the following public key. -

- Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for - user or skip the boarding process and add a new private key manually to Coolify and to the - server. -
- Check this documentation for further - help. - - Check again - + Localhost is not reachable with the following public key. +

+ Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user + 'root' or skip the guided tour and add a new private key manually to Last Hour Cloud and to the + server. +
+ Check the upstream documentation for further help. + + Check again + @endif

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.

-

is the server where Coolify is running on. It is not - recommended to use one server +

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

-

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

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

- @elseif ($currentState === 'private-key') + @endif +
+
+ @if ($currentState === 'private-key') Do you have your own SSH Private Key? - Yes + Yes - No (create one for me) + No (create one for me) @if (count($privateKeys) > 0) -
- - @foreach ($privateKeys as $privateKey) - - @endforeach - - Use this SSH Key -
+
+ + @foreach ($privateKeys as $privateKey) + + @endforeach + + Use this SSH Key +
@endif

SSH Keys are used to connect to a remote server through a secure shell, called SSH.

-

You can use your own ssh private key, or you can let Coolify to create one for you.

+

You can use your own ssh private key, or you can allow Last Hour Cloud to create one for you.

In both ways, you need to add the public version of your ssh private key to the remote server's - ~/.ssh/authorized_keys file. + ~/.ssh/authorized_keys file.

- @elseif ($currentState === 'select-existing-server') + @endif +
+
+ @if ($currentState === 'select-existing-server') There are already servers available for your Team. Do you want to use one of them? @@ -125,9 +120,7 @@ class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border
- No - (create - one + No (create one for me) @@ -136,8 +129,9 @@ class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border
@foreach ($servers as $server) - + @endforeach Use this Server @@ -145,101 +139,93 @@ class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border
@if (!$serverReachable) - This server is not reachable with the following public key. -

- Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for - user or skip the boarding process and add a new private key manually to Coolify and to the - server. -
- Check this documentation for further - help. - - Check - again - + This server is not reachable with the following public key. +

+ Please make sure you have the correct public key in your ~/.ssh/authorized_keys file for user + 'root' or skip the boarding process and add a new private key manually to Last Hour Cloud and to the + server. + + Check + again + @endif

Private Keys are used to connect to a remote server through a secure shell, called SSH.

-

You can use your own private key, or you can let Coolify to create one for you.

+

You can use your own private key, or you can let Last Hour Cloud create one for you.

In both ways, you need to add the public version of your private key to the remote server's ~/.ssh/authorized_keys file.

- @elseif ($currentState === 'create-private-key') + @endif +
+
+ @if ($currentState === 'create-private-key') Please let me know your key details. - - - - + + + + @if ($privateKeyType === 'create') - - ACTION REQUIRED: Copy the 'Public Key' to your - server's - ~/.ssh/authorized_keys - file. + + ACTION REQUIRED: Copy the 'Public Key' to your server's + ~/.ssh/authorized_keys + file. @endif Save

Private Keys are used to connect to a remote server through a secure shell, called SSH.

-

You can use your own private key, or you can let Coolify to create one for you.

+

You can use your own private key, or you can let Last Hour Cloud create one for you.

In both ways, you need to add the public version of your private key to the remote server's ~/.ssh/authorized_keys file.

- @elseif ($currentState === 'create-server') - + @endif +
+
+ @if ($currentState === 'create-server') + - Please let me know your server details. + Please let us know your server details. -
-
- - + +
+ +
-
+
- -
- -
Non-root user is experimental: docs. -
-
+ +
-
- +
+
Continue + +

Username should be for now. We are working on using + non-root users.

+
- @elseif ($currentState === 'validate-server') + @endif +
+
+ @if ($currentState === 'validate-server') - I need to validate your server (connection, Docker Engine, etc) and configure if something is - missing for me. Are you okay with this? + we need to validate your server (connection, Docker Engine, etc) and configure to see if something is + missing. Are you okay with this? @@ -247,87 +233,103 @@ class="font-bold underline" target="_blank" - - Let's do it! + + Send it!

This will install the latest Docker Engine on your server, configure a few things to be able - to run optimal.

Minimum Docker Engine version is: 22

To manually install - Docker - Engine, check this + to run optimal.

Minimum Docker Engine version is: 22

To manually install Docker + Engine, check
this documentation.

- @elseif ($currentState === 'create-project') + @endif +
+ {{--
+ @if ($currentState === 'select-proxy') + + + If you would like to attach any kind of domain to your resources, you need a proxy. + + + + Decide later + + + Traefik + v2 + + + Nginx + + + Caddy + + + +

This will install the latest Docker Engine on your server and configure a few items to be able + to run optimally.

+
+
+ @endif +
--}} +
+ @if ($currentState === 'create-project') @if (count($projects) > 0) - You already have some projects. Do you want to use one of them or should I create a new one - for - you? + You already have some projects. Do you want to use one of them or should we create a new one for + you? @else - Let's create an initial project for you. You can change all the details later on. + We will create an initial project for you. You can change it later on. @endif - Create new - project! + Create New Project
@if (count($projects) > 0) -
- - @foreach ($projects as $project) - - @endforeach - - Use this Project -
+
+ + @foreach ($projects as $project) + + @endforeach + + Use this Project +
@endif
-

Projects contain several resources combined into one virtual group. There are no - limitations on the number of projects you can add.

-

Each project should have at least one environment, this allows you to create a production & +

Projects put together several resources into one virtual group. There are no + limitations on the number of projects you can have here.

+

Each project should have at least one environment. This helps you to create a production & staging version of the same application, but grouped separately.

- @elseif ($currentState === 'create-resource') + @endif +
+
+ @if ($currentState === 'create-resource') - Let's go to the new resource page, where you can create your first resource. + Next we will redirect you to the resource page, where you can create your first resource. -
Let's do +
Let's do it!
-

A resource could be an application, a database or a service (like WordPress).

+

A resource is an application, a database or a service (like WordPress).

- @endif -
-
-
-
Skip - onboarding
-
Restart - onboarding
+ @endif
- - -
- Feedback -
-
- -
-
-
-
+ +
\ No newline at end of file