ui ui ui ui

resources/views/livewire/project/database/backup/execution.blade.php

@@ -1,16 +1,6 @@
 <div>
     <h1>Backups</h1>
     <livewire:project.database.heading :database="$database" />
-    <x-modal modalId="startDatabase">
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Database Startup Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="startDatabase.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
     <div class="pt-6">
         <livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
         <div class="flex items-center gap-2">

resources/views/livewire/project/database/backup/index.blade.php

@@ -1,28 +1,12 @@
 <div>
     <h1>Backups</h1>
     <livewire:project.database.heading :database="$database" />
-
-    <x-modal modalId="startDatabase">
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Database Startup Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="startDatabase.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
     <div class="pt-6">
         <div class="flex gap-2 ">
             <h2 class="pb-4">Scheduled Backups</h2>
-            <x-slide-over>
-                <x-slot:title>New Scheduled Backup</x-slot:title>
-                <x-slot:content>
-                    <livewire:project.database.create-scheduled-backup :database="$database" :s3s="$s3s" />
-                </x-slot:content>
-                <button @click="slideOverOpen=true" class="button">+
-                    Add</button>
-            </x-slide-over>
+            <x-modal-input buttonTitle="+ Add" title="New Scheduled Backup">
+                <livewire:project.database.create-scheduled-backup :database="$database" :s3s="$s3s" />
+            </x-modal-input>
         </div>
         <livewire:project.database.scheduled-backups :database="$database" />
     </div>

resources/views/livewire/project/database/configuration.blade.php

@@ -1,16 +1,6 @@
 <div>
     <h1>Configuration</h1>
     <livewire:project.database.heading :database="$database" />
-    <x-modal modalId="startDatabase" noSubmit>
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Database Startup Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="startDatabase.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
     <div x-data="{ activeTab: window.location.hash ? window.location.hash.substring(1) : 'general' }" class="flex h-full pt-6">
         <div class="flex flex-col gap-4 min-w-fit">
             <a :class="activeTab === 'general' && 'dark:text-white'"

resources/views/livewire/project/database/create-scheduled-backup.blade.php

@@ -1,5 +1,5 @@
-<form class="flex flex-col gap-2 rounded" wire:submit='submit'>
-    <x-forms.input placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
+<form class="flex flex-col w-full gap-2 rounded" wire:submit='submit'>
+    <x-forms.input autofocus placeholder="0 0 * * * or daily" id="frequency" label="Frequency" required />
     <x-forms.checkbox id="save_s3" label="Save to S3" />
     <x-forms.select id="selected_storage_id">
         @if ($s3s->count() === 0)

resources/views/livewire/project/database/heading.blade.php

@@ -3,7 +3,7 @@
     <x-slide-over @startdatabase.window="slideOverOpen = true" closeWithX fullScreen>
         <x-slot:title>Database Startup Logs</x-slot:title>
         <x-slot:content>
-            <livewire:activity-monitor showWaiting />
+            <livewire:activity-monitor header="Logs" showWaiting />
         </x-slot:content>
     </x-slide-over>
     <div class="navbar-main">

resources/views/livewire/project/database/postgresql/general.blade.php

@@ -82,21 +82,17 @@
     <div class="pb-16">
         <div class="flex gap-2 pt-4 pb-2">
             <h3>Initialization scripts</h3>
-            <x-slide-over>
-                <x-slot:title>New Init Script</x-slot:title>
-                <x-slot:content>
-                    <form class="flex flex-col gap-2 rounded modal-box" wire:submit='save_new_init_script'>
-                        <x-forms.input placeholder="create_test_db.sql" id="new_filename" label="Filename" required />
-                        <x-forms.textarea placeholder="CREATE DATABASE test;" id="new_content" label="Content"
-                            required />
-                        <x-forms.button type="submit">
-                            Save
-                        </x-forms.button>
-                    </form>
-                </x-slot:content>
-                <button @click="slideOverOpen=true" class="button">+
-                    Add</button>
-            </x-slide-over>
+            <x-modal-input buttonTitle="+ Add" title="New Init Script">
+                <form class="flex flex-col w-full gap-2 rounded" wire:submit='save_new_init_script'>
+                    <x-forms.input autofocus placeholder="create_test_db.sql" id="new_filename" label="Filename"
+                        required />
+                    <x-forms.textarea rows="20" placeholder="CREATE DATABASE test;" id="new_content"
+                        label="Content" required />
+                    <x-forms.button type="submit">
+                        Save
+                    </x-forms.button>
+                </form>
+            </x-modal-input>
         </div>
         <div class="flex flex-col gap-2">
             @forelse(data_get($database,'init_scripts', []) as $script)

resources/views/livewire/project/database/scheduled-backups.blade.php

@@ -2,12 +2,14 @@
     <div class="flex flex-wrap gap-2">
         @forelse($database->scheduledBackups as $backup)
             @if ($type == 'database')
-                <a class="flex flex-col box"
-                    href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
-                    <div>Frequency: {{ $backup->frequency }}</div>
-                    <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-                    <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
-                </a>
+                <div class="box">
+                    <a class="flex flex-col"
+                        href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
+                        <div>Frequency: {{ $backup->frequency }}</div>
+                        <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                    </a>
+                </div>
             @else
                 <div @class([
                     'border-coollabs' =>
@@ -25,8 +27,8 @@
     </div>
     @if ($type === 'service-database' && $selectedBackup)
         <div class="pt-10">
-            <livewire:project.database.backup-edit wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup" :s3s="$s3s"
-                :status="data_get($database, 'status')" />
+            <livewire:project.database.backup-edit wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
+                :s3s="$s3s" :status="data_get($database, 'status')" />
             <h3 class="py-4">Executions</h3>
             <livewire:project.database.backup-executions wire:keykey="{{ $selectedBackup->id }}" :backup="$selectedBackup"
                 :executions="$selectedBackup->executions" />