From 6aa6f4c8a21e5f956fdbea2e3e6c52c878df8360 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 28 Jul 2023 13:40:47 +0200
Subject: [PATCH] fix: proxy stop/start ui

---
 bootstrap/helpers/shared.php                  |  3 ++
 .../livewire/server/proxy/deploy.blade.php    | 54 ++++++++++++-------
 2 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 2dd89007c..69cfe6f4b 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -93,6 +93,9 @@ function set_transanctional_email_settings()
 }
 function base_ip()
 {
+    if (isDev()) {
+        return "http://localhost";
+    }
     $settings = InstanceSettings::get();
     return "http://{$settings->public_ipv4}";
 }
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php
index 109fa4a06..99c09d5bf 100644
--- a/resources/views/livewire/server/proxy/deploy.blade.php
+++ b/resources/views/livewire/server/proxy/deploy.blade.php
@@ -10,7 +10,13 @@
                 </x-slot:modalBody>
             </x-modal>
             <div class="flex gap-4">
-                <div class="group">
+                <button>
+                    <a target="_blank" href="{{ base_ip() }}:8080">
+                        Traefik Dashboard
+                        <x-external-link />
+                    </a>
+                </button>
+                {{-- <div class="group">
                     <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Links
                         <x-chevron-down />
                     </label>
@@ -18,26 +24,36 @@
                         <ul tabindex="0"
                             class="relative text-xs text-white normal-case rounded -ml-28 min-w-max menu bg-coolgray-200">
                             <li>
-                                @if ($server->name === 'localhost')
-                                    <a target="_blank"
-                                        class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                                        href="{{ base_ip() }}:8080">
-                                        Traefik Dashboard
-                                        <x-external-link />
-                                    </a>
-                                @else
-                                    <a target="_blank"
-                                        class="text-xs text-white rounded-none hover:no-underline hover:bg-coollabs hover:text-white"
-                                        href="http://{{ $server->ip }}:8080">
-                                        Traefik Dashboard
-                                        <x-external-link />
-                                    </a>
-                                @endif
+
                             </li>
                         </ul>
                     </div>
-                </div>
-                <div class="group">
+                </div> --}}
+                <button wire:click='deploy'
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-warning" viewBox="0 0 24 24"
+                        stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                        stroke-linejoin="round">
+                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                        <path
+                            d="M10.09 4.01l.496 -.495a2 2 0 0 1 2.828 0l7.071 7.07a2 2 0 0 1 0 2.83l-7.07 7.07a2 2 0 0 1 -2.83 0l-7.07 -7.07a2 2 0 0 1 0 -2.83l3.535 -3.535h-3.988">
+                        </path>
+                        <path d="M7.05 11.038v-3.988"></path>
+                    </svg>
+                    Restart
+                </button>
+                <x-forms.button isModal noStyle modalId="stopProxy"
+                    class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+                    <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24"
+                        stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round"
+                        stroke-linejoin="round">
+                        <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                        <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                        <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                    </svg>
+                    Stop
+                </x-forms.button>
+                {{-- <div class="group">
                     <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Actions
                         <x-chevron-down />
                     </label>
@@ -74,7 +90,7 @@
                             </li>
                         </ul>
                     </div>
-                </div>
+                </div> --}}
             </div>
         @else
             <button wire:click='deploy' class="flex items-center gap-2 cursor-pointer hover:text-white">