From 644f15e80daa0790a06812b6cd824384f2c7a389 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 3 May 2024 10:54:44 +0200
Subject: [PATCH] Refactor server navbar and proxy components

---
 .../views/components/server/navbar.blade.php     | 16 ++--------------
 .../views/livewire/server/proxy/deploy.blade.php |  6 +++++-
 .../views/livewire/server/proxy/status.blade.php |  6 +++++-
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/resources/views/components/server/navbar.blade.php b/resources/views/components/server/navbar.blade.php
index 5afee652c..2130d0031 100644
--- a/resources/views/components/server/navbar.blade.php
+++ b/resources/views/components/server/navbar.blade.php
@@ -2,13 +2,7 @@
     <livewire:server.proxy.modal :server="$server" />
     <div class="flex items-center gap-2">
         <h1>Server</h1>
-        @if (
-            $server->proxyType() !== 'NONE' &&
-                $server->isFunctional() &&
-                !$server->isSwarmWorker() &&
-                !$server->settings->is_build_server)
-            <livewire:server.proxy.status :server="$server" />
-        @endif
+        <livewire:server.proxy.status :server="$server" />
     </div>
     <div class="subtitle">{{ data_get($server, 'name') }}.</div>
     <nav class="navbar-main">
@@ -52,12 +46,6 @@
         @endif
 
         <div class="flex-1"></div>
-        @if (
-            $server->proxyType() !== 'NONE' &&
-                $server->isFunctional() &&
-                !$server->isSwarmWorker() &&
-                !$server->settings->is_build_server)
-            <livewire:server.proxy.deploy :server="$server" />
-        @endif
+        <livewire:server.proxy.deploy :server="$server" />
     </nav>
 </div>
diff --git a/resources/views/livewire/server/proxy/deploy.blade.php b/resources/views/livewire/server/proxy/deploy.blade.php
index 1f00a7b48..32ddbb890 100644
--- a/resources/views/livewire/server/proxy/deploy.blade.php
+++ b/resources/views/livewire/server/proxy/deploy.blade.php
@@ -1,5 +1,9 @@
 <div>
-    @if ($server->isFunctional() && $server->proxyType() !== 'NONE')
+    @if (
+        $server->proxyType() !== 'NONE' &&
+            $server->isFunctional() &&
+            !$server->isSwarmWorker() &&
+            !$server->settings->is_build_server)
         <x-slide-over closeWithX fullScreen @startproxy.window="slideOverOpen = true">
             <x-slot:title>Proxy Status</x-slot:title>
             <x-slot:content>
diff --git a/resources/views/livewire/server/proxy/status.blade.php b/resources/views/livewire/server/proxy/status.blade.php
index 8200d4420..8a066d0a3 100644
--- a/resources/views/livewire/server/proxy/status.blade.php
+++ b/resources/views/livewire/server/proxy/status.blade.php
@@ -1,5 +1,9 @@
 <div x-init="$wire.checkProxy()">
-    @if ($server->isFunctional())
+    @if (
+        $server->proxyType() !== 'NONE' &&
+            $server->isFunctional() &&
+            !$server->isSwarmWorker() &&
+            !$server->settings->is_build_server)
         <div class="flex gap-2">
             @if (data_get($server, 'proxy.status') === 'running')
                 <x-status.running status="Proxy Running" />