From ef40b79a5f98dae45106b2d0fddda9a9a1b99265 Mon Sep 17 00:00:00 2001
From: ayntk-ai <122374094+ayntk-ai@users.noreply.github.com>
Date: Sun, 18 Aug 2024 20:44:15 +0200
Subject: [PATCH 1/3] fix project selection

---
 .../views/livewire/project/index.blade.php    | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 92d4a63f9..88b2e12e9 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -11,9 +11,8 @@
     <div class="subtitle">All your projects are here.</div>
     <div class="grid gap-2 lg:grid-cols-2">
         @forelse ($projects as $project)
-            <div class="box group" x-data x-on:click="goto('{{ $project->uuid }}')">
-                <div class="flex flex-col justify-center flex-1 mx-6"
-                    onclick="gotoProject('{{ $project->uuid }}','{{ $project->default_environment() }}')">
+            <div class="box group" onclick="gotoProject('{{ $project->uuid }}', '{{ $project->default_environment() }}')">
+                <div class="flex flex-col justify-center flex-1 mx-6">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>
@@ -33,15 +32,8 @@
     </div>
 
     <script>
-        function goto(uuid) {
-            window.location.href = '/project/' + uuid;
-        }
-
-        function gotoProject(uuid, environment) {
-            if (!environment) {
-                window.location.href = '/project/' + uuid;
-            }
-            window.location.href = '/project/' + uuid + '/' + environment;
-        }
-    </script>
+    function gotoProject(uuid, defaultEnvironment) {
+        window.location.href = '/project/' + uuid + '/' + defaultEnvironment;
+    }
+</script>
 </div>

From abd2aefd6ca52a67ff8ca4793b1d990132743ec1 Mon Sep 17 00:00:00 2001
From: ayntk-ai <122374094+ayntk-ai@users.noreply.github.com>
Date: Sun, 18 Aug 2024 20:55:54 +0200
Subject: [PATCH 2/3] remove duplicated validation

---
 resources/views/livewire/dashboard.blade.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index a6eb231d4..c0c5c7a6d 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -28,16 +28,16 @@
                         <div class="flex flex-col justify-center flex-1">
                             <div class="box-title">{{ $project->name }}</div>
                             <div class="box-description">
-                                {{ $project->description }}</div>
+                                {{ $project->description }}
+                            </div>
                         </div>
-                        <div class="flex items-center justify-center gap-2 text-xs font-bold ">
+                        <div class="flex items-center justify-center gap-2 text-xs font-bold">
                             <a class="hover:underline"
-                                href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
-                                <span class="p-2 font-bold">+
-                                    Add Resource</span>
+                                href="{{ route('project.resource.create', ['project_uuid' => $project->uuid, 'environment_name' => $project->default_environment()]) }}">
+                                <span class="p-2 font-bold">+ Add Resource</span>
                             </a>
                             <a class="hover:underline"
-                                href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                                href="{{ route('project.edit', ['project_uuid' => $project->uuid]) }}">
                                 Settings
                             </a>
                         </div>
@@ -161,9 +161,6 @@
 
     <script>
         function gotoProject(uuid, environment) {
-            if (!environment) {
-                window.location.href = '/project/' + uuid;
-            }
             window.location.href = '/project/' + uuid + '/' + environment;
         }
     </script>

From c813373d211609f3db915b0e4f68a51360c70d50 Mon Sep 17 00:00:00 2001
From: ayntk-ai <122374094+ayntk-ai@users.noreply.github.com>
Date: Sun, 18 Aug 2024 21:00:30 +0200
Subject: [PATCH 3/3] fix validation if null, empty or undefined

---
 resources/views/livewire/dashboard.blade.php     | 7 ++++++-
 resources/views/livewire/project/index.blade.php | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php
index c0c5c7a6d..e9cd27311 100644
--- a/resources/views/livewire/dashboard.blade.php
+++ b/resources/views/livewire/dashboard.blade.php
@@ -159,9 +159,14 @@
         </div>
     @endif
 
+
     <script>
         function gotoProject(uuid, environment) {
-            window.location.href = '/project/' + uuid + '/' + environment;
+            if (environment) {
+                window.location.href = '/project/' + uuid + '/' + environment;
+            } else {
+                window.location.href = '/project/' + uuid;
+            }
         }
     </script>
     {{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
diff --git a/resources/views/livewire/project/index.blade.php b/resources/views/livewire/project/index.blade.php
index 88b2e12e9..a15f6e18f 100644
--- a/resources/views/livewire/project/index.blade.php
+++ b/resources/views/livewire/project/index.blade.php
@@ -32,8 +32,12 @@
     </div>
 
     <script>
-    function gotoProject(uuid, defaultEnvironment) {
-        window.location.href = '/project/' + uuid + '/' + defaultEnvironment;
+    function gotoProject(uuid, environment) {
+        if (environment) {
+            window.location.href = '/project/' + uuid + '/' + environment;
+        } else {
+            window.location.href = '/project/' + uuid;
+        }
     }
 </script>
 </div>