From 845a8e50762fc1808b1445361609ebf0df8c0748 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 15 May 2023 08:53:56 +0200
Subject: [PATCH] wip

---
 app/Actions/Proxy/CheckProxySettingsInSync.php       |  4 ++--
 package-lock.json                                    |  2 +-
 resources/views/components/proxy/loading.blade.php   |  3 +++
 .../_proxy => components/proxy}/options.blade.php    |  0
 resources/views/components/proxy/problems.blade.php  |  3 +++
 .../views/livewire/server/_proxy/loading.blade.php   | 12 ------------
 .../views/livewire/server/_proxy/problems.blade.php  |  5 -----
 resources/views/livewire/server/proxy.blade.php      |  7 ++++---
 8 files changed, 13 insertions(+), 23 deletions(-)
 create mode 100644 resources/views/components/proxy/loading.blade.php
 rename resources/views/{livewire/server/_proxy => components/proxy}/options.blade.php (100%)
 create mode 100644 resources/views/components/proxy/problems.blade.php
 delete mode 100644 resources/views/livewire/server/_proxy/loading.blade.php
 delete mode 100644 resources/views/livewire/server/_proxy/problems.blade.php

diff --git a/app/Actions/Proxy/CheckProxySettingsInSync.php b/app/Actions/Proxy/CheckProxySettingsInSync.php
index dc72e1dd7..038a1bb8c 100644
--- a/app/Actions/Proxy/CheckProxySettingsInSync.php
+++ b/app/Actions/Proxy/CheckProxySettingsInSync.php
@@ -21,7 +21,7 @@ class CheckProxySettingsInSync
 
         $output = instantRemoteProcess([
             // Folder exists, in ~/projects/<folder-name>
-            'if [ -d "projects/'.$folder_name.'" ]; then echo "true"; else echo "false"; fi',
+            'if [ -d "projects/' . $folder_name . '" ]; then echo "true"; else echo "false"; fi',
             // Container of name <container-name> is running
             <<<EOT
             [[ "$(docker inspect -f '{{.State.Running}}' $container_name 2>/dev/null)" == "true" ]] && echo "true" || echo "false"
@@ -30,6 +30,6 @@ class CheckProxySettingsInSync
 
         return collect(
             explode(PHP_EOL, $output)
-        )->every(fn($output) => $output === 'true');
+        )->every(fn ($output) => $output === 'true');
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 8f645fe63..bcb3b48ee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-    "name": "coolify",
+    "name": "html",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
diff --git a/resources/views/components/proxy/loading.blade.php b/resources/views/components/proxy/loading.blade.php
new file mode 100644
index 000000000..cab8315c3
--- /dev/null
+++ b/resources/views/components/proxy/loading.blade.php
@@ -0,0 +1,3 @@
+<div>
+    Loading...
+</div>
diff --git a/resources/views/livewire/server/_proxy/options.blade.php b/resources/views/components/proxy/options.blade.php
similarity index 100%
rename from resources/views/livewire/server/_proxy/options.blade.php
rename to resources/views/components/proxy/options.blade.php
diff --git a/resources/views/components/proxy/problems.blade.php b/resources/views/components/proxy/problems.blade.php
new file mode 100644
index 000000000..751f7f370
--- /dev/null
+++ b/resources/views/components/proxy/problems.blade.php
@@ -0,0 +1,3 @@
+<div>
+    Problems!
+</div>
diff --git a/resources/views/livewire/server/_proxy/loading.blade.php b/resources/views/livewire/server/_proxy/loading.blade.php
deleted file mode 100644
index cfab2d8db..000000000
--- a/resources/views/livewire/server/_proxy/loading.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="absolute w-full h-full bg-sky-600 rounded-lg">
-    <div class="w-full mt-32 text-center animate-pulse">
-        Loading
-    </div>
-    <div class="mt-20 w-full flex justify-center">
-        <span class="relative flex h-28 w-28">
-          <span
-              class="animate-ping absolute inline-flex h-full w-full rounded-full bg-sky-400 opacity-75"></span>
-          <span class="relative inline-flex rounded-full h-28 w-28 bg-sky-500"></span>
-        </span>
-    </div>
-</div>
diff --git a/resources/views/livewire/server/_proxy/problems.blade.php b/resources/views/livewire/server/_proxy/problems.blade.php
deleted file mode 100644
index 541d15e6a..000000000
--- a/resources/views/livewire/server/_proxy/problems.blade.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<div class="absolute w-full h-full bg-orange-700 rounded-lg">
-    <div class="w-full mt-32 text-center animate-pulse">
-        Problems!
-    </div>
-</div>
diff --git a/resources/views/livewire/server/proxy.blade.php b/resources/views/livewire/server/proxy.blade.php
index 2d6a6c07b..6a81549ff 100644
--- a/resources/views/livewire/server/proxy.blade.php
+++ b/resources/views/livewire/server/proxy.blade.php
@@ -11,14 +11,15 @@
 
                 {{-- Proxy is being checked against DB information --}}
                 @if (!$this->is_check_proxy_complete)
-                    @include('livewire.server._proxy.loading')
+                    <x-proxy.loading />
                 @endif
 
                 @if ($this->is_check_proxy_complete && !$this->is_proxy_settings_in_sync)
-                    @include('livewire.server._proxy.problems')
+                    <x-proxy.problems />
+                @else
+                    <x-proxy.options />
                 @endif
 
-                @include('livewire.server._proxy.options')
             </div>
 
         </div>