From e5f534b6ef655aebf92891d129e5f7917307e2ec Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 12 Dec 2024 08:40:34 +0100
Subject: [PATCH] fix: pushover

---
 .../livewire/notifications/pushover.blade.php | 140 +++++++++---------
 routes/web.php                                |   2 +-
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/resources/views/livewire/notifications/pushover.blade.php b/resources/views/livewire/notifications/pushover.blade.php
index 271af5367..c8dd777d8 100644
--- a/resources/views/livewire/notifications/pushover.blade.php
+++ b/resources/views/livewire/notifications/pushover.blade.php
@@ -1,84 +1,86 @@
 <div>
     <x-slot:title>
         Notifications | Coolify
-        </x-slot>
-        <x-notification.navbar />
-        <form wire:submit='submit' class="flex flex-col gap-4 pb-4">
-            <div class="flex items-center gap-2">
-                <h2>Pushover</h2>
-                <x-forms.button type="submit">
-                    Save
-                </x-forms.button>
-                @if ($pushoverEnabled)
+    </x-slot>
+    <x-notification.navbar />
+    <form wire:submit='submit' class="flex flex-col gap-4 pb-4">
+        <div class="flex items-center gap-2">
+            <h2>Pushover</h2>
+            <x-forms.button type="submit">
+                Save
+            </x-forms.button>
+            @if ($pushoverEnabled)
                 <x-forms.button class="normal-case dark:text-white btn btn-xs no-animation btn-primary"
                     wire:click="sendTestNotification">
                     Send Test Notification
                 </x-forms.button>
-                @else
+            @else
                 <x-forms.button disabled class="normal-case dark:text-white btn btn-xs no-animation btn-primary">
                     Send Test Notification
                 </x-forms.button>
-                @endif
-            </div>
-            <div class="w-32">
-                <x-forms.checkbox instantSave="instantSavePushoverEnabled" id="pushoverEnabled" label="Enabled" />
-            </div>
+            @endif
+        </div>
+        <div class="w-32">
+            <x-forms.checkbox instantSave="instantSavePushoverEnabled" id="pushoverEnabled" label="Enabled" />
+        </div>
+        <div class="flex  gap-2">
             <x-forms.input type="password"
-                helper="Get your User Key in Pushover. You need to be logged in to Pushover to see your user key in the top right corner. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/' target='_blank'>Pushover Dashboard</a>" required
-                id="pushoverUserKey" label="User Key" />
+                helper="Get your User Key in Pushover. You need to be logged in to Pushover to see your user key in the top right corner. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/' target='_blank'>Pushover Dashboard</a>"
+                required id="pushoverUserKey" label="User Key" />
             <x-forms.input type="password"
-                helper="Generate an API Token/Key in Pushover by creating a new application. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/apps/build' target='_blank'>Create Pushover Application</a>" required
-                id="pushoverApiToken" label="API Token" />
-        </form>
-        <h2 class="mt-4">Notification Settings</h2>
-        <p class="mb-4">
-            Select events for which you would like to receive Pushover notifications.
-        </p>
-        <div class="flex flex-col gap-4 max-w-2xl">
-            <div class="border dark:border-coolgray-300 p-4 rounded-lg">
-                <h3 class="font-medium mb-3">Deployments</h3>
-                <div class="flex flex-col gap-1.5 pl-1">
-                    <x-forms.checkbox instantSave="saveModel" id="deploymentSuccessPushoverNotifications"
-                        label="Deployment Success" />
-                    <x-forms.checkbox instantSave="saveModel" id="deploymentFailurePushoverNotifications"
-                        label="Deployment Failure" />
-                    <x-forms.checkbox instantSave="saveModel"
-                        helper="Send a notification when a container status changes. It will notify for Stopped and Restarted events of a container."
-                        id="statusChangePushoverNotifications" label="Container Status Changes" />
-                </div>
-            </div>
-            <div class="border dark:border-coolgray-300 p-4 rounded-lg">
-                <h3 class="font-medium mb-3">Backups</h3>
-                <div class="flex flex-col gap-1.5 pl-1">
-                    <x-forms.checkbox instantSave="saveModel" id="backupSuccessPushoverNotifications"
-                        label="Backup Success" />
-                    <x-forms.checkbox instantSave="saveModel" id="backupFailurePushoverNotifications"
-                        label="Backup Failure" />
-                </div>
-            </div>
-            <div class="border dark:border-coolgray-300 p-4 rounded-lg">
-                <h3 class="font-medium mb-3">Scheduled Tasks</h3>
-                <div class="flex flex-col gap-1.5 pl-1">
-                    <x-forms.checkbox instantSave="saveModel" id="scheduledTaskSuccessPushoverNotifications"
-                        label="Scheduled Task Success" />
-                    <x-forms.checkbox instantSave="saveModel" id="scheduledTaskFailurePushoverNotifications"
-                        label="Scheduled Task Failure" />
-                </div>
-            </div>
-            <div class="border dark:border-coolgray-300 p-4 rounded-lg">
-                <h3 class="font-medium mb-3">Server</h3>
-                <div class="flex flex-col gap-1.5 pl-1">
-                    <x-forms.checkbox instantSave="saveModel" id="dockerCleanupSuccessPushoverNotifications"
-                        label="Docker Cleanup Success" />
-                    <x-forms.checkbox instantSave="saveModel" id="dockerCleanupFailurePushoverNotifications"
-                        label="Docker Cleanup Failure" />
-                    <x-forms.checkbox instantSave="saveModel" id="serverDiskUsagePushoverNotifications"
-                        label="Server Disk Usage" />
-                    <x-forms.checkbox instantSave="saveModel" id="serverReachablePushoverNotifications"
-                        label="Server Reachable" />
-                    <x-forms.checkbox instantSave="saveModel" id="serverUnreachablePushoverNotifications"
-                        label="Server Unreachable" />
-                </div>
+                helper="Generate an API Token/Key in Pushover by creating a new application. <br><a class='inline-block underline dark:text-white' href='https://pushover.net/apps/build' target='_blank'>Create Pushover Application</a>"
+                required id="pushoverApiToken" label="API Token" />
+        </div>
+    </form>
+    <h2 class="mt-4">Notification Settings</h2>
+    <p class="mb-4">
+        Select events for which you would like to receive Pushover notifications.
+    </p>
+    <div class="flex flex-col gap-4 max-w-2xl">
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Deployments</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="deploymentSuccessPushoverNotifications"
+                    label="Deployment Success" />
+                <x-forms.checkbox instantSave="saveModel" id="deploymentFailurePushoverNotifications"
+                    label="Deployment Failure" />
+                <x-forms.checkbox instantSave="saveModel"
+                    helper="Send a notification when a container status changes. It will notify for Stopped and Restarted events of a container."
+                    id="statusChangePushoverNotifications" label="Container Status Changes" />
             </div>
         </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Backups</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="backupSuccessPushoverNotifications"
+                    label="Backup Success" />
+                <x-forms.checkbox instantSave="saveModel" id="backupFailurePushoverNotifications"
+                    label="Backup Failure" />
+            </div>
+        </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Scheduled Tasks</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="scheduledTaskSuccessPushoverNotifications"
+                    label="Scheduled Task Success" />
+                <x-forms.checkbox instantSave="saveModel" id="scheduledTaskFailurePushoverNotifications"
+                    label="Scheduled Task Failure" />
+            </div>
+        </div>
+        <div class="border dark:border-coolgray-300 p-4 rounded-lg">
+            <h3 class="font-medium mb-3">Server</h3>
+            <div class="flex flex-col gap-1.5 pl-1">
+                <x-forms.checkbox instantSave="saveModel" id="dockerCleanupSuccessPushoverNotifications"
+                    label="Docker Cleanup Success" />
+                <x-forms.checkbox instantSave="saveModel" id="dockerCleanupFailurePushoverNotifications"
+                    label="Docker Cleanup Failure" />
+                <x-forms.checkbox instantSave="saveModel" id="serverDiskUsagePushoverNotifications"
+                    label="Server Disk Usage" />
+                <x-forms.checkbox instantSave="saveModel" id="serverReachablePushoverNotifications"
+                    label="Server Reachable" />
+                <x-forms.checkbox instantSave="saveModel" id="serverUnreachablePushoverNotifications"
+                    label="Server Unreachable" />
+            </div>
+        </div>
+    </div>
 </div>
diff --git a/routes/web.php b/routes/web.php
index 38ce7f15c..3d12b9b46 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,9 +12,9 @@ use App\Livewire\Destination\Show as DestinationShow;
 use App\Livewire\ForcePasswordReset;
 use App\Livewire\Notifications\Discord as NotificationDiscord;
 use App\Livewire\Notifications\Email as NotificationEmail;
+use App\Livewire\Notifications\Pushover as NotificationPushover;
 use App\Livewire\Notifications\Slack as NotificationSlack;
 use App\Livewire\Notifications\Telegram as NotificationTelegram;
-use App\Livewire\Notifications\Pushover as NotificationPushover;
 use App\Livewire\Profile\Index as ProfileIndex;
 use App\Livewire\Project\Application\Configuration as ApplicationConfiguration;
 use App\Livewire\Project\Application\Deployment\Index as DeploymentIndex;