Merge branch 'coollabsio:main' into new-dockerfiles

README.md

@@ -40,7 +40,7 @@ Special thanks to our biggest sponsors!
 
 ### Special Sponsors
 
-![image](https://github.com/user-attachments/assets/152bd1e0-e0c1-4d47-8a4f-0eb3700d2e61)
+![image](https://github.com/user-attachments/assets/726fb63e-c3b8-4260-b3ac-06780605ec5d)
 
 * [CCCareers](https://cccareers.org/) - A career development platform connecting coding bootcamp graduates with job opportunities in the tech industry.
 * [Hetzner](http://htznr.li/CoolifyXHetzner) - A German web hosting company offering affordable dedicated servers, cloud services, and web hosting solutions.
@@ -50,6 +50,7 @@ Special thanks to our biggest sponsors!
 * [QuantCDN](https://www.quantcdn.io/?ref=coolify.io) - A content delivery network (CDN) optimizing website performance through global content distribution.
 * [Arcjet](https://arcjet.com/?ref=coolify.io) - A cloud-based platform providing real-time protection against API abuse and bot attacks.
 * [SupaGuide](https://supa.guide/?ref=coolify.io) - A comprehensive resource hub offering guides and tutorials for web development using Supabase.
+* [GoldenVM](https://billing.goldenvm.com/?ref=coolify.io) - A cloud hosting provider offering scalable infrastructure solutions for businesses of all sizes.
 * [Tigris](https://tigrisdata.com/?ref=coolify.io) - A fully managed serverless object storage service compatible with Amazon S3 API. Offers high performance, scalability, and built-in search capabilities for efficient data management.
 * [Advin](https://coolify.ad.vin/?ref=coolify.io) - A digital advertising agency specializing in programmatic advertising and data-driven marketing strategies.
 * [Treive](https://trieve.ai/?ref=coolify.io) - An AI-powered search and discovery platform for enhancing information retrieval in large datasets.
@@ -90,7 +91,6 @@ Special thanks to our biggest sponsors!
 <a href="https://github.com/urtho"><img src="https://github.com/urtho.png" width="60px" alt="Paweł Pierścionek" /></a>
 <a href="https://github.com/monocursive"><img src="https://github.com/monocursive.png" width="60px" alt="Michael Mazurczak" /></a>
 <a href="https://formbricks.com/?utm_source=coolify.io"><img src="https://github.com/formbricks.png" width="60px" alt="Formbricks" /></a>
-<a href="https://x.com/adithsuhas17?utm_source=coolify.io"><img src="https://github.com/adith-suhas-sv.png" width="60px" alt="Adith Suhas" /></a>
 <a href="https://startupfa.me?utm_source=coolify.io"><img src="https://github.com/startupfame.png" width="60px" alt="StartupFame" /></a>
 <a href="https://jonasjaeger.com?utm_source=coolify.io"><img src="https://github.com/toxin20.png" width="60px" alt="Jonas Jaeger" /></a>
 <a href="https://github.com/therealjp?utm_source=coolify.io"><img src="https://github.com/therealjp.png" width="60px" alt="JP" /></a>
@@ -147,10 +147,10 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
 
 # Core Maintainers
 
-| Andras Bacsai | Peak |
+| Andras Bacsai | 🏔️ Peak |
 |------------|------------|
-| <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="Peak Labs" /> |
-| <a href="https://x.com/heyandras"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/andrasbacsai"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> | <a href="https://x.com/peaklabs_dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Twitter.svg" width="25px"></a> <a href="https://github.com/peaklabs-dev"><img src="https://raw.githubusercontent.com/gauravghongde/social-icons/master/SVG/Color/Github.svg" width="25px"></a> |
+| <img src="https://github.com/andrasbacsai.png" width="200px" alt="Andras Bacsai" /> | <img src="https://github.com/peaklabs-dev.png" width="200px" alt="peaklabs-dev" /> |
+| <a href="https://github.com/andrasbacsai"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/heyandras"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/heyandras.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> | <a href="https://github.com/peaklabs-dev"><img src="https://api.iconify.design/devicon:github.svg" width="25px"></a> <a href="https://x.com/peaklabs_dev"><img src="https://api.iconify.design/devicon:twitter.svg" width="25px"></a> <a href="https://bsky.app/profile/peaklabs.dev"><img src="https://api.iconify.design/simple-icons:bluesky.svg" width="25px"></a> |
 
 # Repo Activity
 

app/Actions/Docker/GetContainersStatus.php

@@ -179,7 +179,7 @@ class GetContainersStatus
                                 })->first();
                                 if (! $foundTcpProxy) {
                                     StartDatabaseProxy::run($database);
-                                    // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
+                                    // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for database", $this->server));
                                 }
                             }
                         } else {

app/Actions/Server/ServerCheck.php

@@ -51,7 +51,6 @@ class ServerCheck
 
                     $containerReplicates = null;
                     $this->isSentinel = true;
-
                 } else {
                     ['containers' => $this->containers, 'containerReplicates' => $containerReplicates] = $this->server->getContainers();
                     // ServerStorageCheckJob::dispatch($this->server);
@@ -148,7 +147,6 @@ class ServerCheck
                 } else {
                     $labels = Arr::undot(data_get($container, 'Config.Labels'));
                 }
-
             }
             $managed = data_get($labels, 'coolify.managed');
             if (! $managed) {
@@ -259,7 +257,7 @@ class ServerCheck
                         })->first();
                         if (! $foundTcpProxy) {
                             StartDatabaseProxy::run($database);
-                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
+                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for database", $this->server));
                         }
                     }
                 }

app/Actions/Server/UpdateCoolify.php

@@ -31,7 +31,7 @@ class UpdateCoolify
         }
         CleanupDocker::dispatch($this->server);
         $this->latestVersion = get_latest_version_of_coolify();
-        $this->currentVersion = config('version');
+        $this->currentVersion = config('constants.coolify.version');
         if (! $manual_update) {
             if (! $settings->is_auto_update_enabled) {
                 return;

app/Console/Commands/Emails.php

@@ -187,7 +187,7 @@ class Emails extends Command
                         'team_id' => 0,
                     ]);
                 }
-                $this->mail = (new BackupSuccess($backup, $db))->toMail();
+                // $this->mail = (new BackupSuccess($backup->frequency, $db->name))->toMail();
                 $this->sendEmail();
                 break;
                 // case 'invitation-link':

app/Console/Commands/Init.php

@@ -200,7 +200,7 @@ class Init extends Command
 
     private function restore_coolify_db_backup()
     {
-        if (version_compare('4.0.0-beta.179', config('version'), '<=')) {
+        if (version_compare('4.0.0-beta.179', config('constants.coolify.version'), '<=')) {
             try {
                 $database = StandalonePostgresql::withTrashed()->find(0);
                 if ($database && $database->trashed()) {
@@ -228,7 +228,7 @@ class Init extends Command
     private function send_alive_signal()
     {
         $id = config('app.id');
-        $version = config('version');
+        $version = config('constants.coolify.version');
         $settings = instanceSettings();
         $do_not_track = data_get($settings, 'do_not_track');
         if ($do_not_track == true) {
@@ -264,7 +264,7 @@ class Init extends Command
 
     private function replace_slash_in_environment_name()
     {
-        if (version_compare('4.0.0-beta.298', config('version'), '<=')) {
+        if (version_compare('4.0.0-beta.298', config('constants.coolify.version'), '<=')) {
             $environments = Environment::all();
             foreach ($environments as $environment) {
                 if (str_contains($environment->name, '/')) {

app/Console/Commands/ServicesGenerate.php

@@ -20,7 +20,10 @@ class ServicesGenerate extends Command
 
     public function handle(): int
     {
-        $serviceTemplatesJson = collect(glob(base_path('templates/compose/*.yaml')))
+        $serviceTemplatesJson = collect(array_merge(
+            glob(base_path('templates/compose/*.yaml')),
+            glob(base_path('templates/compose/*.yml'))
+        ))
             ->mapWithKeys(function ($file): array {
                 $file = basename($file);
                 $parsed = $this->processFile($file);
@@ -68,7 +71,7 @@ class ServicesGenerate extends Command
             'slogan' => $data->get('slogan', str($file)->headline()),
             'compose' => $compose,
             'tags' => $tags,
-            'logo' => $data->get('logo', 'svgs/coolify.png'),
+            'logo' => $data->get('logo', 'svgs/default.webp'),
             'minversion' => $data->get('minversion', '0.0.0'),
         ];
 

app/Console/Kernel.php

@@ -50,7 +50,7 @@ class Kernel extends ConsoleKernel
             $this->instanceTimezone = config('app.timezone');
         }
 
-        $this->scheduleInstance->job(new CleanupStaleMultiplexedConnections)->hourly();
+        // $this->scheduleInstance->job(new CleanupStaleMultiplexedConnections)->hourly();
 
         if (isDev()) {
             // Instance Jobs
@@ -132,7 +132,7 @@ class Kernel extends ConsoleKernel
         }
 
         foreach ($servers as $server) {
-            $serverTimezone = $server->settings->server_timezone;
+            $serverTimezone = data_get($server->settings, 'server_timezone', $this->instanceTimezone);
 
             // Sentinel check
             $lastSentinelUpdate = $server->sentinel_updated_at;
@@ -141,8 +141,12 @@ class Kernel extends ConsoleKernel
                 if (validate_timezone($serverTimezone) === false) {
                     $serverTimezone = config('app.timezone');
                 }
-                $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
-                // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyMinute()->onOneServer();
+                if (isCloud()) {
+                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
+                } else {
+                    $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
+                }
+                // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();
 
                 // Check storage usage every 10 minutes if Sentinel does not activated
                 $this->scheduleInstance->job(new ServerStorageCheckJob($server))->everyTenMinutes()->onOneServer();
@@ -154,7 +158,7 @@ class Kernel extends ConsoleKernel
             }
 
             // Cleanup multiplexed connections every hour
-            $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
+            // $this->scheduleInstance->job(new ServerCleanupMux($server))->hourly()->onOneServer();
 
             // Temporary solution until we have better memory management for Sentinel
             if ($server->isSentinelEnabled()) {

app/Events/DatabaseProxyStopped.php

@@ -18,7 +18,7 @@ class DatabaseProxyStopped implements ShouldBroadcast
     public function __construct($teamId = null)
     {
         if (is_null($teamId)) {
-            $teamId = Auth::user()->currentTeam()->id ?? null;
+            $teamId = Auth::user()?->currentTeam()?->id ?? null;
         }
         if (is_null($teamId)) {
             throw new \Exception('Team id is null');

app/Http/Controllers/Api/ApplicationsController.php

@@ -1591,16 +1591,32 @@ class ApplicationsController extends Controller
         }
         $domains = $request->domains;
         if ($request->has('domains') && $server->isProxyShouldRun()) {
-            $errors = [];
+            $uuid = $request->uuid;
             $fqdn = $request->domains;
             $fqdn = str($fqdn)->replaceEnd(',', '')->trim();
             $fqdn = str($fqdn)->replaceStart(',', '')->trim();
-            $application->fqdn = $fqdn;
-            if (! $application->settings->is_container_label_readonly_enabled) {
-                $customLabels = str(implode('|coolify|', generateLabelsApplication($application)))->replace('|coolify|', "\n");
-                $application->custom_labels = base64_encode($customLabels);
+            $errors = [];
+            $fqdn = str($fqdn)->trim()->explode(',')->map(function ($domain) use (&$errors) {
+                $domain = trim($domain);
+                if (filter_var($domain, FILTER_VALIDATE_URL) === false || !preg_match('/^https?:\/\/[a-zA-Z0-9\-\.]+\.[a-zA-Z]{2,}/', $domain)) {
+                    $errors[] = 'Invalid domain: '.$domain;
+                }
+                return $domain;
+            });
+            if (count($errors) > 0) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => $errors,
+                ], 422);
+            }
+            if (checkIfDomainIsAlreadyUsed($fqdn, $teamId, $uuid)) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => [
+                        'domains' => 'One of the domain is already used.',
+                    ],
+                ], 422);
             }
-            $request->offsetUnset('domains');
         }
 
         $dockerComposeDomainsJson = collect();
@@ -2811,3 +2827,30 @@ class ApplicationsController extends Controller
         }
     }
 }
+
+            $fqdn = str($fqdn)->replaceStart(',', '')->trim();
+            $errors = [];
+            $fqdn = str($fqdn)->trim()->explode(',')->map(function ($domain) use (&$errors) {
+                if (filter_var($domain, FILTER_VALIDATE_URL) === false) {
+                    $errors[] = 'Invalid domain: ' . $domain;
+                }
+
+                return str($domain)->trim()->lower();
+            });
+            if (count($errors) > 0) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => $errors,
+                ], 422);
+            }
+            if (checkIfDomainIsAlreadyUsed($fqdn, $teamId, $uuid)) {
+                return response()->json([
+                    'message' => 'Validation failed.',
+                    'errors' => [
+                        'domains' => 'One of the domain is already used.',
+                    ],
+                ], 422);
+            }
+        }
+    }
+}

app/Http/Controllers/Api/DatabasesController.php

@@ -1557,7 +1557,8 @@ class DatabasesController extends Controller
                             ]
                         )
                     ),
-                ]),
+                ]
+            ),
             new OA\Response(
                 response: 401,
                 ref: '#/components/responses/401',
@@ -1632,9 +1633,11 @@ class DatabasesController extends Controller
                             type: 'object',
                             properties: [
                                 'message' => ['type' => 'string', 'example' => 'Database starting request queued.'],
-                            ])
+                            ]
+                        )
                     ),
-                ]),
+                ]
+            ),
             new OA\Response(
                 response: 401,
                 ref: '#/components/responses/401',
@@ -1708,9 +1711,11 @@ class DatabasesController extends Controller
                             type: 'object',
                             properties: [
                                 'message' => ['type' => 'string', 'example' => 'Database stopping request queued.'],
-                            ])
+                            ]
+                        )
                     ),
-                ]),
+                ]
+            ),
             new OA\Response(
                 response: 401,
                 ref: '#/components/responses/401',
@@ -1784,9 +1789,11 @@ class DatabasesController extends Controller
                             type: 'object',
                             properties: [
                                 'message' => ['type' => 'string', 'example' => 'Database restaring request queued.'],
-                            ])
+                            ]
+                        )
                     ),
-                ]),
+                ]
+            ),
             new OA\Response(
                 response: 401,
                 ref: '#/components/responses/401',

app/Http/Controllers/Api/OtherController.php

@@ -37,7 +37,7 @@ class OtherController extends Controller
     )]
     public function version(Request $request)
     {
-        return response(config('version'));
+        return response(config('constants.coolify.version'));
     }
 
     #[OA\Get(

app/Http/Controllers/Api/ServersController.php

@@ -567,6 +567,9 @@ class ServersController extends Controller
             ['bearerAuth' => []],
         ],
         tags: ['Servers'],
+        parameters: [
+            new OA\Parameter(name: 'uuid', in: 'path', required: true, description: 'Server UUID', schema: new OA\Schema(type: 'string')),
+        ],
         requestBody: new OA\RequestBody(
             required: true,
             description: 'Server updated.',
@@ -596,8 +599,7 @@ class ServersController extends Controller
                     new OA\MediaType(
                         mediaType: 'application/json',
                         schema: new OA\Schema(
-                            type: 'array',
-                            items: new OA\Items(ref: '#/components/schemas/Server')
+                            ref: '#/components/schemas/Server'
                         )
                     ),
                 ]),
@@ -679,7 +681,7 @@ class ServersController extends Controller
         }
 
         return response()->json([
-
+            'uuid' => $server->uuid,
         ])->setStatusCode(201);
     }
 

app/Jobs/ApplicationDeploymentJob.php

@@ -463,7 +463,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
             $composeFile = $this->application->parse(pull_request_id: $this->pull_request_id, preview_id: data_get($this->preview, 'id'));
             $this->save_environment_variables();
             if (! is_null($this->env_filename)) {
-                $services = collect($composeFile['services']);
+                $services = collect(data_get($composeFile, 'services', []));
                 $services = $services->map(function ($service, $name) {
                     $service['env_file'] = [$this->env_filename];
 
@@ -2400,7 +2400,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
             if (! $this->only_this_server) {
                 $this->deploy_to_additional_destinations();
             }
-            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
+            //$this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 

app/Jobs/CheckForUpdatesJob.php

@@ -27,7 +27,7 @@ class CheckForUpdatesJob implements ShouldBeEncrypted, ShouldQueue
                 $versions = $response->json();
 
                 $latest_version = data_get($versions, 'coolify.v4.version');
-                $current_version = config('version');
+                $current_version = config('constants.coolify.version');
 
                 if (version_compare($latest_version, $current_version, '>')) {
                     // New version available

app/Jobs/DatabaseBackupJob.php

@@ -67,6 +67,8 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
     public function handle(): void
     {
         try {
+            $databasesToBackup = null;
+
             $this->team = Team::find($this->backup->team_id);
             if (! $this->team) {
                 $this->backup->delete();
@@ -198,8 +200,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                 $databaseType = $this->database->type();
                 $databasesToBackup = data_get($this->backup, 'databases_to_backup');
             }
-
-            if (filled($databasesToBackup)) {
+            if (blank($databasesToBackup)) {
                 if (str($databaseType)->contains('postgres')) {
                     $databasesToBackup = [$this->database->postgres_db];
                 } elseif (str($databaseType)->contains('mongodb')) {
@@ -305,7 +306,7 @@ class DatabaseBackupJob implements ShouldBeEncrypted, ShouldQueue
                     if ($this->backup->save_s3) {
                         $this->upload_to_s3();
                     }
-                    $this->team?->notify(new BackupSuccess($this->backup, $this->database, $database));
+                    //$this->team?->notify(new BackupSuccess($this->backup, $this->database, $database));
                     $this->backup_log->update([
                         'status' => 'success',
                         'message' => $this->backup_output,

app/Jobs/SendMessageToTelegramJob.php

@@ -72,7 +72,7 @@ class SendMessageToTelegramJob implements ShouldBeEncrypted, ShouldQueue
         }
         $response = Http::post($url, $payload);
         if ($response->failed()) {
-            throw new \Exception('Telegram notification failed with '.$response->status().' status code.'.$response->body());
+            throw new \RuntimeException('Telegram notification failed with '.$response->status().' status code.'.$response->body());
         }
     }
 }

app/Jobs/ServerCheckJob.php

@@ -31,7 +31,12 @@ class ServerCheckJob implements ShouldBeEncrypted, ShouldQueue
         return [(new WithoutOverlapping($this->server->uuid))->dontRelease()];
     }
 
-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+        if (isDev()) {
+            $this->handle();
+        }
+    }
 
     public function handle()
     {

app/Jobs/StripeProcessJob.php

@@ -25,218 +25,222 @@ class StripeProcessJob implements ShouldQueue
 
     public function handle(): void
     {
-        $excludedPlans = config('subscription.stripe_excluded_plans');
+        try {
+            $excludedPlans = config('subscription.stripe_excluded_plans');
 
-        $type = data_get($this->event, 'type');
-        $this->type = $type;
-        $data = data_get($this->event, 'data.object');
-        switch ($type) {
-            case 'radar.early_fraud_warning.created':
-                $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
-                $id = data_get($data, 'id');
-                $charge = data_get($data, 'charge');
-                if ($charge) {
-                    $stripe->refunds->create(['charge' => $charge]);
-                }
-                $pi = data_get($data, 'payment_intent');
-                $piData = $stripe->paymentIntents->retrieve($pi, []);
-                $customerId = data_get($piData, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                if ($subscription) {
-                    $subscriptionId = data_get($subscription, 'stripe_subscription_id');
-                    $stripe->subscriptions->cancel($subscriptionId, []);
-                    $subscription->update([
-                        'stripe_invoice_paid' => false,
-                    ]);
-                    send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
-                } else {
-                    send_internal_notification("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
-                    throw new \Exception("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
-                }
-                break;
-            case 'checkout.session.completed':
-                $clientReferenceId = data_get($data, 'client_reference_id');
-                if (is_null($clientReferenceId)) {
-                    send_internal_notification('Checkout session completed without client reference id.');
-                    break;
-                }
-                $userId = Str::before($clientReferenceId, ':');
-                $teamId = Str::after($clientReferenceId, ':');
-                $subscriptionId = data_get($data, 'subscription');
-                $customerId = data_get($data, 'customer');
-                $team = Team::find($teamId);
-                $found = $team->members->where('id', $userId)->first();
-                if (! $found->isAdmin()) {
-                    send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
-                    throw new \Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
-                }
-                $subscription = Subscription::where('team_id', $teamId)->first();
-                if ($subscription) {
-                    send_internal_notification('Old subscription activated for team: '.$teamId);
-                    $subscription->update([
-                        'stripe_subscription_id' => $subscriptionId,
-                        'stripe_customer_id' => $customerId,
-                        'stripe_invoice_paid' => true,
-                    ]);
-                } else {
-                    send_internal_notification('New subscription for team: '.$teamId);
-                    Subscription::create([
-                        'team_id' => $teamId,
-                        'stripe_subscription_id' => $subscriptionId,
-                        'stripe_customer_id' => $customerId,
-                        'stripe_invoice_paid' => true,
-                    ]);
-                }
-                break;
-            case 'invoice.paid':
-                $customerId = data_get($data, 'customer');
-                $planId = data_get($data, 'lines.data.0.plan.id');
-                if (Str::contains($excludedPlans, $planId)) {
-                    send_internal_notification('Subscription excluded.');
-                    break;
-                }
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                if ($subscription) {
-                    $subscription->update([
-                        'stripe_invoice_paid' => true,
-                    ]);
-                } else {
-                    throw new \Exception("No subscription found for customer: {$customerId}");
-                }
-                break;
-            case 'invoice.payment_failed':
-                $customerId = data_get($data, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                if (! $subscription) {
-                    send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
-                    throw new \Exception("No subscription found for customer: {$customerId}");
-                }
-                $team = data_get($subscription, 'team');
-                if (! $team) {
-                    send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
-                    throw new \Exception("No team found in Coolify for customer: {$customerId}");
-                }
-                if (! $subscription->stripe_invoice_paid) {
-                    SubscriptionInvoiceFailedJob::dispatch($team);
-                    send_internal_notification('Invoice payment failed: '.$customerId);
-                } else {
-                    send_internal_notification('Invoice payment failed but already paid: '.$customerId);
-                }
-                break;
-            case 'payment_intent.payment_failed':
-                $customerId = data_get($data, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                if (! $subscription) {
-                    send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
-                    throw new \Exception("No subscription found in Coolify for customer: {$customerId}");
-                }
-                if ($subscription->stripe_invoice_paid) {
-                    send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
-
-                    return;
-                }
-                send_internal_notification('Subscription payment failed for customer: '.$customerId);
-                break;
-            case 'customer.subscription.created':
-                $customerId = data_get($data, 'customer');
-                $subscriptionId = data_get($data, 'id');
-                $teamId = data_get($data, 'metadata.team_id');
-                $userId = data_get($data, 'metadata.user_id');
-                if (! $teamId || ! $userId) {
+            $type = data_get($this->event, 'type');
+            $this->type = $type;
+            $data = data_get($this->event, 'data.object');
+            switch ($type) {
+                case 'radar.early_fraud_warning.created':
+                    $stripe = new \Stripe\StripeClient(config('subscription.stripe_api_key'));
+                    $id = data_get($data, 'id');
+                    $charge = data_get($data, 'charge');
+                    if ($charge) {
+                        $stripe->refunds->create(['charge' => $charge]);
+                    }
+                    $pi = data_get($data, 'payment_intent');
+                    $piData = $stripe->paymentIntents->retrieve($pi, []);
+                    $customerId = data_get($piData, 'customer');
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                     if ($subscription) {
-                        throw new \Exception("Subscription already exists for customer: {$customerId}");
+                        $subscriptionId = data_get($subscription, 'stripe_subscription_id');
+                        $stripe->subscriptions->cancel($subscriptionId, []);
+                        $subscription->update([
+                            'stripe_invoice_paid' => false,
+                        ]);
+                        send_internal_notification("Early fraud warning created Refunded, subscription canceled. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                    } else {
+                        send_internal_notification("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
+                        throw new \RuntimeException("Early fraud warning: subscription not found. Charge: {$charge}, id: {$id}, pi: {$pi}");
                     }
-                    throw new \Exception('No team id or user id found');
-                }
-                $team = Team::find($teamId);
-                $found = $team->members->where('id', $userId)->first();
-                if (! $found->isAdmin()) {
-                    send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
-                    throw new \Exception("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
-                }
-                $subscription = Subscription::where('team_id', $teamId)->first();
-                if ($subscription) {
-                    send_internal_notification("Subscription already exists for team: {$teamId}");
-                    throw new \Exception("Subscription already exists for team: {$teamId}");
-                } else {
-                    Subscription::create([
-                        'team_id' => $teamId,
-                        'stripe_subscription_id' => $subscriptionId,
-                        'stripe_customer_id' => $customerId,
-                        'stripe_invoice_paid' => false,
-                    ]);
-                }
-            case 'customer.subscription.updated':
-                $teamId = data_get($data, 'metadata.team_id');
-                $userId = data_get($data, 'metadata.user_id');
-                $customerId = data_get($data, 'customer');
-                $status = data_get($data, 'status');
-                $subscriptionId = data_get($data, 'items.data.0.subscription');
-                $planId = data_get($data, 'items.data.0.plan.id');
-                if (Str::contains($excludedPlans, $planId)) {
-                    send_internal_notification('Subscription excluded.');
                     break;
-                }
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
-                if (! $subscription) {
-                    if ($status === 'incomplete_expired') {
-                        send_internal_notification('Subscription incomplete expired');
-                        throw new \Exception('Subscription incomplete expired');
+                case 'checkout.session.completed':
+                    $clientReferenceId = data_get($data, 'client_reference_id');
+                    if (is_null($clientReferenceId)) {
+                        send_internal_notification('Checkout session completed without client reference id.');
+                        break;
                     }
-                    if ($teamId) {
-                        $subscription = Subscription::create([
+                    $userId = Str::before($clientReferenceId, ':');
+                    $teamId = Str::after($clientReferenceId, ':');
+                    $subscriptionId = data_get($data, 'subscription');
+                    $customerId = data_get($data, 'customer');
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (! $found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                        throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}, subscriptionid: {$subscriptionId}.");
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        send_internal_notification('Old subscription activated for team: '.$teamId);
+                        $subscription->update([
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        send_internal_notification('New subscription for team: '.$teamId);
+                        Subscription::create([
+                            'team_id' => $teamId,
+                            'stripe_subscription_id' => $subscriptionId,
+                            'stripe_customer_id' => $customerId,
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    }
+                    break;
+                case 'invoice.paid':
+                    $customerId = data_get($data, 'customer');
+                    $planId = data_get($data, 'lines.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if ($subscription) {
+                        $subscription->update([
+                            'stripe_invoice_paid' => true,
+                        ]);
+                    } else {
+                        throw new \RuntimeException("No subscription found for customer: {$customerId}");
+                    }
+                    break;
+                case 'invoice.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (! $subscription) {
+                        send_internal_notification('invoice.payment_failed failed but no subscription found in Coolify for customer: '.$customerId);
+                        throw new \RuntimeException("No subscription found for customer: {$customerId}");
+                    }
+                    $team = data_get($subscription, 'team');
+                    if (! $team) {
+                        send_internal_notification('invoice.payment_failed failed but no team found in Coolify for customer: '.$customerId);
+                        throw new \RuntimeException("No team found in Coolify for customer: {$customerId}");
+                    }
+                    if (! $subscription->stripe_invoice_paid) {
+                        SubscriptionInvoiceFailedJob::dispatch($team);
+                        send_internal_notification('Invoice payment failed: '.$customerId);
+                    } else {
+                        send_internal_notification('Invoice payment failed but already paid: '.$customerId);
+                    }
+                    break;
+                case 'payment_intent.payment_failed':
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (! $subscription) {
+                        send_internal_notification('payment_intent.payment_failed, no subscription found in Coolify for customer: '.$customerId);
+                        throw new \RuntimeException("No subscription found in Coolify for customer: {$customerId}");
+                    }
+                    if ($subscription->stripe_invoice_paid) {
+                        send_internal_notification('payment_intent.payment_failed but invoice is active for customer: '.$customerId);
+
+                        return;
+                    }
+                    send_internal_notification('Subscription payment failed for customer: '.$customerId);
+                    break;
+                case 'customer.subscription.created':
+                    $customerId = data_get($data, 'customer');
+                    $subscriptionId = data_get($data, 'id');
+                    $teamId = data_get($data, 'metadata.team_id');
+                    $userId = data_get($data, 'metadata.user_id');
+                    if (! $teamId || ! $userId) {
+                        $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                        if ($subscription) {
+                            throw new \RuntimeException("Subscription already exists for customer: {$customerId}");
+                        }
+                        throw new \RuntimeException('No team id or user id found');
+                    }
+                    $team = Team::find($teamId);
+                    $found = $team->members->where('id', $userId)->first();
+                    if (! $found->isAdmin()) {
+                        send_internal_notification("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+                        throw new \RuntimeException("User {$userId} is not an admin or owner of team {$team->id}, customerid: {$customerId}.");
+                    }
+                    $subscription = Subscription::where('team_id', $teamId)->first();
+                    if ($subscription) {
+                        send_internal_notification("Subscription already exists for team: {$teamId}");
+                        throw new \RuntimeException("Subscription already exists for team: {$teamId}");
+                    } else {
+                        Subscription::create([
                             'team_id' => $teamId,
                             'stripe_subscription_id' => $subscriptionId,
                             'stripe_customer_id' => $customerId,
                             'stripe_invoice_paid' => false,
                         ]);
-                    } else {
-                        send_internal_notification('No subscription and team id found');
-                        throw new \Exception('No subscription and team id found');
                     }
-                }
-                $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
-                $feedback = data_get($data, 'cancellation_details.feedback');
-                $comment = data_get($data, 'cancellation_details.comment');
-                $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
-                if (str($lookup_key)->contains('dynamic')) {
-                    $quantity = data_get($data, 'items.data.0.quantity', 2);
-                    $team = data_get($subscription, 'team');
-                    if ($team) {
-                        $team->update([
-                            'custom_server_limit' => $quantity,
+                case 'customer.subscription.updated':
+                    $teamId = data_get($data, 'metadata.team_id');
+                    $userId = data_get($data, 'metadata.user_id');
+                    $customerId = data_get($data, 'customer');
+                    $status = data_get($data, 'status');
+                    $subscriptionId = data_get($data, 'items.data.0.subscription');
+                    $planId = data_get($data, 'items.data.0.plan.id');
+                    if (Str::contains($excludedPlans, $planId)) {
+                        send_internal_notification('Subscription excluded.');
+                        break;
+                    }
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
+                    if (! $subscription) {
+                        if ($status === 'incomplete_expired') {
+                            send_internal_notification('Subscription incomplete expired');
+                            throw new \RuntimeException('Subscription incomplete expired');
+                        }
+                        if ($teamId) {
+                            $subscription = Subscription::create([
+                                'team_id' => $teamId,
+                                'stripe_subscription_id' => $subscriptionId,
+                                'stripe_customer_id' => $customerId,
+                                'stripe_invoice_paid' => false,
+                            ]);
+                        } else {
+                            send_internal_notification('No subscription and team id found');
+                            throw new \RuntimeException('No subscription and team id found');
+                        }
+                    }
+                    $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
+                    $feedback = data_get($data, 'cancellation_details.feedback');
+                    $comment = data_get($data, 'cancellation_details.comment');
+                    $lookup_key = data_get($data, 'items.data.0.price.lookup_key');
+                    if (str($lookup_key)->contains('dynamic')) {
+                        $quantity = data_get($data, 'items.data.0.quantity', 2);
+                        $team = data_get($subscription, 'team');
+                        if ($team) {
+                            $team->update([
+                                'custom_server_limit' => $quantity,
+                            ]);
+                        }
+                        ServerLimitCheckJob::dispatch($team);
+                    }
+                    $subscription->update([
+                        'stripe_feedback' => $feedback,
+                        'stripe_comment' => $comment,
+                        'stripe_plan_id' => $planId,
+                        'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
+                    ]);
+                    if ($status === 'paused' || $status === 'incomplete_expired') {
+                        $subscription->update([
+                            'stripe_invoice_paid' => false,
                         ]);
                     }
-                    ServerLimitCheckJob::dispatch($team);
-                }
-                $subscription->update([
-                    'stripe_feedback' => $feedback,
-                    'stripe_comment' => $comment,
-                    'stripe_plan_id' => $planId,
-                    'stripe_cancel_at_period_end' => $cancelAtPeriodEnd,
-                ]);
-                if ($status === 'paused' || $status === 'incomplete_expired') {
-                    $subscription->update([
-                        'stripe_invoice_paid' => false,
-                    ]);
-                }
-                if ($feedback) {
-                    $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
-                    if ($comment) {
-                        $reason .= ' with comment: \''.$comment."'";
+                    if ($feedback) {
+                        $reason = "Cancellation feedback for {$customerId}: '".$feedback."'";
+                        if ($comment) {
+                            $reason .= ' with comment: \''.$comment."'";
+                        }
                     }
-                }
-                break;
-            case 'customer.subscription.deleted':
-                // End subscription
-                $customerId = data_get($data, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
-                $team = data_get($subscription, 'team');
-                $team?->subscriptionEnded();
-                break;
-            default:
-                // Unhandled event type
+                    break;
+                case 'customer.subscription.deleted':
+                    // End subscription
+                    $customerId = data_get($data, 'customer');
+                    $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                    $team = data_get($subscription, 'team');
+                    $team?->subscriptionEnded();
+                    break;
+                default:
+                    throw new \RuntimeException("Unhandled event type: {$type}");
+            }
+        } catch (\Exception $e) {
+            send_internal_notification('StripeProcessJob error: '.$e->getMessage());
         }
     }
 }

app/Livewire/Boarding/Index.php

@@ -172,13 +172,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
     public function getProxyType()
     {
-        // Set Default Proxy Type
         $this->selectProxy(ProxyTypes::TRAEFIK->value);
-        // $proxyTypeSet = $this->createdServer->proxy->type;
-        // if (!$proxyTypeSet) {
-        //     $this->currentState = 'select-proxy';
-        //     return;
-        // }
         $this->getProjects();
     }
 
@@ -189,7 +183,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
 
             return;
         }
-        $this->createdPrivateKey = PrivateKey::find($this->selectedExistingPrivateKey);
+        $this->createdPrivateKey = PrivateKey::where('team_id', currentTeam()->id)->where('id', $this->selectedExistingPrivateKey)->first();
         $this->privateKey = $this->createdPrivateKey->private_key;
         $this->currentState = 'create-server';
     }

app/Livewire/Destination/New/Docker.php

@@ -35,7 +35,7 @@ class Docker extends Component
         $this->network = new Cuid2;
         $this->servers = Server::isUsable()->get();
         if ($server_id) {
-            $this->selectedServer = $this->servers->find($server_id);
+            $this->selectedServer = $this->servers->find($server_id) ?: $this->servers->first();
             $this->serverId = $this->selectedServer->id;
         } else {
             $this->selectedServer = $this->servers->first();

app/Livewire/NavbarDeleteTeam.php

@@ -3,7 +3,6 @@
 namespace App\Livewire;
 
 use App\Models\InstanceSettings;
-use Illuminate\Container\Attributes\Auth as AttributesAuth;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -32,7 +31,7 @@ class NavbarDeleteTeam extends Component
         $currentTeam->delete();
 
         $currentTeam->members->each(function ($user) use ($currentTeam) {
-            if ($user->id === AttributesAuth::id()) {
+            if ($user->id === Auth::id()) {
                 return;
             }
             $user->teams()->detach($currentTeam);

app/Livewire/Notifications/Email.php

@@ -73,8 +73,8 @@ class Email extends Component
     #[Validate(['nullable', 'string'])]
     public ?string $resendApiKey = null;
 
-    #[Validate(['required', 'email'])]
-    public string $testEmailAddress = '';
+    #[Validate(['nullable', 'email'])]
+    public ?string $testEmailAddress = null;
 
     public function mount()
     {

app/Livewire/Project/Application/Configuration.php

@@ -16,24 +16,28 @@ class Configuration extends Component
 
     public function mount()
     {
-        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
-        if (! $project) {
-            return redirect()->route('dashboard');
+        $this->application = Application::query()
+            ->whereHas('environment.project', function ($query) {
+                $query->where('team_id', currentTeam()->id)
+                    ->where('uuid', request()->route('project_uuid'));
+            })
+            ->whereHas('environment', function ($query) {
+                $query->where('name', request()->route('environment_name'));
+            })
+            ->where('uuid', request()->route('application_uuid'))
+            ->with(['destination' => function ($query) {
+                $query->select('id', 'server_id');
+            }])
+            ->firstOrFail();
+
+        if ($this->application->destination && $this->application->destination->server_id) {
+            $this->servers = Server::ownedByCurrentTeam()
+                ->select('id', 'name')
+                ->where('id', '!=', $this->application->destination->server_id)
+                ->get();
+        } else {
+            $this->servers = collect();
         }
-        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
-        if (! $environment) {
-            return redirect()->route('dashboard');
-        }
-        $application = $environment->applications->where('uuid', request()->route('application_uuid'))->first();
-        if (! $application) {
-            return redirect()->route('dashboard');
-        }
-        $this->application = $application;
-        $mainServer = $this->application->destination->server;
-        $servers = Server::ownedByCurrentTeam()->get();
-        $this->servers = $servers->filter(function ($server) use ($mainServer) {
-            return $server->id != $mainServer->id;
-        });
     }
 
     public function render()

app/Livewire/Project/Application/Heading.php

@@ -36,7 +36,11 @@ class Heading extends Component
 
     public function mount()
     {
-        $this->parameters = get_route_parameters();
+        $this->parameters = [
+            'project_uuid' => $this->application->project()->uuid,
+            'environment_name' => $this->application->environment->name,
+            'application_uuid' => $this->application->uuid,
+        ];
         $lastDeployment = $this->application->get_last_successful_deployment();
         $this->lastDeploymentInfo = data_get_str($lastDeployment, 'commit')->limit(7).' '.data_get($lastDeployment, 'commit_message');
         $this->lastDeploymentLink = $this->application->gitCommitLink(data_get($lastDeployment, 'commit'));

app/Livewire/Server/Advanced.php

@@ -22,7 +22,7 @@ class Advanced extends Component
     #[Validate('boolean')]
     public bool $forceDockerCleanup = false;
 
-    #[Validate('string')]
+    #[Validate(['string', 'required'])]
     public string $dockerCleanupFrequency = '*/10 * * * *';
 
     #[Validate(['integer', 'min:1', 'max:99'])]
@@ -78,7 +78,6 @@ class Advanced extends Component
         try {
             $this->syncData(true);
             $this->dispatch('success', 'Server updated.');
-            // $this->dispatch('refreshServerShow');
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/LogDrains.php

@@ -49,33 +49,73 @@ class LogDrains extends Component
         }
     }
 
-    public function syncData(bool $toModel = false)
+    public function syncDataNewRelic(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
+            $this->server->settings->logdrain_newrelic_license_key = $this->logDrainNewRelicLicenseKey;
+            $this->server->settings->logdrain_newrelic_base_uri = $this->logDrainNewRelicBaseUri;
+        } else {
+            $this->isLogDrainNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled;
+            $this->logDrainNewRelicLicenseKey = $this->server->settings->logdrain_newrelic_license_key;
+            $this->logDrainNewRelicBaseUri = $this->server->settings->logdrain_newrelic_base_uri;
+        }
+    }
+
+    public function syncDataAxiom(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_axiom_enabled = $this->isLogDrainAxiomEnabled;
+            $this->server->settings->logdrain_axiom_dataset_name = $this->logDrainAxiomDatasetName;
+            $this->server->settings->logdrain_axiom_api_key = $this->logDrainAxiomApiKey;
+        } else {
+            $this->isLogDrainAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled;
+            $this->logDrainAxiomDatasetName = $this->server->settings->logdrain_axiom_dataset_name;
+            $this->logDrainAxiomApiKey = $this->server->settings->logdrain_axiom_api_key;
+        }
+    }
+
+    public function syncDataCustom(bool $toModel = false)
+    {
+        if ($toModel) {
+            $this->server->settings->is_logdrain_custom_enabled = $this->isLogDrainCustomEnabled;
+            $this->server->settings->logdrain_custom_config = $this->logDrainCustomConfig;
+            $this->server->settings->logdrain_custom_config_parser = $this->logDrainCustomConfigParser;
+        } else {
+            $this->isLogDrainCustomEnabled = $this->server->settings->is_logdrain_custom_enabled;
+            $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
+            $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
+        }
+    }
+
+    public function syncData(bool $toModel = false, ?string $type = null)
     {
         if ($toModel) {
             $this->customValidation();
-            $this->server->settings->is_logdrain_newrelic_enabled = $this->isLogDrainNewRelicEnabled;
-            $this->server->settings->is_logdrain_axiom_enabled = $this->isLogDrainAxiomEnabled;
-            $this->server->settings->is_logdrain_custom_enabled = $this->isLogDrainCustomEnabled;
-
-            $this->server->settings->logdrain_newrelic_license_key = $this->logDrainNewRelicLicenseKey;
-            $this->server->settings->logdrain_newrelic_base_uri = $this->logDrainNewRelicBaseUri;
-            $this->server->settings->logdrain_axiom_dataset_name = $this->logDrainAxiomDatasetName;
-            $this->server->settings->logdrain_axiom_api_key = $this->logDrainAxiomApiKey;
-            $this->server->settings->logdrain_custom_config = $this->logDrainCustomConfig;
-            $this->server->settings->logdrain_custom_config_parser = $this->logDrainCustomConfigParser;
-
+            if ($type === 'newrelic') {
+                $this->syncDataNewRelic($toModel);
+            } elseif ($type === 'axiom') {
+                $this->syncDataAxiom($toModel);
+            } elseif ($type === 'custom') {
+                $this->syncDataCustom($toModel);
+            } else {
+                $this->syncDataNewRelic($toModel);
+                $this->syncDataAxiom($toModel);
+                $this->syncDataCustom($toModel);
+            }
             $this->server->settings->save();
         } else {
-            $this->isLogDrainNewRelicEnabled = $this->server->settings->is_logdrain_newrelic_enabled;
-            $this->isLogDrainAxiomEnabled = $this->server->settings->is_logdrain_axiom_enabled;
-            $this->isLogDrainCustomEnabled = $this->server->settings->is_logdrain_custom_enabled;
-
-            $this->logDrainNewRelicLicenseKey = $this->server->settings->logdrain_newrelic_license_key;
-            $this->logDrainNewRelicBaseUri = $this->server->settings->logdrain_newrelic_base_uri;
-            $this->logDrainAxiomDatasetName = $this->server->settings->logdrain_axiom_dataset_name;
-            $this->logDrainAxiomApiKey = $this->server->settings->logdrain_axiom_api_key;
-            $this->logDrainCustomConfig = $this->server->settings->logdrain_custom_config;
-            $this->logDrainCustomConfigParser = $this->server->settings->logdrain_custom_config_parser;
+            if ($type === 'newrelic') {
+                $this->syncDataNewRelic($toModel);
+            } elseif ($type === 'axiom') {
+                $this->syncDataAxiom($toModel);
+            } elseif ($type === 'custom') {
+                $this->syncDataCustom($toModel);
+            } else {
+                $this->syncDataNewRelic($toModel);
+                $this->syncDataAxiom($toModel);
+                $this->syncDataCustom($toModel);
+            }
         }
     }
 
@@ -136,7 +176,7 @@ class LogDrains extends Component
     public function submit(string $type)
     {
         try {
-            $this->syncData(true);
+            $this->syncData(true, $type);
             $this->dispatch('success', 'Settings saved.');
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Livewire/Settings/Index.php

@@ -53,7 +53,7 @@ class Index extends Component
     #[Validate('string')]
     public string $auto_update_frequency;
 
-    #[Validate('string')]
+    #[Validate('string|required')]
     public string $update_check_frequency;
 
     #[Validate('required|string|timezone')]
@@ -109,6 +109,13 @@ class Index extends Component
 
     public function instantSave($isSave = true)
     {
+        $this->validate();
+        if ($this->settings->is_auto_update_enabled === true) {
+            $this->validate([
+                'auto_update_frequency' => ['required', 'string'],
+            ]);
+        }
+
         $this->settings->fqdn = $this->fqdn;
         $this->settings->resale_license = $this->resale_license;
         $this->settings->public_port_min = $this->public_port_min;

app/Models/BaseModel.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Visus\Cuid2\Cuid2;
 
@@ -18,4 +19,18 @@ abstract class BaseModel extends Model
             }
         });
     }
+
+    public function name(): Attribute
+    {
+        return new Attribute(
+            get: fn () => sanitize_string($this->getRawOriginal('name')),
+        );
+    }
+
+    public function image(): Attribute
+    {
+        return new Attribute(
+            get: fn () => sanitize_string($this->getRawOriginal('image')),
+        );
+    }
 }

app/Models/EnvironmentVariable.php

@@ -71,7 +71,7 @@ class EnvironmentVariable extends Model
                 }
             }
             $environment_variable->update([
-                'version' => config('version'),
+                'version' => config('constants.coolify.version'),
             ]);
         });
         static::saving(function (EnvironmentVariable $environmentVariable) {

app/Models/Server.php

@@ -42,8 +42,7 @@ use Symfony\Component\Yaml\Yaml;
         'validation_logs' => ['type' => 'string', 'description' => 'The validation logs.'],
         'log_drain_notification_sent' => ['type' => 'boolean', 'description' => 'The flag to indicate if the log drain notification has been sent.'],
         'swarm_cluster' => ['type' => 'string', 'description' => 'The swarm cluster configuration.'],
-        'delete_unused_volumes' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused volumes should be deleted.'],
-        'delete_unused_networks' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused networks should be deleted.'],
+        'settings' => ['$ref' => '#/components/schemas/ServerSetting'],
     ]
 )]
 
@@ -814,7 +813,7 @@ $schema://$host {
     {
         return Attribute::make(
             get: function ($value) {
-                return preg_replace('/[^0-9]/', '', $value);
+                return (int) preg_replace('/[^0-9]/', '', $value);
             }
         );
     }
@@ -1040,7 +1039,7 @@ $schema://$host {
         $this->unreachable_notification_sent = false;
         $this->save();
         $this->refresh();
-        $this->team->notify(new Reachable($this));
+        // $this->team->notify(new Reachable($this));
     }
 
     public function sendUnreachableNotification()
@@ -1048,7 +1047,7 @@ $schema://$host {
         $this->unreachable_notification_sent = true;
         $this->save();
         $this->refresh();
-        $this->team->notify(new Unreachable($this));
+        // $this->team->notify(new Unreachable($this));
     }
 
     public function validateConnection(bool $justCheckingNewKey = false)

app/Models/ServerSetting.php

@@ -45,6 +45,8 @@ use OpenApi\Attributes as OA;
         'wildcard_domain' => ['type' => 'string'],
         'created_at' => ['type' => 'string'],
         'updated_at' => ['type' => 'string'],
+        'delete_unused_volumes' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused volumes should be deleted.'],
+        'delete_unused_networks' => ['type' => 'boolean', 'description' => 'The flag to indicate if the unused networks should be deleted.'],
     ]
 )]
 class ServerSetting extends Model

app/Models/Team.php

@@ -127,6 +127,13 @@ class Team extends Model implements SendsDiscord, SendsEmail
         ];
     }
 
+    public function name(): Attribute
+    {
+        return new Attribute(
+            get: fn () => sanitize_string($this->getRawOriginal('name')),
+        );
+    }
+
     public function getRecepients($notification)
     {
         $recipients = data_get($notification, 'emails', null);

app/Notifications/Application/DeploymentFailed.php

@@ -4,18 +4,12 @@ namespace App\Notifications\Application;
 
 use App\Models\Application;
 use App\Models\ApplicationPreview;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class DeploymentFailed extends Notification implements ShouldQueue
+class DeploymentFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public Application $application;
 
     public ?ApplicationPreview $preview = null;

app/Notifications/Application/DeploymentSuccess.php

@@ -4,18 +4,12 @@ namespace App\Notifications\Application;
 
 use App\Models\Application;
 use App\Models\ApplicationPreview;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class DeploymentSuccess extends Notification implements ShouldQueue
+class DeploymentSuccess extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public Application $application;
 
     public ?ApplicationPreview $preview = null;

app/Notifications/Application/StatusChanged.php

@@ -3,18 +3,12 @@
 namespace App\Notifications\Application;
 
 use App\Models\Application;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class StatusChanged extends Notification implements ShouldQueue
+class StatusChanged extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public string $resource_name;
 
     public string $project_uuid;

app/Notifications/Container/ContainerRestarted.php

@@ -3,18 +3,12 @@
 namespace App\Notifications\Container;
 
 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class ContainerRestarted extends Notification implements ShouldQueue
+class ContainerRestarted extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public string $name, public Server $server, public ?string $url = null)
     {
         $this->onQueue('high');

app/Notifications/Container/ContainerStopped.php

@@ -3,18 +3,12 @@
 namespace App\Notifications\Container;
 
 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class ContainerStopped extends Notification implements ShouldQueue
+class ContainerStopped extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public string $name, public Server $server, public ?string $url = null)
     {
         $this->onQueue('high');

app/Notifications/CustomEmailNotification.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Notification;
+
+class CustomEmailNotification extends Notification implements ShouldQueue
+{
+    use Queueable;
+
+    public $backoff = [10, 20, 30, 40, 50];
+
+    public $tries = 5;
+
+    public $maxExceptions = 5;
+}

app/Notifications/Database/BackupFailed.php

@@ -3,20 +3,12 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class BackupFailed extends Notification implements ShouldQueue
+class BackupFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 2;
-
     public string $name;
 
     public string $frequency;

app/Notifications/Database/BackupSuccess.php

@@ -3,20 +3,12 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class BackupSuccess extends Notification implements ShouldQueue
+class BackupSuccess extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 3;
-
     public string $name;
 
     public string $frequency;
@@ -24,6 +16,7 @@ class BackupSuccess extends Notification implements ShouldQueue
     public function __construct(ScheduledDatabaseBackup $backup, public $database, public $database_name)
     {
         $this->onQueue('high');
+
         $this->name = $database->name;
         $this->frequency = $backup->frequency;
     }

app/Notifications/Dto/DiscordMessage.php

@@ -46,7 +46,7 @@ class DiscordMessage
 
     public function toPayload(): array
     {
-        $footerText = 'Coolify v'.config('version');
+        $footerText = 'Coolify v'.config('constants.coolify.version');
         if (isCloud()) {
             $footerText = 'Coolify Cloud';
         }

app/Notifications/ScheduledTask/TaskFailed.php

@@ -3,20 +3,12 @@
 namespace App\Notifications\ScheduledTask;
 
 use App\Models\ScheduledTask;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class TaskFailed extends Notification implements ShouldQueue
+class TaskFailed extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $backoff = 10;
-
-    public $tries = 2;
-
     public ?string $url = null;
 
     public function __construct(public ScheduledTask $task, public string $output)

app/Notifications/Server/DockerCleanup.php

@@ -5,17 +5,11 @@ namespace App\Notifications\Server;
 use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Notification;
 
-class DockerCleanup extends Notification implements ShouldQueue
+class DockerCleanup extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public Server $server, public string $message)
     {
         $this->onQueue('high');

app/Notifications/Server/ForceDisabled.php

@@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class ForceDisabled extends Notification implements ShouldQueue
+class ForceDisabled extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public Server $server)
     {
         $this->onQueue('high');

app/Notifications/Server/ForceEnabled.php

@@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class ForceEnabled extends Notification implements ShouldQueue
+class ForceEnabled extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public Server $server)
     {
         $this->onQueue('high');

app/Notifications/Server/HighDiskUsage.php

@@ -3,18 +3,12 @@
 namespace App\Notifications\Server;
 
 use App\Models\Server;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class HighDiskUsage extends Notification implements ShouldQueue
+class HighDiskUsage extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     public function __construct(public Server $server, public int $disk_usage, public int $server_disk_usage_notification_threshold)
     {
         $this->onQueue('high');

app/Notifications/Server/Reachable.php

@@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class Reachable extends Notification implements ShouldQueue
+class Reachable extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     protected bool $isRateLimited = false;
 
     public function __construct(public Server $server)

app/Notifications/Server/Unreachable.php

@@ -6,18 +6,12 @@ use App\Models\Server;
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
 use App\Notifications\Channels\TelegramChannel;
+use App\Notifications\CustomEmailNotification;
 use App\Notifications\Dto\DiscordMessage;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class Unreachable extends Notification implements ShouldQueue
+class Unreachable extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 1;
-
     protected bool $isRateLimited = false;
 
     public function __construct(public Server $server)

app/Notifications/TransactionalEmails/InvitationLink.php

@@ -6,17 +6,11 @@ use App\Models\Team;
 use App\Models\TeamInvitation;
 use App\Models\User;
 use App\Notifications\Channels\TransactionalEmailChannel;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Notifications\CustomEmailNotification;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class InvitationLink extends Notification implements ShouldQueue
+class InvitationLink extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 5;
-
     public function via(): array
     {
         return [TransactionalEmailChannel::class];

app/Notifications/TransactionalEmails/Test.php

@@ -3,17 +3,11 @@
 namespace App\Notifications\TransactionalEmails;
 
 use App\Notifications\Channels\EmailChannel;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
+use App\Notifications\CustomEmailNotification;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Notifications\Notification;
 
-class Test extends Notification implements ShouldQueue
+class Test extends CustomEmailNotification
 {
-    use Queueable;
-
-    public $tries = 5;
-
     public function __construct(public string $emails)
     {
         $this->onQueue('high');

bootstrap/getVersion.php

@@ -1,4 +1,10 @@
 <?php
 
-$version = include 'config/version.php';
-echo $version;
+// To prevent github actions from failing
+function env()
+{
+    return null;
+}
+
+$version = include 'config/constants.php';
+echo $version['coolify']['version'] ?: 'unknown';

bootstrap/helpers/docker.php

@@ -192,7 +192,7 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
 {
     $labels = collect([]);
     $labels->push('coolify.managed=true');
-    $labels->push('coolify.version='.config('version'));
+    $labels->push('coolify.version='.config('constants.coolify.version'));
     $labels->push('coolify.'.$type.'Id='.$id);
     $labels->push("coolify.type=$type");
     $labels->push('coolify.name='.$name);
@@ -288,6 +288,10 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
         $host_without_www = str($host)->replace('www.', '');
         $schema = $url->getScheme();
         $port = $url->getPort();
+        $handle = "handle_path";
+        if ( ! $is_stripprefix_enabled){
+            $handle = "handle";
+        }
         if (is_null($port) && ! is_null($onlyPort)) {
             $port = $onlyPort;
         }
@@ -298,12 +302,13 @@ function fqdnLabelsForCaddy(string $network, string $uuid, Collection $domains,
         $labels->push("caddy_{$loop}.header=-Server");
         $labels->push("caddy_{$loop}.try_files={path} /index.html /index.php");
 
+
         if ($port) {
-            $labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams $port}}");
+            $labels->push("caddy_{$loop}.{$handle}.{$loop}_reverse_proxy={{upstreams $port}}");
         } else {
-            $labels->push("caddy_{$loop}.handle_path.{$loop}_reverse_proxy={{upstreams}}");
+            $labels->push("caddy_{$loop}.{$handle}.{$loop}_reverse_proxy={{upstreams}}");
         }
-        $labels->push("caddy_{$loop}.handle_path={$path}*");
+        $labels->push("caddy_{$loop}.{$handle}={$path}*");
         if ($is_gzip_enabled) {
             $labels->push("caddy_{$loop}.encode=zstd gzip");
         }

bootstrap/helpers/shared.php

@@ -90,8 +90,28 @@ function metrics_dir(): string
     return base_configuration_dir().'/metrics';
 }
 
+function sanitize_string(string $input): string
+{
+    // Remove any HTML/PHP tags
+    $sanitized = strip_tags($input);
+
+    // Convert special characters to HTML entities
+    $sanitized = htmlspecialchars($sanitized, ENT_QUOTES | ENT_HTML5, 'UTF-8');
+
+    // Remove any control characters
+    $sanitized = preg_replace('/[\x00-\x1F\x7F]/u', '', $sanitized);
+
+    // Trim whitespace
+    $sanitized = trim($sanitized);
+
+    return $sanitized;
+}
+
 function generate_readme_file(string $name, string $updated_at): string
 {
+    $name = sanitize_string($name);
+    $updated_at = sanitize_string($updated_at);
+
     return "Resource name: $name\nLatest Deployment Date: $updated_at";
 }
 
@@ -940,6 +960,15 @@ function generateEnvValue(string $command, Service|Application|null $service = n
         case 'REALBASE64_32':
             $generatedValue = base64_encode(Str::random(32));
             break;
+        case 'HEX_32':
+            $generatedValue = bin2hex(Str::random(32));
+            break;
+        case 'HEX_64':
+            $generatedValue = bin2hex(Str::random(64));
+            break;
+        case 'HEX_128':
+            $generatedValue = bin2hex(Str::random(128));
+            break;
         case 'USER':
             $generatedValue = Str::random(16);
             break;

config/constants.php

@@ -2,7 +2,7 @@
 
 return [
     'coolify' => [
-        'version' => '4.0.0-beta.372',
+        'version' => '4.0.0-beta.374',
         'self_hosted' => env('SELF_HOSTED', true),
         'autoupdate' => env('AUTOUPDATE'),
         'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),

config/version.php

@@ -1,3 +0,0 @@
-<?php
-
-return '4.0.0-beta.372';

openapi.json

@@ -1,5 +1,5 @@
 {
-    "openapi": "3.0.0",
+    "openapi": "3.1.0",
     "info": {
         "title": "Coolify",
         "version": "0.1"
@@ -5391,6 +5391,17 @@
                 "summary": "Update",
                 "description": "Update Server.",
                 "operationId": "update-server-by-uuid",
+                "parameters": [
+                    {
+                        "name": "uuid",
+                        "in": "path",
+                        "description": "Server UUID",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
                 "requestBody": {
                     "description": "Server updated.",
                     "required": true,
@@ -5451,10 +5462,7 @@
                         "content": {
                             "application\/json": {
                                 "schema": {
-                                    "type": "array",
-                                    "items": {
-                                        "$ref": "#\/components\/schemas\/Server"
-                                    }
+                                    "$ref": "#\/components\/schemas\/Server"
                                 }
                             }
                         }
@@ -7441,13 +7449,8 @@
                         "type": "string",
                         "description": "The swarm cluster configuration."
                     },
-                    "delete_unused_volumes": {
-                        "type": "boolean",
-                        "description": "The flag to indicate if the unused volumes should be deleted."
-                    },
-                    "delete_unused_networks": {
-                        "type": "boolean",
-                        "description": "The flag to indicate if the unused networks should be deleted."
+                    "settings": {
+                        "$ref": "#\/components\/schemas\/ServerSetting"
                     }
                 },
                 "type": "object"
@@ -7556,6 +7559,14 @@
                     },
                     "updated_at": {
                         "type": "string"
+                    },
+                    "delete_unused_volumes": {
+                        "type": "boolean",
+                        "description": "The flag to indicate if the unused volumes should be deleted."
+                    },
+                    "delete_unused_networks": {
+                        "type": "boolean",
+                        "description": "The flag to indicate if the unused networks should be deleted."
                     }
                 },
                 "type": "object"

openapi.yaml

@@ -3671,6 +3671,14 @@ paths:
       summary: Update
       description: 'Update Server.'
       operationId: update-server-by-uuid
+      parameters:
+        -
+          name: uuid
+          in: path
+          description: 'Server UUID'
+          required: true
+          schema:
+            type: string
       requestBody:
         description: 'Server updated.'
         required: true
@@ -3713,9 +3721,7 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/Server'
+                $ref: '#/components/schemas/Server'
         '401':
           $ref: '#/components/responses/401'
         '400':
@@ -4967,12 +4973,8 @@ components:
         swarm_cluster:
           type: string
           description: 'The swarm cluster configuration.'
-        delete_unused_volumes:
-          type: boolean
-          description: 'The flag to indicate if the unused volumes should be deleted.'
-        delete_unused_networks:
-          type: boolean
-          description: 'The flag to indicate if the unused networks should be deleted.'
+        settings:
+          $ref: '#/components/schemas/ServerSetting'
       type: object
     ServerSetting:
       description: 'Server Settings model'
@@ -5045,6 +5047,12 @@ components:
           type: string
         updated_at:
           type: string
+        delete_unused_volumes:
+          type: boolean
+          description: 'The flag to indicate if the unused volumes should be deleted.'
+        delete_unused_networks:
+          type: boolean
+          description: 'The flag to indicate if the unused networks should be deleted.'
       type: object
     Service:
       description: 'Service model'

public/svgs/beszel.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 285 75"><path d="M146.4 73.1h-30.5V59.8h30.5a3.2 3.2 0 0 0 2.3-1 3.2 3.2 0 0 0 1-2.3q0-.8-.3-1.3a1.5 1.5 0 0 0-.7-.6 4.7 4.7 0 0 0-1-.3l-1.3-.1h-13.9q-3.4 0-6.5-1.3-3-1.3-5.2-3.6a16.9 16.9 0 0 1-3.6-5.3 16.3 16.3 0 0 1-1.3-6.5 16.4 16.4 0 0 1 1.3-6.4q1.3-3.1 3.6-5.4 2.2-2.2 5.2-3.5a16.3 16.3 0 0 1 6.5-1.3h27v13.3h-27a3.2 3.2 0 0 0-2.3 1 3.2 3.2 0 0 0-1 2.3 3.3 3.3 0 0 0 1 2.4 3.3 3.3 0 0 0 1.2.8 3.2 3.2 0 0 0 1.1.2h13.9a18.1 18.1 0 0 1 6 1 17.3 17.3 0 0 1 .4.2q3 1.1 5.3 3.2a15.1 15.1 0 0 1 3.6 4.9 14.7 14.7 0 0 1 1.3 5.4 17.2 17.2 0 0 1 0 .9 16 16 0 0 1-1 5.8 15.4 15.4 0 0 1-.3.7 17.3 17.3 0 0 1-3.6 5.2 16.4 16.4 0 0 1-5.3 3.6 16.2 16.2 0 0 1-6.4 1.3Zm64.5-13.3v13.3h-43.6l22-39h-22V21h43.6l-22 39h22ZM35 73.1H0v-70h35q4.4 0 8.2 1.6a21.4 21.4 0 0 1 6.6 4.6q2.9 2.8 4.5 6.6 1.7 3.8 1.7 8.2a15.4 15.4 0 0 1-.3 3.2 17.6 17.6 0 0 1-.2.8 19.4 19.4 0 0 1-1.5 4 17 17 0 0 1-2.4 3.4 13.5 13.5 0 0 1-2.6 2.3 12.5 12.5 0 0 1-.4.3q1.7 1 3 2.5 1.4 1.6 2.4 3.5a18.3 18.3 0 0 1 1.5 4A17.4 17.4 0 0 1 56 51a15.3 15.3 0 0 1 0 1.1q0 4.3-1.7 8.2a21.4 21.4 0 0 1-4.5 6.6q-2.8 2.9-6.6 4.5-3.8 1.7-8.2 1.7Zm76-43L86 60.4l1.5.3a16.7 16.7 0 0 0 1.6 0q2 0 3.8-.4 1.8-.6 3.4-1.6 1.6-1 2.8-2.4a12.8 12.8 0 0 0 2-3.2l9.8 9.8q-1.9 2.6-4.3 4.7a27 27 0 0 1-5.2 3.6 26.1 26.1 0 0 1-6 2.2 26.8 26.8 0 0 1-6.3.8 26.4 26.4 0 0 1-10.4-2 26.2 26.2 0 0 1-8.5-5.8 26.7 26.7 0 0 1-5.5-8.3 30.4 30.4 0 0 1-.2-.4q-2.1-5-2.1-11.1a31.9 31.9 0 0 1 .7-7 27 27 0 0 1 1.4-4.3 27 27 0 0 1 3.8-6.6 24.5 24.5 0 0 1 2-2.2 26 26 0 0 1 8.4-5.6 27 27 0 0 1 10.4-2 26.3 26.3 0 0 1 6.4.8 26.9 26.9 0 0 1 6 2.2q2.7 1.5 5.2 3.6 2.4 2.1 4.3 4.8Zm152.3 0-25 30.2 1.5.3a16.7 16.7 0 0 0 1.6 0q2 0 3.8-.4 1.8-.6 3.4-1.6 1.5-1 2.8-2.4a12.8 12.8 0 0 0 2-3.2l9.8 9.8q-1.9 2.6-4.3 4.7a27 27 0 0 1-5.2 3.6 26.1 26.1 0 0 1-6 2.2 26.8 26.8 0 0 1-6.3.8 26.4 26.4 0 0 1-10.4-2 26.2 26.2 0 0 1-8.5-5.8A26.7 26.7 0 0 1 217 58a30.4 30.4 0 0 1-.2-.4q-2.1-5-2.1-11.1a31.9 31.9 0 0 1 .7-7 27 27 0 0 1 1.4-4.3 27 27 0 0 1 3.8-6.6 24.5 24.5 0 0 1 2-2.2 26 26 0 0 1 8.4-5.6 27 27 0 0 1 10.4-2 26.3 26.3 0 0 1 6.4.8 26.9 26.9 0 0 1 6 2.2q2.7 1.5 5.2 3.6 2.4 2.1 4.3 4.8ZM283.4 0v73.1H270V0h13.4ZM14 17v14.1h21a7 7 0 0 0 2.3-.4 6.6 6.6 0 0 0 .4-.1Q39 30 40 29a6.9 6.9 0 0 0 1.5-2.3q.5-1.3.5-2.7a7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.5q-.6-1.2-1.5-2.2a7 7 0 0 0-2.3-1.5 6.9 6.9 0 0 0-2.5-.5 7.9 7.9 0 0 0-.2 0H14Zm0 28.1v14h21a7 7 0 0 0 2.3-.4 6.6 6.6 0 0 0 .4-.2Q39 58 40 57.1a7 7 0 0 0 1.5-2.3 6.9 6.9 0 0 0 .5-2.5 7.9 7.9 0 0 0 0-.2 7 7 0 0 0-.4-2.3 6.6 6.6 0 0 0-.1-.4Q40.9 48 40 47a7 7 0 0 0-2.3-1.4 6.9 6.9 0 0 0-2.5-.6 7.9 7.9 0 0 0-.2 0H14Zm63.3 8.3 15.5-20.6a8 8 0 0 0-1.4-.4 7 7 0 0 0-.4 0 17.2 17.2 0 0 0-1.6-.1 19.2 19.2 0 0 0-.3 0 13.3 13.3 0 0 0-5.1 1q-2.5 1-4.2 2.8a13.1 13.1 0 0 0-2.5 3.6 15.5 15.5 0 0 0-.3.9 14.7 14.7 0 0 0-1 3.5 18.7 18.7 0 0 0 0 2.4 17.6 17.6 0 0 0 0 .7v.8a29.4 29.4 0 0 0 0 .1 19.2 19.2 0 0 0 .2 2 20.2 20.2 0 0 0 .4 1.6 18.6 18.6 0 0 0 0 .2 7.5 7.5 0 0 0 .4.9 6 6 0 0 0 .3.6Zm152.3 0L245 32.8a8 8 0 0 0-1.4-.4 7 7 0 0 0-.4 0 17.2 17.2 0 0 0-1.6-.1 19.2 19.2 0 0 0-.3 0 13.3 13.3 0 0 0-5.1 1q-2.5 1-4.2 2.8a13.1 13.1 0 0 0-2.5 3.6 15.5 15.5 0 0 0-.4.9 14.7 14.7 0 0 0-.8 3.5 18.7 18.7 0 0 0-.2 2.4 17.6 17.6 0 0 0 0 .7v.8a29.4 29.4 0 0 0 .1.1 19.2 19.2 0 0 0 .2 2 20.2 20.2 0 0 0 .4 1.6 18.6 18.6 0 0 0 0 .2 7.5 7.5 0 0 0 .4.9 6 6 0 0 0 .3.6Z"></path></svg>

public/svgs/macos.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="240" height="240"><path fill="#464646" d="M0 0h240v240H0z"/><path fill="#efefef" d="M130.5 85.09v-1.71l-5.315.365c-1.505.095-2.635.415-3.395.955-.76.545-1.14 1.3-1.14 2.265 0 .94.375 1.69 1.13 2.245.75.56 1.76.835 3.02.835.805 0 1.56-.125 2.255-.37s1.305-.59 1.815-1.03c.51-.435.91-.955 1.195-1.56.29-.605.435-1.27.435-1.995zM120 16.25c-57.9 0-103.8 45.85-103.8 103.8.05 57.9 45.9 103.8 103.8 103.8s103.8-45.9 103.8-103.8S177.9 16.25 120 16.25zm20.14 61.5c.49-1.375 1.18-2.555 2.075-3.535s1.97-1.735 3.23-2.265 2.665-.795 4.21-.795c1.395 0 2.655.21 3.775.625 1.125.415 2.085.975 2.89 1.68s1.445 1.525 1.915 2.465.75 1.935.845 2.98h-4.165c-.105-.575-.295-1.115-.565-1.61s-.625-.925-1.065-1.29c-.445-.365-.965-.65-1.56-.855-.6-.21-1.27-.31-2.025-.31-.885 0-1.69.18-2.405.535-.72.355-1.335.86-1.845 1.51s-.905 1.445-1.185 2.375c-.285.935-.425 1.97-.425 3.11 0 1.18.14 2.24.425 3.17.28.935.68 1.72 1.2 2.365.515.645 1.14 1.14 1.865 1.48s1.525.515 2.395.515c1.425 0 2.585-.335 3.485-1.005s1.48-1.65 1.75-2.94h4.17c-.12 1.14-.435 2.18-.945 3.12s-1.17 1.74-1.98 2.405c-.815.665-1.77 1.18-2.87 1.54s-2.31.545-3.625.545c-1.56 0-2.965-.26-4.23-.775-1.26-.515-2.345-1.26-3.245-2.225s-1.595-2.14-2.085-3.525-.735-2.94-.735-4.675c-.01-1.695.235-3.235.725-4.615zm-59.26-6.31h4.17v3.705h.08c.255-.615.59-1.17 1-1.65.41-.485.88-.895 1.42-1.24.535-.345 1.13-.605 1.77-.785.645-.18 1.325-.27 2.035-.27 1.53 0 2.825.365 3.875 1.095 1.055.73 1.805 1.78 2.245 3.15h.105c.28-.66.65-1.25 1.105-1.77s.98-.97 1.57-1.34 1.24-.65 1.945-.845 1.445-.29 2.225-.29c1.075 0 2.05.17 2.93.515s1.63.825 2.255 1.45 1.105 1.385 1.44 2.275.505 1.88.505 2.97v14.9h-4.35V79.45c0-1.435-.37-2.55-1.11-3.335-.735-.785-1.79-1.18-3.16-1.18-.67 0-1.285.12-1.845.355-.555.235-1.04.565-1.44.99-.405.42-.72.93-.945 1.52-.23.59-.345 1.235-.345 1.935v13.58h-4.29v-14.22c0-.63-.1-1.2-.295-1.71s-.47-.945-.835-1.31c-.36-.365-.805-.64-1.32-.835-.52-.195-1.1-.295-1.745-.295-.67 0-1.29.125-1.865.375-.57.25-1.06.595-1.47 1.035-.41.445-.73.965-.955 1.57-.22.6-.58 1.26-.58 1.97v13.42H80.88v-21.87zm9.5 104.7c-19.12 0-31.12-13.29-31.12-34.5s12-34.54 31.12-34.54 31.08 13.34 31.08 34.54-11.95 34.5-31.08 34.5zm35.41-82.88c-.705.18-1.425.27-2.165.27-1.09 0-2.085-.155-2.99-.465-.91-.31-1.685-.745-2.335-1.31s-1.16-1.245-1.52-2.045c-.365-.8-.545-1.69-.545-2.67 0-1.92.715-3.42 2.145-4.5s3.5-1.71 6.215-1.885l5.9-.34v-1.69c0-1.26-.4-2.225-1.2-2.88s-1.93-.985-3.395-.985c-.59 0-1.145.075-1.655.22-.51.15-.96.36-1.35.635s-.715.605-.965.99c-.255.38-.43.81-.525 1.28h-4.09c.025-.965.265-1.86.715-2.68s1.06-1.53 1.835-2.135 1.68-1.075 2.73-1.41 2.19-.505 3.425-.505c1.33 0 2.535.165 3.615.505s2.005.815 2.77 1.44 1.355 1.375 1.77 2.255.625 1.865.625 2.95v15h-4.165V89.66h-.105c-.31.59-.7 1.125-1.175 1.6-.48.475-1.015.885-1.61 1.22-.6.335-1.25.595-1.955.775zm27.52 82.88c-14.58 0-24.5-7.64-25.19-19.64h9.495c.74 6.855 7.365 11.4 16.44 11.4 8.705 0 14.96-4.54 14.96-10.74 0-5.37-3.8-8.615-12.6-10.84l-8.57-2.13c-12.32-3.055-17.92-8.66-17.92-17.88 0-11.34 9.91-19.22 24.04-19.22 13.8 0 23.43 7.92 23.8 19.31h-9.4c-.65-6.855-6.25-11.07-14.59-11.07-8.29 0-14.03 4.26-14.03 10.42 0 4.86 3.61 7.735 12.41 9.955l7.225 1.805c13.76 3.335 19.4 8.755 19.4 18.48-.005 12.41-9.82 20.14-25.48 20.14zm-62.96-60.5c-13.1 0-21.3 10.05-21.3 26.02 0 15.93 8.195 25.98 21.3 25.98 13.06 0 21.3-10.05 21.3-25.98 0-16-8.2-26-21.26-26z"/></svg>

public/svgs/maybe.svg

@@ -0,0 +1,160 @@
+<svg width="70" height="70" viewBox="0 0 70 70" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_iii_4725_68011)">
+<path d="M1.66199 28.3573C3.33915 4.37286 8.83917 -0.408237 32.8236 1.26892L41.868 1.90136C65.8524 3.57851 70.6335 9.07854 68.9563 33.063L68.3239 42.1073C66.6467 66.0917 61.1467 70.8728 37.1623 69.1957L28.1179 68.5632C4.13349 66.8861 -0.647606 61.3861 1.02955 37.4016L1.66199 28.3573Z" fill="url(#paint0_linear_4725_68011)"/>
+<path d="M1.66199 28.3573C3.33915 4.37286 8.83917 -0.408237 32.8236 1.26892L41.868 1.90136C65.8524 3.57851 70.6335 9.07854 68.9563 33.063L68.3239 42.1073C66.6467 66.0917 61.1467 70.8728 37.1623 69.1957L28.1179 68.5632C4.13349 66.8861 -0.647606 61.3861 1.02955 37.4016L1.66199 28.3573Z" fill="black" fill-opacity="0.7"/>
+</g>
+<path d="M2.82179 28.4384C3.23922 22.4687 3.89051 17.7733 4.98031 14.1012C6.06625 10.4421 7.56711 7.86966 9.64032 6.06745C11.7135 4.26524 14.4698 3.13701 18.2445 2.57088C22.0324 2.00274 26.7729 2.01127 32.7425 2.42871L41.7868 3.06115C47.7565 3.47859 52.452 4.12988 56.124 5.21968C59.7831 6.30562 62.3556 7.80648 64.1578 9.87969C65.96 11.9529 67.0882 14.7092 67.6544 18.4838C68.2225 22.2718 68.214 27.0122 67.7965 32.9819L67.1641 42.0262C66.7466 47.9959 66.0953 52.6913 65.0056 56.3634C63.9196 60.0225 62.4188 62.5949 60.3455 64.3971C58.2723 66.1994 55.516 67.3276 51.7414 67.8937C47.9534 68.4619 43.213 68.4533 37.2434 68.0359L28.199 67.4034C22.2294 66.986 17.5339 66.3347 13.8619 65.2449C10.2028 64.159 7.6303 62.6581 5.82808 60.5849C4.02587 58.5117 2.89764 55.7554 2.33151 51.9808C1.76337 48.1928 1.77191 43.4524 2.18934 37.4827L2.82179 28.4384Z" stroke="white" stroke-width="2.32525"/>
+<path d="M2.82179 28.4384C3.23922 22.4687 3.89051 17.7733 4.98031 14.1012C6.06625 10.4421 7.56711 7.86966 9.64032 6.06745C11.7135 4.26524 14.4698 3.13701 18.2445 2.57088C22.0324 2.00274 26.7729 2.01127 32.7425 2.42871L41.7868 3.06115C47.7565 3.47859 52.452 4.12988 56.124 5.21968C59.7831 6.30562 62.3556 7.80648 64.1578 9.87969C65.96 11.9529 67.0882 14.7092 67.6544 18.4838C68.2225 22.2718 68.214 27.0122 67.7965 32.9819L67.1641 42.0262C66.7466 47.9959 66.0953 52.6913 65.0056 56.3634C63.9196 60.0225 62.4188 62.5949 60.3455 64.3971C58.2723 66.1994 55.516 67.3276 51.7414 67.8937C47.9534 68.4619 43.213 68.4533 37.2434 68.0359L28.199 67.4034C22.2294 66.986 17.5339 66.3347 13.8619 65.2449C10.2028 64.159 7.6303 62.6581 5.82808 60.5849C4.02587 58.5117 2.89764 55.7554 2.33151 51.9808C1.76337 48.1928 1.77191 43.4524 2.18934 37.4827L2.82179 28.4384Z" stroke="url(#paint1_linear_4725_68011)" stroke-width="2.32525"/>
+<path d="M3.66933 28.4976C4.08541 22.5474 4.73164 17.9253 5.79481 14.343C6.85131 10.7831 8.28392 8.3723 10.1977 6.70866C12.1115 5.04503 14.6982 3.96188 18.3705 3.4111C22.0659 2.85684 26.7329 2.86017 32.6832 3.27625L41.7276 3.9087C47.6779 4.32478 52.2999 4.97101 55.8823 6.03418C59.4422 7.09068 61.8529 8.52329 63.5166 10.4371C65.1802 12.3509 66.2634 14.9376 66.8141 18.6098C67.3684 22.3053 67.3651 26.9723 66.949 32.9226L66.3165 41.967C65.9005 47.9172 65.2542 52.5393 64.1911 56.1216C63.1345 59.6815 61.7019 62.0923 59.7882 63.7559C57.8744 65.4196 55.2877 66.5027 51.6154 67.0535C47.92 67.6078 43.2529 67.6044 37.3026 67.1883L28.2583 66.5559C22.308 66.1398 17.6859 65.4936 14.1036 64.4304C10.5437 63.3739 8.13293 61.9413 6.4693 60.0275C4.80566 58.1137 3.72251 55.527 3.17173 51.8548C2.61747 48.1593 2.6208 43.4923 3.03688 37.542L3.66933 28.4976Z" stroke="url(#paint2_linear_4725_68011)" stroke-opacity="0.05" stroke-width="4.02448"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.20106 14.4635C5.15118 18.0011 4.50747 22.5866 4.09206 28.5272L3.45962 37.5716C3.04421 43.5122 3.04348 48.1426 3.59081 51.7919C4.13394 55.4131 5.1946 57.9152 6.78912 59.7495C8.38363 61.5838 10.7138 62.9824 14.2242 64.0242C17.7617 65.0741 22.3472 65.7178 28.2878 66.1332L37.3322 66.7656C43.2728 67.181 47.9033 67.1818 51.5525 66.6344C55.1738 66.0913 57.6759 65.0306 59.5101 63.4361C61.3444 61.8416 62.743 59.5115 63.7848 56.0011C64.8347 52.4635 65.4784 47.878 65.8938 41.9374L66.5262 32.893C66.9417 26.9524 66.9424 22.322 66.3951 18.6727C65.8519 15.0515 64.7913 12.5494 63.1968 10.7151C61.6022 8.88082 59.2721 7.48225 55.7617 6.44043C52.2241 5.39055 47.6387 4.74684 41.698 4.33143L32.6537 3.69899C26.713 3.28358 22.0826 3.28284 18.4333 3.83018C14.8121 4.3733 12.31 5.43397 10.4757 7.02849C8.64145 8.623 7.24288 10.9531 6.20106 14.4635ZM32.8236 1.26892C8.83917 -0.408237 3.33915 4.37286 1.66199 28.3573L1.02955 37.4016C-0.647606 61.3861 4.13349 66.8861 28.1179 68.5632L37.1623 69.1957C61.1467 70.8728 66.6467 66.0917 68.3239 42.1073L68.9563 33.063C70.6335 9.07854 65.8524 3.57851 41.868 1.90136L32.8236 1.26892Z" fill="url(#paint3_linear_4725_68011)"/>
+<g filter="url(#filter1_ddii_4725_68011)">
+<path d="M20.8165 43.8927L14.5692 43.4559C13.0888 43.3523 11.8006 44.5292 11.6919 46.0845C11.5831 47.6398 12.695 48.9845 14.1753 49.088L20.4227 49.5248C21.903 49.6284 23.1912 48.4515 23.3 46.8962C23.4087 45.3409 22.2968 43.9962 20.8165 43.8927Z" fill="#F23E94"/>
+<path d="M14.5574 43.6244L20.8047 44.0612C22.1842 44.1577 23.2343 45.4143 23.1315 46.8844C23.0287 48.3546 21.814 49.4528 20.4344 49.3564L14.1871 48.9195C12.8076 48.823 11.7576 47.5664 11.8604 46.0963C11.9632 44.6261 13.1779 43.5279 14.5574 43.6244Z" stroke="url(#paint4_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M48.3652 51.4775L54.6125 51.9144C56.0928 52.0179 57.381 50.841 57.4898 49.2857C57.5985 47.7305 56.4866 46.3858 55.0063 46.2823L48.759 45.8454C47.2787 45.7419 45.9905 46.9188 45.8817 48.474C45.7729 50.0293 46.8848 51.374 48.3652 51.4775Z" fill="#F23E94"/>
+<path d="M54.6243 51.7459L48.3769 51.309C46.9974 51.2126 45.9474 49.956 46.0502 48.4858C46.153 47.0157 47.3677 45.9174 48.7472 46.0139L54.9945 46.4508C56.3741 46.5472 57.4241 47.8038 57.3213 49.274C57.2185 50.7441 56.0038 51.8423 54.6243 51.7459Z" stroke="url(#paint5_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M37.3154 45.0271L32.2298 44.6714C30.7495 44.5679 29.4613 45.7448 29.3525 47.3001C29.2438 48.8553 30.3556 50.2001 31.836 50.3036L36.9215 50.6592C38.4019 50.7627 39.6901 49.5858 39.7988 48.0306C39.9076 46.4753 38.7957 45.1306 37.3154 45.0271Z" fill="#F23E94"/>
+<path d="M32.218 44.8399L37.3036 45.1956C38.6831 45.292 39.7331 46.5486 39.6303 48.0188C39.5275 49.4889 38.3128 50.5872 36.9333 50.4907L31.8478 50.1351C30.4682 50.0386 29.4182 48.782 29.521 47.3119C29.6238 45.8417 30.8385 44.7435 32.218 44.8399Z" stroke="url(#paint6_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M46.5039 43.2046L52.5198 43.6253C54.0001 43.7288 55.2884 42.5519 55.3971 40.9967C55.5059 39.4414 54.394 38.0967 52.9136 37.9932L46.8977 37.5725C45.4174 37.469 44.1292 38.6459 44.0204 40.2011C43.9116 41.7564 45.0235 43.1011 46.5039 43.2046Z" fill="#6927DA"/>
+<path d="M52.5316 43.4568L46.5156 43.0361C45.1361 42.9397 44.0861 41.6831 44.1889 40.2129C44.2917 38.7428 45.5064 37.6445 46.8859 37.741L52.9019 38.1617C54.2814 38.2582 55.3314 39.5148 55.2286 40.9849C55.1258 42.455 53.9111 43.5533 52.5316 43.4568Z" stroke="url(#paint7_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M23.7094 35.95L17.6934 35.5293C16.2131 35.4258 14.9249 36.6027 14.8161 38.158C14.7074 39.7133 15.8193 41.058 17.2996 41.1615L23.3155 41.5822C24.7959 41.6857 26.0841 40.5088 26.1928 38.9535C26.3016 37.3983 25.1897 36.0535 23.7094 35.95Z" fill="#6927DA"/>
+<path d="M17.6817 35.6978L23.6976 36.1185C25.0771 36.215 26.1272 37.4716 26.0244 38.9417C25.9215 40.4119 24.7069 41.5101 23.3273 41.4137L17.3114 40.993C15.9319 40.8965 14.8818 39.6399 14.9846 38.1698C15.0874 36.6996 16.3021 35.6014 17.6817 35.6978Z" stroke="url(#paint8_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M39.8134 37.0582L30.8613 36.4322C29.381 36.3287 28.0927 37.5055 27.984 39.0608C27.8752 40.6161 28.9871 41.9608 30.4675 42.0643L39.4195 42.6903C40.8999 42.7938 42.1881 41.6169 42.2968 40.0617C42.4056 38.5064 41.2937 37.1617 39.8134 37.0582Z" fill="#6927DA"/>
+<path d="M30.8495 36.6007L39.8016 37.2267C41.1811 37.3231 42.2311 38.5797 42.1283 40.0499C42.0255 41.52 40.8108 42.6183 39.4313 42.5218L30.4792 41.8958C29.0997 41.7994 28.0497 40.5428 28.1525 39.0726C28.2553 37.6025 29.47 36.5042 30.8495 36.6007Z" stroke="url(#paint9_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M32.3636 28.1666L20.9406 27.3679C19.4603 27.2643 18.1721 28.4412 18.0633 29.9965C17.9546 31.5518 19.0665 32.8965 20.5468 33L31.9698 33.7988C33.4501 33.9023 34.7383 32.7254 34.8471 31.1701C34.9558 29.6148 33.8439 28.2701 32.3636 28.1666Z" fill="#1570EF"/>
+<path d="M20.9289 27.5363L32.3518 28.3351C33.7314 28.4316 34.7814 29.6882 34.6786 31.1583C34.5758 32.6285 33.3611 33.7267 31.9816 33.6303L20.5586 32.8315C19.179 32.735 18.129 31.4784 18.2318 30.0083C18.3346 28.5381 19.5493 27.4399 20.9289 27.5363Z" stroke="url(#paint10_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M39.7417 34.3403L50.4352 35.0881C51.9156 35.1916 53.2038 34.0147 53.3125 32.4594C53.4213 30.9042 52.3094 29.5595 50.8291 29.456L40.1356 28.7082C38.6552 28.6047 37.367 29.7816 37.2583 31.3368C37.1495 32.8921 38.2614 34.2368 39.7417 34.3403Z" fill="#1570EF"/>
+<path d="M50.447 34.9196L39.7535 34.1718C38.374 34.0754 37.324 32.8188 37.4268 31.3486C37.5296 29.8785 38.7442 28.7802 40.1238 28.8767L50.8173 29.6245C52.1968 29.7209 53.2468 30.9775 53.144 32.4477C53.0412 33.9178 51.8265 35.0161 50.447 34.9196Z" stroke="url(#paint11_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M48.8251 21.1728L42.7957 20.7512C41.3154 20.6476 40.0272 21.8245 39.9184 23.3798C39.8097 24.9351 40.9216 26.2798 42.4019 26.3833L48.4312 26.8049C49.9116 26.9084 51.1998 25.7315 51.3085 24.1763C51.4173 22.621 50.3054 21.2763 48.8251 21.1728Z" fill="#22CCEE"/>
+<path d="M42.784 20.9196L48.8133 21.3413C50.1928 21.4377 51.2428 22.6943 51.14 24.1645C51.0372 25.6346 49.8226 26.7329 48.443 26.6364L42.4137 26.2148C41.0342 26.1183 39.9841 24.8617 40.0869 23.3916C40.1897 21.9214 41.4044 20.8232 42.784 20.9196Z" stroke="url(#paint12_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+<path d="M30.0984 19.8627L24.0691 19.4411C22.5887 19.3376 21.3005 20.5145 21.1918 22.0697C21.083 23.625 22.1949 24.9697 23.6752 25.0732L29.7046 25.4948C31.1849 25.5983 32.4731 24.4215 32.5819 22.8662C32.6906 21.3109 31.5787 19.9662 30.0984 19.8627Z" fill="#22CCEE"/>
+<path d="M24.0573 19.6096L30.0866 20.0312C31.4661 20.1277 32.5162 21.3843 32.4134 22.8544C32.3106 24.3246 31.0959 25.4228 29.7163 25.3263L23.687 24.9047C22.3075 24.8083 21.2574 23.5517 21.3603 22.0815C21.4631 20.6114 22.6777 19.5131 24.0573 19.6096Z" stroke="url(#paint13_linear_4725_68011)" stroke-opacity="0.1" stroke-width="0.33782" stroke-linejoin="round"/>
+</g>
+<g opacity="0.23" filter="url(#filter2_f_4725_68011)">
+<path d="M2.69258 40.4874L12.7122 44.9449L39.098 57.1213L66.9412 61.8859L45.5294 72.5984L-0.202764 68.4613L2.69258 40.4874Z" fill="#F24396"/>
+</g>
+<g opacity="0.23" filter="url(#filter3_f_4725_68011)">
+<path d="M2.56821 1.97031L52.6272 -2.04293L69.5358 11.3492L56.9932 16.1074L23.2807 14.6892L2.56821 1.97031Z" fill="#22CCEE"/>
+</g>
+<defs>
+<filter id="filter0_iii_4725_68011" x="0.72644" y="-2.61149" width="68.533" height="75.6876" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.27762"/>
+<feGaussianBlur stdDeviation="1.59703"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.196078 0 0 0 0 0.188235 0 0 0 0 0.219608 0 0 0 1 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="3.57731"/>
+<feGaussianBlur stdDeviation="2.68298"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.321569 0 0 0 0 0.905882 0 0 0 0 1 0 0 0 0.6 0"/>
+<feBlend mode="normal" in2="effect1_innerShadow_4725_68011" result="effect2_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-3.57731"/>
+<feGaussianBlur stdDeviation="1.78866"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.933333 0 0 0 0 0.160784 0 0 0 0 0.509804 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="effect2_innerShadow_4725_68011" result="effect3_innerShadow_4725_68011"/>
+</filter>
+<filter id="filter1_ddii_4725_68011" x="1.54998" y="10.9893" width="66.0817" height="52.755" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="5.0673"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.29135 0 0 0 0 0.0895476 0 0 0 0 0.654593 0 0 0 1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="4.22275"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_4725_68011" result="effect2_dropShadow_4725_68011"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_4725_68011" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1.6891"/>
+<feGaussianBlur stdDeviation="0.844549"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="shape" result="effect3_innerShadow_4725_68011"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="1.6891"/>
+<feGaussianBlur stdDeviation="0.844549"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.05 0"/>
+<feBlend mode="normal" in2="effect3_innerShadow_4725_68011" result="effect4_innerShadow_4725_68011"/>
+</filter>
+<filter id="filter2_f_4725_68011" x="-23.4553" y="17.2348" width="113.649" height="78.6161" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="11.6263" result="effect1_foregroundBlur_4725_68011"/>
+</filter>
+<filter id="filter3_f_4725_68011" x="-20.6843" y="-25.2955" width="113.473" height="64.6555" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feGaussianBlur stdDeviation="11.6263" result="effect1_foregroundBlur_4725_68011"/>
+</filter>
+<linearGradient id="paint0_linear_4725_68011" x1="53.7772" y1="8.36942" x2="38.7315" y2="35.4937" gradientUnits="userSpaceOnUse">
+<stop stop-color="#363636"/>
+<stop offset="1" stop-color="#141414"/>
+</linearGradient>
+<linearGradient id="paint1_linear_4725_68011" x1="37.3458" y1="1.58514" x2="32.6401" y2="68.8795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#52EDFF"/>
+<stop offset="0.274483" stop-color="#4361EE"/>
+<stop offset="0.629793" stop-color="#7209B7"/>
+<stop offset="1" stop-color="#F12980"/>
+</linearGradient>
+<linearGradient id="paint2_linear_4725_68011" x1="37.019" y1="6.25836" x2="33.4897" y2="56.7291" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear_4725_68011" x1="37.3458" y1="1.58514" x2="32.6401" y2="68.8795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#52EDFF"/>
+<stop offset="0.274483" stop-color="#4361EE"/>
+<stop offset="0.629793" stop-color="#7209B7"/>
+<stop offset="1" stop-color="#F12980"/>
+</linearGradient>
+<linearGradient id="paint4_linear_4725_68011" x1="17.6928" y1="43.6743" x2="17.299" y2="49.3064" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_4725_68011" x1="51.4888" y1="51.6959" x2="51.8826" y2="46.0638" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint6_linear_4725_68011" x1="34.7726" y1="44.8492" x2="34.3788" y2="50.4814" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint7_linear_4725_68011" x1="49.5118" y1="43.415" x2="49.9057" y2="37.7829" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint8_linear_4725_68011" x1="20.7014" y1="35.7397" x2="20.3076" y2="41.3718" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint9_linear_4725_68011" x1="35.3373" y1="36.7452" x2="34.9435" y2="42.3773" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint10_linear_4725_68011" x1="26.6521" y1="27.7672" x2="26.2583" y2="33.3994" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint11_linear_4725_68011" x1="45.0885" y1="34.7142" x2="45.4823" y2="29.0821" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint12_linear_4725_68011" x1="45.8104" y1="20.962" x2="45.4166" y2="26.5941" gradientUnits="userSpaceOnUse">
+<stop stop-color="white" stop-opacity="0"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint13_linear_4725_68011" x1="27.0837" y1="19.6519" x2="26.6899" y2="25.284" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>

public/svgs/overseerr.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="512" height="512">
+<path d="M0 0 C0.77839233 0.70552002 0.77839233 0.70552002 1.57250977 1.42529297 C20.51724698 18.95857955 35.3183542 42.25039645 45.25 65.9375 C45.75917969 67.13761719 46.26835937 68.33773437 46.79296875 69.57421875 C53.13904333 85.15591751 57.42335993 102.21306817 59.25 118.9375 C59.35957031 119.79472656 59.46914063 120.65195313 59.58203125 121.53515625 C65.30647708 174.58168758 49.01780615 227.1014046 15.875 268.5 C12.4098987 272.65198864 8.83161111 276.6927508 5.1875 280.6875 C4.48197998 281.46589233 4.48197998 281.46589233 3.76220703 282.26000977 C-13.77107955 301.20474698 -37.06289645 316.0058542 -60.75 325.9375 C-61.95011719 326.44667969 -63.15023438 326.95585937 -64.38671875 327.48046875 C-79.96841751 333.82654333 -97.02556817 338.11085993 -113.75 339.9375 C-114.60722656 340.04707031 -115.46445312 340.15664063 -116.34765625 340.26953125 C-169.39418758 345.99397708 -221.9139046 329.70530615 -263.3125 296.5625 C-267.46448864 293.0973987 -271.5052508 289.51911111 -275.5 285.875 C-276.27839233 285.16947998 -276.27839233 285.16947998 -277.07250977 284.44970703 C-296.01724698 266.91642045 -310.8183542 243.62460355 -320.75 219.9375 C-321.25917969 218.73738281 -321.76835937 217.53726562 -322.29296875 216.30078125 C-328.63904333 200.71908249 -332.92335993 183.66193183 -334.75 166.9375 C-334.85957031 166.08027344 -334.96914063 165.22304688 -335.08203125 164.33984375 C-340.80647708 111.29331242 -324.51780615 58.7735954 -291.375 17.375 C-287.9098987 13.22301136 -284.33161111 9.1822492 -280.6875 5.1875 C-280.21715332 4.66857178 -279.74680664 4.14964355 -279.26220703 3.61499023 C-261.72892045 -15.32974698 -238.43710355 -30.1308542 -214.75 -40.0625 C-213.54988281 -40.57167969 -212.34976563 -41.08085938 -211.11328125 -41.60546875 C-195.53158249 -47.95154333 -178.47443183 -52.23585993 -161.75 -54.0625 C-160.89277344 -54.17207031 -160.03554687 -54.28164063 -159.15234375 -54.39453125 C-99.82500101 -60.79676248 -43.54726444 -39.72491441 0 0 Z " fill="#A289F9" transform="translate(393.75,113.0625)"/>
+<path d="M0 0 C2.63622485 2.22708275 5.19150738 4.52921782 7.7409668 6.85546875 C8.46670898 7.49871094 9.19245117 8.14195312 9.94018555 8.8046875 C28.36748008 26.03588989 41.75155651 53.35960955 42.86425781 78.65869141 C43.70797362 112.3608808 36.58885956 142.14006064 13.7409668 167.85546875 C12.54020508 169.20705078 12.54020508 169.20705078 11.31518555 170.5859375 C-8.53153214 191.53705519 -37.09680019 204.15705607 -65.8137207 205.140625 C-77.94100422 205.37709014 -89.5422865 205.25443065 -101.2590332 201.85546875 C-103.0224707 201.37980469 -103.0224707 201.37980469 -104.8215332 200.89453125 C-121.40302939 195.94116057 -136.3527812 187.31831389 -149.2590332 175.85546875 C-150.14848633 175.0665625 -151.03793945 174.27765625 -151.9543457 173.46484375 C-167.40909083 158.83370573 -177.61511815 140.25052542 -183.2590332 119.85546875 C-183.5787207 118.70820313 -183.8984082 117.5609375 -184.2277832 116.37890625 C-188.26683057 98.91376625 -188.98196274 77.02425735 -183.2590332 59.85546875 C-182.5990332 58.86546875 -181.9390332 57.87546875 -181.2590332 56.85546875 C-180.93032227 57.46132812 -180.60161133 58.0671875 -180.26293945 58.69140625 C-172.21889547 72.86113142 -160.79177658 83.491992 -144.8840332 88.23046875 C-127.13242009 91.2910917 -110.45150547 88.72225434 -95.2590332 78.85546875 C-83.60677615 70.49132656 -75.75104634 56.9235307 -73.2590332 42.85546875 C-71.45757952 24.03946126 -74.73970981 8.78864654 -86.8762207 -6.1328125 C-90.96217608 -10.5413433 -95.77705169 -13.57401274 -100.90356445 -16.6640625 C-103.2590332 -18.14453125 -103.2590332 -18.14453125 -105.2590332 -20.14453125 C-103.57312478 -20.62926803 -101.88520775 -21.10702051 -100.1965332 -21.58203125 C-98.78694336 -21.98228516 -98.78694336 -21.98228516 -97.34887695 -22.390625 C-64.24168178 -30.4686132 -26.24452842 -21.45755623 0 0 Z " fill="#131928" transform="translate(344.259033203125,182.14453125)"/>
+<path d="M0 0 C27.51668329 -1.54459553 56.68622642 12.36261605 76.97143555 30.24731445 C100.05828616 51.22761351 116.14269665 79.83089922 118.22119141 111.35473633 C119.4842267 149.41509562 109.54536352 181.25369492 83.42504883 209.56640625 C61.20694161 232.76768274 30.18258643 245.68447023 -1.72436523 246.47045898 C-37.47694444 246.75019142 -67.91707948 234.63666274 -93.52539062 209.50195312 C-112.03605933 190.64804024 -127.24579555 162.86302866 -128.09765625 135.91015625 C-128.08605469 134.97042969 -128.07445312 134.03070313 -128.0625 133.0625 C-128.05347656 132.10472656 -128.04445312 131.14695312 -128.03515625 130.16015625 C-128.01775391 129.09087891 -128.01775391 129.09087891 -128 128 C-127.67 128 -127.34 128 -127 128 C-126.79246094 129.23492187 -126.58492187 130.46984375 -126.37109375 131.7421875 C-122.03641631 156.12747696 -112.65378734 175.70645513 -96 194 C-95.43023437 194.65226563 -94.86046875 195.30453125 -94.2734375 195.9765625 C-77.53338041 214.09016274 -49.82674725 227.04001852 -25.19677734 228.12329102 C8.55585455 228.96826963 38.21751895 221.8135893 64 199 C64.82757813 198.27296875 65.65515625 197.5459375 66.5078125 196.796875 C87.15165343 177.37583998 99.32367565 148.51732778 100.28515625 120.4453125 C100.52162139 108.31802898 100.3989619 96.7167467 97 85 C96.68289063 83.824375 96.36578125 82.64875 96.0390625 81.4375 C91.07002873 64.80357134 82.4108957 49.99996858 71 37 C70.28457031 36.18402344 69.56914062 35.36804688 68.83203125 34.52734375 C50.47303107 14.99722536 25.98974766 5.20070823 0 1 C0 0.67 0 0.34 0 0 Z " fill="#6865CD" transform="translate(286,158)"/>
+</svg>

public/svgs/privatebin.svg

@@ -0,0 +1 @@
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="38" width="38" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 38 38" xmlns:dc="http://purl.org/dc/elements/1.1/"><defs><radialGradient id="a" gradientUnits="userSpaceOnUse" cx="261" cy="240" r="341" gradientTransform="matrix(1.3 .000949 -.00102 1.4 -89.2 -86.2)"><stop stop-color="#ff0" offset="0"/><stop stop-color="#fa0" offset="1"/></radialGradient></defs><path stroke-linejoin="round" d="m250 3.16-227 123-0.42 247 227 124 227-123 0.42-247zm-0.711 97.9v0.006c3.78 0 7.6 0.297 11.5 0.875 41.1 6.17 72.2 40.6 66.4 70.5-5.8 29.8-33.3 56-40.1 61.7s37.1 165 37.1 165h-149s46.2-157 36.5-165c-9.7-8.14-41.2-36.9-36.4-68.9 4.81-32.1 37.6-64 74.2-64.1z" transform="matrix(.0709 0 0 .0709 1.4 1.38)" stroke="#000" stroke-linecap="round" stroke-width="10.6" fill="url(#a)"/></svg>

public/svgs/radarr.svg

@@ -0,0 +1 @@
+<svg height="1024" viewBox="0 0 1024 1024" width="1024" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h1024v1024h-1024z"/><clipPath id="b"><use clip-rule="evenodd" xlink:href="#a"/></clipPath></defs><g clip-path="url(#b)"><use fill="none" xlink:href="#a"/><g transform="translate(70 21.00012)"><path d="m105.302 154.943 7.522 714.549c-60.173 7.522-105.30242-22.565-105.30242-82.737l-7.52158-594.205c0-188.03894 172.996-233.1684 278.298-157.9526l534.032 308.3846c75.216 52.651 90.259 150.431 52.651 218.125-7.521-52.651-30.086-82.737-75.216-112.823l-601.726-338.471c-45.129-30.0862-82.737-22.5646-82.737 45.13z" fill="#24292e"/><path d="m0 376.079c45.1295 15.043 90.259 7.521 127.867-15.043l616.769-361.036c37.608 52.651 30.087 105.302-15.043 135.388l-518.989 300.863c-75.216 37.608-172.9961 0-210.604-60.172z" fill="#24292e" transform="translate(60.17249 531.0214)"/><path d="m0 413.687 368.557-210.604-361.03543-203.083z" fill="#ffc230" transform="translate(240.6902 282.8092)"/></g></g></svg>

public/svgs/redlib.svg

@@ -0,0 +1,7 @@
+<svg version="1.1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 -1 0 512)">
+    <circle cx="256" cy="256" r="256" fill="#1a1a1a"/>
+    <path d="M144,96 v320 h224 v-70 h-152 V96 z" fill="#d54455"/>
+    <path d="M240,96 v226 h70 v-156 h58 V96 z" fill="#f9f9f9"/>
+  </g>
+</svg>

public/svgs/sonarr.svg

@@ -0,0 +1 @@
+<svg height="216.9" viewBox="0 0 216.7 216.9" width="216.7" xmlns="http://www.w3.org/2000/svg"><g clip-rule="evenodd"><path d="m216.7 108.45c0 29.833-10.533 55.4-31.6 76.7-.7.833-1.483 1.6-2.35 2.3-3.466 3.4-7.133 6.484-11 9.25-18.267 13.467-39.367 20.2-63.3 20.2-23.967 0-45.033-6.733-63.2-20.2-4.8-3.4-9.3-7.25-13.5-11.55-16.367-16.266-26.417-35.167-30.15-56.7-.733-4.2-1.217-8.467-1.45-12.8-.1-2.4-.15-4.8-.15-7.2 0-2.533.05-4.95.15-7.25 0-.233.066-.467.2-.7 1.567-26.6 12.033-49.583 31.4-68.95 21.3-21.033 46.867-31.55 76.7-31.55 29.933 0 55.484 10.517 76.65 31.55 21.067 21.433 31.6 47.067 31.6 76.9z" fill="#eee" fill-rule="evenodd"/><path d="m194.65 42.5-22.4 22.4c-13.098 13.098-14.25 24.5-14.25 44.6 0 17.934 2.852 34.352 16.2 47.7 9.746 9.746 19 18.95 19 18.95-2.5 3.067-5.2 6.067-8.1 9-.7.833-1.483 1.6-2.35 2.3-2.533 2.5-5.167 4.817-7.9 6.95l-17.55-17.55c-15.598-15.6-27.996-17.1-48.6-17.1-19.77 0-33.223 1.822-47.7 16.3-8.647 8.647-18.55 18.6-18.55 18.6-3.767-2.867-7.333-6.034-10.7-9.5-2.8-2.8-5.417-5.667-7.85-8.6 0 0 9.798-9.848 19.15-19.2 13.852-13.853 16.1-29.916 16.1-47.85 0-17.5-2.874-33.823-15.6-46.55-8.835-8.836-21.05-21-21.05-21 2.833-3.6 5.917-7.067 9.25-10.4 2.934-2.867 5.934-5.55 9-8.05l20.35 20.35c13.002 13.002 29.667 16.35 47.6 16.35 18.467 0 35.077-3.577 48.6-17.1 8.32-8.32 19.3-19.25 19.3-19.25 2.9 2.367 5.733 4.933 8.5 7.7 3.467 3.533 6.65 7.183 9.55 10.95z" fill="#3a3f51" fill-rule="evenodd"/><g><path d="m78.7 114c-.2-1.167-.332-2.35-.4-3.55-.032-.667-.05-1.333-.05-2 0-.7.018-1.367.05-2 0-.067.018-.133.05-.2.435-7.367 3.334-13.733 8.7-19.1 5.9-5.833 12.984-8.75 21.25-8.75 8.3 0 15.384 2.917 21.25 8.75 5.834 5.934 8.75 13.033 8.75 21.3s-2.916 15.35-8.75 21.25c-.2.233-.416.45-.65.65-.966.933-1.982 1.783-3.05 2.55-5.065 3.733-10.916 5.6-17.55 5.6s-12.466-1.866-17.5-5.6c-1.332-.934-2.582-2-3.75-3.2-4.532-4.5-7.316-9.734-8.35-15.7z" fill="#0cf" fill-rule="evenodd"/><g fill="none" stroke="#0cf" stroke-miterlimit="1"><path d="m157.8 59.75-15 14.65m-112.015-41.874 40.865 40.724m84.6 84.25 27.808 28.78m1.855-153.894-28.113 27.364m-125.45 126 27.35-27.4" stroke-width="2"/><path d="m157.8 59.75-16.95 17.2m-81.88-16.346 17.2 17.15m-16.547 80.676 16.75-17.4m61.928-1.396 18.028 17.945" stroke-width="7"/></g></g></g></svg>

public/svgs/windows.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="88" width="88" xmlns:v="https://vecta.io/nano"><path d="M0 12.402l35.687-4.86.016 34.423-35.67.203zm35.67 33.529l.028 34.453L.028 75.48.026 45.7zm4.326-39.025L87.314 0v41.527l-47.318.376zm47.329 39.349l-.011 41.34-47.318-6.678-.066-34.739z" fill="#00adef"/></svg>

resources/css/app.css

@@ -6,7 +6,7 @@
 
 html,
 body {
-    @apply h-full bg-neutral-50 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 w-full;
 }
 
 body {
@@ -30,6 +30,14 @@ body {
     @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300;
 }
 
+.input-sticky {
+    @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300 focus:ring-2 dark:focus:ring-coolgray-300 focus:ring-neutral-400 block w-full py-1.5 rounded border-0 text-sm ring-1 ring-inset;
+}
+
+.input-sticky-active {
+    @apply border-2 border-coollabs text-black dark:text-white focus:bg-neutral-200 dark:focus:bg-coolgray-400 focus:border-coollabs;
+}
+
 /* Readonly */
 .input {
     @apply dark:read-only:text-neutral-500 dark:read-only:ring-0 dark:read-only:bg-coolgray-100/40 placeholder:text-neutral-300 dark:placeholder:text-neutral-700 read-only:text-neutral-500 read-only:bg-neutral-200;
@@ -314,4 +322,4 @@ section {
 
 .dz-button {
     @apply w-full p-4 py-10 my-4 font-bold bg-white border dark:border-coolgray-400 dark:text-white dark:bg-transparent hover:dark:bg-coolgray-400;
-}
+}

resources/js/terminal.js

@@ -60,7 +60,22 @@ export function initializeTerminalComponent() {
                 };
 
             },
+            resetTerminal() {
+                if (this.term) {
+                    this.$wire.dispatch('error', 'Terminal websocket connection lost.');
+                    this.term.reset();
+                    this.term.clear();
+                    this.pendingWrites = 0;
+                    this.paused = false;
+                    this.commandBuffer = '';
 
+                    // Force a refresh
+                    this.$nextTick(() => {
+                        this.resizeTerminal();
+                        this.term.focus();
+                    });
+                }
+            },
             setupTerminal() {
                 const terminalElement = document.getElementById('terminal');
                 if (terminalElement) {
@@ -69,9 +84,15 @@ export function initializeTerminalComponent() {
                         rows: 30,
                         fontFamily: '"Fira Code", courier-new, courier, monospace, "Powerline Extra Symbols"',
                         cursorBlink: true,
+                        rendererType: 'canvas',
+                        convertEol: true,
+                        disableStdin: false
                     });
                     this.fitAddon = new FitAddon();
                     this.term.loadAddon(this.fitAddon);
+                    this.$nextTick(() => {
+                        this.resizeTerminal();
+                    });
                 }
             },
 
@@ -101,12 +122,19 @@ export function initializeTerminalComponent() {
                         `${connectionString.protocol}://${connectionString.host}${connectionString.port}${connectionString.path}`
                     this.socket = new WebSocket(url);
 
+                    this.socket.onopen = () => {
+                        console.log('[Terminal] WebSocket connection established. Cool cool cool cool cool cool.');
+                    };
+
                     this.socket.onmessage = this.handleSocketMessage.bind(this);
                     this.socket.onerror = (e) => {
-                        console.error('WebSocket error:', e);
+                        console.error('[Terminal] WebSocket error.');
                     };
                     this.socket.onclose = () => {
-                        console.log('WebSocket connection closed');
+                        console.warn('[Terminal] WebSocket connection closed.');
+                        this.resetTerminal();
+                        this.message = '(connection closed)';
+                        this.terminalActive = false;
                         this.reconnect();
                     };
                 }
@@ -117,19 +145,18 @@ export function initializeTerminalComponent() {
                     clearInterval(this.reconnectInterval);
                 }
                 this.reconnectInterval = setInterval(() => {
-                    console.log('Attempting to reconnect...');
+                    console.warn('[Terminal] Attempting to reconnect...');
                     this.initializeWebSocket();
                     if (this.socket && this.socket.readyState === WebSocket.OPEN) {
-                        console.log('Reconnected successfully');
+                        console.log('[Terminal] Reconnected successfully');
                         clearInterval(this.reconnectInterval);
                         this.reconnectInterval = null;
-                        window.location.reload();
+
                     }
                 }, 2000);
             },
 
             handleSocketMessage(event) {
-                this.message = '(connection closed)';
                 if (event.data === 'pty-ready') {
                     if (!this.term._initialized) {
                         this.term.open(document.getElementById('terminal'));
@@ -150,8 +177,17 @@ export function initializeTerminalComponent() {
                     this.term.reset();
                     this.commandBuffer = '';
                 } else {
-                    this.pendingWrites++;
-                    this.term.write(event.data, this.flowControlCallback.bind(this));
+                    try {
+                        this.pendingWrites++;
+                        this.term.write(event.data, (err) => {
+                            if (err) {
+                                console.error('[Terminal] Write error:', err);
+                            }
+                            this.flowControlCallback();
+                        });
+                    } catch (error) {
+                        console.error('[Terminal] Write operation failed:', error);
+                    }
                 }
             },
 
@@ -173,11 +209,15 @@ export function initializeTerminalComponent() {
                 if (!this.term) return;
 
                 this.term.onData((data) => {
-                    this.socket.send(JSON.stringify({ message: data }));
-                    if (data === '\r') {
-                        this.commandBuffer = '';
+                    if (this.socket.readyState === WebSocket.OPEN) {
+                        this.socket.send(JSON.stringify({ message: data }));
+                        if (data === '\r') {
+                            this.commandBuffer = '';
+                        } else {
+                            this.commandBuffer += data;
+                        }
                     } else {
-                        this.commandBuffer += data;
+                        console.warn('[Terminal] WebSocket not ready, data not sent');
                     }
                 });
 

resources/views/components/navbar.blade.php

@@ -7,8 +7,13 @@
             }
             window.location.reload();
         },
+        setZoom(zoom) {
+            localStorage.setItem('zoom', zoom);
+            window.location.reload();
+        },
         init() {
             this.full = localStorage.getItem('pageWidth');
+            this.zoom = localStorage.getItem('zoom');
             window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', e => {
                 const userSettings = localStorage.getItem('theme');
                 if (userSettings !== 'system') {
@@ -21,6 +26,7 @@
                 }
             });
             this.queryTheme();
+            this.checkZoom();
         },
         setTheme(type) {
             this.theme = type;
@@ -44,6 +50,30 @@
                 this.theme = 'system';
                 document.documentElement.classList.remove('dark');
             }
+        },
+        checkZoom() {
+            if (this.zoom === null) {
+                this.setZoom(100);
+            }
+            if (this.zoom === '90') {
+                const style = document.createElement('style');
+                style.textContent = `
+                    html {
+                        font-size: 93.75%;
+                    }
+
+                    :root {
+                        --vh: 1vh;
+                    }
+
+                    @media (min-width: 1024px) {
+                        html {
+                            font-size: 87.5%;
+                        }
+                    }
+                `;
+                document.head.appendChild(style);
+            }
         }
 }">
     <div class="flex pt-6 pb-4 pl-2">
@@ -69,7 +99,7 @@
                     </div>
                 </x-slot:title>
                 <div class="flex flex-col gap-1">
-                    <div class="mb-1 font-bold border-b dark:border-coolgray-500 dark:text-white text-md">Color</div>
+                    <div class="font-bold border-b dark:border-coolgray-500 dark:text-white text-md">Color</div>
                     <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>
@@ -78,6 +108,9 @@
                         x-show="full === 'full'">Center</button>
                     <button @click="switchWidth()" class="px-1 dropdown-item-no-padding"
                         x-show="full === 'center'">Full</button>
+                    <div class="my-1 font-bold border-b dark:border-coolgray-500 dark:text-white text-md">Zoom</div>
+                    <button @click="setZoom(100)" class="px-1 dropdown-item-no-padding">100%</button>
+                    <button @click="setZoom(90)" class="px-1 dropdown-item-no-padding">90%</button>
                 </div>
             </x-dropdown>
         </div>
@@ -163,8 +196,8 @@
                             class="{{ request()->is('storages*') ? 'menu-item-active menu-item' : 'menu-item' }}"
                             href="{{ route('storage.index') }}">
                             <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24">
-                                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                                    stroke-width="2">
+                                <g fill="none" stroke="currentColor" stroke-linecap="round"
+                                    stroke-linejoin="round" stroke-width="2">
                                     <path d="M4 6a8 3 0 1 0 16 0A8 3 0 1 0 4 6" />
                                     <path d="M4 6v6a8 3 0 0 0 16 0V6" />
                                     <path d="M4 12v6a8 3 0 0 0 16 0v-6" />

resources/views/components/resources/breadcrumbs.blade.php

@@ -8,7 +8,7 @@
         <li class="inline-flex items-center">
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.show', ['project_uuid' => $this->parameters['project_uuid']]) }}">
+                    href="{{ route('project.show', ['project_uuid' => data_get($resource, 'environment.project.uuid')]) }}">
                     {{ data_get($resource, 'environment.project.name', 'Undefined Name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
@@ -21,7 +21,7 @@
         <li>
             <div class="flex items-center">
                 <a class="text-xs truncate lg:text-sm"
-                    href="{{ route('project.resource.index', ['environment_name' => $this->parameters['environment_name'], 'project_uuid' => $this->parameters['project_uuid']]) }}">{{ $this->parameters['environment_name'] }}</a>
+                    href="{{ route('project.resource.index', ['environment_name' => data_get($resource, 'environment.name'), 'project_uuid' => data_get($resource, 'environment.project.uuid')]) }}">{{ data_get($resource, 'environment.name') }}</a>
                 <svg aria-hidden="true" class="w-4 h-4 mx-1 font-bold dark:text-warning" fill="currentColor"
                     viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
                     <path fill-rule="evenodd"

resources/views/components/toast.blade.php

@@ -11,16 +11,20 @@
         toast(this.title, { description: this.description, type: this.type, position: this.position, html: html })
     }
 }" x-init="window.toast = function(message, options = {}) {
-    let description = '';
-    let type = 'default';
-    let position = 'top-center';
-    let html = '';
-    if (typeof options.description != 'undefined') description = options.description;
-    if (typeof options.type != 'undefined') type = options.type;
-    if (typeof options.position != 'undefined') position = options.position;
-    if (typeof options.html != 'undefined') html = options.html;
+    try {
+        let description = '';
+        let type = 'default';
+        let position = 'top-center';
+        let html = '';
+        if (typeof options.description != 'undefined') description = options.description;
+        if (typeof options.type != 'undefined') type = options.type;
+        if (typeof options.position != 'undefined') position = options.position;
+        if (typeof options.html != 'undefined') html = options.html;
 
-    window.dispatchEvent(new CustomEvent('toast-show', { detail: { type: type, message: message, description: description, position: position, html: html } }));
+        window.dispatchEvent(new CustomEvent('toast-show', { detail: { type: type, message: message, description: description, position: position, html: html } }));
+    } catch (error) {
+        console.error('Error showing toast:', error);
+    }
 }" class="relative space-y-5">
     <template x-teleport="body">
         <ul x-data="{

resources/views/components/version.blade.php

@@ -1,4 +1,4 @@
 <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') }}" target="_blank">
-    v{{ config('version') }}
-</a>
+    href="https://github.com/coollabsio/coolify/releases/tag/v{{ config('constants.coolify.version') }}" target="_blank">
+    v{{ config('constants.coolify.version') }}
+</a>

resources/views/layouts/base.blade.php

@@ -34,11 +34,13 @@
     </style>
     @if (config('app.name') == 'Coolify Cloud')
         <script defer data-domain="app.coolify.io" src="https://analytics.coollabs.io/js/plausible.js"></script>
+        <script src="https://js.sentry-cdn.com/0f8593910512b5cdd48c6da78d4093be.min.js" crossorigin="anonymous"></script>
     @endif
     @auth
         <script type="text/javascript" src="{{ URL::asset('js/echo.js') }}"></script>
         <script type="text/javascript" src="{{ URL::asset('js/pusher.js') }}"></script>
         <script type="text/javascript" src="{{ URL::asset('js/apexcharts.js') }}"></script>
+
     @endauth
 </head>
 @section('body')
@@ -94,6 +96,20 @@
                 enableStats: false,
                 enableLogging: true,
                 enabledTransports: ['ws', 'wss'],
+                disableStats: true,
+                // Add auto reconnection settings
+                enabledTransports: ['ws', 'wss'],
+                disabledTransports: ['sockjs', 'xhr_streaming', 'xhr_polling'],
+                // Attempt to reconnect on connection lost
+                autoReconnect: true,
+                // Wait 1 second before first reconnect attempt
+                reconnectionDelay: 1000,
+                // Maximum delay between reconnection attempts
+                maxReconnectionDelay: 1000,
+                // Multiply delay by this number for each reconnection attempt
+                reconnectionDelayGrowth: 1,
+                // Maximum number of reconnection attempts
+                maxAttempts: 15
             });
             @endauth
             let checkHealthInterval = null;

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

@@ -11,16 +11,22 @@
 
         let checkNumber = 1;
         let checkPusherInterval = null;
+        let checkReconnectInterval = null;
+
         if (!this.popups.realtime) {
             checkPusherInterval = setInterval(() => {
-                if (window.Echo && window.Echo.connector.pusher.connection.state !== 'connected') {
-                    checkNumber++;
-                    if (checkNumber > 5) {
-                        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/knowledge-base/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
-                        );
-                        clearInterval(checkPusherInterval);
+                if (window.Echo) {
+                    if (window.Echo.connector.pusher.connection.state === 'connected') {
+                        this.popups.realtime = false;
+                    } else {
+                        checkNumber++;
+                        if (checkNumber > 5) {
+                            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/knowledge-base/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
+                            );
+                        }
+
                     }
                 }
             }, 2000);

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

@@ -162,7 +162,7 @@
                             <div class="pt-1 text-xs">Nixpacks will detect the required configuration
                                 automatically.
                                 <a class="underline"
-                                    href="https://coolify.io/docs/resources/applications/index">Framework
+                                    href="https://coolify.io/docs/applications">Framework
                                     Specific Docs</a>
                             </div>
                         @endif

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

@@ -43,7 +43,7 @@
             <h4 class="py-2 ">Select another Private Key</h4>
             <div class="flex flex-wrap gap-2">
                 @foreach ($privateKeys as $key)
-                    <x-forms.button wire:click.defer="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
+                    <x-forms.button wire:click="setPrivateKey('{{ $key->id }}')">{{ $key->name }}
                     </x-forms.button>
                 @endforeach
             </div>

resources/views/livewire/project/new/select.blade.php

@@ -12,9 +12,10 @@
     <div class="pb-4">Deploy resources, like Applications, Databases, Services...</div>
     <div x-data="searchResources()">
         @if ($current_step === 'type')
-            <div class="sticky top-0 z-50 py-2">
-                <input autocomplete="off" x-ref="searchInput" class="input w-full" x-model="search"
-                    placeholder="Type / to search..." @keydown.window.slash.prevent="$refs.searchInput.focus()">
+            <div x-data="{ isSticky: false }" x-init="window.addEventListener('scroll', () => isSticky = window.pageYOffset > 100)" class="sticky top-0 z-50 py-2">
+                <input autocomplete="off" x-ref="searchInput" class="input-sticky"
+                    :class="{ 'input-sticky-active': isSticky }" x-model="search" placeholder="Type / to search..."
+                    @keydown.window.slash.prevent="$refs.searchInput.focus()">
             </div>
             <div x-show="loading">Loading...</div>
             <div x-show="!loading" class="flex flex-col gap-4 py-4">
@@ -30,8 +31,7 @@
                                     <span x-html="application.description"></span>
                                 </x-slot>
                                 <x-slot:logo>
-                                    <img class="w-[4.5rem]
-                            aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 "
+                                    <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
                                         :src="application.logo">
                                 </x-slot:logo>
                             </x-resource-view>
@@ -47,8 +47,7 @@
                                 <x-slot:title><span x-text="application.name"></span></x-slot>
                                 <x-slot:description><span x-text="application.description"></span></x-slot>
                                 <x-slot:logo> <img
-                                        class="w-[4.5rem]
-                            aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 "
+                                        class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10 "
                                         :src="application.logo"></x-slot>
                             </x-resource-view>
                         </div>
@@ -100,7 +99,7 @@
                                     </x-slot>
                                     <x-slot:logo>
                                         <template x-if="service.logo">
-                                            <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100"
+                                            <img class="w-[4.5rem] aspect-square h-[4.5rem] p-2 transition-all duration-200 dark:opacity-30 grayscale group-hover:grayscale-0 group-hover:opacity-100 dark:bg-white/10 bg-black/10"
                                                 :src='service.logo'
                                                 x-on:error.window="$event.target.src = service.logo_github_url"
                                                 onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');"
@@ -111,7 +110,7 @@
                                     <x-slot:documentation>
                                         <template x-if="service.documentation">
                                             <div class="flex items-center px-2" title="Read the documentation.">
-                                                <a class="p-2 rounded hover:bg-coolgray-200 hover:no-underline group-hover:dark:text-white text-neutral-600"
+                                                <a class="p-2 rounded hover:bg-gray-100 dark:hover:bg-coolgray-200 hover:no-underline group-hover:dark:text-white text-neutral-600"
                                                     onclick="event.stopPropagation()" :href="service.documentation"
                                                     target="_blank">
                                                     Docs
@@ -170,7 +169,8 @@
                             }
                             const filtered = Object.values(items).filter(item => {
                                 return (item.name?.toLowerCase().includes(searchLower) ||
-                                    item.description?.toLowerCase().includes(searchLower))
+                                    item.description?.toLowerCase().includes(searchLower) ||
+                                    item.slogan?.toLowerCase().includes(searchLower))
                             })
                             return isSort ? filtered.sort(sortFn) : filtered;
                         },
@@ -274,7 +274,7 @@
             16 (default).</div>
         <div class="flex flex-col gap-4">
             <div class="flex flex-col gap-2">
-                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex"
+                <div class="gap-2 border border-transparent cursor-pointer box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-400 dark:hover:bg-coollabs group flex "
                     wire:click="setPostgresqlType('postgres:16-alpine')">
                     <div class="flex flex-col">
                         <div class="box-title">PostgreSQL 16 (default)</div>

resources/views/livewire/project/service/edit-compose.blade.php

@@ -13,7 +13,7 @@
         <x-forms.textarea rows="20" readonly id="service.docker_compose">
         </x-forms.textarea>
     </div>
-    <div class="pt-2 w-72">
+    <div class="pt-2 w-96">
         <x-forms.checkbox label="Escape special characters in labels?"
             helper="By default, $ (and other chars) is escaped. So if you write $ in the labels, it will be saved as $$.<br><br>If you want to use env variables inside the labels, turn this off."
             id="service.is_container_label_escape_enabled" instantSave></x-forms.checkbox>

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

@@ -3,7 +3,7 @@
         <div class="flex items-center gap-2">
             <h2>Environment Variables</h2>
             <div class="flex flex-col items-center">
-                <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
+                <x-modal-input buttonTitle="+ Add" title="New Environment Variable" :closeOutside="false">
                     <livewire:project.shared.environment-variable.add />
                 </x-modal-input>
             </div>
@@ -38,7 +38,7 @@
             <div>Environment (secrets) variables for Production.</div>
         </div>
         @php
-            $requiredEmptyVars = $resource->environment_variables->filter(function($env) {
+            $requiredEmptyVars = $resource->environment_variables->filter(function ($env) {
                 return $env->is_required && empty($env->value);
             });
             $otherVars = $resource->environment_variables->diff($requiredEmptyVars);
@@ -62,11 +62,13 @@
         @endif
     @else
         <form wire:submit.prevent='submit' class="flex flex-col gap-2">
-            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables" label="Production Environment Variables"></x-forms.textarea>
+            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables"
+                label="Production Environment Variables"></x-forms.textarea>
 
             @if ($showPreview)
-                <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Deployments Environment Variables"
-                    id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
+                <x-forms.textarea rows="10" class="whitespace-pre-wrap"
+                    label="Preview Deployments Environment Variables" id="variablesPreview"
+                    wire:model="variablesPreview"></x-forms.textarea>
             @endif
 
             <x-forms.button type="submit" class="btn btn-primary">Save All Environment Variables</x-forms.button>

resources/views/livewire/project/shared/execute-container-command.blade.php

@@ -26,8 +26,8 @@
     @else
         @if (count($containers) > 0)
             @if (count($containers) === 1)
-                <form class="w-full pt-4"
-                    wire:submit="$dispatchSelf('connectToContainer')" wire:init="$dispatchSelf('connectToContainer')">
+                <form class="w-full pt-4" wire:submit="$dispatchSelf('connectToContainer')"
+                    wire:init="$dispatchSelf('connectToContainer')">
                     <x-forms.button class="w-full" type="submit">Reconnect</x-forms.button>
                 </form>
             @else

scripts/install.sh

@@ -83,6 +83,11 @@ if [ "$OS_TYPE" = "manjaro" ] || [ "$OS_TYPE" = "manjaro-arm" ]; then
     OS_TYPE="arch"
 fi
 
+# Check if the OS is Endeavour OS, if so, change it to arch
+if [ "$OS_TYPE" = "endeavouros" ]; then
+    OS_TYPE="arch"
+fi
+
 # Check if the OS is Asahi Linux, if so, change it to fedora
 if [ "$OS_TYPE" = "fedora-asahi-remix" ]; then
     OS_TYPE="fedora"

templates/compose/beszel.yaml

@@ -0,0 +1,24 @@
+# documentation: https://github.com/henrygd/beszel?tab=readme-ov-file#getting-started
+# slogan: A lightweight server resource monitoring hub with historical data, docker stats, and alerts.
+# tags: beszel,monitoring,server,stats,alerts
+# logo: svgs/beszel.svg
+# port: 8090
+
+# When adding a System in the UI, the Host/IP must be beszel-agent (or the container name, ex: beszel-agent-pswog4s8wks4o8osw44cw0k8)
+# Add the public Key in "Key" env variable below
+services:
+  beszel:
+    image: henrygd/beszel:latest
+    environment:
+      - SERVICE_FQDN_BESZEL_8090
+    volumes:
+      - beszel_data:/beszel_data
+
+  beszel-agent:
+    image: henrygd/beszel-agent
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - PORT=45876
+    # Public Key from "Add a new system" in the UI and restart the agent
+    # - KEY=""

templates/compose/bluesky-pds.yaml

@@ -0,0 +1,36 @@
+# ignore: true
+# documentation: https://github.com/bluesky-social/pds
+# slogan: A social network for the decentralized web
+# tags: pds, bluesky, social, network, decentralized
+# logo:
+# port: 3000
+
+services:
+  pds:
+    image: ghcr.io/bluesky-social/pds:0.4
+    volumes:
+      - pds-data:/pds
+    environment:
+      - SERVICE_FQDN_PDS_3000
+      - PDS_JWT_SECRET=${SERVICE_BASE64_PDS}
+      - PDS_ADMIN_PASSWORD=${SERVICE_PASSWORD_PDS}
+      - PDS_ADMIN_EMAIL=${PDS_ADMIN_EMAIL:-admin@example.com}
+      - PDS_DATADIR=${PDS_DATADIR:-/pds}
+      - PDS_BLOBSTORE_DISK_LOCATION=${PDS_DATADIR:-/pds}/blocks
+      - PDS_BLOB_UPLOAD_LIMIT=${PDS_BLOB_UPLOAD_LIMIT:-52428800}
+      - PDS_HOSTNAME=${SERVICE_URL_PDS}
+      - PDS_DID_PLC_URL=https://plc.directory
+      - PDS_BSKY_APP_VIEW_URL=https://api.bsky.app
+      - PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app
+      - PDS_REPORT_SERVICE_URL=https://mod.bsky.app
+      - PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac
+      - PDS_CRAWLERS=https://bsky.network
+      - LOG_ENABLED=${LOG_ENABLED:-true}
+      - PDS_EMAIL_SMTP_URL=${PDS_EMAIL_SMTP_URL:-smtp://localhost:8025}
+      - PDS_EMAIL_FROM_ADDRESS=${PDS_EMAIL_FROM_ADDRESS:-admin@example.com}
+      - PDS_PLC_ROTATION_KEY_K256_PRIVATE_KEY_HEX=${SERVICE_HEX_32_ROTATIONKEY}
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "http://127.0.0.1:3000/xrpc/_health"]
+      interval: 2s
+      timeout: 10s
+      retries: 10

templates/compose/budibase.yaml

@@ -9,11 +9,11 @@ services:
     image: budibase.docker.scarf.sh/budibase/apps
     environment:
       - SELF_HOSTED=1
-      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - COUCH_DB_URL=http://$SERVICE_USER_COUCHDB:$SERVICE_PASSWORD_COUCHDB@couchdb-service:5984
       - WORKER_URL=http://worker-service:4003
       - MINIO_URL=http://minio-service:9000
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ACCESS_KEY=$SERVICE_USER_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_MINIO
       - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
       - BUDIBASE_ENVIRONMENT=${BUDIBASE_ENVIRONMENT:-PRODUCTION}
       - PORT=4002
@@ -22,14 +22,14 @@ services:
       - LOG_LEVEL=info
       - ENABLE_ANALYTICS=${ENABLE_ANALYTICS:-true}
       - REDIS_URL=redis-service:6379
-      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
       - BB_ADMIN_USER_EMAIL=
       - BB_ADMIN_USER_PASSWORD=
     depends_on:
       - worker-service
       - redis-service
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://app-service:4002"]
+      test: ["CMD", "wget", "--spider", "-qO-", "http://localhost:4002/health"]
       interval: 15s
       timeout: 15s
       retries: 5
@@ -43,21 +43,21 @@ services:
       - CLUSTER_PORT=10000
       - API_ENCRYPTION_KEY=$SERVICE_BASE64_64_BUDIBASE
       - JWT_SECRET=$SERVICE_BASE64_64_BUDIBASE
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ACCESS_KEY=$SERVICE_USER_MINIO
+      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_MINIO
       - MINIO_URL=http://minio-service:9000
       - APPS_URL=http://app-service:4002
-      - COUCH_DB_USERNAME=$SERVICE_USER_BUDIBASE_COUCHDB
-      - COUCH_DB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
-      - COUCH_DB_URL=http://$SERVICE_USER_BUDIBASE_COUCHDB:$SERVICE_PASSWORD_BUDIBASE_COUCHDB@couchdb-service:5984
+      - COUCH_DB_USERNAME=$SERVICE_USER_COUCHDB
+      - COUCH_DB_PASSWORD=$SERVICE_PASSWORD_COUCHDB
+      - COUCH_DB_URL=http://$SERVICE_USER_COUCHDB:$SERVICE_PASSWORD_COUCHDB@couchdb-service:5984
       - INTERNAL_API_KEY=$SERVICE_BASE64_128_BUDIBASE
       - REDIS_URL=redis-service:6379
-      - REDIS_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_REDIS
+      - REDIS_PASSWORD=$SERVICE_PASSWORD_REDIS
     depends_on:
       - redis-service
       - minio-service
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://worker-service:4003"]
+      test: ["CMD", "wget", "--spider", "-qO-", "http://localhost:4003/health"]
       interval: 15s
       timeout: 15s
       retries: 5
@@ -68,8 +68,8 @@ services:
     volumes:
       - minio_data:/data
     environment:
-      - MINIO_ACCESS_KEY=$SERVICE_USER_BUDIBASE_MINIO
-      - MINIO_SECRET_KEY=$SERVICE_PASSWORD_BUDIBASE_MINIO
+      - MINIO_ROOT_USER=$SERVICE_USER_MINIO
+      - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
       - MINIO_BROWSER=off
     command: server /data --console-address ":9001"
     healthcheck:
@@ -105,8 +105,8 @@ services:
   couchdb-service:
     image: budibase/couchdb
     environment:
-      - COUCHDB_PASSWORD=$SERVICE_PASSWORD_BUDIBASE_COUCHDB
-      - COUCHDB_USER=$SERVICE_USER_BUDIBASE_COUCHDB
+      - COUCHDB_PASSWORD=$SERVICE_PASSWORD_COUCHDB
+      - COUCHDB_USER=$SERVICE_USER_COUCHDB
       - TARGETBUILD=docker-compose
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:5984/"]
@@ -119,12 +119,12 @@ services:
 
   redis-service:
     image: redis
-    command: redis-server --requirepass "$SERVICE_PASSWORD_BUDIBASE_REDIS"
+    command: redis-server --requirepass "$SERVICE_PASSWORD_REDIS"
     volumes:
       - redis_data:/data
     healthcheck:
       test:
-        ["CMD", "redis-cli", "-a", "$SERVICE_PASSWORD_BUDIBASE_REDIS", "ping"]
+        ["CMD", "redis-cli", "-a", "$SERVICE_PASSWORD_REDIS", "ping"]
       interval: 15s
       timeout: 15s
       retries: 5
@@ -138,13 +138,8 @@ services:
     command: --debug --http-api-update bbapps bbworker bbproxy
     environment:
       - WATCHTOWER_HTTP_API=true
-      - WATCHTOWER_HTTP_API_TOKEN=$SERVICE_PASSWORD_BUDIBASE_WATCHTOWER
+      - WATCHTOWER_HTTP_API_TOKEN=$SERVICE_PASSWORD_WATCHTOWER
       - WATCHTOWER_CLEANUP=true
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://watchtower-service:8080"]
-      interval: 15s
-      timeout: 15s
-      retries: 5
-      start_period: 10s
+    exclude_from_hc: true

templates/compose/coder.yaml

@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://coder.com/docs
 # slogan: Coder is an open-source platform for creating and managing cloud development environments on your infrastructure, with the tools and IDEs your developers already love.
 # tags: coder,development,environment,self-hosted,postgres

templates/compose/convertx.yml

@@ -0,0 +1,19 @@
+# documentation: https://github.com/C4illin/ConvertX
+# slogan: A self-hosted online file converter. Supports over a thousand different formats.
+# tags: converter,file,documents,files,directories
+# logo: svgs/convertx.png
+# port: 3000
+
+services:
+  convertx:
+    image: ghcr.io/c4illin/convertx:latest
+    environment:
+      - SERVICE_FQDN_CONVERTX
+      - ACCOUNT_REGISTRATION=${ACCOUNT_REGISTRATION:-false}
+      - HTTP_ALLOWED=${HTTP_ALLOWED:-true}
+      - ALLOW_UNAUTHENTICATED=${ALLOW_UNAUTHENTICATED:-false}
+      - AUTO_DELETE_EVERY_N_HOURS=${AUTO_DELETE_EVERY_N_HOURS:-24}
+      - JWT_SECRET=${SERVICE_PASSWORD_CONVERTXJWTSECRET}
+      # - WEBROOT=/convertx #use this if you want to use a subpath of your domain
+    volumes:
+      - convertx_data:/app/data

templates/compose/formbricks.yaml

@@ -12,10 +12,10 @@ services:
       - WEBAPP_URL=$SERVICE_FQDN_FORMBRICKS
       - DATABASE_URL=postgres://$SERVICE_USER_POSTGRESQL:$SERVICE_PASSWORD_POSTGRESQL@postgresql:5432/${POSTGRESQL_DATABASE:-formbricks}
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
-      - NEXTAUTH_SECRET=$SERVICE_BASE64_64_NEXTAUTH
+      - NEXTAUTH_SECRET=$SERVICE_BASE64_NEXTAUTH
       - NEXTAUTH_URL=$SERVICE_FQDN_FORMBRICKS
-      - ENCRYPTION_KEY=$SERVICE_BASE64_64_ENCRYPTION
-      - CRON_SECRET=$SERVICE_BASE64_64_CRON
+      - ENCRYPTION_KEY=$SERVICE_BASE64_ENCRYPTION
+      - CRON_SECRET=$SERVICE_BASE64_CRON
       - ENTERPRISE_LICENSE_KEY=${ENTERPRISE_LICENSE_KEY}
       - MAIL_FROM=${MAIL_FROM:-test@example.com}
       - SMTP_HOST=${SMTP_HOST:-test.example.com}
@@ -59,7 +59,7 @@ services:
       - REDIS_URL=${REDIS_URL}
       - REDIS_HTTP_URL=${REDIS_HTTP_URL}
       - DEFAULT_ORGANIZATION_ID=${DEFAULT_ORGANIZATION_ID}
-      - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-admin}
+      - DEFAULT_ORGANIZATION_ROLE=${DEFAULT_ORGANIZATION_ROLE:-owner}
     volumes:
       - formbricks-uploads:/apps/web/uploads/
     depends_on:
@@ -72,7 +72,7 @@ services:
       retries: 15
 
   postgresql:
-    image: postgres:16-alpine
+    image: pgvector/pgvector:pg16
     volumes:
       - formbricks-postgresql-data:/var/lib/postgresql/data
     environment:

templates/compose/macos.yaml

@@ -0,0 +1,25 @@
+# ignore: true
+# documentation: https://github.com/dockur/macos
+# slogan: Run macOS in a containerized environment.
+# tags: macos, virtualization, container, os
+# logo: svgs/macos.svg
+# port: 8006
+
+services:
+  macos:
+    image: dockurr/macos
+    volumes:
+      - macos-storage:/storage
+    environment:
+      - SERVICE_FQDN_MACOS_8006
+      - VERSION=15
+    devices:
+      - /dev/kvm:/dev/kvm
+    cap_add:
+      - NET_ADMIN
+    stop_grace_period: 2m
+    healthcheck:
+      test: ["CMD", "nc", "-z", "127.0.0.1", "8006"]
+      interval: 2s
+      timeout: 10s
+      retries: 10

templates/compose/maybe.yaml

@@ -0,0 +1,45 @@
+# documentation: https://github.com/maybe-finance/maybe
+# slogan: Maybe: The OS for your personal finances.
+# tags: finances,wallets,coins,stocks,investments,open,source
+# logo: svgs/maybe.svg
+# port: 3000
+
+services:
+  maybe:
+    image: ghcr.io/maybe-finance/maybe:latest
+    volumes:
+      - app_storage:/rails/storage
+    environment:
+      - SERVICE_FQDN_MAYBE
+      - SELF_HOSTED=true
+      - RAILS_FORCE_SSL=${RAILS_FORCE_SSL:-false}
+      - RAILS_ASSUME_SSL=${RAILS_ASSUME_SSL:-false}
+      - GOOD_JOB_EXECUTION_MODE=${GOOD_JOB_EXECUTION_MODE:-async}
+      - SECRET_KEY_BASE=${SERVICE_BASE64_64_SECRETKEYBASE}
+      - DB_HOST=postgres
+      - POSTGRES_DB=${POSTGRES_DB:-maybe_db}
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+    depends_on:
+      postgres:
+        condition: service_healthy
+    healthcheck:
+      test:
+        - CMD
+        - curl
+        - "-f"
+        - "http://localhost:3000"
+
+  postgres:
+    image: postgres:16
+    volumes:
+      - maybe_postgres_data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${SERVICE_USER_POSTGRES}
+      - POSTGRES_DB=${POSTGRES_DB:-maybe_db}
+      - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 20s
+      retries: 10

templates/compose/mealie.yaml

@@ -0,0 +1,24 @@
+# documentation: https://docs.mealie.io/
+# slogan: A recipe manager and meal planner.
+# tags: recipe manager, meal planner, cooking, food
+# logo: svgs/mealie.png
+# port: 9000
+
+services:
+  mealie:
+    image: 'ghcr.io/mealie-recipes/mealie:latest'
+    environment:
+      - SERVICE_FQDN_MEALIE_9000
+      - ALLOW_SIGNUP=${ALLOW_SIGNUP:-true}
+      - PUID=${PUID:-1000}
+      - PGID=${PGID:-1000}
+      - TZ=${TZ:-Europe/Berlin}
+      - MAX_WORKERS=${MAX_WORKERS:-1}
+      - WEB_CONCURRENCY=${WEB_CONCURRENCY:-1}
+    volumes:
+      - mealie_data:/app/data
+    healthcheck:
+      test: ["CMD-SHELL", "bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1"]
+      interval: 5s
+      timeout: 10s
+      retries: 5

templates/compose/next-image-transformation.yaml

@@ -1,6 +1,7 @@
 # documentation: https://github.com/coollabsio/next-image-transformation
 # slogan: Drop-in replacement for Vercel's Nextjs image optimization service.
 # tags: nextjs,image,transformation,service
+# logo: svgs/coolify.png
 # port: 3000
 
 services:

templates/compose/overseerr.yaml

@@ -0,0 +1,30 @@
+# documentation: https://docs.overseerr.dev/getting-started/installation#docker
+# slogan: Overseerr is a request management and media discovery tool built to work with your existing Plex ecosystem.
+# tags: media,request,plex,sonarr,radarr
+# logo: svgs/overseerr.svg
+# port: 5055
+
+services:
+  overseerr:
+    image: sctx/overseerr:latest
+    environment:
+      - SERVICE_FQDN_OVERSEERR_5055
+      - PUID=1000
+      - PGID=1000
+      - TZ=${TZ:-America/Toronto}
+    volumes:
+      - overseerr-config:/app/config
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "wget",
+          "--tries",
+          "1",
+          "--no-verbose",
+          "--spider",
+          "http://localhost:5055/api/v1/status",
+        ]
+      interval: 2s
+      timeout: 10s
+      retries: 15

templates/compose/postiz.yaml

@@ -13,45 +13,77 @@ services:
       - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
       - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ}/api
       - JWT_SECRET=${SERVICE_PASSWORD_JWTSECRET}
-      - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRESQL}:${SERVICE_PASSWORD_POSTGRESQL}@postgresql:5432/${POSTGRESQL_DATABASE:-postiz-db}
-      - REDIS_URL=redis://${SERVICE_USER_REDIS}:${SERVICE_PASSWORD_REDIS}@redis:6379
+      - DATABASE_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRESQL}@postgres:5432/${POSTGRESQL_DATABASE:-postiz-db}
+      - REDIS_URL=redis://default:${SERVICE_PASSWORD_REDIS}@redis:6379
       - BACKEND_INTERNAL_URL=http://localhost:3000
-      - IS_GENERAL=true
-      - STORAGE_PROVIDER=local
-      - UPLOAD_DIRECTORY=/uploads
-      - NEXT_PUBLIC_UPLOAD_DIRECTORY=/uploads
+      
+      # Cloudflare R2 Settings
+      - CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
+      - CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
+      - CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
+      - CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
+      - CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
+      - CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
+      
+      # Storage Settings
+      - STORAGE_PROVIDER=${STORAGE_PROVIDER:-local}
+      - UPLOAD_DIRECTORY=${UPLOAD_DIRECTORY:-/uploads}
+      - NEXT_PUBLIC_UPLOAD_DIRECTORY=${NEXT_PUBLIC_UPLOAD_DIRECTORY:-/uploads}
+      - NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY=${NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY}
+      
+      # Email Settings
+      - RESEND_API_KEY=${RESEND_API_KEY}
+      - EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
+      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
+      
+      # Social Media API Settings
       - X_API_KEY=${SERVICE_X_API}
       - X_API_SECRET=${SERVICE_X_SECRET}
+      - LINKEDIN_CLIENT_ID=${SERVICE_LINKEDIN_ID}
+      - LINKEDIN_CLIENT_SECRET=${SERVICE_LINKEDIN_SECRET}
       - REDDIT_CLIENT_ID=${SERVICE_REDDIT_API}
       - REDDIT_CLIENT_SECRET=${SERVICE_REDDIT_SECRET}
+      - GITHUB_CLIENT_ID=${SERVICE_GITHUB_ID}
+      - GITHUB_CLIENT_SECRET=${SERVICE_GITHUB_SECRET}
+      - THREADS_APP_ID=${SERVICE_THREADS_ID}
+      - THREADS_APP_SECRET=${SERVICE_THREADS_SECRET}
+      - FACEBOOK_APP_ID=${SERVICE_FACEBOOK_ID}
+      - FACEBOOK_APP_SECRET=${SERVICE_FACEBOOK_SECRET}
+      - YOUTUBE_CLIENT_ID=${SERVICE_YOUTUBE_ID}
+      - YOUTUBE_CLIENT_SECRET=${SERVICE_YOUTUBE_SECRET}
       - TIKTOK_CLIENT_ID=${SERVICE_TIKTOK_ID}
       - TIKTOK_CLIENT_SECRET=${SERVICE_TIKTOK_SECRET}
-      - SLACK_ID=${SERVICE_SLACK_ID}
-      - SLACK_SECRET=${SERVICE_SLACK_SECRET}
       - PINTEREST_CLIENT_ID=${SERVICE_PINTEREST_ID}
       - PINTEREST_CLIENT_SECRET=${SERVICE_PINTEREST_SECRET}
-      - DRIBBLE_CLIENT_ID=${SERVICE_DRIBBLE_ID}
-      - DRIBBLE_CLIENT_SECRET=${SERVICE_DRIBBLE_SECRET}
+      - DRIBBBLE_CLIENT_ID=${SERVICE_DRIBBLE_ID}
+      - DRIBBBLE_CLIENT_SECRET=${SERVICE_DRIBBLE_SECRET}
       - DISCORD_CLIENT_ID=${SERVICE_DISCORD_ID}
       - DISCORD_CLIENT_SECRET=${SERVICE_DISCORD_SECRET}
       - DISCORD_BOT_TOKEN_ID=${SERVICE_DISCORD_TOKEN}
-      - YOUTUBE_CLIENT_ID=${SERVICE_YOUTUBE_ID}
-      - YOUTUBE_CLIENT_SECRET=${SERVICE_YOUTUBE_SECRET}
+      - SLACK_ID=${SERVICE_SLACK_ID}
+      - SLACK_SECRET=${SERVICE_SLACK_SECRET}
+      - SLACK_SIGNING_SECRET=${SLACK_SIGNING_SECRET}
       - MASTODON_CLIENT_ID=${SERVICE_MASTODON_ID}
       - MASTODON_CLIENT_SECRET=${SERVICE_MASTODON_SECRET}
-      - LINKEDIN_CLIENT_ID=${SERVICE_LINKEDIN_ID}
-      - LINKEDIN_CLIENT_SECRET=${SERVICE_LINKEDIN_SECRET}
-      - INSTAGRAM_APP_ID=${SERVICE_INSTAGRAM_ID}
-      - INSTAGRAM_APP_SECRET=${SERVICE_INSTAGRAM_SECRET}
-      - FACEBOOK_APP_ID=${SERVICE_FACEBOOK_ID}
-      - FACEBOOK_APP_SECRET=${SERVICE_FACEBOOK_SECRET}
-      - THREADS_APP_ID=${SERVICE_THREADS_ID}
-      - THREADS_APP_SECRET=${SERVICE_THREADS_SECRET}
-      - GITHUB_CLIENT_ID=${SERVICE_GITHUB_ID}
-      - GITHUB_CLIENT_SECRET=${SERVICE_GITHUB_SECRET}
+      
+      # Integration APIs
       - BEEHIIVE_API_KEY=${SERVICE_BEEHIIVE_KEY}
       - BEEHIIVE_PUBLICATION_ID=${SERVICE_BEEHIIVE_PUBID}
       - OPENAI_API_KEY=${SERVICE_OPENAI_KEY}
+      
+      # Misc Settings
+      - NEXT_PUBLIC_DISCORD_SUPPORT=${NEXT_PUBLIC_DISCORD_SUPPORT}
+      - NEXT_PUBLIC_POLOTNO=${NEXT_PUBLIC_POLOTNO}
+      - IS_GENERAL=true
+      - NX_ADD_PLUGINS=${NX_ADD_PLUGINS:-false}
+      
+      # Payment Settings
+      - FEE_AMOUNT=${FEE_AMOUNT:-0.05}
+      - STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY}
+      - STRIPE_SECRET_KEY=${STRIPE_SECRET_KEY}
+      - STRIPE_SIGNING_KEY=${STRIPE_SIGNING_KEY}
+      - STRIPE_SIGNING_KEY_CONNECT=${STRIPE_SIGNING_KEY_CONNECT}
+
     volumes:
       - postiz_config:/config/
       - postiz_uploads:/uploads/
@@ -61,7 +93,9 @@ services:
       redis:
         condition: service_healthy
     healthcheck:
-      test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:5000/"]
+      test:
+        - CMD-SHELL
+        - wget -qO- http://127.0.0.1:5000/
       interval: 5s
       timeout: 20s
       retries: 10
@@ -71,27 +105,29 @@ services:
     volumes:
       - postiz_postgresql_data:/var/lib/postgresql/data
     environment:
-      - POSTGRES_USER=${SERVICE_USER_POSTGRESQL}
+      - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRESQL}
       - POSTGRES_DB=${POSTGRESQL_DATABASE:-postiz-db}
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB:-postiz-db}"]
       interval: 5s
       timeout: 20s
       retries: 10
 
   redis:
     image: redis:7.2
-    volumes:
-      - postiz_redis_data:/data
     environment:
       - REDIS_PASSWORD=${SERVICE_PASSWORD_REDIS}
-      - REDIS_USER=${SERVICE_USER_REDIS}
+    command: redis-server --requirepass ${SERVICE_PASSWORD_REDIS}
+    volumes:
+      - postiz_redis_data:/data
     healthcheck:
       test:
         - CMD
         - redis-cli
-        - PING
+        - -a
+        - ${SERVICE_PASSWORD_REDIS}
+        - ping
       interval: 5s
       timeout: 10s
       retries: 20