css and stuffs

resources/views/livewire/project/application/danger.blade.php

@@ -0,0 +1,5 @@
+<div x-data="{ deleteApplication: false }">
+    <h2>Danger Zone</h2>
+    <x-naked-modal show="deleteApplication" />
+    <x-inputs.button isWarning x-on:click.prevent="deleteApplication = true">Delete this application</x-inputs.button>
+</div>

resources/views/livewire/project/application/deploy.blade.php

@@ -1,15 +1,13 @@
-<div x-data="{ deleteApplication: false }" class="flex items-center gap-2">
-    <x-naked-modal show="deleteApplication" />
+<div class="flex items-center gap-2">
     @if ($application->status === 'running')
         <x-inputs.button wire:click='start'>Rebuild</x-inputs.button>
         <x-inputs.button wire:click='forceRebuild'>Force Rebuild</x-inputs.button>
-        <x-inputs.button isWarning wire:click='stop'>Stop</x-inputs.button>
+        <x-inputs.button wire:click='stop'>Stop</x-inputs.button>
     @else
         <x-inputs.button wire:click='start'>Start</x-inputs.button>
         <x-inputs.button wire:click='forceRebuild'>Start (no cache)</x-inputs.button>
     @endif
-    <x-inputs.button x-on:click.prevent="deleteApplication = true">
-        Delete</x-inputs.button>
+
     <span wire:poll.5000ms='pollingStatus'>
         @if ($application->status === 'running')
             <span class="text-xs text-pink-600" wire:loading.delay.longer>Loading current status...</span>

resources/views/livewire/project/application/destination.blade.php

@@ -1,5 +1,5 @@
 <div>
-    <h3>Destination</h3>
+    <h2>Destination</h2>
     <p>Server Name: {{ data_get($destination, 'server.name') }}</p>
     @if (data_get($destination, 'server.description'))
         <p>Description: {{ data_get($destination, 'server.description') }}</p>

resources/views/livewire/project/application/environment-variable/add.blade.php

@@ -2,10 +2,10 @@
     <div class="flex gap-2">
         <x-inputs.input noDirty id="key" label="Name" required />
         <x-inputs.input noDirty id="value" label="Value" required />
-        <x-inputs.input noDirty type="checkbox" id="is_build_time" label="Build Variable?" />
+        <x-inputs.checkbox noDirty class="flex-col items-center" id="is_build_time" label="Build Variable?" />
     </div>
     <div class="pt-2">
-        <x-inputs.button isBold type="submit">
+        <x-inputs.button type="submit">
             Add
         </x-inputs.button>
     </div>

resources/views/livewire/project/application/environment-variable/all.blade.php

@@ -1,5 +1,5 @@
 <div class="flex flex-col gap-2">
-    <h3>Environment Variables</h3>
+    <h2>Environment Variables</h2>
     @forelse ($application->environment_variables as $env)
         <livewire:project.application.environment-variable.show wire:key="environment-{{ $env->id }}"
             :env="$env" />

resources/views/livewire/project/application/environment-variable/show.blade.php

@@ -3,13 +3,13 @@
         <div class="flex gap-2">
             <x-inputs.input label="Name" id="env.key" />
             <x-inputs.input label="Value" id="env.value" />
-            <x-inputs.input type="checkbox" id="env.is_build_time" label="Build Variable?" />
+            <x-inputs.checkbox disabled class="flex-col items-center" id="env.is_build_time" label="Build Variable?" />
         </div>
         <div class="pt-2">
-            <x-inputs.button isBold type="submit">
+            <x-inputs.button type="submit">
                 Update
             </x-inputs.button>
-            <x-inputs.button x-on:click.prevent="deleteEnvironment = true" isWarning>
+            <x-inputs.button x-on:click.prevent="deleteEnvironment = true">
                 Delete
             </x-inputs.button>
         </div>

resources/views/livewire/project/application/general.blade.php

@@ -1,12 +1,16 @@
 <div>
-    <h3>General</h3>
     <form wire:submit.prevent='submit' class="flex flex-col">
+        <div class="flex gap-2">
+            <h2>General</h2>
+            <x-inputs.button type="submit">
+                Save
+            </x-inputs.button>
+        </div>
         <div class="flex flex-col gap-2 pb-4">
-            <x-inputs.input id="application.name" label="Name" required />
-            <x-inputs.input id="application.fqdn" label="Domains" />
-            <x-inputs.input id="application.install_command" label="Install Command" />
-            <x-inputs.input id="application.build_command" label="Build Command" />
-            <x-inputs.input id="application.start_command" label="Start Command" />
+            <div class="flex gap-2">
+                <x-inputs.input class="w-full" id="application.name" label="Name" required />
+                <x-inputs.input class="w-full" id="application.fqdn" label="Domains" />
+            </div>
             <x-inputs.select id="application.build_pack" label="Build Pack" required>
                 <option value="nixpacks">Nixpacks</option>
                 <option disabled value="docker">Docker</option>
@@ -18,33 +22,38 @@
                     <option disabled value="apache:alpine">apache:alpine</option>
                 </x-inputs.select>
             @endif
-            <x-inputs.input id="application.base_directory" label="Base Directory" />
-            @if ($application->settings->is_static)
-                <x-inputs.input id="application.publish_directory" label="Publish Directory" required />
-            @else
-                <x-inputs.input id="application.publish_directory" label="Publish Directory" />
-            @endif
-            @if ($application->settings->is_static)
-                <x-inputs.input id="application.ports_exposes" label="Ports Exposes" readonly />
-            @else
-                <x-inputs.input id="application.ports_exposes" label="Ports Exposes" required />
-            @endif
-            <x-inputs.input id="application.ports_mappings" label="Ports Mappings" />
+            <div class="flex gap-2">
+                <x-inputs.input id="application.install_command" label="Install Command" />
+                <x-inputs.input id="application.build_command" label="Build Command" />
+                <x-inputs.input id="application.start_command" label="Start Command" />
+            </div>
+            <div class="flex gap-2">
+                <x-inputs.input id="application.base_directory" label="Base Directory" />
+                @if ($application->settings->is_static)
+                    <x-inputs.input id="application.publish_directory" label="Publish Directory" required />
+                @else
+                    <x-inputs.input id="application.publish_directory" label="Publish Directory" />
+                @endif
+            </div>
+            <div class="flex gap-2">
+                @if ($application->settings->is_static)
+                    <x-inputs.input id="application.ports_exposes" label="Ports Exposes" readonly />
+                @else
+                    <x-inputs.input id="application.ports_exposes" label="Ports Exposes" required />
+                @endif
+                <x-inputs.input id="application.ports_mappings" label="Ports Mappings" />
+            </div>
+        </div>
+        <div class="flex flex-col">
+            <x-inputs.checkbox instantSave id="is_debug" label="Debug" />
+            <x-inputs.checkbox instantSave id="is_static" label="Static website?" />
+            <x-inputs.checkbox instantSave id="is_git_submodules_allowed" label="Git Submodules Allowed?" />
+            <x-inputs.checkbox instantSave id="is_git_lfs_allowed" label="Git LFS Allowed?" />
+            <x-inputs.checkbox instantSave id="is_auto_deploy" label="Auto Deploy?" />
+            <x-inputs.checkbox instantSave id="is_previews" label="Previews?" />
+            <x-inputs.checkbox disabled instantSave id="is_dual_cert" label="Dual Certs?" />
+            <x-inputs.checkbox disabled instantSave id="is_custom_ssl" label="Is Custom SSL?" />
+            <x-inputs.checkbox disabled instantSave id="is_http2" label="Is Http2?" />
         </div>
-        <x-inputs.button isBold type="submit">
-            Submit
-        </x-inputs.button>
     </form>
-    <div class="flex flex-col pt-4">
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_static" label="Static website?" />
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_git_submodules_allowed"
-            label="Git Submodules Allowed?" />
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_git_lfs_allowed" label="Git LFS Allowed?" />
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_debug" label="Debug" />
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_auto_deploy" label="Auto Deploy?" />
-        <x-inputs.input noDirty instantSave type="checkbox" id="is_previews" label="Previews?" />
-        <x-inputs.input disabled instantSave type="checkbox" id="is_dual_cert" label="Dual Certs?" />
-        <x-inputs.input disabled instantSave type="checkbox" id="is_custom_ssl" label="Is Custom SSL?" />
-        <x-inputs.input disabled instantSave type="checkbox" id="is_http2" label="Is Http2?" />
-    </div>
 </div>

resources/views/livewire/project/application/resource-limits.blade.php

@@ -1,6 +1,9 @@
 <div>
-    <h2>Resource Limits</h2>
-    <form wire:submit.prevent='submit'>
+    <form wire:submit.prevent='submit' class="flex flex-col">
+        <div class="flex gap-2">
+            <h2>Resource Limits</h2>
+            <x-inputs.button type='submit'>Save</x-inputs.button>
+        </div>
         <h3>Memory</h3>
         <x-inputs.input placeholder="69b or 420k or 1337m or 1g" label="Limit" id="application.limits_memory" />
         <x-inputs.input placeholder="69b or 420k or 1337m or 1g" label="Swap" id="application.limits_memory_swap" />
@@ -8,13 +11,10 @@
             id="application.limits_memory_swappiness" />
         <x-inputs.input placeholder="69b or 420k or 1337m or 1g" label="Soft Limit"
             id="application.limits_memory_reservation" />
-        <x-inputs.input type="checkbox" label="Is OOM Kill disabled?" id="application.limits_memory_oom_kill" />
+        <x-inputs.checkbox label="Disable OOM kill" id="application.limits_memory_oom_kill" />
         <h3>CPU</h3>
         <x-inputs.input placeholder="1.5" label="Number of CPUs" id="application.limits_cpus" />
         <x-inputs.input placeholder="0-2" label="CPU set to use" id="application.limits_cpuset" />
         <x-inputs.input placeholder="1024" label="CPU Weight" id="application.limits_cpu_shares" />
-        <div class="pt-4">
-            <x-inputs.button isBold>Save</x-inputs.button>
-        </div>
     </form>
 </div>

resources/views/livewire/project/application/rollback.blade.php

@@ -1,7 +1,7 @@
 <div x-init="$wire.loadImages">
-    <h2>Revert</h2>
-    <div>
-        <x-inputs.button isBold wire:click='loadImages'>Refresh Images</x-inputs.button>
+    <div class="flex gap-2">
+        <h2>Rollback</h2>
+        <x-inputs.button isHighlighted wire:click='loadImages'>Refresh Images</x-inputs.button>
     </div>
     <div wire:loading wire:target='loadImages'>
         <x-loading />

resources/views/livewire/project/application/source.blade.php

@@ -1,18 +1,19 @@
 <div>
-    <h3>Source</h3>
+    <h2>Source</h2>
     <div class="pb-8">{{ data_get($application, 'source.name') }}
         @if (data_get($application, 'source.is_public'))
             <span class="text-xs">public</span>
         @endif
     </div>
     <form wire:submit.prevent='submit' class="flex flex-col gap-2 w-max-fit">
-        <x-inputs.input id="application.git_repository" label="Repository" readonly />
-        <x-inputs.input id="application.git_branch" label=" Branch" readonly />
+        <x-inputs.input id="application.git_repository" label="Repository" />
+        <x-inputs.input id="application.git_branch" label=" Branch" />
         <x-inputs.input id="application.git_commit_sha" placeholder="HEAD" label="Commit SHA" />
         <div>
-            <x-inputs.button isBold type="submit">Save</x-inputs.button>
+            <x-inputs.button type="submit">Save</x-inputs.button>
             <a target="_blank" href="{{ $application->gitCommits }}">
-                Commits <img class="inline-flex w-4 h-4" src="{{ asset('svgs/external-link.svg') }}">
+                Commits
+                <x-external-link />
             </a>
         </div>
     </form>

resources/views/livewire/project/application/storages/add.blade.php

@@ -5,7 +5,7 @@
         <x-inputs.input noDirty id="mount_path" label="Destination Path" required />
     </div>
     <div class="pt-2">
-        <x-inputs.button isBold type="submit">
+        <x-inputs.button type="submit">
             Add
         </x-inputs.button>
     </div>

resources/views/livewire/project/application/storages/all.blade.php

@@ -1,5 +1,5 @@
 <div class="flex flex-col gap-2">
-    <h3>Storages</h3>
+    <h2>Storages</h2>
     @forelse ($application->persistentStorages as $storage)
         <livewire:project.application.storages.show wire:key="storage-{{ $storage->id }}" :storage="$storage" />
     @empty

resources/views/livewire/project/application/storages/show.blade.php

@@ -6,10 +6,10 @@
             <x-inputs.input id="storage.mount_path" label="Destination Path" required />
         </div>
         <div class="pt-2">
-            <x-inputs.button isBold type="submit">
+            <x-inputs.button type="submit">
                 Update
             </x-inputs.button>
-            <x-inputs.button x-on:click.prevent="deleteStorage = true" isWarning>
+            <x-inputs.button x-on:click.prevent="deleteStorage = true">
                 Delete
             </x-inputs.button>
         </div>

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

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