diff --git a/app/Http/Livewire/ForceUpgrade.php b/app/Http/Livewire/ForceUpgrade.php index c5f5991f3..369c4fb11 100644 --- a/app/Http/Livewire/ForceUpgrade.php +++ b/app/Http/Livewire/ForceUpgrade.php @@ -9,7 +9,7 @@ class ForceUpgrade extends Component { public function upgrade() { - dispatch_sync(new InstanceAutoUpdateJob(force: true)); $this->emit('updateInitiated'); + dispatch_sync(new InstanceAutoUpdateJob(force: true)); } } diff --git a/app/Http/Livewire/Upgrading.php b/app/Http/Livewire/Upgrading.php new file mode 100644 index 000000000..b9de9bb03 --- /dev/null +++ b/app/Http/Livewire/Upgrading.php @@ -0,0 +1,15 @@ +visible = true; + } +} diff --git a/app/Jobs/InstanceAutoUpdateJob.php b/app/Jobs/InstanceAutoUpdateJob.php index 3c382f527..ecba1d3c2 100644 --- a/app/Jobs/InstanceAutoUpdateJob.php +++ b/app/Jobs/InstanceAutoUpdateJob.php @@ -65,16 +65,8 @@ class InstanceAutoUpdateJob implements ShouldQueue "sleep 10" ], $this->server); } else { - $cdn = "https://coolify-cdn.b-cdn.net/files"; instant_remote_process([ - "curl -fsSL $cdn/docker-compose.yml -o /data/coolify/source/docker-compose.yml", - "curl -fsSL $cdn/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml", - "curl -fsSL $cdn/.env.production -o /data/coolify/source/.env.production", - "curl -fsSL $cdn/upgrade.sh -o /data/coolify/source/upgrade.sh", - ], $this->server); - - instant_remote_process([ - "docker compose -f /data/coolify/source/docker-compose.yml -f /data/coolify/source/docker-compose.prod.yml pull", + "curl -fsSL https://coolify-cdn.b-cdn.net/files/upgrade.sh -o /data/coolify/source/upgrade.sh", ], $this->server); remote_process([ diff --git a/resources/css/app.css b/resources/css/app.css index 5636881f0..1275bfe58 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -97,3 +97,31 @@ main { .magic-item-focused { @apply bg-coolgray-400 text-white; } + + +.lds-heart { + animation: lds-heart 1.2s infinite cubic-bezier(0.215, 0.61, 0.355, 1); +} +@keyframes lds-heart { + 0% { + transform: scale(1); + } + 5% { + transform: scale(1.2); + } + 39% { + transform: scale(0.85); + } + 45% { + transform: scale(1); + } + 60% { + transform: scale(0.95); + } + 100% { + transform: scale(0.9); + } +} +.bg-coollabs-gradient { + @apply text-transparent bg-clip-text bg-gradient-to-r from-coollabs via-pink-500 to-red-500; +} \ No newline at end of file diff --git a/resources/views/components/layout.blade.php b/resources/views/components/layout.blade.php index 4133045a4..dd8030800 100644 --- a/resources/views/components/layout.blade.php +++ b/resources/views/components/layout.blade.php @@ -35,6 +35,7 @@
{{ $slot }}
+ v{{ config('version') }} @auth @@ -47,48 +48,6 @@ } } }) - - function checkIfIamDead() { - console.log('Checking server\'s pulse...') - checkIfIamDeadInterval = setInterval(async () => { - try { - const res = await fetch('/api/health'); - if (res.ok) { - console.log('I\'m alive. Waiting for server to be dead...'); - } - } catch (error) { - console.log('I\'m dead. Charging... Standby... Bzz... Bzz...') - checkHealth(); - if (checkIfIamDeadInterval) clearInterval(checkIfIamDeadInterval); - } - - return; - }, 2000); - } - - function checkHealth() { - console.log('Checking server\'s health...') - checkHealthInterval = setInterval(async () => { - try { - const res = await fetch('/api/health'); - if (res.ok) { - console.log('Server is back online. Reloading...') - if (checkHealthInterval) clearInterval(checkHealthInterval); - window.location.reload(); - } - } catch (error) { - console.log('Waiting for server to come back from dead...'); - } - - return; - }, 2000); - } - Livewire.on('updateInitiated', () => { - let checkHealthInterval = null; - let checkIfIamDeadInterval = null; - console.log('Update initiated. Waiting for server to be dead...') - checkIfIamDead(); - }) Livewire.on('reloadWindow', () => { window.location.reload(); }) diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php index 05645b0dc..e1e0b4297 100644 --- a/resources/views/components/navbar.blade.php +++ b/resources/views/components/navbar.blade.php @@ -64,26 +64,44 @@ @endif -
-
-