woah

resources/views/livewire/project/delete-environment.blade.php

@@ -2,11 +2,11 @@
     <x-naked-modal show="deleteEnvironment" message='Are you sure you would like to delete this environment?' />
     @if ($resource_count > 0)
         <x-forms.button tooltip="First delete all resources." disabled>
-            Delete
+            Delete Environment
         </x-forms.button>
     @else
         <x-forms.button x-on:click.prevent="deleteEnvironment = true">
-            Delete
+            Delete Environment
         </x-forms.button>
     @endif
 </div>

resources/views/livewire/project/delete-project.blade.php

@@ -2,11 +2,11 @@
     <x-naked-modal show="deleteProject" message='Are you sure you would like to delete this project?' />
     @if ($resource_count > 0)
         <x-forms.button disabled="First delete all resources.">
-            Delete
+            Delete Project
         </x-forms.button>
     @else
         <x-forms.button x-on:click.prevent="deleteProject = true">
-            Delete
+            Delete Project
         </x-forms.button>
     @endif
 </div>

resources/views/livewire/run-command.blade.php

@@ -1,5 +1,4 @@
 <div>
-    <div class="pb-4 text-sm">Outputs are not saved at the moment, only available until you refresh or navigate.</div>
     <form class="flex items-end justify-center gap-2" wire:submit.prevent='runCommand'>
         <x-forms.input placeholder="ls -l" autofocus noDirty id="command" label="Command" required />
         <x-forms.select label="Server" id="server" required>

resources/views/livewire/server/form.blade.php

@@ -9,9 +9,16 @@
                     Delete
                 </x-forms.button>
             @endif
+            @if (!$server->settings->is_validated)
+                <div class="w-full">
+                    <x-forms.button isHighlighted wire:click.prevent='validateServer'>
+                        Validate Server
+                    </x-forms.button>
+                </div>
+            @endif
         </div>
         <div class="flex flex-col gap-2 xl:flex-row">
-            <div class="flex flex-col w-96">
+            <div class="flex flex-col w-full">
                 @if ($server->id === 0)
                     <x-forms.input id="server.name" label="Name" readonly required />
                     <x-forms.input id="server.description" label="Description" readonly />
@@ -23,7 +30,7 @@
                 {{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
                     label="Is it part of a Swarm cluster?" /> --}}
             </div>
-            <div class="flex flex-col">
+            <div class="flex flex-col w-full">
                 @if ($server->id === 0)
                     <x-forms.input id="server.ip" label="IP Address" readonly required />
                     <x-forms.input id="server.user" label="User" readonly required />
@@ -37,13 +44,7 @@
                 @endif
             </div>
         </div>
-        @if (!$server->settings->is_validated)
-            <div class="w-full pt-4">
-                <x-forms.button isHighlighted wire:click.prevent='validateServer'>
-                    Validate Server
-                </x-forms.button>
-            </div>
-        @endif
+
         @if ($server->settings->is_validated)
             <h3 class="pt-8 pb-4">Quick Actions</h3>
             <div class="flex items-center gap-2">
@@ -53,17 +54,18 @@
                 {{-- <x-forms.button wire:click.prevent='installDocker'>Install Docker</x-forms.button> --}}
             </div>
         @endif
-        <div class="pt-3 text-sm">
-            @isset($uptime)
+        @isset($uptime)
+            <h3>Server Info</h3>
+            <div class="pt-3 text-sm">
                 <p>Uptime: {{ $uptime }}</p>
-            @endisset
-            @isset($dockerVersion)
-                <p>Docker Engine {{ $dockerVersion }}</p>
-            @endisset
-            @isset($dockerComposeVersion)
-                <p>{{ $dockerComposeVersion }}</p>
-            @endisset
-        </div>
+                @isset($dockerVersion)
+                    <p>Docker Engine {{ $dockerVersion }}</p>
+                @endisset
+                @isset($dockerComposeVersion)
+                    <p>{{ $dockerComposeVersion }}</p>
+                @endisset
+            </div>
+        @endisset
     </form>
     <div class="flex items-center gap-2 py-4">
         <h3>Private Key</h3>

resources/views/livewire/server/new/by-ip.blade.php

@@ -1,11 +1,6 @@
 <div>
     <form class="flex flex-col gap-1" wire:submit.prevent='submit'>
-        <div class="flex items-center gap-2">
-            <h1>New Server</h1>
-            <x-forms.button type="submit">
-                Save
-            </x-forms.button>
-        </div>
+        <h1>New Server</h1>
         <x-forms.input id="name" label="Name" required />
         <x-forms.input id="description" label="Description" />
         <x-forms.input id="ip" label="IP Address" required
@@ -24,6 +19,8 @@
             @endforeach
         </x-forms.select>
         <x-forms.checkbox instantSave noDirty id="is_part_of_swarm" label="Is it part of a Swarm cluster?" />
-
+        <x-forms.button type="submit">
+            Save
+        </x-forms.button>
     </form>
 </div>

resources/views/livewire/server/private-key.blade.php

@@ -1,10 +1,10 @@
-<div class="flex flex-wrap gap-2">
+<div class="grid grid-cols-2">
     @forelse ($private_keys as $private_key)
-        <div class="w-64 box">
-            <button wire:click='setPrivateKey({{ $private_key->id }})'>{{ $private_key->name }}
-            </button>
-        </div>
+        <x-forms.button wire:click='setPrivateKey({{ $private_key->id }})'>{{ $private_key->name }}
+        </x-forms.button>
     @empty
-        <p>No private keys found</p>
+        <div>No private keys found.
+            <x-use-magic-bar />
+        </div>
     @endforelse
 </div>

resources/views/livewire/settings/form.blade.php

@@ -1,7 +1,13 @@
 <div>
     <form wire:submit.prevent='submit' class="flex flex-col">
         <h1>Settings</h1>
-        <div class="pt-2 pb-4 text-sm">Instance wide settings for Coolify. </div>
+        <div class="pb-10 text-sm breadcrumbs">
+            <ul>
+                <li>
+                    Instance wide settings for Coolify.
+                </li>
+            </ul>
+        </div>
         <div class="flex items-center gap-2">
             <h3>General</h3>
             <x-forms.button type="submit">