From 4a4d73b87b94776be651de391d61535b6e1c78a1 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 14 Sep 2023 10:39:05 +0200 Subject: [PATCH] fix: plus boarding step about Coolify --- app/Http/Livewire/Boarding/Index.php | 3 +- .../views/components/boarding-step.blade.php | 4 +- .../views/livewire/boarding/index.blade.php | 52 +++++++++++++++---- 3 files changed, 45 insertions(+), 14 deletions(-) diff --git a/app/Http/Livewire/Boarding/Index.php b/app/Http/Livewire/Boarding/Index.php index 2cb3b1049..77675441d 100644 --- a/app/Http/Livewire/Boarding/Index.php +++ b/app/Http/Livewire/Boarding/Index.php @@ -53,12 +53,13 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA== $this->remoteServerHost = 'coolify-testing-host'; } } - public function welcome() { + public function explanation() { if (isCloud()) { return $this->setServerType('remote'); } $this->currentState = 'select-server-type'; } + public function restartBoarding() { if ($this->createdServer) { diff --git a/resources/views/components/boarding-step.blade.php b/resources/views/components/boarding-step.blade.php index e9341cbd9..9314727bd 100644 --- a/resources/views/components/boarding-step.blade.php +++ b/resources/views/components/boarding-step.blade.php @@ -14,12 +14,12 @@ @endif - @if($explanation) + @isset($explanation)

Explanation

{{$explanation}}
- @endif + @endisset diff --git a/resources/views/livewire/boarding/index.blade.php b/resources/views/livewire/boarding/index.blade.php index bee5f04b7..8c1e7125c 100644 --- a/resources/views/livewire/boarding/index.blade.php +++ b/resources/views/livewire/boarding/index.blade.php @@ -5,12 +5,34 @@

Welcome to Coolify

Let me help you to set the basics.

- Get Started + Get Started
@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 + without vendor lock-in + and much much more. +

+ + +
+ +

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

+

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

+

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

+
+ + Next + + +
+ @endif @if ($currentState === 'select-server-type') @@ -18,9 +40,11 @@ or on a ? - Localhost + Localhost - Remote Server + Remote Server @@ -42,9 +66,11 @@ Do you have your own SSH Private Key? - Yes + Yes - No (create one for me) + No (create one for me) @if (count($privateKeys) > 0)
@@ -115,9 +141,10 @@ @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 @@ -182,7 +209,8 @@ Could not find Docker Engine on your server. Do you want me to install it for you? - + Let's do it! @@ -233,12 +261,14 @@ @endif - Let's create a new one! + Let's create a new + one!
@if (count($projects) > 0)
- + @foreach ($projects as $project)