From d79c063fd61f0ee4d6a138e3962f5db017f76472 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 5 Oct 2023 14:44:17 +0200
Subject: [PATCH] ui: notifications

---
 .../notifications/discord-settings.blade.php  | 28 +++++--------------
 .../notifications/email-settings.blade.php    | 24 +++++-----------
 .../notifications/telegram-settings.blade.php | 20 ++++++-------
 3 files changed, 22 insertions(+), 50 deletions(-)

diff --git a/resources/views/livewire/notifications/discord-settings.blade.php b/resources/views/livewire/notifications/discord-settings.blade.php
index cfba9d92f..89b0e8080 100644
--- a/resources/views/livewire/notifications/discord-settings.blade.php
+++ b/resources/views/livewire/notifications/discord-settings.blade.php
@@ -22,29 +22,15 @@
     @if (data_get($team, 'discord_enabled'))
         <h2 class="mt-4">Subscribe to events</h2>
         <div class="w-64">
-
-
             @if (isDev())
-            <h3 class="mt-4">Test</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_test" label="Enabled" />
-            </div>
+                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_test" label="Test" />
             @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_status_changes"
-                label="Enabled" />
-            </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_deployments"
-                label="Enabled" />
-            </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_database_backups"
-                label="Enabled" />
-            </div>
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_status_changes"
+                label="Container Status Changes" />
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_deployments"
+                label="Application Deployments" />
+            <x-forms.checkbox instantSave="saveModel" id="team.discord_notifications_database_backups"
+                label="Backup Status" />
         </div>
     @endif
 </div>
diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index d96eb4875..8734b3c60 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -104,24 +104,14 @@
         <h2 class="mt-4">Subscribe to events</h2>
         <div class="w-64">
             @if (isDev())
-                <h3 class="mt-4">Test</h3>
-                <div class="flex items-end gap-10">
-                    <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Enabled" />
-                </div>
+                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Test" />
             @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes" label="Enabled" />
-            </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments" label="Enabled" />
-            </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
-                    label="Enabled" />
-            </div>
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes"
+                label="Container Status Changes" />
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments"
+                label="Application Deployments" />
+            <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
+                label="Backup Status" />
         </div>
     @endif
 </div>
diff --git a/resources/views/livewire/notifications/telegram-settings.blade.php b/resources/views/livewire/notifications/telegram-settings.blade.php
index 12b62af4d..89eec05ac 100644
--- a/resources/views/livewire/notifications/telegram-settings.blade.php
+++ b/resources/views/livewire/notifications/telegram-settings.blade.php
@@ -27,34 +27,30 @@
         <h2 class="mt-4">Subscribe to events</h2>
         <div class="w-96">
             @if (isDev())
-            <h3 class="mt-4">Test</h3>
-                <div class="flex items-end gap-10">
-                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_test" label="Enabled" />
+                <div class="w-64">
+                    <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_test" label="Test" />
                     <x-forms.input
                         helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                         id="team.telegram_notifications_test_message_thread_id" label="Custom Topic ID" />
                 </div>
             @endif
-            <h3 class="mt-4">Container Status Changes</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                 <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_status_changes"
-                label="Enabled" />
+                label="Container Status Changes" />
                 <x-forms.input
                     helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                     id="team.telegram_notifications_status_changes_message_thread_id" label="Custom Topic ID" />
             </div>
-            <h3 class="mt-4">Application Deployments</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                 <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_deployments"
-                label="Enabled" />
+                label="Application Deployments" />
                 <x-forms.input
                     helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                     id="team.telegram_notifications_deployments_message_thread_id" label="Custom Topic ID" />
             </div>
-            <h3 class="mt-4">Backup Status</h3>
-            <div class="flex items-end gap-10">
+            <div class="w-64">
                 <x-forms.checkbox instantSave="saveModel" id="team.telegram_notifications_database_backups"
-                label="Enabled" />
+                label="Backup Status" />
                 <x-forms.input
                     helper="If you are using Group chat with Topics, you can specify the topics ID. If empty, General topic will be used."
                     id="team.telegram_notifications_database_backups_message_thread_id" label="Custom Topic ID" />