a lot hehe

resources/views/livewire/notifications/discord-settings.blade.php

@@ -1,23 +1,19 @@
-<div class="">
-    <div class="text-xl">Discord</div>
-    <div class="mt-2"></div>
+<div>
     <form wire:submit.prevent='submit' class="flex flex-col">
-        <div class="flex flex-col gap-2 xl:flex-row w-96">
-            <x-inputs.input type="checkbox" id="model.extra_attributes.discord_active" label="Active?" />
+        <div class="flex items-center gap-2">
+            <h3>Discord</h3>
+            <x-forms.button class="w-16 mt-4" type="submit">
+                Save
+            </x-forms.button>
         </div>
         <div class="flex flex-col gap-2 xl:flex-row w-96">
-            <x-inputs.input id="model.extra_attributes.discord_webhook" label="Discord Webhook" />
+            <x-forms.checkbox instantSave id="model.smtp_attributes.discord_active" label="Notification Enabled" />
+        </div>
+        <div class="flex flex-col gap-2 xl:flex-row w-96">
+            <x-forms.input required id="model.smtp_attributes.discord_webhook" label="Webhook" />
         </div>
         <div>
-            <x-inputs.button class="w-16 mt-4" type="submit">
-                Submit
-            </x-inputs.button>
-            <x-inputs.button
-                class="mt-4 btn btn-xs no-animation normal-case text-white btn-primary"
-                wire:click="sendTestNotification"
-            >
-                Send test message
-            </x-inputs.button>
+
         </div>
     </form>
 </div>

resources/views/livewire/notifications/email-settings.blade.php

@@ -1,45 +1,35 @@
-<div class="mt-10">
-    <div class="text-xl">E-mail - SMTP</div>
-    <div class="mt-2"></div>
-    <form wire:submit.prevent='submit' class="flex flex-col">
+<div>
+    <form wire:submit.prevent='submit' class="flex flex-col mt-2">
+        <div class="flex items-center gap-2">
+            <h3>E-mail (SMTP)</h3>
+            <x-forms.button class="w-16 mt-4" type="submit">
+                Save
+            </x-forms.button>
+        </div>
         <div class="flex flex-col w-96">
-            <x-inputs.input type="checkbox" id="model.extra_attributes.smtp_active" label="Active?" />
+            <x-forms.checkbox instantSave id="model.smtp_attributes.smtp_active" label="Notification Enabled" />
         </div>
         <div class="flex flex-col gap-2 xl:flex-row">
             <div class="flex flex-col w-96">
-                <x-inputs.textarea
-                    id="model.extra_attributes.recipients"
-                    helper="E-mails, one per line"
+                <x-forms.textarea required id="model.smtp_attributes.recipients" helper="E-mails, one per line"
                     label="Recipients" />
             </div>
         </div>
         <div class="flex flex-col gap-2 xl:flex-row">
             <div class="flex flex-col w-96">
-                <x-inputs.input id="model.extra_attributes.smtp_host" label="Host" />
-                <x-inputs.input id="model.extra_attributes.smtp_port" label="Port" />
-                <x-inputs.input id="model.extra_attributes.smtp_encryption" label="Encryption" />
+                <x-forms.input required id="model.smtp_attributes.smtp_host" label="Host" />
+                <x-forms.input required id="model.smtp_attributes.smtp_port" label="Port" />
+                <x-forms.input id="model.smtp_attributes.smtp_encryption" label="Encryption" />
             </div>
             <div class="flex flex-col w-96">
-                <x-inputs.input id="model.extra_attributes.smtp_username" label="Username" />
-                <x-inputs.input id="model.extra_attributes.smtp_password" label="Password" />
-                <x-inputs.input id="model.extra_attributes.smtp_timeout" label="Timeout" />
+                <x-forms.input id="model.smtp_attributes.smtp_username" label="Username" />
+                <x-forms.input id="model.smtp_attributes.smtp_password" label="Password" />
+                <x-forms.input id="model.smtp_attributes.smtp_timeout" label="Timeout" />
             </div>
             <div class="flex flex-col w-96">
-                <x-inputs.input id="model.extra_attributes.from_address" label="From Address" />
-                <x-inputs.input id="model.extra_attributes.from_name" label="From Name" />
-                <x-inputs.input id="model.extra_attributes.test_address" label="Send test e-mails to" />
+                <x-forms.input required id="model.smtp_attributes.from_address" label="From Address" />
+                <x-forms.input required id="model.smtp_attributes.from_name" label="From Name" />
             </div>
         </div>
-        <div class="flex">
-            <x-inputs.button class="w-16 mt-4" type="submit">
-                Submit
-            </x-inputs.button>
-            <x-inputs.button
-                class="mt-4 btn btn-xs no-animation normal-case text-white btn-primary"
-                wire:click="sendTestNotification"
-            >
-                Send test message
-            </x-inputs.button>
-        </div>
     </form>
 </div>

resources/views/livewire/notifications/test.blade.php

@@ -0,0 +1,4 @@
+<x-forms.button isHighlighted class="mt-4 text-white normal-case btn btn-xs no-animation btn-primary"
+    wire:click="sendTestNotification">
+    Send Test Notifications
+</x-forms.button>

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

@@ -1,10 +1,12 @@
 <div>
-    <form wire:submit.prevent='submit'>
+    <form wire:submit.prevent='submit' class="flex flex-col">
         <div class="flex items-center gap-2">
-            <h3>Profile</h3>
+            <h3>General</h3>
             <x-forms.button type="submit" label="Save">Save</x-forms.button>
         </div>
-        <x-forms.input id="name" label="Name" required />
-        <x-forms.input id="email" label="Email" readonly />
+        <div class="flex gap-2">
+            <x-forms.input id="name" label="Name" required />
+            <x-forms.input id="email" label="Email" readonly />
+        </div>
     </form>
 </div>

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

@@ -0,0 +1,18 @@
+<form>
+    <div class="flex flex-col gap-2">
+        <div class="flex gap-2">
+            <x-forms.input id="model.extra_attributes.smtp_host" label="Host" />
+            <x-forms.input id="model.extra_attributes.smtp_port" label="Port" />
+            <x-forms.input id="model.extra_attributes.smtp_encryption" label="Encryption" />
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input id="model.extra_attributes.smtp_username" label="Username" />
+            <x-forms.input id="model.extra_attributes.smtp_password" label="Password" />
+            <x-forms.input id="model.extra_attributes.smtp_timeout" label="Timeout" />
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input id="model.extra_attributes.from_address" label="From Address" />
+            <x-forms.input id="model.extra_attributes.from_name" label="From Name" />
+        </div>
+    </div>
+</form>

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

@@ -6,8 +6,7 @@
                 Save
             </x-forms.button>
         </div>
-        <div class="pb-4 text-sm">Instance wide settings for Coolify.
-        </div>
+        <div class="pb-4 text-sm">Instance wide settings for Coolify.</div>
         <div class="flex flex-col gap-2">
             <div class="flex gap-2">
                 <x-forms.input id="settings.fqdn" label="Coolify's Domain" />
@@ -22,7 +21,6 @@
             </div>
         </div>
     </form>
-
     <h3>Advanced</h3>
     <div class="flex flex-col text-right w-52">
         <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Coolify" />
@@ -30,7 +28,5 @@
         {{-- <x-forms.checkbox instantSave id="is_https_forced" label="Force https?" /> --}}
         <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
     </div>
-    @if (auth()->user()->isPartOfRootTeam())
-        <livewire:force-upgrade />
-    @endif
+
 </div>

resources/views/livewire/switch-team.blade.php

@@ -1,12 +1,9 @@
 <div class="pt-4">
     <h3>Switch Team</h3>
-    @if (auth()->user()->otherTeams()->count() > 0)
-        <div class="flex gap-2">
-            @foreach (auth()->user()->otherTeams() as $team)
-                <x-forms.button isHighlighted wire:key="{{ $team->id }}"
-                    wire:click="switch_to('{{ $team->id }}')">
-                    {{ $team->name }}</x-forms.button>
-            @endforeach
-        </div>
-    @endif
+    <div class="flex gap-2">
+        @foreach (auth()->user()->otherTeams() as $team)
+            <x-forms.button isHighlighted wire:key="{{ $team->id }}" wire:click="switch_to('{{ $team->id }}')">
+                {{ $team->name }}</x-forms.button>
+        @endforeach
+    </div>
 </div>