From 433dff2684856bfda2087e974bb42aeba7ecad21 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 16 Jan 2025 11:04:50 +0100
Subject: [PATCH] improve navigation

---
 app/Livewire/Dashboard.php                   | 12 +---------
 app/Livewire/Project/Index.php               | 12 ++--------
 app/Models/Project.php                       | 12 ++++++++++
 resources/views/livewire/dashboard.blade.php | 23 +++++++++++---------
 resources/views/source/all.blade.php         | 10 ++++-----
 5 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/app/Livewire/Dashboard.php b/app/Livewire/Dashboard.php
index c3cb797bf..d89f2b970 100644
--- a/app/Livewire/Dashboard.php
+++ b/app/Livewire/Dashboard.php
@@ -8,7 +8,6 @@ use App\Models\Project;
 use App\Models\Server;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Redirect;
 use Livewire\Component;
 
 class Dashboard extends Component
@@ -52,16 +51,7 @@ class Dashboard extends Component
 
     public function navigateToProject($projectUuid)
     {
-        $project = Project::where('uuid', $projectUuid)->first();
-
-        if ($project && $project->environments->count() === 1) {
-            return Redirect::route('project.resource.index', [
-                'project_uuid' => $projectUuid,
-                'environment_uuid' => $project->environments->first()->uuid,
-            ]);
-        }
-
-        return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
+        return $this->redirect(collect($this->projects)->firstWhere('uuid', $projectUuid)->navigateTo(), true);
     }
 
     public function render()
diff --git a/app/Livewire/Project/Index.php b/app/Livewire/Project/Index.php
index 06bf88219..8bf511a66 100644
--- a/app/Livewire/Project/Index.php
+++ b/app/Livewire/Project/Index.php
@@ -5,7 +5,6 @@ namespace App\Livewire\Project;
 use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\Server;
-use Illuminate\Support\Facades\Redirect;
 use Livewire\Component;
 
 class Index extends Component
@@ -34,15 +33,8 @@ class Index extends Component
 
     public function navigateToProject($projectUuid)
     {
-        $project = Project::where('uuid', $projectUuid)->first();
+        $project = collect($this->projects)->firstWhere('uuid', $projectUuid);
 
-        if ($project && $project->environments->count() === 1) {
-            return Redirect::route('project.resource.index', [
-                'project_uuid' => $projectUuid,
-                'environment_uuid' => $project->environments->first()->uuid,
-            ]);
-        }
-
-        return Redirect::route('project.show', ['project_uuid' => $projectUuid]);
+        return $this->redirect($project->navigateTo(), true);
     }
 }
diff --git a/app/Models/Project.php b/app/Models/Project.php
index 3b50b9b33..2e4d45859 100644
--- a/app/Models/Project.php
+++ b/app/Models/Project.php
@@ -140,4 +140,16 @@ class Project extends BaseModel
     {
         return $this->postgresqls()->get()->merge($this->redis()->get())->merge($this->mongodbs()->get())->merge($this->mysqls()->get())->merge($this->mariadbs()->get())->merge($this->keydbs()->get())->merge($this->dragonflies()->get())->merge($this->clickhouses()->get());
     }
+
+    public function navigateTo()
+    {
+        if ($this->environments->count() === 1) {
+            return route('project.resource.index', [
+                'project_uuid' => $this->uuid,
+                'environment_uuid' => $this->environments->first()->uuid,
+            ]);
+        }
+
+        return route('project.show', ['project_uuid' => $this->uuid]);
+    }
 }
diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index b7955489a..806704d5d 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -59,7 +59,8 @@
                     <x-modal-input buttonTitle="Add" title="New Project">
                         <livewire:project.add-empty />
                     </x-modal-input> your first project or
-                    go to the <a class="underline dark:text-white" wire:navigate href="{{ route('onboarding') }}">onboarding</a> page.
+                    go to the <a class="underline dark:text-white" wire:navigate
+                        href="{{ route('onboarding') }}">onboarding</a> page.
                 </div>
             </div>
         @endif
@@ -70,8 +71,7 @@
         @if ($servers->count() > 0)
             <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
                 @foreach ($servers as $server)
-                    <a wire:navigate
-                        href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
+                    <a wire:navigate href="{{ route('server.show', ['server_uuid' => data_get($server, 'uuid')]) }}"
                         @class([
                             'gap-2 border cursor-pointer box group',
                             'border-transparent' => $server->settings->is_reachable,
@@ -108,7 +108,8 @@
                             <livewire:security.private-key.create from="server" />
                         </x-modal-input> a private key
                         or
-                        go to the <a class="underline dark:text-white" wire:navigate href="{{ route('onboarding') }}">onboarding</a>
+                        go to the <a class="underline dark:text-white" wire:navigate
+                            href="{{ route('onboarding') }}">onboarding</a>
                         page.
                     </div>
                 </div>
@@ -120,7 +121,8 @@
                             <livewire:server.create />
                         </x-modal-input> your first server
                         or
-                        go to the <a class="underline dark:text-white" wire:navigate href="{{ route('onboarding') }}">onboarding</a>
+                        go to the <a class="underline dark:text-white" wire:navigate
+                            href="{{ route('onboarding') }}">onboarding</a>
                         page.
                     </div>
                 </div>
@@ -145,11 +147,12 @@
                     <h4 class="pb-2">{{ $serverName }}</h4>
                     <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
                         @foreach ($deployments as $deployment)
-                            <a wire:navigate href="{{ data_get($deployment, 'deployment_url') }}" @class([
-                                'gap-2 cursor-pointer box group border-l-2 border-dotted',
-                                'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
-                                'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
-                            ])>
+                            <a wire:navigate href="{{ data_get($deployment, 'deployment_url') }}"
+                                @class([
+                                    'gap-2 cursor-pointer box group border-l-2 border-dotted',
+                                    'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
+                                    'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                                ])>
                                 <div class="flex flex-col justify-center mx-6">
                                     <div class="box-title">
                                         {{ data_get($deployment, 'application_name') }}
diff --git a/resources/views/source/all.blade.php b/resources/views/source/all.blade.php
index 8391e2125..35c3e1222 100644
--- a/resources/views/source/all.blade.php
+++ b/resources/views/source/all.blade.php
@@ -12,21 +12,19 @@
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($sources as $source)
             @if ($source->getMorphClass() === 'App\Models\GithubApp')
-                <a class="flex gap-4 text-center hover:no-underline box group"
-                    wire:navigate
+                <a class="flex gap-4 text-center hover:no-underline box group" wire:navigate
                     href="{{ route('source.github.show', ['github_app_uuid' => data_get($source, 'uuid')]) }}">
                     <x-git-icon class="dark:text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
                     <div class="text-left group-hover:dark:text-white">
-                        <div>{{ $source->name }}</div>
+                        <div class="box-title">{{ $source->name }}</div>
                         @if (is_null($source->app_id))
-                            <span class="text-error">Configuration is not finished</span>
+                            <span class="box-description !text-error ">Configuration is not finished.</span>
                         @endif
                     </div>
                 </a>
             @endif
             @if ($source->getMorphClass() === 'App\Models\GitlabApp')
-                <a class="flex gap-4 text-center hover:no-underline box group"
-                    wire:navigate
+                <a class="flex gap-4 text-center hover:no-underline box group" wire:navigate
                     href="{{ route('source.gitlab.show', ['gitlab_app_uuid' => data_get($source, 'uuid')]) }}">
                     <x-git-icon class="dark:text-white w-9 h-9" git="{{ $source->getMorphClass() }}" />
                     <div class="text-left group-hover:dark:text-white">