wip

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');
     }
 }

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "name": "coolify",
+    "name": "html",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {

resources/views/components/proxy/loading.blade.php

@@ -0,0 +1,3 @@
+<div>
+    Loading...
+</div>

resources/views/components/proxy/problems.blade.php

@@ -0,0 +1,3 @@
+<div>
+    Problems!
+</div>

resources/views/livewire/server/_proxy/loading.blade.php

@@ -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>

resources/views/livewire/server/_proxy/problems.blade.php

@@ -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>

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>