From 890f0819adae7d395f606f88e896606b1b48007c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 15 Jun 2023 11:55:17 +0200
Subject: [PATCH] fix

---
 app/Http/Livewire/Upgrade.php               |  2 +-
 resources/views/components/layout.blade.php | 40 ++++++++++++++++++
 resources/views/livewire/upgrade.blade.php  | 46 +--------------------
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/app/Http/Livewire/Upgrade.php b/app/Http/Livewire/Upgrade.php
index 8509c3e29..2c57b3ff4 100644
--- a/app/Http/Livewire/Upgrade.php
+++ b/app/Http/Livewire/Upgrade.php
@@ -25,7 +25,7 @@ class Upgrade extends Component
         try {
             $this->showProgress = true;
             resolve(UpdateCoolify::class)(true);
-            Toaster::success('Update started.');
+            Toaster::success('Upgrading Coolify to latest version...');
         } catch (\Exception $e) {
             return general_error_handler(err: $e, that: $this);
         }
diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php
index 773c08a04..62ea63ce3 100644
--- a/resources/views/components/layout.blade.php
+++ b/resources/views/components/layout.blade.php
@@ -39,6 +39,46 @@
     <x-version class="fixed left-2 bottom-1" />
     @auth
         <script>
+            let checkHealthInterval = null;
+            let checkIfIamDeadInterval = null;
+
+            function revive() {
+                console.log('Checking server\'s health...')
+                checkHealthInterval = setInterval(() => {
+                    fetch('/api/health')
+                        .then(response => {
+                            if (response.ok) {
+                                Toaster.success('Coolify is back online. Reloading...')
+                                if (checkHealthInterval) clearInterval(checkHealthInterval);
+                                setTimeout(() => {
+                                    window.location.reload();
+                                }, 5000)
+                            } else {
+                                console.log('Waiting for server to come back from dead...');
+                            }
+                        })
+                    return;
+                }, 2000);
+            }
+
+            function upgrade() {
+                console.log('Update initiated.')
+                checkIfIamDeadInterval = setInterval(() => {
+                    fetch('/api/health')
+                        .then(response => {
+                            if (response.ok) {
+                                console.log('It\'s alive. Waiting for server to be dead...');
+                            } else {
+                                Toaster.success('Update done, restarting Coolify!')
+                                console.log('It\'s dead. Reviving... Standby... Bzz... Bzz...')
+                                if (checkIfIamDeadInterval) clearInterval(checkIfIamDeadInterval);
+                                revive();
+                            }
+                        })
+                    return;
+                }, 2000);
+            }
+
             function changePasswordFieldType(id) {
                 const input = document.getElementById(id);
                 if (input.type === 'password') {
diff --git a/resources/views/livewire/upgrade.blade.php b/resources/views/livewire/upgrade.blade.php
index d8bfd8b4f..354c511fe 100644
--- a/resources/views/livewire/upgrade.blade.php
+++ b/resources/views/livewire/upgrade.blade.php
@@ -1,6 +1,6 @@
-<li title="New version available" x-init="$wire.checkUpdate">
+<li title="New version available" x-init="$wire.checkUpdate" x-data>
     @if ($isUpgradeAvailable)
-        <div x-data wire:click='upgrade' class=" hover:bg-transparent focus:bg-transparent" x-on:click="upgrade" <button>
+        <div wire:click='upgrade' class="hover:bg-transparent focus:bg-transparent" x-on:click="upgrade" <button>
             @if ($showProgress)
                 <svg xmlns="http://www.w3.org/2000/svg"
                     class="w-6 h-6 text-pink-500 transition-colors hover:text-pink-300 lds-heart" viewBox="0 0 24 24"
@@ -22,48 +22,6 @@
                 </svg>
             @endif
             </button>
-
-            <script>
-                let checkHealthInterval = null;
-                let checkIfIamDeadInterval = null;
-
-                function revive() {
-                    console.log('Checking server\'s health...')
-                    checkHealthInterval = setInterval(() => {
-                        fetch('/api/health')
-                            .then(response => {
-                                if (response.ok) {
-                                    Toaster.success('Coolify is back online. Reloading...')
-                                    if (checkHealthInterval) clearInterval(checkHealthInterval);
-                                    setTimeout(() => {
-                                        window.location.reload();
-                                    }, 5000)
-                                } else {
-                                    console.log('Waiting for server to come back from dead...');
-                                }
-                            })
-                        return;
-                    }, 2000);
-                }
-
-                function upgrade() {
-                    console.log('Update initiated.')
-                    checkIfIamDeadInterval = setInterval(() => {
-                        fetch('/api/health')
-                            .then(response => {
-                                if (response.ok) {
-                                    console.log('It\'s alive. Waiting for server to be dead...');
-                                } else {
-                                    Toaster.success('Update done, restarting Coolify!')
-                                    console.log('It\'s dead. Reviving... Standby... Bzz... Bzz...')
-                                    if (checkIfIamDeadInterval) clearInterval(checkIfIamDeadInterval);
-                                    revive();
-                                }
-                            })
-                        return;
-                    }, 2000);
-                }
-            </script>
         </div>
     @endif
 </li>