Merge pull request #1893 from coollabsio/next

v4.0.0-beta.245

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -21,6 +21,6 @@ body:
   - type: input
     attributes:
       label: Version
-      description: Coolify's version (see bottom left corner).
+      description: Coolify's version (see top of your screen).
     validations:
       required: true

.tinkerwell/snippets/DeleteUser.php

@@ -1,22 +0,0 @@
-<?php
-
-use App\Models\User;
-
-$email = 'test@example.com';
-$user = User::whereEmail($email)->first();
-$teams = $user->teams;
-foreach ($teams as $team) {
-    $servers = $team->servers;
-    if ($servers->count() > 0) {
-        foreach ($servers as $server) {
-            dump($server);
-            $server->delete();
-        }
-    }
-    dump($team);
-    $team->delete();
-}
-if ($user) {
-    dump($user);
-    $user->delete();
-}

.tinkerwell/snippets/SendEmail.php

@@ -1,28 +0,0 @@
-<?php
-/**
- * @label Send Email
- * @description Send email to all users
- */
-
-use App\Models\User;
-use Illuminate\Support\Facades\Mail;
-
-set_transanctional_email_settings();
-
-$users = User::whereEmail('test@example.com');
-foreach ($users as $user) {
-  Mail::send([], [], function ($message) use ($user) {
-    $message
-      ->to($user->email)
-      ->subject("Testing")
-      ->text(
-        <<<EOF
-Hello,
-
-Welcome to Coolify Cloud.
-Here is your user id: $user->id
-
-EOF
-      );
-  });
-}

app/Console/Commands/CleanupDatabase.php

@@ -20,7 +20,7 @@ class CleanupDatabase extends Command
         $keep_days = 60;
         echo "Keep days: $keep_days\n";
         // Cleanup failed jobs table
-        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7));
+        $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(1));
         $count = $failed_jobs->count();
         echo "Delete $count entries from failed_jobs.\n";
         if ($this->option('yes')) {

app/Console/Kernel.php

@@ -48,9 +48,7 @@ class Kernel extends ConsoleKernel
             $this->pull_helper_image($schedule);
             $this->check_scheduled_tasks($schedule);
 
-            if (!isCloud()) {
+            $schedule->command('cleanup:database --yes')->daily();
-                $schedule->command('cleanup:database --yes')->daily();
-            }
         }
     }
     private function pull_helper_image($schedule)
@@ -72,43 +70,14 @@ class Kernel extends ConsoleKernel
             $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
         }
         foreach ($containerServers as $server) {
-            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer();
             if ($server->isLogDrainEnabled()) {
-                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer();
             }
         }
         foreach ($servers as $server) {
-            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer();
         }
-        // Delayed Jobs
-        // foreach ($containerServers as $server) {
-        //     $schedule
-        //         ->call(function () use ($server) {
-        //             $randomSeconds = rand(1, 40);
-        //             $job = new ContainerStatusJob($server);
-        //             $job->delay($randomSeconds);
-        //             ray('dispatching container status job in ' . $randomSeconds . ' seconds');
-        //             dispatch($job);
-        //         })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
-        //     if ($server->isLogDrainEnabled()) {
-        //         $schedule
-        //             ->call(function () use ($server) {
-        //                 $randomSeconds = rand(1, 40);
-        //                 $job = new CheckLogDrainContainerJob($server);
-        //                 $job->delay($randomSeconds);
-        //                 dispatch($job);
-        //             })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
-        //     }
-        // }
-        // foreach ($servers as $server) {
-        //     $schedule
-        //         ->call(function () use ($server) {
-        //             $randomSeconds = rand(1, 40);
-        //             $job = new ServerStatusJob($server);
-        //             $job->delay($randomSeconds);
-        //             dispatch($job);
-        //         })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
-        // }
     }
     private function instance_auto_update($schedule)
     {

app/Jobs/ApplicationDeploymentJob.php

@@ -898,6 +898,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($this->application->additional_networks->count() === 0) {
             return;
         }
+        if ($this->pull_request_id !== 0) {
+            return;
+        }
         $destination_ids = $this->application->additional_networks->pluck('id');
         if ($this->server->isSwarm()) {
             $this->application_deployment_queue->addLogEntry("Additional destinations are not supported in swarm mode.");

app/Jobs/DatabaseBackupJob.php

@@ -95,7 +95,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $databaseType = $this->database->databaseType();
                 $serviceUuid = $this->database->service->uuid;
                 $serviceName = str($this->database->service->name)->slug();
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep POSTGRES_";
@@ -120,7 +120,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     } else {
                         $databasesToBackup = $this->database->postgres_user;
                     }
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env | grep MYSQL_";
@@ -143,7 +143,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     } else {
                         throw new \Exception('MYSQL_DATABASE not found');
                     }
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     $this->container_name = "{$this->database->name}-$serviceUuid";
                     $this->directory_name = $serviceName . '-' . $this->container_name;
                     $commands[] = "docker exec $this->container_name env";
@@ -190,32 +190,32 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
             }
 
             if (is_null($databasesToBackup)) {
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     $databasesToBackup = [$this->database->postgres_db];
-                } else if ($databaseType === 'standalone-mongodb') {
+                } else if (str($databaseType)->contains('mongodb')) {
                     $databasesToBackup = ['*'];
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     $databasesToBackup = [$this->database->mysql_database];
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     $databasesToBackup = [$this->database->mariadb_database];
                 } else {
                     return;
                 }
             } else {
-                if ($databaseType === 'standalone-postgresql') {
+                if (str($databaseType)->contains('postgres')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
-                } else if ($databaseType === 'standalone-mongodb') {
+                } else if (str($databaseType)->contains('mongodb')) {
                     // Format: db1:collection1,collection2|db2:collection3,collection4
                     $databasesToBackup = explode('|', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
                     ray($databasesToBackup);
-                } else if ($databaseType === 'standalone-mysql') {
+                } else if (str($databaseType)->contains('mysql')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
-                } else if ($databaseType === 'standalone-mariadb') {
+                } else if (str($databaseType)->contains('mariadb')) {
                     // Format: db1,db2,db3
                     $databasesToBackup = explode(',', $databasesToBackup);
                     $databasesToBackup = array_map('trim', $databasesToBackup);
@@ -235,7 +235,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                 $size = 0;
                 ray('Backing up ' . $database);
                 try {
-                    if ($databaseType === 'standalone-postgresql') {
+                    if (str($databaseType)->contains('postgres')) {
                         $this->backup_file = "/pg-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -244,7 +244,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_postgresql($database);
-                    } else if ($databaseType === 'standalone-mongodb') {
+                    } else if (str($databaseType)->contains('mongodb')) {
                         if ($database === '*') {
                             $database = 'all';
                             $databaseName = 'all';
@@ -263,7 +263,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_mongodb($database);
-                    } else if ($databaseType === 'standalone-mysql') {
+                    } else if (str($databaseType)->contains('mysql')) {
                         $this->backup_file = "/mysql-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -272,7 +272,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                             'scheduled_database_backup_id' => $this->backup->id,
                         ]);
                         $this->backup_standalone_mysql($database);
-                    } else if ($databaseType === 'standalone-mariadb') {
+                    } else if (str($databaseType)->contains('mariadb')) {
                         $this->backup_file = "/mariadb-dump-$database-" . Carbon::now()->timestamp . ".dmp";
                         $this->backup_location = $this->backup_dir . $this->backup_file;
                         $this->backup_log = ScheduledDatabaseBackupExecution::create([

app/Livewire/Project/Shared/EnvironmentVariable/All.php

@@ -98,6 +98,7 @@ class All extends Component
                     }
                 }
                 $environment->is_build_time = false;
+                $environment->is_multiline = false;
                 $environment->is_preview = $isPreview ? true : false;
                 switch ($this->resource->type()) {
                     case 'application':

app/Livewire/RealtimeConnection.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Livewire;
-
-use Livewire\Component;
-
-class RealtimeConnection extends Component
-{
-    public $checkConnection = false;
-    public $showNotification = false;
-    public $isNotificationEnabled = true;
-    public function render()
-    {
-        return view('livewire.realtime-connection');
-    }
-    public function disable()
-    {
-        auth()->user()->update(['is_notification_realtime_enabled' => false]);
-        $this->showNotification = false;
-    }
-    public function mount() {
-        $this->isNotificationEnabled = auth()->user()->is_notification_realtime_enabled;
-        $this->checkConnection = auth()->user()->id === 0;
-    }
-}

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.243',
+    'release' => '4.0.0-beta.245',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.243';
+return '4.0.0-beta.245';

database/migrations/2024_03_26_122110_remove_realtime_notifications.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('is_notification_realtime_enabled');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('is_notification_realtime_enabled')->default(true);
+        });
+    }
+};

public/svgs/unknown.svg

@@ -1,3 +0,0 @@
-<svg width="45.34" height="64" viewBox="0 0 17 24" xmlns="http://www.w3.org/2000/svg">
-    <path fill="#FCD34D" d="M11.403 18.751v4.499c-.01.41-.34.74-.748.75H6.159a.768.768 0 0 1-.749-.748v-4.5c.01-.41.34-.739.749-.749h4.5c.41.01.74.34.75.749v.001zm5.923-11.247a6.306 6.306 0 0 1-.962 3.354l.015-.026a5.462 5.462 0 0 1-1.021 1.108l-.01.008c-.321.282-.672.55-1.042.794l-.036.022q-.413.253-1.144.665a3.71 3.71 0 0 0-1.275 1.204l-.009.014a2.535 2.535 0 0 0-.515 1.243l-.001.012a.978.978 0 0 1-.226.611l.001-.002a.652.652 0 0 1-.524.29h-4.5a.563.563 0 0 1-.479-.343l-.001-.004a1.394 1.394 0 0 1-.197-.702v-.845a4.356 4.356 0 0 1 1.219-2.935l-.001.001A7.945 7.945 0 0 1 9.251 9.96l.048-.02a4.627 4.627 0 0 0 1.574-1.049l.001-.001a2.094 2.094 0 0 0 .469-1.429v.005a1.695 1.695 0 0 0-.863-1.382l-.009-.004a3.436 3.436 0 0 0-2.018-.599h.003a3.53 3.53 0 0 0-2.039.552l.014-.009A12.825 12.825 0 0 0 4.45 8.149l-.025.035a.73.73 0 0 1-.581.3a.897.897 0 0 1-.472-.152l.003.002L.301 5.991a.732.732 0 0 1-.29-.464L.01 5.523a.747.747 0 0 1 .105-.527l-.002.003C1.77 2 4.912.003 8.522.003c.103 0 .205.002.307.005h-.015a8.362 8.362 0 0 1 3.074.602l-.057-.02a10.2 10.2 0 0 1 2.757 1.571l-.02-.016a7.838 7.838 0 0 1 1.966 2.349l.02.041c.483.857.768 1.881.769 2.971z"/>
-</svg>

resources/css/app.css

@@ -4,7 +4,7 @@
 
 html,
 body {
-    @apply h-full bg-neutral-100 text-neutral-800 dark:bg-base dark:text-neutral-400;
+    @apply h-full bg-neutral-50 text-neutral-800 dark:bg-base dark:text-neutral-400;
 }
 
 body {
@@ -41,7 +41,7 @@ option {
 }
 
 .button {
-    @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 disabled:bg-neutral-100 disabled:text-neutral-200 disabled:cursor-not-allowed min-w-fit hover:dark:text-white focus:outline-1 ;
+    @apply flex items-center justify-center gap-2 px-3 py-1 text-sm text-white normal-case rounded cursor-pointer hover:bg-black/80 bg-coolgray-200 hover:bg-coolgray-500 hover:text-white disabled:bg-coolgray-100/10 disabled:cursor-not-allowed min-w-fit focus:outline-1 dark:disabled:text-neutral-600;
 }
 
 button[isError]:not(:disabled) {
@@ -94,7 +94,7 @@ tr {
 }
 
 tr th {
-    @apply px-3 py-3.5 text-left text-white;
+    @apply px-3 py-3.5 text-left text-black dark:text-white;
 }
 
 tr th:first-child {
@@ -116,9 +116,17 @@ tr td:first-child {
 .alert-error {
     @apply flex items-center gap-2 text-error;
 }
-
+.tag {
+    @apply px-2 py-1 cursor-pointer box-description dark:bg-coolgray-100 dark:hover:bg-coolgray-300 bg-neutral-100 hover:bg-neutral-200
+}
+.add-tag {
+    @apply flex items-center px-2 text-xs cursor-pointer dark:text-neutral-500/20 text-neutral-500 group-hover:text-neutral-700 group-hover:dark:text-white dark:hover:bg-coolgray-300 hover:bg-neutral-200;
+}
 .dropdown-item {
-    @apply relative flex cursor-pointer select-none dark:text-white hover:bg-neutral-300 dark:hover:bg-coollabs items-center pr-4 pl-2 py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full;
+    @apply relative flex cursor-pointer select-none dark:text-white hover:bg-neutral-100 dark:hover:bg-coollabs items-center pr-4 pl-2 py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full;
+}
+.dropdown-item-no-padding {
+    @apply relative flex cursor-pointer select-none dark:text-white hover:bg-neutral-100 dark:hover:bg-coollabs items-center py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full;
 }
 
 .badge {
@@ -187,7 +195,10 @@ tr td:first-child {
 }
 
 .box {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-200 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+}
+.box-boarding {
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black;
 }
 
 .on-box {

resources/views/components/boarding-step.blade.php

@@ -1,5 +1,5 @@
 <div class="grid grid-cols-1 gap-4 md:grid-cols-3">
-    <div class="box-border col-span-2 lg:min-w-[24rem] min-h-[21rem]">
+    <div class="box-border col-span-2 lg:min-w-[24rem] lg:min-h-[21rem]">
         <h1 class="text-2xl font-bold lg:text-5xl">{{ $title }}</h1>
         <div class="py-6">
             @isset($question)
@@ -16,7 +16,7 @@
     </div>
     @isset($explanation)
         <div class="col-span-1">
-            <h1 class="pb-8 font-bold">Explanation</h1>
+            <h3 class="pb-8 font-bold">Explanation</h3>
             <div class="space-y-4">
                 {{ $explanation }}
             </div>

resources/views/components/dropdown.blade.php

@@ -2,11 +2,11 @@
     dropdownOpen: false
 }" class="relative" @click.outside="dropdownOpen = false">
     <button @click="dropdownOpen=true"
-        class="inline-flex items-center justify-start pr-10 transition-colors focus:outline-none disabled:opacity-50 disabled:pointer-events-none">
+        class="inline-flex items-center justify-start pr-8 transition-colors focus:outline-none disabled:opacity-50 disabled:pointer-events-none">
         <span class="flex flex-col items-start h-full leading-none">
             {{ $title }}
         </span>
-        <svg class="absolute right-0 w-5 h-5 mr-3" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+        <svg class="absolute right-0 w-4 h-4 mr-3" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
             stroke-width="1.5" stroke="currentColor">
             <path stroke-linecap="round" stroke-linejoin="round"
                 d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
@@ -16,7 +16,7 @@
     <div x-show="dropdownOpen" @click.away="dropdownOpen=false" x-transition:enter="ease-out duration-200"
         x-transition:enter-start="-translate-y-2" x-transition:enter-end="translate-y-0"
         class="absolute top-0 z-50 mt-6 min-w-max" x-cloak>
-        <div class="p-1 mt-1 border dark:bg-coolgray-200 bg-neutral-200 dark:border-black border-neutral-300">
+        <div class="p-1 mt-1 bg-white border rounded shadow dark:bg-coolgray-200 dark:border-black border-neutral-300">
             {{ $slot }}
         </div>
     </div>

resources/views/components/external-link.blade.php

@@ -1,4 +1,4 @@
-<svg class="inline-flex w-3 h-3 ml-1 text-black dark:text-white" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"
+<svg class="inline-flex w-3 h-3 ml-1" xmlns="http://www.w3.org/2000/svg" aria-hidden="true"
     focusable="false" viewBox="0 0 24 24">
     <path d="M0 0h24v24H0V0z" fill="none">
     </path>

resources/views/components/forms/button.blade.php

@@ -10,6 +10,6 @@
 
     {{ $slot }}
     @if ($attributes->whereStartsWith('wire:click')->first())
-        <x-loading wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}" wire:loading.delay />
+        <x-loading-on-button wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}" wire:loading.delay />
     @endif
 </button>

resources/views/components/loading-on-button.blade.php

@@ -0,0 +1,13 @@
+@props(['text' => null])
+<div class="inline-flex items-center justify-center" {{ $attributes }}>
+    @if (isset($text))
+        <div>{{ $text }}</div>
+    @endif
+    <svg class="w-4 h-4 mx-1 ml-3 text-warning animate-spin" xmlns="http://www.w3.org/2000/svg" fill="none"
+        viewBox="0 0 24 24">
+        <circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
+        <path class="opacity-75" fill="currentColor"
+            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z">
+        </path>
+    </svg>
+</div>

resources/views/components/modal-input.blade.php

@@ -23,28 +23,28 @@
     <template x-teleport="body">
         <div x-show="modalOpen" class="fixed top-0 left-0 lg:px-0 px-4 z-[99] flex items-center justify-center w-screen h-screen"
             x-cloak>
-            <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+            <div x-show="modalOpen"  x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
                 x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0"
                 class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
-            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
+            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" @click.outside="modalOpen=false" x-transition:enter="ease-out duration-100"
                 x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
                 x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave="ease-in duration-100"
                 x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
                 x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
-                class="relative w-full py-6 border rounded min-w-full lg:min-w-[36rem] max-w-fit bg-neutral-100 border-neutral-400 dark:bg-base px-7 dark:border-coolgray-300">
+                class="relative w-full py-6 border rounded drop-shadow min-w-full lg:min-w-[36rem] max-w-fit bg-white border-neutral-200 dark:bg-base px-6 dark:border-coolgray-300">
                 <div class="flex items-center justify-between pb-3">
                     <h3 class="text-2xl font-bold">{{ $title }}</h3>
                     <button @click="modalOpen=false"
-                        class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-coolgray-300">
+                        class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 rounded-full dark:text-white hover:bg-neutral-100 dark:hover:bg-coolgray-300">
                         <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor">
                             <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
                         </svg>
                     </button>
                 </div>
-                <div class="relative flex items-center justify-center w-auto pb-4">
+                <div class="relative flex items-center justify-center w-auto">
                     {{ $slot }}
                 </div>
             </div>

resources/views/components/navbar.blade.php

@@ -1,10 +1,72 @@
-<nav class="flex flex-col flex-1 pl-2 bg-white border-r dark:border-coolgray-200 dark:bg-base">
+<nav class="flex flex-col flex-1 pl-2 bg-white border-r dark:border-coolgray-200 dark:bg-base" x-data="{
-    <div class="flex w-full pt-6 pb-4 pl-3">
+    init() {
-        <div class="flex flex-col">
+            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', e => {
+                const userSettings = localStorage.getItem('theme');
+                if (userSettings !== 'system') {
+                    return;
+                }
+                if (e.matches) {
+                    document.documentElement.classList.add('dark');
+                } else {
+                    document.documentElement.classList.remove('dark');
+                }
+            });
+            this.queryTheme();
+        },
+        setTheme(type) {
+            this.theme = type;
+            localStorage.setItem('theme', type);
+            this.queryTheme();
+        },
+        queryTheme() {
+            const darkModePreference = window.matchMedia('(prefers-color-scheme: dark)').matches;
+            const userSettings = localStorage.getItem('theme') || 'dark';
+            localStorage.setItem('theme', userSettings);
+            if (userSettings === 'dark') {
+                document.documentElement.classList.add('dark');
+                this.theme = 'dark';
+            } else if (userSettings === 'light') {
+                document.documentElement.classList.remove('dark');
+                this.theme = 'light';
+            } else if (darkModePreference) {
+                this.theme = 'system';
+                document.documentElement.classList.add('dark');
+            } else if (!darkModePreference) {
+                this.theme = 'system';
+                document.documentElement.classList.remove('dark');
+            }
+        }
+}">
+    <div class="flex pt-6 pb-4 pl-3">
+        <div class="flex flex-col w-full">
             <div class="text-2xl font-bold tracking-wide dark:text-white">Coolify</div>
             <x-version />
         </div>
-        {{-- <button onclick="changeTheme()">Dark/light</button> --}}
+        <div class="pt-1">
+            <x-dropdown>
+                <x-slot:title>
+                    <div class="flex justify-end w-8" x-show="theme === 'dark' || theme === 'system'">
+                        <svg class="w-5 h-5 rounded dark:fill-white" xmlns="http://www.w3.org/2000/svg"
+                            viewBox="0 0 24 24">
+                            <path
+                                d="M5.64,17l-.71.71a1,1,0,0,0,0,1.41,1,1,0,0,0,1.41,0l.71-.71A1,1,0,0,0,5.64,17ZM5,12a1,1,0,0,0-1-1H3a1,1,0,0,0,0,2H4A1,1,0,0,0,5,12Zm7-7a1,1,0,0,0,1-1V3a1,1,0,0,0-2,0V4A1,1,0,0,0,12,5ZM5.64,7.05a1,1,0,0,0,.7.29,1,1,0,0,0,.71-.29,1,1,0,0,0,0-1.41l-.71-.71A1,1,0,0,0,4.93,6.34Zm12,.29a1,1,0,0,0,.7-.29l.71-.71a1,1,0,1,0-1.41-1.41L17,5.64a1,1,0,0,0,0,1.41A1,1,0,0,0,17.66,7.34ZM21,11H20a1,1,0,0,0,0,2h1a1,1,0,0,0,0-2Zm-9,8a1,1,0,0,0-1,1v1a1,1,0,0,0,2,0V20A1,1,0,0,0,12,19ZM18.36,17A1,1,0,0,0,17,18.36l.71.71a1,1,0,0,0,1.41,0,1,1,0,0,0,0-1.41ZM12,6.5A5.5,5.5,0,1,0,17.5,12,5.51,5.51,0,0,0,12,6.5Zm0,9A3.5,3.5,0,1,1,15.5,12,3.5,3.5,0,0,1,12,15.5Z" />
+                        </svg>
+                    </div>
+                    <div class="flex justify-end w-8" x-show="theme === 'light'">
+                        <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+                            <path
+                                d="M21.64,13a1,1,0,0,0-1.05-.14,8.05,8.05,0,0,1-3.37.73A8.15,8.15,0,0,1,9.08,5.49a8.59,8.59,0,0,1,.25-2A1,1,0,0,0,8,2.36,10.14,10.14,0,1,0,22,14.05,1,1,0,0,0,21.64,13Zm-9.5,6.69A8.14,8.14,0,0,1,7.08,5.22v.27A10.15,10.15,0,0,0,17.22,15.63a9.79,9.79,0,0,0,2.1-.22A8.11,8.11,0,0,1,12.14,19.73Z" />
+                        </svg>
+                    </div>
+                </x-slot:title>
+                <div class="flex flex-col gap-1">
+                    <button @click="setTheme('dark')" class="px-1 dropdown-item-no-padding">Dark</button>
+                    <button @click="setTheme('light')" class="px-1 dropdown-item-no-padding">Light</button>
+                    <button @click="setTheme('system')" class="px-1 dropdown-item-no-padding">System</button>
+                </div>
+            </x-dropdown>
+        </div>
+
     </div>
     <div class="px-2 pt-2 pb-7">
         <livewire:switch-team />
@@ -111,8 +173,8 @@
                             class="{{ request()->is('tags*') ? 'menu-item-active menu-item' : 'menu-item' }}"
                             href="{{ route('tags.index') }}">
                             <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                <g fill="none" stroke="currentColor" stroke-linecap="round"
-                                    stroke-width="2">
+                                    stroke-linejoin="round" stroke-width="2">
                                     <path
                                         d="M3 8v4.172a2 2 0 0 0 .586 1.414l5.71 5.71a2.41 2.41 0 0 0 3.408 0l3.592-3.592a2.41 2.41 0 0 0 0-3.408l-5.71-5.71A2 2 0 0 0 9.172 6H5a2 2 0 0 0-2 2" />
                                     <path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" />

resources/views/components/popup.blade.php

@@ -6,7 +6,8 @@
     x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0"
     x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0"
     x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);"
-    class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 sm:w-[26rem] lg:w-full z-[999]" x-cloak>
+    class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 sm:w-[26rem] lg:w-full z-[999]"
+    x-cloak>
     <div
         class="flex flex-col items-center justify-between w-full h-full max-w-4xl p-6 mx-auto bg-white border shadow-lg lg:border-t dark:border-coolgray-300 dark:bg-coolgray-100 lg:p-8 lg:flex-row sm:rounded">
         <div
@@ -27,7 +28,7 @@
                 @if ($buttonText->attributes->whereStartsWith('@click')->first()) @click="bannerVisible=false;{{ $buttonText->attributes->get('@click') }}"
                 @else
                 @click="bannerVisible=false;" @endif
-                class="inline-flex items-center justify-center flex-shrink-0 w-1/2 px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 bg-white rounded-md dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none">
+                class="inline-flex items-center justify-center flex-shrink-0 w-1/2 px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 rounded-md bg-neutral-100 hover:bg-neutral-200 dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none">
                 {{ $buttonText }}
             </button>
         </div>

resources/views/components/pricing-plans.blade.php

@@ -8,13 +8,13 @@
                 class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded dark:text-white gap-x-1 bg-white/5">
                 <legend class="sr-only">Payment frequency</legend>
                 <label class="cursor-pointer rounded px-2.5 py-1"
-                    :class="selected === 'monthly' ? 'bg-coollabs-100 dark:text-white' : ''">
+                    :class="selected === 'monthly' ? 'bg-coollabs-100 text-white' : ''">
                     <input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
                         class="sr-only">
                     <span>Monthly</span>
                 </label>
                 <label class="cursor-pointer rounded px-2.5 py-1"
-                    :class="selected === 'yearly' ? 'bg-coollabs-100 dark:text-white' : ''">
+                    :class="selected === 'yearly' ? 'bg-coollabs-100 text-white' : ''">
                     <input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
                         class="sr-only">
                     <span>Annually</span>
@@ -27,7 +27,7 @@
                     days trial</span> included on all plans, without credit card details.</div>
         @endif
         <div x-show="selected === 'monthly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
-            <div>Save <span class="font-bold dark:text-warning">10%</span> annually with the yearly plans.
+            <div>Save <span class="font-bold text-black dark:text-warning">10%</span> annually with the yearly plans.
             </div>
         </div>
         <div x-show="selected === 'yearly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">

resources/views/components/status/index.blade.php

@@ -8,7 +8,7 @@
     <x-status.stopped :status="$resource->status" />
 @endif
 @if (!str($resource->status)->contains('exited') && $showRefreshButton)
-    <button title="Refresh Status" wire:click='check_status(true)' class="mx-1 hover:fill-white fill-warning">
+    <button title="Refresh Status" wire:click='check_status(true)' class="mx-1 dark:hover:fill-white fill-coollabs dark:fill-warning">
         <svg class="w-4 h-4" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
             <path
                 d="M12 2a10.016 10.016 0 0 0-7 2.877V3a1 1 0 1 0-2 0v4.5a1 1 0 0 0 1 1h4.5a1 1 0 0 0 0-2H6.218A7.98 7.98 0 0 1 20 12a1 1 0 0 0 2 0A10.012 10.012 0 0 0 12 2zm7.989 13.5h-4.5a1 1 0 0 0 0 2h2.293A7.98 7.98 0 0 1 4 12a1 1 0 0 0-2 0a9.986 9.986 0 0 0 16.989 7.133V21a1 1 0 0 0 2 0v-4.5a1 1 0 0 0-1-1z" />

resources/views/components/version.blade.php

@@ -1,2 +1,2 @@
-<a {{ $attributes->merge(['class' => 'text-xs cursor-pointer opacity-90 hover:opacity-100 dark:hover:text-white hover:text-black z-[60]']) }}
+<a {{ $attributes->merge(['class' => 'text-xs cursor-pointer opacity-90 hover:opacity-100 dark:hover:text-white hover:text-black']) }}
     href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('version') }}">v{{ config('version') }}</a>

resources/views/destination/all.blade.php

@@ -8,29 +8,30 @@
         @endif
     </div>
     <div class="subtitle">Network endpoints to deploy your resources.</div>
-    <div class="grid gap-2 lg:grid-cols-2">
+    <div class="grid gap-2 lg:grid-cols-1">
         @forelse ($destinations as $destination)
             @if ($destination->getMorphClass() === 'App\Models\StandaloneDocker')
-                <a class="flex gap-4 text-center hover:no-underline box group"
+            <div class="box group">
+                <a class="flex flex-col mx-6"
                     href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}">
-                    <div class="group-hover:dark:text-white">
+                    <div class="box-title">{{ $destination->name }}</div>
-                        <div>{{ $destination->name }}</div>
+                    <div class="box-description">server: {{ $destination->server->name }}</div>
-                    </div>
                 </a>
+            </div>
             @endif
             @if ($destination->getMorphClass() === 'App\Models\SwarmDocker')
-                <a class="flex gap-4 text-center hover:no-underline box group"
+            <div class="box group">
+                <a class="flex flex-col mx-6"
                     href="{{ route('destination.show', ['destination_uuid' => data_get($destination, 'uuid')]) }}">
-
+                    <div class="box-title">{{ $destination->name }}</div>
-                    <div class="group-hover:dark:text-white">
+                    <div class="box-description">server: {{ $destination->server->name }}</div>
-                        <div>{{ $destination->name }}</div>
-                    </div>
                 </a>
+            </div>
             @endif
         @empty
             <div>
                 @if ($servers->count() === 0)
-                    <div> No servers found. Please add one first.</div>
+                    <div>No servers found. Please add one first.</div>
                 @else
                     <div>No destinations found.</div>
                 @endif

resources/views/errors/401.blade.php

@@ -1,20 +1,18 @@
 @extends('layouts.base')
-<div class="min-h-screen hero">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div class="">
+        <p class="font-mono font-semibold text-7xl dark:text-warning">401</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">401</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">You shall not pass!</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">You shall not pass!</h1>
+        <p class="text-base leading-7 text-neutral-300">You don't have permission to access this page.
-            <p class="mt-6 text-base leading-7 text-neutral-300">You don't have permission to access this page.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+                support
-                    support
+                <x-external-link />
-                    <x-external-link />
+            </a>
-                </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/402.blade.php

@@ -1,5 +1,17 @@
-@extends('errors::minimal')
+@extends('layouts.base')
 
-@section('title', __('Payment Required'))
+<div class="flex flex-col items-center justify-center h-full">
-@section('code', '402')
+    <div>
-@section('message', __('Payment Required'))
+        <p class="font-mono font-semibold text-7xl dark:text-warning">402</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">Payment required.</h1>
+        <div class="flex items-center mt-10 gap-x-6">
+            <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
+            </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+                support
+                <x-external-link />
+            </a>
+        </div>
+    </div>
+</div>

resources/views/errors/403.blade.php

@@ -1,20 +1,18 @@
 @extends('layouts.base')
-<div class="min-h-screen hero">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div class="">
+        <p class="font-mono font-semibold text-7xl dark:text-warning">403</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">403</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">You shall not pass!</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">You shall not pass!</h1>
+        <p class="text-base leading-7 text-neutral-300">You don't have permission to access this page.
-            <p class="mt-6 text-base leading-7 text-neutral-300">You don't have permission to access this page.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+                support
-                    support
+                <x-external-link />
-                    <x-external-link />
+            </a>
-                </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/404.blade.php

@@ -1,21 +1,19 @@
 @extends('layouts.base')
-<div class="min-h-screen hero">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div class="">
+        <p class="font-mono font-semibold text-7xl dark:text-warning">404</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">404</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">How did you got here?</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">How did you got here?</h1>
+        <p class="text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
-            <p class="mt-6 text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
+            for.
-                for.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
+                support
-                    support
+                <x-external-link />
-                    <x-external-link />
+            </a>
-                </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/419.blade.php

@@ -1,20 +1,19 @@
 @extends('layouts.base')
-<div class="min-h-screen hero">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div class="">
+        <p class="font-mono font-semibold text-7xl dark:text-warning">419</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">419</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">This page is definitely old, not like you!</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">This page is definitely old, not like you!</h1>
+        <p class="text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
-            <p class="mt-6 text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
+            for.
-                for.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a href="{{ config('coolify.contact') }}" class="font-semibold dark:text-white ">Contact
+                support
-                    support
+                <x-external-link />
-                    <span aria-hidden="true">&rarr;</span></a>
+            </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/429.blade.php

@@ -1,20 +1,19 @@
 @extends('layouts.base')
-<div class="min-h-screen hero">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div class="">
+        <p class="font-mono font-semibold text-7xl dark:text-warning">429</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">429</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">Woah, slow down there!</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">Woah, slow down there!</h1>
+        <p class="text-base leading-7 text-neutral-300">You're making too many requests. Please wait a few
-            <p class="mt-6 text-base leading-7 text-neutral-300">You're making too many requests. Please wait a few
+            seconds before trying again.
-                seconds before trying again.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a href="{{ config('coolify.contact') }}" class="font-semibold dark:text-white ">Contact
+                support
-                    support
+                <x-external-link />
-                    <span aria-hidden="true">&rarr;</span></a>
+            </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/500.blade.php

@@ -1,23 +1,22 @@
 @extends('layouts.base')
-<div class="min-h-screen hero ">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div>
+        <p class="font-mono font-semibold text-red-500 text-7xl">500</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">500</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">Something is not okay, are you okay?</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">Something is not okay, are you okay?</h1>
+        <p class="text-base leading-7 text-neutral-300">There has been an error, we are working on it.
-            <p class="mt-6 text-base leading-7 text-neutral-300">There has been an error, we are working on it.
+        </p>
-            </p>
+        @if ($exception->getMessage() !== '')
-            @if ($exception->getMessage() !== '')
+            <code class="mt-6 text-xs text-left text-red-500">Error: {{ $exception->getMessage() }}
-                <code class="mt-6 text-xs text-left text-red-500">Error: {{ $exception->getMessage() }}
+            </code>
-                </code>
+        @endif
-            @endif
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a href="/">
-                <a href="/">
+                <x-forms.button>Go back home</x-forms.button>
-                    <x-forms.button>Go back home</x-forms.button>
+            </a>
-                </a>
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a href="{{ config('coolify.contact') }}" class="font-semibold dark:text-white">Contact
+                support
-                    support
+                <x-external-link />
-                    <span aria-hidden="true">&rarr;</span></a>
+            </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/errors/503.blade.php

@@ -1,17 +1,16 @@
 @extends('layouts.base')
-<div class="min-h-screen hero ">
+<div class="flex flex-col items-center justify-center h-full">
-    <div class="text-center hero-content">
+    <div>
-        <div>
+        <p class="font-mono font-semibold text-7xl dark:text-warning">503</p>
-            <p class="font-mono text-6xl font-semibold dark:text-warning">503</p>
+        <h1 class="mt-4 font-bold tracking-tight dark:text-white">We are working on serious things.</h1>
-            <h1 class="mt-4 font-bold tracking-tight dark:text-white">We are working on serious things.</h1>
+        <p class="text-base leading-7 text-neutral-300">Service Unavailable. Be right back. Thanks for your
-            <p class="mt-6 text-base leading-7 text-neutral-300">Service Unavailable. Be right back. Thanks for your
+            patience.
-                patience.
+        </p>
-            </p>
+        <div class="flex items-center mt-10 gap-x-6">
-            <div class="flex items-center justify-center mt-10 gap-x-6">
+            <a target="_blank" class="text-xs" href="{{ config('coolify.contact') }}">Contact
-                <a href="{{ config('coolify.contact') }}" class="font-semibold dark:text-white ">Contact
+                support
-                    support
+                <x-external-link />
-                    <span aria-hidden="true">&rarr;</span></a>
+            </a>
-            </div>
         </div>
     </div>
 </div>

resources/views/layouts/app.blade.php

@@ -4,9 +4,6 @@
     @if (isSubscribed() || !isCloud())
         <livewire:layout-popups />
     @endif
-    @auth
-        <livewire:realtime-connection />
-    @endauth
     @auth
         <div x-data="{ open: false }" x-cloak class="mx-auto max-w-7xl">
             <div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true">

resources/views/layouts/base.blade.php

@@ -40,20 +40,15 @@
     <body>
         <x-toast />
         <script data-navigate-once>
-            if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia(
+            if (localStorage.theme === 'dark') {
-                    '(prefers-color-scheme: dark)').matches)) {
                 document.documentElement.classList.add('dark')
-            } else {
+            } else if (localStorage.theme === 'light') {
                 document.documentElement.classList.remove('dark')
-            }
+            } else {
-
+                if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-            function changeTheme() {
-                if (localStorage.theme === 'dark') {
-                    localStorage.theme = 'light'
-                    document.documentElement.classList.remove('dark')
-                } else {
-                    localStorage.theme = 'dark'
                     document.documentElement.classList.add('dark')
+                } else {
+                    document.documentElement.classList.remove('dark')
                 }
             }
             @auth

resources/views/layouts/boarding.blade.php

@@ -1,6 +1,6 @@
 @extends('layouts.base')
 @section('body')
-    <main class="h-full bg-gray-50 dark:bg-base">
+    <main class="h-full">
         {{ $slot }}
     </main>
     @parent

resources/views/livewire/activity-monitor.blade.php

@@ -10,7 +10,7 @@
             </div>
         @endif
         <div
-            class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto dark:text-white border border-solid rounded bg-coolgray-100 scrollbar border-coolgray-300 max-h-96">
+            class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto bg-white border border-solid rounded dark:text-white dark:bg-coolgray-100 scrollbar border-neutral-300 dark:border-coolgray-300 max-h-96">
             <pre class="font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>
         </div>
     @else

resources/views/livewire/boarding/index.blade.php

@@ -1,11 +1,11 @@
 @php use App\Enums\ProxyTypes; @endphp
 <section class="flex flex-col h-full lg:items-center lg:justify-center">
-    <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto max-w-7xl lg:py-0">
+    <div class="flex flex-col items-center justify-center p-10 mx-2 mt-10 bg-white border rounded-lg shadow lg:p-20 dark:bg-transparent dark:border-none max-w-7xl ">
         @if ($currentState === 'welcome')
             <h1 class="text-3xl font-bold lg:text-5xl">Welcome to Coolify</h1>
-            <p class="py-6 text-base text-center lg:text-xl">Let me help you set up the basics.</p>
+            <div class="py-6 text-center lg:text-xl">Let me help you set up the basics.</div>
             <div class="flex justify-center ">
-                <x-forms.button class="justify-center w-64 box" wire:click="$set('currentState','explanation')">Get
+                <x-forms.button class="justify-center w-64 box-boarding" wire:click="$set('currentState','explanation')">Get
                     Started
                 </x-forms.button>
             </div>
@@ -33,7 +33,7 @@
                         Telegram, Email, etc.) when something goes wrong, or an action is needed from your side.</p>
                 </x-slot:explanation>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center lg:w-64 box" wire:click="explanation">Next
+                    <x-forms.button class="justify-center lg:w-64 box-boarding" wire:click="explanation">Next
                     </x-forms.button>
                 </x-slot:actions>
             </x-boarding-step>
@@ -44,11 +44,11 @@
                     or to a <x-highlighted text="Remote Server" />?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center w-64 box" wire:target="setServerType('localhost')"
+                    <x-forms.button class="justify-center w-64 box-boarding" wire:target="setServerType('localhost')"
                         wire:click="setServerType('localhost')">Localhost
                     </x-forms.button>
 
-                    <x-forms.button class="justify-center w-64 box " wire:target="setServerType('remote')"
+                    <x-forms.button class="justify-center w-64 box-boarding " wire:target="setServerType('remote')"
                         wire:click="setServerType('remote')">Remote Server
                     </x-forms.button>
                     @if (!$serverReachable)
@@ -62,7 +62,7 @@
                         Check this <a target="_blank" class="underline"
                             href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="lg:w-64 box" wire:target="setServerType('localhost')"
+                        <x-forms.button class="lg:w-64 box-boarding" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again
                         </x-forms.button>
                     @endif
@@ -85,10 +85,10 @@
                     Do you have your own SSH Private Key?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center lg:w-64 box" wire:target="setPrivateKey('own')"
+                    <x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('own')"
                         wire:click="setPrivateKey('own')">Yes
                     </x-forms.button>
-                    <x-forms.button class="justify-center lg:w-64 box" wire:target="setPrivateKey('create')"
+                    <x-forms.button class="justify-center lg:w-64 box-boarding" wire:target="setPrivateKey('create')"
                         wire:click="setPrivateKey('create')">No (create one for me)
                     </x-forms.button>
                     @if (count($privateKeys) > 0)
@@ -120,7 +120,7 @@
                 <x-slot:actions>
                     <div class="flex flex-col gap-4">
                         <div>
-                            <x-forms.button class="justify-center w-64 box" wire:click="createNewServer">No (create
+                            <x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewServer">No (create
                                 one
                                 for
                                 me)
@@ -146,7 +146,7 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="w-64 box" wire:target="validateServer" wire:click="validateServer">Check
+                        <x-forms.button class="w-64 box-boarding" wire:target="validateServer" wire:click="validateServer">Check
                             again
                         </x-forms.button>
                     @endif
@@ -236,7 +236,7 @@
                         <x-slot:content>
                             <livewire:server.validate-and-install :server="$this->createdServer" />
                         </x-slot:content>
-                        <x-forms.button @click="slideOverOpen=true" class="w-full font-bold box lg:w-96"
+                        <x-forms.button @click="slideOverOpen=true" class="w-full font-bold box-boarding lg:w-96"
                             wire:click.prevent='installServer' isHighlighted>
                             Let's do it!
                         </x-forms.button>
@@ -263,7 +263,7 @@
                     @endif
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center w-64 box" wire:click="createNewProject">Create new
+                    <x-forms.button class="justify-center w-64 box-boarding" wire:click="createNewProject">Create new
                         project!</x-forms.button>
                     <div>
                         @if (count($projects) > 0)
@@ -292,7 +292,7 @@
                     Let's go to the new resource page, where you can create your first resource.
                 </x-slot:question>
                 <x-slot:actions>
-                    <div class="items-center justify-center w-64 box" wire:click="showNewResource">Let's do
+                    <div class="items-center justify-center w-64 box-boarding" wire:click="showNewResource">Let's do
                         it!</div>
                 </x-slot:actions>
                 <x-slot:explanation>

resources/views/livewire/dashboard.blade.php

@@ -21,21 +21,20 @@
             @foreach ($projects as $project)
                 <div class="gap-2 border border-transparent cursor-pointer box group">
                     @if (data_get($project, 'environments')->count() === 1)
-                        <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                        <a class="flex flex-col justify-center flex-1 mx-6"
                             href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                             <div class="box-title">{{ $project->name }}</div>
-                            <div class="box-description">
+                            <div class="box-description"> {{ $project->description }}</div>
-                                {{ $project->description }}</div>
                         </a>
                     @else
-                        <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                        <a class="flex flex-col justify-center flex-1 mx-6"
                             href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
                             <div class="box-title">{{ $project->name }}</div>
                             <div class="box-description">
                                 {{ $project->description }}</div>
                         </a>
                     @endif
-                    <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 lg:py-0 lg:justify-normal">
+                    <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                         <a class="hover:underline"
                             href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                             <span class="p-2 font-bold">+
@@ -71,7 +70,7 @@
                         'border-transparent' => $server->settings->is_reachable,
                         'border-red-500' => !$server->settings->is_reachable,
                     ])>
-                    <div class="flex flex-col mx-6">
+                    <div class="flex flex-col justify-center mx-6">
                         <div class="box-title">
                             {{ $server->name }}
                         </div>
@@ -79,13 +78,13 @@
                             {{ $server->description }}</div>
                         <div class="flex gap-1 text-xs text-error">
                             @if (!$server->settings->is_reachable)
-                                <span>Not reachable</span>
+                                Not reachable
                             @endif
                             @if (!$server->settings->is_reachable && !$server->settings->is_usable)
                                 &
                             @endif
                             @if (!$server->settings->is_usable)
-                                <span>Not usable by Coolify</span>
+                                Not usable by Coolify
                             @endif
                         </div>
                     </div>
@@ -137,7 +136,7 @@
                             'dark:border-coolgray-300' => data_get($deployment, 'status') === 'queued',
                             'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
                         ])>
-                            <div class="flex flex-col mx-6">
+                            <div class="flex flex-col justify-center mx-6">
                                 <div class="box-title">
                                     {{ data_get($deployment, 'application_name') }}
                                 </div>

resources/views/livewire/layout-popups.blade.php

@@ -1,13 +1,52 @@
 <div x-data="{
     popups: {
         sponsorship: true,
-        notification: true
+        notification: true,
+        realtime: false,
     },
     init() {
         this.popups.sponsorship = localStorage.getItem('popupSponsorship') !== 'false';
         this.popups.notification = localStorage.getItem('popupNotification') !== 'false';
+        this.popups.realtime = localStorage.getItem('popupRealtime');
+
+        let checkNumber = 1;
+        let checkPusherInterval = null;
+        if (!this.popups.realtime) {
+            checkPusherInterval = setInterval(() => {
+                if (window.Echo && window.Echo.connector.pusher.connection.state !== 'connected') {
+                    checkNumber++;
+                    if (checkNumber > 4) {
+                        this.popups.realtime = true;
+                        console.error(
+                            'Coolify could not connect to its real-time service. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
+                        );
+                        clearInterval(checkPusherInterval);
+                    }
+                }
+            }, 1000);
+        }
     }
 }">
+    @auth
+        <span x-show="popups.realtime === true">
+            <x-popup>
+                <x-slot:title>
+                    <span class="font-bold text-left text-red-500">WARNING: </span>Realtime Error?!
+                </x-slot:title>
+                <x-slot:description>
+                    <span>Coolify could not connect to its real-time service.<br>This will cause unusual problems on the UI
+                        if
+                        not fixed! <br><br>Please check the
+                        related <a class="underline" href='https://coolify.io/docs/cloudflare/tunnels'
+                            target='_blank'>documentation</a> or get
+                        help on <a class="underline" href='https://coollabs.io/discord' target='_blank'>Discord</a>. </span>
+                </x-slot:description>
+                <x-slot:button-text @click="disableRealtime()">
+                    Acknowledge & Disable This Popup
+                </x-slot:button-text>
+            </x-popup>
+        </span>
+    @endauth
     <span x-show="popups.sponsorship">
         <x-popup>
             <x-slot:title>
@@ -20,8 +59,9 @@
             <x-slot:description>
                 <span>Please
                     consider donating on <a href="https://github.com/sponsors/coollabsio"
-                        class="text-xs dark:text-white underline">GitHub</a> or <a href="https://opencollective.com/coollabsio"
+                        class="text-xs underline dark:text-white">GitHub</a> or <a
-                        class="text-xs dark:text-white underline">OpenCollective</a>.<br><br></span>
+                        href="https://opencollective.com/coollabsio"
+                        class="text-xs underline dark:text-white">OpenCollective</a>.<br><br></span>
                 <span>It enables us to keep creating features without paywalls, ensuring our work remains free and
                     open.</span>
             </x-slot:description>
@@ -35,7 +75,8 @@
             <div><span class="font-bold text-red-500">WARNING:</span> The number of active servers exceeds the limit
                 covered by your payment. If not resolved, some of your servers <span class="font-bold text-red-500">will
                     be deactivated</span>. Visit <a href="{{ route('subscription.show') }}"
-                    class="dark:text-white underline">/subscription</a> to update your subscription or remove some servers.
+                    class="underline dark:text-white">/subscription</a> to update your subscription or remove some
+                servers.
             </div>
         </x-banner>
     @endif
@@ -57,7 +98,7 @@
                     highly recommended to enable at least
                     one
                     notification channel to receive important alerts.<br>Visit <a
-                        href="{{ route('notifications.email') }}" class="dark:text-white underline">/notification</a> to
+                        href="{{ route('notifications.email') }}" class="underline dark:text-white">/notification</a> to
                     enable notifications.</span>
         </x-slot:description>
         <x-slot:button-text @click="disableNotification()">
@@ -70,8 +111,13 @@
         function disableSponsorship() {
             localStorage.setItem('popupSponsorship', false);
         }
+
         function disableNotification() {
             localStorage.setItem('popupNotification', false);
         }
+
+        function disableRealtime() {
+            localStorage.setItem('popupRealtime', 'disabled');
+        }
     </script>
 </div>

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

@@ -18,8 +18,10 @@
         </div>
         <div class="flex flex-col gap-2">
             <x-forms.input id="current_password" label="Current Password" required type="password" />
+            <div class="flex gap-2">
             <x-forms.input id="new_password" label="New Password" required type="password" />
             <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
+            </div>
         </div>
     </form>
     <h2 class="py-4">Two-factor Authentication</h2>

resources/views/livewire/project/application/general.blade.php

@@ -51,7 +51,7 @@
                                 helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
                         </div>
                         @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
-                        <h3>Domains</h3>
+                            <h3>Domains</h3>
                             @foreach (data_get($parsedServices, 'services') as $serviceName => $service)
                                 @if (!isDatabaseImage(data_get($service, 'image')))
                                     <div class="flex items-end gap-2">
@@ -78,13 +78,13 @@
                     </x-forms.button>
                 </div>
             @endif
+
             @if ($application->build_pack !== 'dockercompose')
                 <div class="flex items-center gap-2 pt-8">
                     <h3>Docker Registry</h3>
                     @if ($application->build_pack !== 'dockerimage' && !$application->destination->server->isSwarm())
                         <x-helper
-                            helper='Push the built image to a docker registry. More info <a class="underline"
+                            helper="Push the built image to a docker registry. More info <a class='underline' href='https://coolify.io/docs/docker/registry' target='_blank'>here</a>." />
-                href="https://coolify.io/docs/docker/registry" target="_blank">here</a>' />
                     @endif
                 </div>
                 @if ($application->destination->server->isSwarm())

resources/views/livewire/project/application/rollback.blade.php

@@ -9,7 +9,7 @@
         <div class="flex flex-wrap">
             @forelse ($images as $image)
                 <div class="w-2/4 p-2">
-                    <div class="rounded shadow-lg bg-coolgray-100">
+                    <div class="bg-white border rounded dark:border-bg-black dark:bg-coolgray-100">
                         <div class="p-2">
                             <div class="">
                                 @if (data_get($image, 'is_current'))

resources/views/livewire/project/database/scheduled-backups.blade.php

@@ -11,14 +11,16 @@
                     </a>
                 </div>
             @else
-                <div @class([
+                <div class="box">
-                    'border-coollabs' =>
+                    <div @class([
-                        data_get($backup, 'id') === data_get($selectedBackup, 'id'),
+                        'border-coollabs' =>
-                    'flex flex-col box border-l-2 border-transparent',
+                            data_get($backup, 'id') === data_get($selectedBackup, 'id'),
-                ]) wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
+                        'flex flex-col  border-l-2 border-transparent',
-                    <div>Frequency: {{ $backup->frequency }}</div>
+                    ]) wire:click="setSelectedBackup('{{ data_get($backup, 'id') }}')">
-                    <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                        <div>Frequency: {{ $backup->frequency }}</div>
-                    <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                        <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
+                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
+                    </div>
                 </div>
             @endif
         @empty

resources/views/livewire/project/environment-edit.blade.php

@@ -48,7 +48,7 @@
             <livewire:project.shared.environment-variable.add />
         </x-modal-input>
     </div>
-    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning">@{{environment.VARIABLENAME}}</span><x-helper
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning text-coollabs">@{{environment.VARIABLENAME}}</span><x-helper
             helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">

resources/views/livewire/project/index.blade.php

@@ -10,13 +10,13 @@
         @forelse ($projects as $project)
             <div class="box group" x-data
                 x-on:click="goto('{{ $project->uuid }}')">
-                <a class="flex flex-col flex-1 mx-6 hover:no-underline"
+                <a class="flex flex-col justify-center flex-1 mx-6"
                     href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
                     <div class="box-title">{{ $project->name }}</div>
                     <div class="box-description ">
                         {{ $project->description }}</div>
                 </a>
-                <div class="flex items-center">
+                <div class="flex items-center text-xs">
                     <a class="mx-4 font-bold hover:underline"
                         href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
                         Settings

resources/views/livewire/project/new/docker-compose.blade.php

@@ -6,16 +6,7 @@
             <h2>Docker Compose</h2>
             <x-forms.button type="submit">Save</x-forms.button>
         </div>
-        <x-forms.textarea label="Docker Compose file"
+        <x-forms.textarea label="Docker Compose file" rows="20" id="dockerComposeRaw"
-            helper="
-    You can use these variables in your Docker Compose file and Coolify will generate default values or replace them with the values you set on the UI forms.<br>
-    <br>
-    - SERVICE_FQDN_*: FQDN - could be changeable from the UI. (example: SERVICE_FQDN_GHOST)<br>
-    - SERVICE_URL_*: URL parsed from FQDN - could be changeable from the UI. (example: SERVICE_URL_GHOST)<br>
-    - SERVICE_BASE64_64_*: Generated 'base64' string with length of '64' (example: SERVICE_BASE64_64_GHOST, to generate 32 bit: SERVICE_BASE64_32_GHOST)<br>
-    - SERVICE_USER_*: Generated user (example: SERVICE_USER_MYSQL)<br>
-    - SERVICE_PASSWORD_*: Generated password (example: SERVICE_PASSWORD_MYSQL)<br>"
-            rows="20" id="dockerComposeRaw"
             placeholder='services:
   ghost:
     documentation: https://ghost.org/docs/config
@@ -44,6 +35,5 @@
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
 '></x-forms.textarea>
-        {{-- <x-forms.textarea label="Environment File" rows="20" id="envFile"></x-forms.textarea> --}}
     </form>
 </div>

resources/views/livewire/project/resource/index.blade.php

@@ -72,10 +72,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer box-description dark:bg-coolgray-100 dark:hover:bg-coolgray-300 bg-neutral-100 hover:bg-neutral-200"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer dark:text-neutral-500/20 text-neutral-500 group-hover:text-neutral-700 group-hover:dark:text-white dark:hover:bg-coolgray-300 hover:bg-neutral-200"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -104,10 +104,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group-hover:text-black group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -136,10 +136,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -168,10 +168,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -200,10 +200,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -232,10 +232,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>
@@ -264,10 +264,10 @@
                         </a>
                         <div class="flex gap-1 pt-1 group-hover:dark:text-white group min-h-6">
                             <template x-for="tag in item.tags">
-                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                <div class="tag"
                                     @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
                             </template>
-                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:dark:text-white hover:bg-coolgray-300"
+                            <div class="add-tag"
                                 @click.prevent="goto(item)">Add tag</div>
                         </div>
                     </span>

resources/views/livewire/project/service/configuration.blade.php

@@ -75,7 +75,7 @@
                                     <div class="text-xs">{{ $application->status }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
-                                    <a class="mx-4 font-bold hover:underline"
+                                    <a class="mx-4 text-xs font-bold hover:underline"
                                         href="{{ route('project.service.index', [...$parameters, 'stack_service_uuid' => $application->uuid]) }}">
                                         Settings
                                     </a>
@@ -116,7 +116,7 @@
                                     <div class="text-xs">{{ $database->status }}</div>
                                 </div>
                                 <div class="flex items-center px-4">
-                                    <a class="mx-4 font-bold hover:underline"
+                                    <a class="mx-4 text-xs font-bold hover:underline"
                                         href="{{ route('project.service.index', [...$parameters, 'stack_service_uuid' => $database->uuid]) }}">
                                         Settings
                                     </a>

resources/views/livewire/project/service/index.blade.php

@@ -17,10 +17,9 @@
                 @click.prevent="activeTab = 'scheduled-tasks'; window.location.hash = 'scheduled-tasks'"
                 href="#">Scheduled Tasks
             </a>
-            @if (
+            @if (str($serviceDatabase?->databaseType())->contains('mysql') ||
-                $serviceDatabase?->databaseType() === 'standalone-mysql' ||
+                    str($serviceDatabase?->databaseType())->contains('postgres') ||
-                    $serviceDatabase?->databaseType() === 'standalone-postgresql' ||
+                    str($serviceDatabase?->databaseType())->contains('mariadb'))
-                    $serviceDatabase?->databaseType() === 'standalone-mariadb')
                 <a :class="activeTab === 'backups' && 'dark:text-white'"
                     @click.prevent="activeTab = 'backups'; window.location.hash = 'backups'" href="#">Backups</a>
             @endif

resources/views/livewire/project/shared/destination.blade.php

@@ -3,7 +3,7 @@
     <div class="">Server related configurations.</div>
     <div class="grid grid-cols-1 gap-4 py-4">
         <div class="flex gap-2">
-            <div class="relative flex flex-col bg-white cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96">
+            <div class="relative flex flex-col bg-white border cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96 dark:border-black">
                 <div class="text-xl font-bold">Primary Server</div>
                 @if (str($resource->realStatus())->startsWith('running'))
                     <div title="{{ $resource->realStatus() }}" class="absolute bg-success -top-1 -left-1 badge ">

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -1,5 +1,6 @@
 <div>
-    <form wire:submit='submit' class="flex flex-col items-center gap-4 p-4 border lg:items-start dark:border-coolgray-300">
+    <form wire:submit='submit'
+        class="flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base dark:border-coolgray-300">
         @if ($isLocked)
             <div class="flex flex-1 w-full gap-2">
                 <x-forms.input disabled id="env.key" />
@@ -12,7 +13,7 @@
                 </svg>
                 <x-modal-confirmation isErrorButton buttonTitle="Delete">
                     You will delete environment variable <span
-                        class="font-bold dark:text-warning">{{ $env->key }}</span>.
+                        class="font-bold dark:text-warning text-coollabs">{{ $env->key }}</span>.
                 </x-modal-confirmation>
             </div>
         @else
@@ -39,9 +40,15 @@
                 </div>
             @endif
             <div class="flex flex-col w-full gap-2 lg:flex-row">
-                @if ($type !== 'service' && !$isSharedVariable)
+                @if ($type === 'service')
-                    <x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
                     <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
+                @else
+                    @if ($env->is_shared)
+                        <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
+                    @else
+                        <x-forms.checkbox instantSave id="env.is_multiline" label="Is Multiline?" />
+                        <x-forms.checkbox instantSave id="env.is_build_time" label="Build Variable?" />
+                    @endif
                 @endif
                 <div class="flex-1"></div>
                 @if ($isDisabled)

resources/views/livewire/project/shared/resource-operations.blade.php

@@ -14,9 +14,9 @@
                             <x-modal-confirmation action="cloneTo({{ data_get($destination, 'id') }})">
                                 <x:slot name="content">
                                     <div class="box">
-                                        <div class="flex flex-col gap-2 ">
+                                        <div class="flex flex-col">
-                                            <div class="font-bold dark:text-white">{{ $server->name }}</div>
+                                            <div class="box-title">{{ $server->name }}</div>
-                                            <div>{{ $destination->name }}</div>
+                                            <div class="box-description">{{ $destination->name }}</div>
                                         </div>
                                     </div>
                                 </x:slot>
@@ -35,16 +35,16 @@
                 class="font-bold dark:text-warning">{{ $resource->environment->project->name }} /
                 {{ $resource->environment->name }}</span> environment.
         </div>
-        <div class="grid gap-4">
+        <div class="flex flex-wrap gap-2">
             @forelse ($projects as $project)
-                <div class="flex flex-row flex-wrap gap-2">
+                <div class="flex flex-wrap gap-2">
                     @foreach ($project->environments as $environment)
                         <x-modal-confirmation action="moveTo({{ data_get($environment, 'id') }})">
                             <x:slot name="content">
                                 <div class="box">
-                                    <div class="flex flex-col gap-2 ">
+                                    <div class="flex flex-col">
-                                        <div class="font-bold dark:text-white">{{ $project->name }}</div>
+                                        <div class="box-title">{{ $project->name }}</div>
-                                        <div><span class="dark:text-warning">{{ $environment->name }}</span> environment
+                                        <div class="box-description">environment: {{ $environment->name }}
                                         </div>
                                     </div>
                                 </div>

resources/views/livewire/project/show.blade.php

@@ -17,7 +17,7 @@
                     <div class="description">
                         {{ $environment->description }}</div>
                 </a>
-                <div class="flex items-center">
+                <div class="flex items-center text-xs">
                     <a class="mx-4 font-bold hover:underline"
                         href="{{ route('project.environment.edit', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => $environment->name]) }}">
                         Settings

resources/views/livewire/realtime-connection.blade.php

@@ -1,48 +0,0 @@
-<div x-data="{ showNotification: @entangle('showNotification') }">
-    @if ($checkConnection)
-        @script
-            <script>
-                let checkPusherInterval = null;
-                let checkNumber = 0;
-                checkPusherInterval = setInterval(() => {
-                    if (window.Echo) {
-                        if (window.Echo.connector.pusher.connection.state !== 'connected') {
-                            checkNumber++;
-                            if (checkNumber > 4) {
-                                @if ($isNotificationEnabled)
-                                    $wire.showNotification = true;
-                                @endif
-                                console.error(
-                                    'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
-                                );
-                                clearInterval(checkPusherInterval);
-                            }
-                        } else {
-                            console.log('Coolify Realtime Service is connected!');
-                            clearInterval(checkPusherInterval);
-                        }
-                    } else {
-                        @if ($isNotificationEnabled)
-                            $wire.showNotification = true;
-                        @endif
-                        console.error(
-                            'Coolify could not connect to the new realtime service introduced in beta.154. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
-                        );
-                        clearInterval(checkPusherInterval);
-                    }
-                }, 1000);
-            </script>
-        @endscript
-        <div class="toast z-[9999]" x-cloak x-show="showNotification">
-            <div class="flex flex-col dark:text-white border border-red-500 border-dashed rounded alert-error bg-coolgray-200">
-                <span><span class="font-bold text-left text-red-500">WARNING: </span>Coolify could not connect to the new
-                    realtime service introduced in beta.154. <br>This will cause unusual problems on the UI if not
-                    fixed!<br><br>Please check the
-                    related <a href='https://coolify.io/docs/cloudflare/tunnels' target='_blank'>documentation</a> or get
-                    help on <a href='https://coollabs.io/discord' target='_blank'>Discord</a>.</span>
-                <x-forms.button class="bg-coolgray-400" wire:click='disable'>Acknowledge the problem and disable this
-                    popup</x-forms.button>
-            </div>
-        </div>
-    @endif
-</div>

resources/views/livewire/server/index.blade.php

@@ -18,7 +18,7 @@
                     'border-red-500' =>
                         !$server->settings->is_reachable || $server->settings->force_disabled,
                 ])>
-                <div class="flex flex-col mx-6">
+                <div class="flex flex-col justify-center mx-6">
                     <div class="font-bold dark:text-white">
                         {{ $server->name }}
                     </div>

resources/views/livewire/team-shared-variables-index.blade.php

@@ -7,7 +7,7 @@
         </x-modal-input>
     </div>
     <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span
-            class="dark:text-warning">@{{ team.VARIABLENAME }}</span> <x-helper
+            class="dark:text-warning text-coollabs">@{{ team.VARIABLENAME }}</span> <x-helper
             helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
 

resources/views/livewire/team/member.blade.php

@@ -1,6 +1,6 @@
 <tr @class([
-    'dark:text-white bg-coolblack hover:bg-coolgray-100',
+    'dark:text-white text-black dark:bg-coolblack dark:hover:bg-coolgray-100',
-    'bg-coolgray-100' => $member->id == auth()->user()->id,
+    'dark:bg-coolgray-100 bg-neutral-200' => $member->id == auth()->user()->id,
 ])>
     <td class="px-5 py-4 text-sm whitespace-nowrap">
         {{ $member->name }}

resources/views/livewire/team/member/index.blade.php

@@ -7,7 +7,7 @@
             <div class="overflow-x-auto">
                 <div class="inline-block min-w-full">
                     <div class="overflow-hidden">
-                        <table class="min-w-full divide-y divide-coolgray-400">
+                        <table class="min-w-full divide-y dark:divide-coolgray-400 divide-neutral-400">
                             <thead>
                                 <tr>
                                     <th class="px-5 py-3 text-xs font-medium text-left uppercase">Name
@@ -17,7 +17,7 @@
                                     <th class="px-5 py-3 text-xs font-medium text-left uppercase">Actions</th>
                                 </tr>
                             </thead>
-                            <tbody class="divide-y divide-coolgray-400">
+                            <tbody class="divide-y dark:divide-coolgray-400 divide-neutral-200">
                                 @foreach (currentTeam()->members as $member)
                                     <livewire:team.member :member="$member" :wire:key="$member->id" />
                                 @endforeach

resources/views/livewire/team/storage/index.blade.php

@@ -12,10 +12,10 @@
         @forelse ($s3 as $storage)
             <div x-data x-on:click="goto('{{ $storage->uuid }}')" @class(['gap-2 border cursor-pointer box group border-transparent'])>
                 <div class="flex flex-col mx-6">
-                    <div class=" group-hover:dark:text-white">
+                    <div class="box-title">
                         {{ $storage->name }}
                     </div>
-                    <div class="text-xs group-hover:dark:text-white">
+                    <div class="box-description">
                         {{ $storage->description }}</div>
                 </div>
             </div>

resources/views/vendor/wire-elements-modal/modal.blade.php

@@ -1,45 +0,0 @@
-<div>
-    @isset($jsPath)
-        <script>
-            {!! file_get_contents($jsPath) !!}
-        </script>
-    @endisset
-    @isset($cssPath)
-        <style>
-            {!! file_get_contents($cssPath) !!}
-        </style>
-    @endisset
-
-    <div x-data="LivewireUIModal()" x-on:close.stop="setShowPropertyTo(false)"
-        x-on:keydown.escape.window="closeModalOnEscape()" x-show="show" class="fixed inset-0 overflow-y-auto z-[60]"
-        style="display: none;">
-        <div class="flex items-end justify-center min-h-screen px-4 pt-4 pb-10 text-center sm:block sm:p-0">
-            <div x-show="show" x-on:click="closeModalOnClickAway()" x-transition:enter="ease-out duration-300"
-                x-transition:enter-start="opacity-0" x-transition:enter-end="opacity-100"
-                x-transition:leave="ease-in duration-200" x-transition:leave-start="opacity-100"
-                x-transition:leave-end="opacity-0" class="fixed inset-0 transition-all transform">
-                <div class="absolute inset-0 bg-black opacity-70"></div>
-            </div>
-
-            {{-- <span class="hidden sm:inline-block sm:align-middle sm:h-screen" aria-hidden="true">&#8203;</span> --}}
-
-            <div x-show="show && showActiveComponent" x-transition:enter="ease-out duration-300"
-                x-transition:enter-start="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-                x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
-                x-transition:leave="ease-in duration-200"
-                x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
-                x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
-                x-bind:class="modalWidth"
-                class="w-full overflow-hidden text-left align-bottom transition-all transform sm:align-middle sm:w-full"
-                id="modal-container" x-trap.noscroll.inert="show && showActiveComponent" aria-modal="true">
-                @forelse($components as $id => $component)
-                    <div class="sm:mx-20 sm:my-8" x-show.immediate="activeComponent == '{{ $id }}'"
-                        x-ref="{{ $id }}" wire:key="{{ $id }}">
-                        @livewire($component['name'], $component['arguments'], key($id))
-                    </div>
-                @empty
-                @endforelse
-            </div>
-        </div>
-    </div>
-</div>

routes/web.php

@@ -26,10 +26,8 @@ use App\Livewire\Notifications\Telegram as NotificationTelegram;
 use App\Livewire\Notifications\Discord as NotificationDiscord;
 
 use App\Livewire\Team\Index as TeamIndex;
-use App\Livewire\Team\Create as TeamCreate;
 
 use App\Livewire\Team\Storage\Index as TeamStorageIndex;
-use App\Livewire\Team\Storage\Create as TeamStorageCreate;
 use App\Livewire\Team\Storage\Show as TeamStorageShow;
 use App\Livewire\Team\Member\Index as TeamMemberIndex;
 
@@ -58,11 +56,9 @@ use App\Livewire\Project\Shared\Logs;
 use App\Livewire\Project\Shared\ScheduledTask\Show as ScheduledTaskShow;
 
 use App\Livewire\Security\ApiTokens;
-use App\Livewire\Security\PrivateKey\Create as SecurityPrivateKeyCreate;
 use App\Livewire\Security\PrivateKey\Show as SecurityPrivateKeyShow;
 
 use App\Livewire\Server\Index as ServerIndex;
-use App\Livewire\Server\Create as ServerCreate;
 use App\Livewire\Server\Show as ServerShow;
 use App\Livewire\Server\Resources as ResourcesShow;
 

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.243"
+            "version": "4.0.0-beta.245"
         }
     }
 }