From f11a89aec7b7eb8726c9e3f3a8fbb74dcf57e1f4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 6 Jun 2023 08:53:30 +0200
Subject: [PATCH] updates

---
 .../views/components/server/navbar.blade.php  |  8 +++--
 .../views/livewire/server/form.blade.php      |  8 +++--
 .../livewire/server/proxy/deploy.blade.php    | 31 ++++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index 4e9dadb67..d26a9a15e 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -5,7 +5,7 @@
             <li>{{ data_get($server, 'name') }}</li>
         </ul>
     </div>
-    <nav class="flex items-center gap-4 py-2 border-b-2 border-solid border-coolgray-200">
+    <nav class="flex items-center h-12 gap-4 py-2 border-b-2 border-solid border-coolgray-200">
         <a class="{{ request()->routeIs('server.show') ? 'text-white' : '' }}"
             href="{{ route('server.show', [
                 'server_uuid' => Route::current()->parameters()['server_uuid'],
@@ -18,7 +18,9 @@
             ]) }}">
             <button>Proxy</button>
         </a>
-        <div class="flex-1"></div>
-        <livewire:server.proxy.deploy :server="$server" />
+        @if (request()->routeIs('server.proxy'))
+            <div class="flex-1"></div>
+            <livewire:server.proxy.deploy :server="$server" />
+        @endif
     </nav>
 </div>
diff --git a/resources/views/livewire/server/form.blade.php b/resources/views/livewire/server/form.blade.php
index 0643f6a1a..8fdad7bce 100644
--- a/resources/views/livewire/server/form.blade.php
+++ b/resources/views/livewire/server/form.blade.php
@@ -38,9 +38,11 @@
             </div>
         </div>
         @if (!$server->settings->is_validated)
-            <x-forms.button class="mt-4" wire:click.prevent='validateServer'>
-                Validate Server
-            </x-forms.button>
+            <div class="w-full pt-4">
+                <x-forms.button isHighlighted wire:click.prevent='validateServer'>
+                    Validate Server
+                </x-forms.button>
+            </div>
         @endif
         @if ($server->settings->is_validated)
             <h3 class="pt-8 pb-4">Quick Actions</h3>
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php
index 4439e1788..4fc390e03 100644
--- a/resources/views/livewire/server/proxy/deploy.blade.php
+++ b/resources/views/livewire/server/proxy/deploy.blade.php
@@ -2,32 +2,33 @@
     @if ($server->settings->is_validated)
         @if ($server->extra_attributes->proxy_status === 'running')
             <div class="dropdown dropdown-bottom">
-                <x-forms.button tabindex="0">
-                    Actions
+                <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Actions
                     <x-chevron-down />
-                </x-forms.button>
+                </label>
                 <ul tabindex="0"
                     class="mt-1 text-xs text-white normal-case rounded min-w-max dropdown-content menu bg-coolgray-200">
                     <li>
                         <div class="rounded-none hover:bg-coollabs" wire:click='deploy'><svg
-                                xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
+                                xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24" stroke-width="1.5"
                                 stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-                                <path d="M9 4.55a8 8 0 0 1 6 14.9m0 -4.45v5h5" />
-                                <path d="M5.63 7.16l0 .01" />
-                                <path d="M4.06 11l0 .01" />
-                                <path d="M4.63 15.1l0 .01" />
-                                <path d="M7.16 18.37l0 .01" />
-                                <path d="M11 19.94l0 .01" />
+                                <path d="M20 11a8.1 8.1 0 0 0 -15.5 -2m-.5 -4v4h4" />
+                                <path d="M4 13a8.1 8.1 0 0 0 15.5 2m.5 4v-4h-4" />
+                                <path d="M12 9l0 3" />
+                                <path d="M12 15l.01 0" />
                             </svg>Restart</div>
                     </li>
                     <li>
-                        <div class="rounded-none hover:bg-red-500" wire:click='stop'> <svg
-                                xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                        <div class="rounded-none hover:bg-red-500" wire:click='stop'><svg
+                                xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
+                                stroke-linejoin="round">
                                 <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                                <path d="M8 13v-7.5a1.5 1.5 0 0 1 3 0v6.5" />
+                                <path d="M11 5.5v-2a1.5 1.5 0 1 1 3 0v8.5" />
+                                <path d="M14 5.5a1.5 1.5 0 0 1 3 0v6.5" />
                                 <path
-                                    d="M5 5m0 2a2 2 0 0 1 2 -2h10a2 2 0 0 1 2 2v10a2 2 0 0 1 -2 2h-10a2 2 0 0 1 -2 -2z" />
+                                    d="M17 7.5a1.5 1.5 0 0 1 3 0v8.5a6 6 0 0 1 -6 6h-2h.208a6 6 0 0 1 -5.012 -2.7a69.74 69.74 0 0 1 -.196 -.3c-.312 -.479 -1.407 -2.388 -3.286 -5.728a1.5 1.5 0 0 1 .536 -2.022a1.867 1.867 0 0 1 2.28 .28l1.47 1.47" />
                             </svg>Stop</div>
                     </li>
                 </ul>
@@ -38,7 +39,7 @@
                     stroke-linecap="round" stroke-linejoin="round">
                     <path stroke="none" d="M0 0h24v24H0z" fill="none" />
                     <path d="M7 4v16l13 -8z" />
-                </svg>Start</x-forms.button>
+                </svg>Start Proxy</x-forms.button>
         @endif
     @endif
 </div>