From 6910f9c5c7e4cdde6cc22e1e61a1f9b6e5bac4f5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 15 May 2023 21:14:45 +0200
Subject: [PATCH] fix

---
 app/Http/Livewire/Server/Form.php             |   1 +
 app/Http/Livewire/Server/Proxy.php            |   5 +
 resources/views/errors/404.blade.php          |   8 +-
 .../views/livewire/server/proxy.blade.php     | 100 +++++++++---------
 resources/views/server/show.blade.php         |   6 +-
 5 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php
index ed2fc38b4..f131c159a 100644
--- a/app/Http/Livewire/Server/Form.php
+++ b/app/Http/Livewire/Server/Form.php
@@ -43,6 +43,7 @@ public function validateServer()
                 if (!$this->server->settings->is_validated) {
                     $this->server->settings->is_validated = true;
                     $this->server->settings->save();
+                    $this->emit('serverValidated');
                 }
             }
             $this->dockerVersion = instantRemoteProcess(['docker version|head -2|grep -i version'], $this->server, false);
diff --git a/app/Http/Livewire/Server/Proxy.php b/app/Http/Livewire/Server/Proxy.php
index 1991b75e9..2cfae33dc 100644
--- a/app/Http/Livewire/Server/Proxy.php
+++ b/app/Http/Livewire/Server/Proxy.php
@@ -11,11 +11,16 @@
 
 class Proxy extends Component
 {
+    protected $listeners = ['serverValidated'];
     public Server $server;
 
     public ProxyTypes $selectedProxy = ProxyTypes::TRAEFIK_V2;
     public $proxy_settings = null;
 
+    public function serverValidated()
+    {
+        $this->server->settings->refresh();
+    }
     public function installProxy()
     {
         $this->saveConfiguration($this->server);
diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index c5c95717d..b9782463c 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,3 +1,5 @@
-<div>
-    You are lost. <a href="{{ route('dashboard') }}">Go home</a>
-</div>
+<x-layout>
+    <div class="flex items-center justify-center">
+        <div><a class="underline" href="{{ route('dashboard') }}">Go home</a></div>
+    </div>
+</x-layout>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index ca3b1629a..3487b57e4 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -1,52 +1,56 @@
 <div>
-
-    @if ($this->server->extra_attributes->proxy_status !== 'running')
-        <select wire:model="selectedProxy">
-            <option value="{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}">
-                {{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}
-            </option>
-        </select>
-        <x-inputs.button isBold wire:click="setProxy">Set Proxy</x-inputs.button>
-    @endif
-    @if ($this->server->extra_attributes->proxy_type)
-        <div wire:poll="proxyStatus">
-            @if (
-                $this->server->extra_attributes->last_applied_proxy_settings &&
-                    $this->server->extra_attributes->last_saved_proxy_settings !==
-                        $this->server->extra_attributes->last_applied_proxy_settings)
-                <div class="text-red-500">Configuration out of sync.</div>
-            @endif
-            @if ($this->server->extra_attributes->proxy_status !== 'running')
-                <x-inputs.button isBold wire:click="installProxy">
-                    Install
-                </x-inputs.button>
-            @endif
-            <x-inputs.button isBold wire:click="stopProxy">Stop</x-inputs.button>
-            <span x-data="{ showConfiguration: false }">
-                <x-inputs.button isBold x-on:click="showConfiguration = !showConfiguration">Show Configuration
-                </x-inputs.button>
-                <div class="pt-4">
-                    <livewire:activity-monitor />
-                </div>
-                <template x-if="showConfiguration">
-                    <div x-init="$wire.checkProxySettingsInSync">
-                        <h3>Configuration</h3>
-                        <div wire:loading wire:target="checkProxySettingsInSync">
-                            <x-proxy.loading />
-                        </div>
-                        @isset($this->proxy_settings)
-                            <form wire:submit.prevent='saveConfiguration'>
-                                <x-inputs.button isBold>Save</x-inputs.button>
-                                <x-inputs.button x-on:click="showConfiguration = false" isBold
-                                    wire:click.prevent="installProxy">
-                                    Apply
-                                </x-inputs.button>
-                                <textarea wire:model.defer="proxy_settings" class="w-full" rows="30"></textarea>
-                            </form>
-                        @endisset
+    @if ($server->settings->is_validated)
+        @if ($this->server->extra_attributes->proxy_status !== 'running')
+            <select wire:model="selectedProxy">
+                <option value="{{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}">
+                    {{ \App\Enums\ProxyTypes::TRAEFIK_V2 }}
+                </option>
+            </select>
+            <x-inputs.button isBold wire:click="setProxy">Set Proxy</x-inputs.button>
+        @endif
+        @if ($this->server->extra_attributes->proxy_type)
+            <div wire:poll="proxyStatus">
+                @if (
+                    $this->server->extra_attributes->last_applied_proxy_settings &&
+                        $this->server->extra_attributes->last_saved_proxy_settings !==
+                            $this->server->extra_attributes->last_applied_proxy_settings)
+                    <div class="text-red-500">Configuration out of sync.</div>
+                @endif
+                @if ($this->server->extra_attributes->proxy_status !== 'running')
+                    <x-inputs.button isBold wire:click="installProxy">
+                        Install
+                    </x-inputs.button>
+                @endif
+                <x-inputs.button isBold wire:click="stopProxy">Stop</x-inputs.button>
+                <span x-data="{ showConfiguration: false }">
+                    <x-inputs.button isBold x-on:click="showConfiguration = !showConfiguration">Show Configuration
+                    </x-inputs.button>
+                    <div class="pt-4">
+                        <livewire:activity-monitor />
                     </div>
-                </template>
-            </span>
-        </div>
+                    <template x-if="showConfiguration">
+                        <div x-init="$wire.checkProxySettingsInSync">
+                            <h3>Configuration</h3>
+                            <div wire:loading wire:target="checkProxySettingsInSync">
+                                <x-proxy.loading />
+                            </div>
+                            @isset($this->proxy_settings)
+                                <form wire:submit.prevent='saveConfiguration'>
+                                    <x-inputs.button isBold>Save</x-inputs.button>
+                                    <x-inputs.button x-on:click="showConfiguration = false" isBold
+                                        wire:click.prevent="installProxy">
+                                        Apply
+                                    </x-inputs.button>
+                                    <textarea wire:model.defer="proxy_settings" class="w-full" rows="30"></textarea>
+                                </form>
+                            @endisset
+                        </div>
+                    </template>
+                </span>
+            </div>
+        @endif
+    @else
+        <p>Server is not validated. Validate first.</p>
     @endif
+
 </div>
diff --git a/resources/views/server/show.blade.php b/resources/views/server/show.blade.php
index 761e61747..83c56598d 100644
--- a/resources/views/server/show.blade.php
+++ b/resources/views/server/show.blade.php
@@ -26,9 +26,5 @@
             <div>{{ $server->extra_attributes->proxy_status }}</div>
         @endif
     </div>
-    @if ($server->settings->is_validated)
-        <livewire:server.proxy :server="$server" />
-    @else
-        <p>Server is not validated. Validate first.</p>
-    @endif
+    <livewire:server.proxy :server="$server" />
 </x-layout>