Merge pull request #1946 from coollabsio/next

v4.0.0-beta.252

.github/workflows/coolify-helper-next.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/coolify-helper.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/coolify-testing-host.yml

@@ -18,15 +18,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -40,15 +40,15 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Build image and push to registry
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           no-cache: true
           context: .
@@ -64,13 +64,13 @@ jobs:
     needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to ghcr.io
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

.github/workflows/docker-image.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache Docker layers
         uses: actions/cache@v2
         with:

CONTRIBUTION.md

@@ -30,5 +30,5 @@ Your horizon (Laravel scheduler): `localhost:8000/horizon` - Only reachable if y
 Mails are caught by Mailpit: `localhost:8025`
 
 ## New Service Contribution
-Check out the docs [here](https://coolify.io/docs/how-to-add-a-service).
+Check out the docs [here](https://coolify.io/docs/resources/services/add-service).
 

README.md

@@ -28,12 +28,12 @@ https://coolify.io/sponsorships
 
 Thank you so much!
 
-Special thanks to our biggest sponsors, [CCCareers](https://cccareers.org/) and [Appwrite](https://appwrite.io)!
+Special thanks to our biggest sponsor, [CCCareers](https://cccareers.org/)!
 
 <a href="https://cccareers.org/" target="_blank"><img src="./other/logos/ccc-logo.webp" alt="cccareers logo" width="200"/></a>
-<a href="https://appwrite.io" target="_blank"><img src="./other/logos/appwrite.svg" alt="appwrite logo" width="200"/></a>
 
 ## Github Sponsors ($40+)
+<a href="https://americancloud.com/?utm_source=coolify.io"><img src="https://github.com/American-Cloud.png" width="60px" alt="American Cloud"/></a>
 <a href="https://cryptojobslist.com/?utm_source=coolify.io"><img src="https://github.com/cryptojobslist.png" width="60px" alt="CryptoJobsList" /></a>
 <a href="https://typebot.io/?utm_source=coolify.io"><img src="https://pbs.twimg.com/profile_images/1509194008366657543/9I-C7uWT_400x400.jpg" width="60px" alt="typebot"/></a>
 <a href="https://bc.direct"><img width="60px" alt="BC Direct" src="https://github.com/coollabsio/coolify/assets/5845193/a4063c41-95ed-4a32-8814-cd1475572e37"/></a>

app/Actions/Proxy/CheckProxy.php

@@ -13,6 +13,9 @@ class CheckProxy
         if ($server->proxyType() === 'NONE') {
             return false;
         }
+        if (!$server->validateConnection()) {
+            throw new \Exception("Server Connection Error");
+        }
         if (!$server->isProxyShouldRun()) {
             if ($fromUI) {
                 throw new \Exception("Proxy should not run. You selected the Custom Proxy.");
@@ -35,6 +38,9 @@ class CheckProxy
                 $server->save();
                 return false;
             }
+            if ($server->settings->is_cloudflare_tunnel) {
+                return false;
+            }
             $ip = $server->ip;
             if ($server->id === 0) {
                 $ip = 'host.docker.internal';

app/Actions/Server/ConfigureCloudflared.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Actions\Server;
+
+use App\Models\Server;
+use Lorisleiva\Actions\Concerns\AsAction;
+use Symfony\Component\Yaml\Yaml;
+
+class ConfigureCloudflared
+{
+    use AsAction;
+    public function handle(Server $server, string $cloudflare_token)
+    {
+        try {
+            $config = [
+                "services" => [
+                    "coolify-cloudflared" => [
+                        "container_name" => "coolify-cloudflared",
+                        "image" => "cloudflare/cloudflared:latest",
+                        "restart" => RESTART_MODE,
+                        "network_mode" => "host",
+                        "command" => "tunnel run",
+                        "environment" => [
+                            "TUNNEL_TOKEN={$cloudflare_token}",
+                        ],
+                    ],
+                ],
+            ];
+            $config = Yaml::dump($config, 12, 2);
+            $docker_compose_yml_base64 = base64_encode($config);
+            $commands = collect([
+                "mkdir -p /tmp/cloudflared && cd /tmp/cloudflared",
+                "echo '$docker_compose_yml_base64' | base64 -d > docker-compose.yml",
+                "docker compose pull",
+                "docker compose down -v --remove-orphans > /dev/null 2>&1",
+                "docker compose up -d --remove-orphans",
+            ]);
+            instant_remote_process($commands, $server);
+        } catch (\Throwable $e) {
+            ray($e);
+            throw $e;
+        }
+    }
+}

app/Actions/Server/InstallDocker.php

@@ -13,7 +13,7 @@ class InstallDocker
     {
         $supported_os_type = $server->validateOS();
         if (!$supported_os_type) {
-            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/servers#install-docker-engine-manually">documentation</a>.');
+            throw new \Exception('Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://coolify.io/docs/installation#manually">documentation</a>.');
         }
         ray('Installing Docker on server: ' . $server->name . ' (' . $server->ip . ')' . ' with OS type: ' . $supported_os_type);
         $dockerVersion = '24.0';

app/Actions/Server/UpdateCoolify.php

@@ -12,10 +12,12 @@ class UpdateCoolify
     public ?Server $server = null;
     public ?string $latestVersion = null;
     public ?string $currentVersion = null;
+    public bool $async = false;
 
-    public function handle(bool $force)
+    public function handle(bool $force = false, bool $async = false)
     {
         try {
+            $this->async = $async;
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
             $this->server = Server::find(0);
@@ -43,7 +45,6 @@ class UpdateCoolify
                 }
                 $this->update();
             }
-            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
         } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());
@@ -56,17 +57,32 @@ class UpdateCoolify
     {
         if (isDev()) {
             ray("Running update on local docker container. Updating to $this->latestVersion");
-            remote_process([
+            if ($this->async) {
-                "sleep 10"
+                ray('Running async update');
-            ], $this->server);
+                remote_process([
+                    "sleep 10"
+                ], $this->server);
+            } else {
+                instant_remote_process([
+                    "sleep 10"
+                ], $this->server);
+            }
             ray('Update done');
             return;
         } else {
             ray('Running update on production server');
-            remote_process([
+            if ($this->async) {
-                "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
+                remote_process([
-                "bash /data/coolify/source/upgrade.sh $this->latestVersion"
+                    "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
-            ], $this->server);
+                    "bash /data/coolify/source/upgrade.sh $this->latestVersion"
+                ], $this->server);
+            } else {
+                instant_remote_process([
+                    "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
+                    "bash /data/coolify/source/upgrade.sh $this->latestVersion"
+                ], $this->server);
+            }
+            send_internal_notification("Instance updated from {$this->currentVersion} -> {$this->latestVersion}");
             return;
         }
     }

app/Console/Commands/Init.php

@@ -34,11 +34,13 @@ class Init extends Command
             $this->cleanup_stucked_helper_containers();
             $this->call('cleanup:queue');
             $this->call('cleanup:stucked-resources');
-            try {
+            if (!isCloud()) {
-                $server = Server::find(0)->first();
+                try {
-                $server->setupDynamicProxyConfiguration();
+                    $server = Server::find(0)->first();
-            } catch (\Throwable $e) {
+                    $server->setupDynamicProxyConfiguration();
-                echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                } catch (\Throwable $e) {
+                    echo "Could not setup dynamic configuration: {$e->getMessage()}\n";
+                }
             }
 
             $settings = InstanceSettings::get();

app/Http/Controllers/Api/Deploy.php

@@ -44,7 +44,7 @@ class Deploy extends Controller
         $force = $request->query->get('force') ?? false;
 
         if ($uuids && $tags) {
-            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
         if (is_null($teamId)) {
             return invalid_token();
@@ -54,7 +54,7 @@ class Deploy extends Controller
         } else if ($uuids) {
             return $this->by_uuids($uuids, $teamId, $force);
         }
-        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
     }
     private function by_uuids(string $uuid, int $teamId, bool $force = false)
     {
@@ -62,7 +62,7 @@ class Deploy extends Controller
         $uuids = collect(array_filter($uuids));
 
         if (count($uuids) === 0) {
-            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
         $deployments = collect();
         $payload = collect();
@@ -81,7 +81,7 @@ class Deploy extends Controller
             $payload->put('deployments', $deployments->toArray());
             return response()->json($payload->toArray(), 200);
         }
-        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 404);
     }
     public function by_tags(string $tags, int $team_id, bool $force = false)
     {
@@ -89,7 +89,7 @@ class Deploy extends Controller
         $tags = collect(array_filter($tags));
 
         if (count($tags) === 0) {
-            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 400);
         }
         $message = collect([]);
         $deployments = collect();
@@ -127,7 +127,7 @@ class Deploy extends Controller
             return response()->json($payload->toArray(), 200);
         }
 
-        return response()->json(['error' => "No resources found with this tag.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+        return response()->json(['error' => "No resources found with this tag.", 'docs' => 'https://coolify.io/docs/api-reference/deploy-webhook'], 404);
     }
     public function deploy_resource($resource, bool $force = false): array
     {

app/Http/Controllers/Api/Team.php

@@ -26,7 +26,7 @@ class Team extends Controller
         $teams = auth()->user()->teams;
         $team = $teams->where('id', $id)->first();
         if (is_null($team)) {
-            return response()->json(['error' => 'Team not found.',  "docs" => "https://coolify.io/docs/api/team-by-id"], 404);
+            return response()->json(['error' => 'Team not found.',  "docs" => "https://coolify.io/docs/api-reference/get-team-by-teamid"], 404);
         }
         return response()->json($team);
     }
@@ -40,7 +40,7 @@ class Team extends Controller
         $teams = auth()->user()->teams;
         $team = $teams->where('id', $id)->first();
         if (is_null($team)) {
-            return response()->json(['error' => 'Team not found.', "docs" => "https://coolify.io/docs/api/team-by-id-members"], 404);
+            return response()->json(['error' => 'Team not found.', "docs" => "https://coolify.io/docs/api-reference/get-team-by-teamid-members"], 404);
         }
         return response()->json($team->members);
     }

app/Http/Controllers/Webhook/Github.php

@@ -22,7 +22,6 @@ class Github extends Controller
     public function manual(Request $request)
     {
         try {
-            ray($request);
             $return_payloads = collect([]);
             $x_github_delivery = request()->header('X-GitHub-Delivery');
             if (app()->isDownForMaintenance()) {
@@ -68,6 +67,10 @@ class Github extends Controller
                 if (Str::isMatch('/refs\/heads\/*/', $branch)) {
                     $branch = Str::after($branch, 'refs/heads/');
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Manual Webhook GitHub Push Event with branch: ' . $branch);
             }
             if ($x_github_event === 'pull_request') {
@@ -118,24 +121,41 @@ class Github extends Controller
                 }
                 if ($x_github_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
-                        $deployment_uuid = new Cuid2(7);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
-                        queue_application_deployment(
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                            application: $application,
+                            $deployment_uuid = new Cuid2(7);
-                            deployment_uuid: $deployment_uuid,
+                            queue_application_deployment(
-                            force_rebuild: false,
+                                application: $application,
-                            is_webhook: true,
+                                deployment_uuid: $deployment_uuid,
-                        );
+                                force_rebuild: false,
-                        $return_payloads->push([
+                                is_webhook: true,
-                            'application' => $application->name,
+                            );
-                            'status' => 'success',
+                            $return_payloads->push([
-                            'message' => 'Deployment queued.',
+                                'status' => 'success',
-                        ]);
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                     }
                 }
@@ -266,6 +286,10 @@ class Github extends Controller
                 if (Str::isMatch('/refs\/heads\/*/', $branch)) {
                     $branch = Str::after($branch, 'refs/heads/');
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Webhook GitHub Push Event: ' . $id . ' with branch: ' . $branch);
             }
             if ($x_github_event === 'pull_request') {
@@ -298,32 +322,50 @@ class Github extends Controller
                 $isFunctional = $application->destination->server->isFunctional();
                 if (!$isFunctional) {
                     $return_payloads->push([
-                        'application' => $application->name,
                         'status' => 'failed',
                         'message' => 'Server is not functional.',
+                        'application_uuid' => $application->uuid,
+                        'application_name' => $application->name,
                     ]);
                     continue;
                 }
                 if ($x_github_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
-                        $deployment_uuid = new Cuid2(7);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
-                        queue_application_deployment(
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                            application: $application,
+                            $deployment_uuid = new Cuid2(7);
-                            deployment_uuid: $deployment_uuid,
+                            queue_application_deployment(
-                            force_rebuild: false,
+                                application: $application,
-                            is_webhook: true
+                                deployment_uuid: $deployment_uuid,
-                        );
+                                force_rebuild: false,
-                        $return_payloads->push([
+                                is_webhook: true,
-                            'application' => $application->name,
+                            );
-                            'status' => 'success',
+                            $return_payloads->push([
-                            'message' => 'Deployment queued.',
+                                'status' => 'success',
-                        ]);
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled.',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                     }
                 }

app/Http/Controllers/Webhook/Gitlab.php

@@ -51,6 +51,10 @@ class Gitlab extends Controller
                     ]);
                     return response($return_payloads);
                 }
+                $added_files = data_get($payload, 'commits.*.added');
+                $removed_files = data_get($payload, 'commits.*.removed');
+                $modified_files = data_get($payload, 'commits.*.modified');
+                $changed_files = collect($added_files)->concat($removed_files)->concat($modified_files)->unique()->flatten();
                 ray('Manual Webhook GitLab Push Event with branch: ' . $branch);
             }
             if ($x_gitlab_event === 'merge_request') {
@@ -113,19 +117,41 @@ class Gitlab extends Controller
                 }
                 if ($x_gitlab_event === 'push') {
                     if ($application->isDeployable()) {
-                        ray('Deploying ' . $application->name . ' with branch ' . $branch);
+                        $is_watch_path_triggered = $application->isWatchPathsTriggered($changed_files);
-                        $deployment_uuid = new Cuid2(7);
+                        if ($is_watch_path_triggered || is_null($application->watch_paths)) {
-                        queue_application_deployment(
+                            ray('Deploying ' . $application->name . ' with branch ' . $branch);
-                            application: $application,
+                            $deployment_uuid = new Cuid2(7);
-                            deployment_uuid: $deployment_uuid,
+                            queue_application_deployment(
-                            force_rebuild: false,
+                                application: $application,
-                            is_webhook: true
+                                deployment_uuid: $deployment_uuid,
-                        );
+                                force_rebuild: false,
+                                is_webhook: true,
+                            );
+                            $return_payloads->push([
+                                'status' => 'success',
+                                'message' => 'Deployment queued.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                            ]);
+                        } else {
+                            $paths = str($application->watch_paths)->explode("\n");
+                            $return_payloads->push([
+                                'status' => 'failed',
+                                'message' => 'Changed files do not match watch paths. Ignoring deployment.',
+                                'application_uuid' => $application->uuid,
+                                'application_name' => $application->name,
+                                'details' => [
+                                    'changed_files' => $changed_files,
+                                    'watch_paths' => $paths,
+                                ],
+                            ]);
+                        }
                     } else {
                         $return_payloads->push([
-                            'application' => $application->name,
                             'status' => 'failed',
                             'message' => 'Deployments disabled',
+                            'application_uuid' => $application->uuid,
+                            'application_name' => $application->name,
                         ]);
                         ray('Deployments disabled for ' . $application->name);
                     }

app/Jobs/ApplicationDeploymentJob.php

@@ -179,6 +179,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
+        if (!$this->server->isFunctional()) {
+            $this->application_deployment_queue->addLogEntry("Server is not functional.");
+            $this->fail("Server is not functional.");
+            return;
+        }
         try {
             // Generate custom host<->ip mapping
             $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
@@ -234,7 +239,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->build_server = $this->server;
                 $this->original_server = $this->server;
             }
-            if ($this->restart_only && $this->application->build_pack !== 'dockerimage') {
+            if ($this->restart_only && $this->application->build_pack !== 'dockerimage' && $this->application->build_pack !== 'dockerfile') {
                 $this->just_restart();
                 if ($this->server->isProxyShouldRun()) {
                     dispatch(new ContainerStatusJob($this->server));
@@ -326,17 +331,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             ],
         );
         $this->generate_image_names();
-        if (!$this->force_rebuild) {
+
-            $this->check_image_locally_or_remotely();
+        // Always rebuild dockerfile based container.
-            if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
+        // if (!$this->force_rebuild) {
-                $this->create_workdir();
+        //     $this->check_image_locally_or_remotely();
-                $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
+        //     if (str($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) {
-                $this->generate_compose_file();
+        //         $this->create_workdir();
-                $this->push_to_docker_registry();
+        //         $this->application_deployment_queue->addLogEntry("No configuration changed & image found ({$this->production_image_name}) with the same Git Commit SHA. Build step skipped.");
-                $this->rolling_update();
+        //         $this->generate_compose_file();
-                return;
+        //         $this->push_to_docker_registry();
-            }
+        //         $this->rolling_update();
-        }
+        //         return;
+        //     }
+        // }
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
@@ -644,21 +651,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         if ($this->application->dockerfile) {
             if ($this->application->docker_registry_image_name) {
-                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:build");
+                $this->build_image_name = "{$this->application->docker_registry_image_name}:build";
-                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:latest");
+                $this->production_image_name = "{$this->application->docker_registry_image_name}:latest";
             } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:build");
+                $this->build_image_name = "{$this->application->uuid}:build";
-                $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+                $this->production_image_name = "{$this->application->uuid}:latest";
             }
         } else if ($this->application->build_pack === 'dockerimage') {
-            $this->production_image_name = Str::lower("{$this->dockerImage}:{$this->dockerImageTag}");
+            $this->production_image_name = "{$this->dockerImage}:{$this->dockerImageTag}";
         } else if ($this->pull_request_id !== 0) {
             if ($this->application->docker_registry_image_name) {
-                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}-build");
+                $this->build_image_name = "{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}-build";
-                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}");
+                $this->production_image_name = "{$this->application->docker_registry_image_name}:pr-{$this->pull_request_id}";
             } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
+                $this->build_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}-build";
-                $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
+                $this->production_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}";
             }
         } else {
             $this->dockerImageTag = str($this->commit)->substr(0, 128);
@@ -666,11 +673,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->dockerImageTag = $this->application->docker_registry_image_tag;
             }
             if ($this->application->docker_registry_image_name) {
-                $this->build_image_name = Str::lower("{$this->application->docker_registry_image_name}:{$this->dockerImageTag}-build");
+                $this->build_image_name = "{$this->application->docker_registry_image_name}:{$this->dockerImageTag}-build";
-                $this->production_image_name = Str::lower("{$this->application->docker_registry_image_name}:{$this->dockerImageTag}");
+                $this->production_image_name = "{$this->application->docker_registry_image_name}:{$this->dockerImageTag}";
             } else {
-                $this->build_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}-build");
+                $this->build_image_name = "{$this->application->uuid}:{$this->dockerImageTag}-build";
-                $this->production_image_name = Str::lower("{$this->application->uuid}:{$this->dockerImageTag}");
+                $this->production_image_name = "{$this->application->uuid}:{$this->dockerImageTag}";
             }
         }
     }
@@ -737,7 +744,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             $nixpacks_php_root_dir = $this->application->environment_variables_preview->where('key', 'NIXPACKS_PHP_ROOT_DIR')->first();
         }
         if ($nixpacks_php_fallback_path?->value === '/index.php' && $nixpacks_php_root_dir?->value === '/app/public' && $this->newVersionIsHealthy === false) {
-            $this->application_deployment_queue->addLogEntry("There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/frameworks/laravel#requirements", 'stderr');
+            $this->application_deployment_queue->addLogEntry("There was a change in how Laravel is deployed. Please update your environment variables to match the new deployment method. More details here: https://coolify.io/docs/resources/laravel", 'stderr');
         }
     }
     private function rolling_update()
@@ -999,11 +1006,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         return $commands;
     }
 
-    private function set_git_import_settings($git_clone_command)
-    {
-        return $this->application->setGitImportSettings($this->deployment_uuid, $git_clone_command);
-    }
-
     private function cleanup_git()
     {
         $this->execute_remote_command(
@@ -1812,7 +1814,6 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
 
     public function failed(Throwable $exception): void
     {
-
         $this->next(ApplicationDeploymentStatus::FAILED->value);
         $this->application_deployment_queue->addLogEntry("Oops something is not okay, are you okay? 😢", 'stderr');
         if (str($exception->getMessage())->isNotEmpty()) {

app/Jobs/ContainerStatusJob.php

@@ -170,16 +170,13 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                                         })->first();
                                         if (!$foundTcpProxy) {
                                             StartDatabaseProxy::run($service_db);
-                                            $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
+                                            // $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$service_db->service->name}", $this->server));
                                         }
                                     }
                                 }
                             }
                         } else {
                             $database = $databases->where('uuid', $uuid)->first();
-                            if ($uuid == 'postgresql') {
-                                ray($database);
-                            }
                             if ($database) {
                                 $isPublic = data_get($database, 'is_public');
                                 $foundDatabases[] = $database->id;
@@ -187,7 +184,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                                 if ($statusFromDb !== $containerStatus) {
                                     $database->update(['status' => $containerStatus]);
                                 }
-                                ray($database);
                                 if ($isPublic) {
                                     $foundTcpProxy = $containers->filter(function ($value, $key) use ($uuid) {
                                         if ($this->server->isSwarm()) {
@@ -197,7 +193,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                                         }
                                     })->first();
                                     if (!$foundTcpProxy) {
-                                        ray('asdffff');
                                         StartDatabaseProxy::run($database);
                                         $this->server->team?->notify(new ContainerRestarted("TCP Proxy for {$database->name}", $this->server));
                                     }

app/Jobs/InstanceAutoUpdateJob.php

@@ -23,6 +23,6 @@ class InstanceAutoUpdateJob implements ShouldQueue, ShouldBeUnique, ShouldBeEncr
 
     public function handle(): void
     {
-        UpdateCoolify::run($this->force);
+        UpdateCoolify::run(force: $this->force, async: false);
     }
 }

app/Livewire/Admin/Index.php

@@ -8,7 +8,31 @@ use Livewire\Component;
 
 class Index extends Component
 {
-    public $users = [];
+    public $active_subscribers = [];
+    public $inactive_subscribers = [];
+    public $search = '';
+    public function submitSearch() {
+        if ($this->search !== "") {
+            $this->inactive_subscribers = User::whereDoesntHave('teams', function ($query) {
+                $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+            })->where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== 0;
+            });
+            $this->active_subscribers = User::whereHas('teams', function ($query) {
+                $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+            })->where(function ($query) {
+                $query->where('name', 'like', "%{$this->search}%")
+                    ->orWhere('email', 'like', "%{$this->search}%");
+            })->get()->filter(function ($user) {
+                return $user->id !== 0;
+            });
+        } else {
+            $this->getSubscribers();
+        }
+    }
     public function mount()
     {
         if (!isCloud()) {
@@ -17,7 +41,15 @@ class Index extends Component
         if (auth()->user()->id !== 0) {
             return redirect()->route('dashboard');
         }
-        $this->users = User::whereHas('teams', function ($query) {
+        $this->getSubscribers();
+    }
+    public function getSubscribers() {
+        $this->inactive_subscribers = User::whereDoesntHave('teams', function ($query) {
+            $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
+        })->get()->filter(function ($user) {
+            return $user->id !== 0;
+        });
+        $this->active_subscribers = User::whereHas('teams', function ($query) {
             $query->whereRelation('subscription', 'stripe_subscription_id', '!=', null);
         })->get()->filter(function ($user) {
             return $user->id !== 0;

app/Livewire/Project/Application/General.php

@@ -73,6 +73,7 @@ class General extends Component
         'application.settings.is_static' => 'boolean|required',
         'application.settings.is_raw_compose_deployment_enabled' => 'boolean|required',
         'application.settings.is_build_server_enabled' => 'boolean|required',
+        'application.watch_paths' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
@@ -108,6 +109,7 @@ class General extends Component
         'application.settings.is_static' => 'Is static',
         'application.settings.is_raw_compose_deployment_enabled' => 'Is raw compose deployment enabled',
         'application.settings.is_build_server_enabled' => 'Is build server enabled',
+        'application.watch_paths' => 'Watch paths',
     ];
     public function mount()
     {
@@ -161,18 +163,16 @@ class General extends Component
     }
     public function generateDomain(string $serviceName)
     {
-        $domain = $this->parsedServiceDomains[$serviceName]['domain'] ?? null;
+        $uuid = new Cuid2(7);
-        if (!$domain) {
+        $domain = generateFqdn($this->application->destination->server, $uuid);
-            $uuid = new Cuid2(7);
+        $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
-            $domain = generateFqdn($this->application->destination->server, $uuid);
+        $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
-            $this->parsedServiceDomains[$serviceName]['domain'] = $domain;
+        $this->application->save();
-            $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
+        $this->dispatch('success', 'Domain generated.');
-            $this->application->save();
-        }
         return $domain;
     }
-    public function updatedApplicationBaseDirectory() {
+    public function updatedApplicationBaseDirectory()
-        raY('asdf');
+    {
         if ($this->application->build_pack === 'dockercompose') {
             $this->loadComposeFile();
         }
@@ -204,30 +204,47 @@ class General extends Component
             $fqdn = generateFqdn($server, $this->application->uuid);
             $this->application->fqdn = $fqdn;
             $this->application->save();
-            $this->updatedApplicationFqdn();
+            $this->dispatch('success', 'Wildcard domain generated.');
         }
     }
-    public function resetDefaultLabels($showToaster = true)
+    public function resetDefaultLabels()
     {
         $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
         $this->ports_exposes = $this->application->ports_exposes;
-        $this->submit($showToaster);
+
+        $this->application->custom_labels = base64_encode($this->customLabels);
+        $this->application->save();
     }
 
-    public function updatedApplicationFqdn()
+    public function checkFqdns($showToaster = true)
     {
-        $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+        if (data_get($this->application, 'fqdn')) {
-        $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
+            $domains = str($this->application->fqdn)->trim()->explode(',');
-        $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+            if ($this->application->additional_servers->count() === 0) {
-            return str($domain)->trim()->lower();
+                foreach ($domains as $domain) {
-        });
+                    if (!validate_dns_entry($domain, $this->application->destination->server)) {
-        $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+                        $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
-        $this->application->save();
+                    }
-        $this->resetDefaultLabels(false);
+                }
+            }
+            check_domain_usage(resource: $this->application);
+            $this->application->fqdn = $domains->implode(',');
+        }
     }
     public function submit($showToaster = true)
     {
         try {
+            $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+            $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
+            $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                return str($domain)->trim()->lower();
+            });
+            $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+
+            $this->checkFqdns();
+
+            $this->application->save();
+
             if (!$this->customLabels && $this->application->destination->server->proxyType() !== 'NONE') {
                 $this->customLabels = str(implode("|", generateLabelsApplication($this->application)))->replace("|", "\n");
                 $this->application->custom_labels = base64_encode($this->customLabels);
@@ -239,25 +256,14 @@ class General extends Component
             }
             $this->validate();
             if ($this->ports_exposes !== $this->application->ports_exposes) {
-                $this->resetDefaultLabels(false);
+                $this->resetDefaultLabels();
             }
             if (data_get($this->application, 'build_pack') === 'dockerimage') {
                 $this->validate([
                     'application.docker_registry_image_name' => 'required',
                 ]);
             }
-            if (data_get($this->application, 'fqdn')) {
+
-                $domains = str($this->application->fqdn)->trim()->explode(',');
-                if ($this->application->additional_servers->count() === 0) {
-                    foreach ($domains as $domain) {
-                        if (!validate_dns_entry($domain, $this->application->destination->server)) {
-                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='dark:text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
-                        }
-                    }
-                }
-                check_fqdn_usage($this->application);
-                $this->application->fqdn = $domains->implode(',');
-            }
             if (data_get($this->application, 'custom_docker_run_options')) {
                 $this->application->custom_docker_run_options = str($this->application->custom_docker_run_options)->trim();
             }
@@ -275,6 +281,15 @@ class General extends Component
             }
             if ($this->application->build_pack === 'dockercompose') {
                 $this->application->docker_compose_domains = json_encode($this->parsedServiceDomains);
+                foreach ($this->parsedServiceDomains as $serviceName => $service) {
+                    $domain = data_get($service, 'domain');
+                    if ($domain) {
+                        if (!validate_dns_entry($domain, $this->application->destination->server)) {
+                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
+                        }
+                        check_domain_usage(resource: $this->application);
+                    }
+                }
                 if ($this->application->settings->is_raw_compose_deployment_enabled) {
                     $this->application->parseRawCompose();
                 } else {

app/Livewire/Project/Application/Heading.php

@@ -56,11 +56,11 @@ class Heading extends Component
             return;
         }
         if (data_get($this->application, 'settings.is_build_server_enabled') && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/build-server">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'To use a build server, you must first set a Docker image.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/build-server">documentation</a>');
             return;
         }
         if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();
@@ -99,7 +99,7 @@ class Heading extends Component
     public function restart()
     {
         if ($this->application->additional_servers->count() > 0 && str($this->application->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $this->setDeploymentUuid();

app/Livewire/Project/New/GithubPrivateRepository.php

@@ -7,14 +7,12 @@ use App\Models\GithubApp;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
-use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Route;
 use Livewire\Component;
 
 class GithubPrivateRepository extends Component
 {
-    use SaveFromRedirect;
     public $current_step = 'github_apps';
     public $github_apps;
     public GithubApp $github_app;

app/Livewire/Project/New/Select.php

@@ -49,7 +49,6 @@ class Select extends Component
     }
     public function render()
     {
-        $this->loadServices();
         return view('livewire.project.new.select');
     }
 
@@ -71,9 +70,14 @@ class Select extends Component
     //     }
     // }
 
+    public function updatedSearch()
+    {
+        $this->loadServices();
+    }
     public function loadServices(bool $force = false)
     {
         try {
+            $this->loadingServices = true;
             if (count($this->allServices) > 0 && !$force) {
                 if (!$this->search) {
                     $this->services = $this->allServices;

app/Livewire/Project/Service/Index.php

@@ -10,7 +10,7 @@ use Livewire\Component;
 
 class Index extends Component
 {
-    public Service $service;
+    public ?Service $service = null;
     public ?ServiceApplication $serviceApplication = null;
     public ?ServiceDatabase $serviceDatabase = null;
     public array $parameters;
@@ -26,7 +26,10 @@ class Index extends Component
             $this->services = collect([]);
             $this->parameters = get_route_parameters();
             $this->query = request()->query();
-            $this->service = Service::whereUuid($this->parameters['service_uuid'])->firstOrFail();
+            $this->service = Service::whereUuid($this->parameters['service_uuid'])->first();
+            if (!$this->service) {
+                return redirect()->route('dashboard');
+            }
             $service = $this->service->applications()->whereUuid($this->parameters['stack_service_uuid'])->first();
             if ($service) {
                 $this->serviceApplication = $service;

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -24,6 +24,16 @@ class ServiceApplicationView extends Component
     {
         return view('livewire.project.service.service-application-view');
     }
+    public function updatedApplicationFqdn()
+    {
+        $this->application->fqdn = str($this->application->fqdn)->replaceEnd(',', '')->trim();
+        $this->application->fqdn = str($this->application->fqdn)->replaceStart(',', '')->trim();
+        $this->application->fqdn = str($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+            return str($domain)->trim()->lower();
+        });
+        $this->application->fqdn = $this->application->fqdn->unique()->implode(',');
+        $this->application->save();
+    }
     public function instantSave()
     {
         $this->submit();
@@ -55,11 +65,15 @@ class ServiceApplicationView extends Component
     public function submit()
     {
         try {
-            check_fqdn_usage($this->application);
+            check_domain_usage(resource: $this->application);
             $this->validate();
             $this->application->save();
             updateCompose($this->application);
-            $this->dispatch('success', 'Service saved.');
+            if (str($this->application->fqdn)->contains(',')) {
+                $this->dispatch('warning', 'Some services do not support multiple domains, which can lead to problems and is NOT RECOMMENDED.<br><br>Only use multiple domains if you know what you are doing.');
+            } else {
+                $this->dispatch('success', 'Service saved.');
+            }
         } catch (\Throwable $e) {
             return handleError($e, $this);
         } finally {

app/Livewire/Project/Shared/Destination.php

@@ -56,7 +56,7 @@ class Destination extends Component
     public function redeploy(int $network_id, int $server_id)
     {
         if ($this->resource->additional_servers->count() > 0 && str($this->resource->docker_registry_image_name)->isEmpty()) {
-            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/server/multiple-servers">documentation</a>');
+            $this->dispatch('error', 'Failed to deploy.', 'Before deploying to multiple servers, you must first set a Docker image in the General tab.<br>More information here: <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/multiple-servers">documentation</a>');
             return;
         }
         $deployment_uuid = new Cuid2(7);

app/Livewire/Security/PrivateKey/Create.php

@@ -26,7 +26,7 @@ class Create extends Component
         'value' => 'private Key',
     ];
 
-    public function generateNewKey()
+    public function generateNewRSAKey()
     {
         try {
             $this->rateLimit(10);
@@ -37,6 +37,17 @@ class Create extends Component
             return handleError($e, $this);
         }
     }
+    public function generateNewEDKey()
+    {
+        try {
+            $this->rateLimit(10);
+            $this->name = generate_random_name();
+            $this->description = 'Created by Coolify';
+            ['private' => $this->value, 'public' => $this->publicKey] = generateSSHKey('ed25519');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
     public function updated($updateProperty)
     {
         if ($updateProperty === 'value') {

app/Livewire/Security/PrivateKey/Show.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class Show extends Component
 {
     public PrivateKey $private_key;
-    public $public_key;
+    public $public_key = "Loading...";
     protected $rules = [
         'private_key.name' => 'required|string',
         'private_key.description' => 'nullable|string',
@@ -25,11 +25,13 @@ class Show extends Component
     {
         try {
             $this->private_key = PrivateKey::ownedByCurrentTeam(['name', 'description', 'private_key', 'is_git_related'])->whereUuid(request()->private_key_uuid)->firstOrFail();
-            $this->public_key = $this->private_key->publicKey();
         }catch(\Throwable $e) {
             return handleError($e, $this);
         }
     }
+    public function loadPublicKey() {
+        $this->public_key = $this->private_key->publicKey();
+    }
     public function delete()
     {
         try {

app/Livewire/Server/ConfigureCloudflareTunnels.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Actions\Server\ConfigureCloudflared;
+use App\Models\Server;
+use Livewire\Component;
+
+class ConfigureCloudflareTunnels extends Component
+{
+    public $server_id;
+    public string $cloudflare_token;
+    public string $ssh_domain;
+    public function alreadyConfigured()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function submit()
+    {
+        try {
+            $server = Server::ownedByCurrentTeam()->where('id', $this->server_id)->firstOrFail();
+            ConfigureCloudflared::run($server, $this->cloudflare_token);
+            $server->settings->is_cloudflare_tunnel = true;
+            $server->ip = $this->ssh_domain;
+            $server->save();
+            $server->settings->save();
+            $this->dispatch('success', 'Cloudflare Tunnels configured successfully.');
+            $this->dispatch('serverInstalled');
+        } catch(\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.configure-cloudflare-tunnels');
+    }
+}

app/Livewire/Server/Form.php

@@ -82,7 +82,7 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
+            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.');
             return;
         }
     }

app/Livewire/Server/Resources.php

@@ -42,7 +42,11 @@ class Resources extends Component
         $this->dispatch('success', 'Resource statuses refreshed.');
     }
     public function loadUnmanagedContainers() {
-        $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
+        try {
+            $this->unmanagedContainers = $this->server->loadUnmanagedContainers();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
     }
     public function mount() {
         $this->unmanagedContainers = collect();

app/Livewire/Server/ShowPrivateKey.php

@@ -39,7 +39,7 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh#openssh">documentation</a> for further help.');
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.');
                 return;
             }
         } catch (\Throwable $e) {

app/Livewire/Server/ValidateAndInstall.php

@@ -75,7 +75,7 @@ class ValidateAndInstall extends Component
     {
         $this->uptime = $this->server->validateConnection();
         if (!$this->uptime) {
-            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.';
+            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.';
             return;
         }
         $this->dispatch('validateOS');

app/Livewire/Settings/Configuration.php

@@ -59,23 +59,37 @@ class Configuration extends Component
 
     public function submit()
     {
-        $this->resetErrorBag();
+        try {
-        if ($this->settings->public_port_min > $this->settings->public_port_max) {
+            $error_show = false;
-            $this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
+            $this->server = Server::findOrFail(0);
-            return;
+            $this->resetErrorBag();
+            if ($this->settings->public_port_min > $this->settings->public_port_max) {
+                $this->addError('settings.public_port_min', 'The minimum port must be lower than the maximum port.');
+                return;
+            }
+            $this->validate();
+
+            if ($this->settings->is_dns_validation_enabled) {
+                if (!validate_dns_entry($this->settings->fqdn, $this->server)) {
+                    $this->dispatch('error',  "Validating DNS ({$this->settings->fqdn}) failed.<br><br>Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/dns-configuration'>documentation</a> for further help.");
+                    $error_show = true;
+                }
+            }
+            check_domain_usage(domain: $this->settings->fqdn);
+            $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
+            $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
+                return str($dns)->trim()->lower();
+            });
+            $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
+            $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
+
+            $this->settings->save();
+            $this->server->setupDynamicProxyConfiguration();
+            if (!$error_show) {
+                $this->dispatch('success', 'Instance settings updated successfully!');
+            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
         }
-        $this->validate();
-
-        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->replaceEnd(',', '')->trim();
-        $this->settings->custom_dns_servers = str($this->settings->custom_dns_servers)->trim()->explode(',')->map(function ($dns) {
-            return str($dns)->trim()->lower();
-        });
-        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->unique();
-        $this->settings->custom_dns_servers = $this->settings->custom_dns_servers->implode(',');
-
-        $this->settings->save();
-        $this->server = Server::findOrFail(0);
-        $this->server->setupDynamicProxyConfiguration();
-        $this->dispatch('success', 'Instance settings updated successfully!');
     }
 }

app/Livewire/Settings/Email.php

@@ -58,6 +58,8 @@ class Email extends Component
         try {
             $this->resetErrorBag();
             $this->validate([
+                'settings.smtp_from_address' => 'required|email',
+                'settings.smtp_from_name' => 'required',
                 'settings.resend_api_key' => 'required'
             ]);
             $this->settings->save();
@@ -90,6 +92,8 @@ class Email extends Component
         try {
             $this->resetErrorBag();
             $this->validate([
+                'settings.smtp_from_address' => 'required|email',
+                'settings.smtp_from_name' => 'required',
                 'settings.smtp_host' => 'required',
                 'settings.smtp_port' => 'required|numeric',
                 'settings.smtp_encryption' => 'nullable',

app/Livewire/Subscription/Index.php

@@ -15,7 +15,10 @@ class Index extends Component
         if (!isCloud()) {
             return redirect(RouteServiceProvider::HOME);
         }
-        if (data_get(currentTeam(), 'subscription')) {
+        if (auth()->user()?->isMember()) {
+            return redirect()->route('dashboard');
+        }
+        if (data_get(currentTeam(), 'subscription') && isSubscriptionActive()) {
             return redirect()->route('subscription.show');
         }
         $this->settings = InstanceSettings::get();

app/Livewire/Subscription/Show.php

@@ -11,6 +11,9 @@ class Show extends Component
         if (!isCloud()) {
             return redirect()->route('dashboard');
         }
+        if (auth()->user()?->isMember()) {
+            return redirect()->route('dashboard');
+        }
         if (!data_get(currentTeam(), 'subscription')) {
             return redirect()->route('subscription.index');
         }

app/Livewire/Upgrade.php

@@ -32,13 +32,13 @@ class Upgrade extends Component
     public function upgrade()
     {
         try {
-            $this->rateLimit(1, 30);
             if ($this->showProgress) {
                 return;
             }
+            $this->rateLimit(1, 30);
             $this->showProgress = true;
-            UpdateCoolify::run(true);
+            UpdateCoolify::run(force: true, async: true);
-            $this->dispatch('success', "Upgrading to {$this->latestVersion} version...");
+            $this->dispatch('success', "Updating Coolify to {$this->latestVersion} version...");
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Models/Application.php

@@ -6,6 +6,7 @@ use App\Enums\ApplicationDeploymentStatus;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Collection;
 use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
 use RuntimeException;
@@ -501,9 +502,9 @@ class Application extends BaseModel
     {
         $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command  . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->dockerfile . $this->dockerfile_location . $this->custom_labels;
         if ($this->pull_request_id === 0 || $this->pull_request_id === null) {
-            $newConfigHash .= json_encode($this->environment_variables());
+            $newConfigHash .= json_encode($this->environment_variables()->get('updated_at'));
         } else {
-            $newConfigHash .= json_encode($this->environment_variables_preview->all());
+            $newConfigHash .= json_encode($this->environment_variables_preview->get('updated_at'));
         }
         $newConfigHash = md5($newConfigHash);
         $oldConfigHash = data_get($this, 'config_hash');
@@ -597,21 +598,30 @@ class Application extends BaseModel
                 } else {
                     $github_access_token = generate_github_installation_token($this->source);
                     if ($exec_in_docker) {
-                        $commands->push(executeInDocker($deployment_uuid, "{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git {$baseDir}"));
+                        $git_clone_command = "{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git {$baseDir}";
                         $fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}.git";
                     } else {
-                        $commands->push("{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository} {$baseDir}");
+                        $git_clone_command = "{$git_clone_command} $source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository} {$baseDir}";
                         $fullRepoUrl = "$source_html_url_scheme://x-access-token:$github_access_token@$source_html_url_host/{$customRepository}";
                     }
+                    $git_clone_command = $this->setGitImportSettings($deployment_uuid, $git_clone_command, public: false);
+                    if ($exec_in_docker) {
+                        $commands->push(executeInDocker($deployment_uuid, $git_clone_command));
+                    } else {
+                        $commands->push($git_clone_command);
+                    }
                 }
                 if ($pull_request_id !== 0) {
                     $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
+
+                    $git_checkout_command = $this->buildGitCheckoutCommand($pr_branch_name);
                     if ($exec_in_docker) {
-                        $commands->push(executeInDocker($deployment_uuid, "cd {$baseDir} && git fetch origin {$branch} && git checkout $pr_branch_name"));
+                        $commands->push(executeInDocker($deployment_uuid, "cd {$baseDir} && git fetch origin {$branch} && $git_checkout_command"));
                     } else {
-                        $commands->push("cd {$baseDir} && git fetch origin {$branch} && git checkout $pr_branch_name");
+                        $commands->push("cd {$baseDir} && git fetch origin {$branch} && $git_checkout_command");
                     }
                 }
+                ray($commands);
                 return [
                     'commands' => $commands->implode(' && '),
                     'branch' => $branch,
@@ -653,7 +663,7 @@ class Application extends BaseModel
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && " . $this->buildGitCheckoutCommand($pr_branch_name);
                 } else if ($git_type === 'github') {
                     $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
                     if ($exec_in_docker) {
@@ -661,14 +671,14 @@ class Application extends BaseModel
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && " . $this->buildGitCheckoutCommand($pr_branch_name);
                 } else if ($git_type === 'bitbucket') {
                     if ($exec_in_docker) {
                         $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git checkout $commit";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" " . $this->buildGitCheckoutCommand($commit);
                 }
             }
 
@@ -696,7 +706,7 @@ class Application extends BaseModel
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && " . $this->buildGitCheckoutCommand($pr_branch_name);
                 } else if ($git_type === 'github') {
                     $branch = "pull/{$pull_request_id}/head:$pr_branch_name";
                     if ($exec_in_docker) {
@@ -704,14 +714,14 @@ class Application extends BaseModel
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && git checkout $pr_branch_name";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git fetch origin $branch && " . $this->buildGitCheckoutCommand($pr_branch_name);
                 } else if ($git_type === 'bitbucket') {
                     if ($exec_in_docker) {
                         $commands->push(executeInDocker($deployment_uuid, "echo 'Checking out $branch'"));
                     } else {
                         $commands->push("echo 'Checking out $branch'");
                     }
-                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" git checkout $commit";
+                    $git_clone_command = "{$git_clone_command} && cd {$baseDir} && GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$customPort} -o Port={$customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i /root/.ssh/id_rsa\" " . $this->buildGitCheckoutCommand($commit);
                 }
             }
 
@@ -903,4 +913,37 @@ class Application extends BaseModel
                 : explode(',', $this->fqdn),
         );
     }
+    protected function buildGitCheckoutCommand($target): string
+    {
+        $command = "git checkout $target";
+
+        if ($this->settings->is_git_submodules_enabled) {
+            $command .= " && git submodule update --init --recursive";
+        }
+
+        return $command;
+    }
+    public function watchPaths(): Attribute
+    {
+        return Attribute::make(
+            set: function ($value) {
+                if ($value) {
+                    return trim($value);
+                }
+            }
+        );
+    }
+    public function isWatchPathsTriggered(Collection $modified_files): bool
+    {
+        if (is_null($this->watch_paths)) {
+            return false;
+        }
+        $watch_paths = collect(explode("\n", $this->watch_paths));
+        $matches = $modified_files->filter(function ($file) use ($watch_paths) {
+            return $watch_paths->contains(function ($glob) use ($file) {
+                return fnmatch($glob, $file);
+            });
+        });
+        return $matches->count() > 0;
+    }
 }

app/Models/EnvironmentVariable.php

@@ -25,19 +25,18 @@ class EnvironmentVariable extends Model
         static::created(function (EnvironmentVariable $environment_variable) {
             if ($environment_variable->application_id && !$environment_variable->is_preview) {
                 $found = ModelsEnvironmentVariable::where('key', $environment_variable->key)->where('application_id', $environment_variable->application_id)->where('is_preview', true)->first();
-                $application = Application::find($environment_variable->application_id);
-                if ($application->build_pack === 'dockerfile') {
-                    return;
-                }
                 if (!$found) {
-                    ModelsEnvironmentVariable::create([
+                    $application = Application::find($environment_variable->application_id);
-                        'key' => $environment_variable->key,
+                    if ($application->build_pack !== 'dockerfile') {
-                        'value' => $environment_variable->value,
+                        ModelsEnvironmentVariable::create([
-                        'is_build_time' => $environment_variable->is_build_time,
+                            'key' => $environment_variable->key,
-                        'is_multiline' => $environment_variable->is_multiline,
+                            'value' => $environment_variable->value,
-                        'application_id' => $environment_variable->application_id,
+                            'is_build_time' => $environment_variable->is_build_time,
-                        'is_preview' => true
+                            'is_multiline' => $environment_variable->is_multiline,
-                    ]);
+                            'application_id' => $environment_variable->application_id,
+                            'is_preview' => true
+                        ]);
+                    }
                 }
             }
             $environment_variable->update([

app/Models/Server.php

@@ -690,7 +690,13 @@ $schema://$host {
     }
     public function isFunctional()
     {
-        return $this->settings->is_reachable && $this->settings->is_usable && !$this->settings->force_disabled;
+        $isFunctional = $this->settings->is_reachable && $this->settings->is_usable && !$this->settings->force_disabled;
+        ['private_key_filename' =>  $private_key_filename, 'mux_filename' => $mux_filename] = server_ssh_configuration($this);
+        if (!$isFunctional) {
+            Storage::disk('ssh-keys')->delete($private_key_filename);
+            Storage::disk('ssh-mux')->delete($mux_filename);
+        }
+        return $isFunctional;
     }
     public function isLogDrainEnabled()
     {

app/Models/Team.php

@@ -21,9 +21,11 @@ class Team extends Model implements SendsDiscord, SendsEmail
 
     protected static function booted()
     {
-        // static::saved(function () {
+        static::saving(function ($team) {
-        //     refreshSession();
+            if (auth()->user()?->isMember()) {
-        // });
+                throw new \Exception('You are not allowed to update this team.');
+            }
+        });
     }
 
     public function routeNotificationForDiscord()

app/Models/User.php

@@ -127,6 +127,10 @@ class User extends Authenticatable implements SendsEmail
     {
         return $this->role() === 'owner';
     }
+    public function isMember()
+    {
+        return $this->role() === 'member';
+    }
     public function isAdminFromSession()
     {
         if (auth()->user()->id === 0) {

app/Notifications/Server/HighDiskUsage.php

@@ -53,13 +53,13 @@ class HighDiskUsage extends Notification implements ShouldQueue
 
     public function toDiscord(): string
     {
-        $message = "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup.";
+        $message = "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/knowledge-base/server/automated-cleanup.";
         return $message;
     }
     public function toTelegram(): array
     {
         return [
-            "message" => "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/automated-cleanup."
+            "message" => "Coolify: Server '{$this->server->name}' high disk usage detected!\nDisk usage: {$this->disk_usage}%. Threshold: {$this->cleanup_after_percentage}%.\nPlease cleanup your disk to prevent data-loss.\nHere are some tips: https://coolify.io/docs/knowledge-base/server/automated-cleanup."
         ];
     }
 }

app/Notifications/Server/Revived.php

@@ -2,6 +2,7 @@
 
 namespace App\Notifications\Server;
 
+use App\Jobs\ContainerStatusJob;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use App\Notifications\Channels\DiscordChannel;
@@ -21,6 +22,7 @@ class Revived extends Notification implements ShouldQueue
         if ($this->server->unreachable_notification_sent === false) {
             return;
         }
+        dispatch(new ContainerStatusJob($server));
     }
 
     public function via(object $notifiable): array

bootstrap/helpers/api.php

@@ -7,5 +7,5 @@ function get_team_id_from_token()
 }
 function invalid_token()
 {
-    return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+    return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api-reference/authorization'], 400);
 }

bootstrap/helpers/applications.php

@@ -6,6 +6,7 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use App\Models\StandaloneDocker;
+use Illuminate\Support\Collection;
 use Spatie\Url\Url;
 
 function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null, bool $only_this_server = false)

bootstrap/helpers/constants.php

@@ -37,7 +37,7 @@ const SPECIFIC_SERVICES = [
 // Based on /etc/os-release
 const SUPPORTED_OS = [
     'ubuntu debian raspbian',
-    'centos fedora rhel ol rocky',
+    'centos fedora rhel ol rocky amzn',
     'sles opensuse-leap opensuse-tumbleweed'
 ];
 

bootstrap/helpers/remoteProcess.php

@@ -55,17 +55,30 @@ function remote_process(
         ),
     ])();
 }
-
+function server_ssh_configuration(Server $server)
+{
+    $uuid = data_get($server, 'uuid');
+    if (is_null($uuid)) {
+        throw new \Exception("Server does not have a uuid");
+    }
+    $private_key_filename = "id.root@{$server->uuid}";
+    $location = '/var/www/html/storage/app/ssh/keys/' . $private_key_filename;
+    $mux_filename = '/var/www/html/storage/app/ssh/mux/' . $server->muxFilename();
+    return [
+        'location' => $location,
+        'mux_filename' => $mux_filename,
+        'private_key_filename' => $private_key_filename
+    ];
+}
 function savePrivateKeyToFs(Server $server)
 {
     if (data_get($server, 'privateKey.private_key') === null) {
         throw new \Exception("Server {$server->name} does not have a private key");
     }
-    $sshKeyFileLocation = "id.root@{$server->uuid}";
+    ['location' => $location, 'private_key_filename' =>  $private_key_filename] = server_ssh_configuration($server);
     Storage::disk('ssh-keys')->makeDirectory('.');
     Storage::disk('ssh-mux')->makeDirectory('.');
-    Storage::disk('ssh-keys')->put($sshKeyFileLocation, $server->privateKey->private_key);
+    Storage::disk('ssh-keys')->put($private_key_filename, $server->privateKey->private_key);
-    $location = '/var/www/html/storage/app/ssh/keys/' . $sshKeyFileLocation;
     return $location;
 }
 
@@ -223,6 +236,13 @@ function remove_iip($text)
     $text = preg_replace('/x-access-token:.*?(?=@)/', "x-access-token:" . REDACTED, $text);
     return preg_replace('/\x1b\[[0-9;]*m/', '', $text);
 }
+function remove_mux_and_private_key(Server $server)
+{
+    $muxFilename = $server->muxFilename();
+    $privateKeyLocation = savePrivateKeyToFs($server);
+    Storage::disk('ssh-mux')->delete($muxFilename);
+    Storage::disk('ssh-keys')->delete($privateKeyLocation);
+}
 function refresh_server_connection(?PrivateKey $private_key = null)
 {
     if (is_null($private_key)) {

bootstrap/helpers/services.php

@@ -88,33 +88,106 @@ function updateCompose(ServiceApplication|ServiceDatabase $resource)
         $dockerCompose = Yaml::parse($dockerComposeRaw);
 
         // Switch Image
-        $image = data_get($resource, 'image');
+        $updatedImage = data_get_str($resource, 'image');
-        data_set($dockerCompose, "services.{$name}.image", $image);
+        $currentImage = data_get_str($dockerCompose, "services.{$name}.image");
-        $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);
+        if ($currentImage !== $updatedImage) {
-        $resource->service->docker_compose_raw = $dockerComposeRaw;
+            data_set($dockerCompose, "services.{$name}.image", $updatedImage->value());
-        $resource->service->save();
+            $dockerComposeRaw = Yaml::dump($dockerCompose, 10, 2);
-
+            $resource->service->docker_compose_raw = $dockerComposeRaw;
-        if ($resource->fqdn && !str($resource->fqdn)->contains(',')) {
+            $resource->service->save();
-            // Update FQDN
+            $resource->image = $updatedImage;
-            $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper();
+            $resource->save();
-            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+        }
-            $fqdn = Url::fromString($resource->fqdn);
+        if ($resource->fqdn) {
-            $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
+            $resourceFqdns = str($resource->fqdn)->explode(',');
-            if ($generatedEnv) {
+            if ($resourceFqdns->count() === 1) {
-                $generatedEnv->value = $fqdn;
+                $resourceFqdns = $resourceFqdns->first();
-                $generatedEnv->save();
+                $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper()->replace('-', '');
-            }
+                $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
-            $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper();
+                $fqdn = Url::fromString($resourceFqdns);
-            $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                $port = $fqdn->getPort();
-            $url = Url::fromString($resource->fqdn);
+                $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
-            $url = $url->getHost();
+                if ($generatedEnv) {
-            if ($generatedEnv) {
+                    $generatedEnv->value = $fqdn;
-                $url = Str::of($resource->fqdn)->after('://');
+                    $generatedEnv->save();
-                $generatedEnv->value = $url;
+                }
-                $generatedEnv->save();
+                if ($port) {
+                    $variableName = $variableName . "_$port";
+                    $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                    if ($generatedEnv) {
+                        $generatedEnv->value = $fqdn . ':' . $port;
+                        $generatedEnv->save();
+                    }
+                }
+                $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper()->replace('-', '');
+                $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                $url = Url::fromString($fqdn);
+                $port = $url->getPort();
+                $url = $url->getHost();
+                if ($generatedEnv) {
+                    $url = Str::of($fqdn)->after('://');
+                    $generatedEnv->value = $url;
+                    $generatedEnv->save();
+                }
+                if ($port) {
+                    $variableName = $variableName . "_$port";
+                    $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                    if ($generatedEnv) {
+                        $generatedEnv->value = $url . ':' . $port;
+                        $generatedEnv->save();
+                    }
+                }
+            } else if ($resourceFqdns->count() > 1) {
+                foreach ($resourceFqdns as $fqdn) {
+                    $host = Url::fromString($fqdn);
+                    $port = $host->getPort();
+                    $url = $host->getHost();
+                    $host = $host->getScheme() . '://' . $host->getHost();
+                    if ($port) {
+                        $port_envs = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_FQDN_%_$port")->get();
+                        foreach ($port_envs as $port_env) {
+                            $service_fqdn = str($port_env->key)->beforeLast('_')->after('SERVICE_FQDN_');
+                            $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_FQDN_' . $service_fqdn)->first();
+                            if ($env) {
+                                $env->value = $host;
+                                $env->save();
+                            }
+                            $port_env->value = $host . ':' . $port;
+                            $port_env->save();
+                        }
+                        $port_envs_url = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'like', "SERVICE_URL_%_$port")->get();
+                        foreach ($port_envs_url as $port_env_url) {
+                            $service_url = str($port_env_url->key)->beforeLast('_')->after('SERVICE_URL_');
+                            $env = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', 'SERVICE_URL_' . $service_url)->first();
+                            if ($env) {
+                                $env->value = $url;
+                                $env->save();
+                            }
+                            $port_env_url->value = $url . ':' . $port;
+                            $port_env_url->save();
+                        }
+                    } else {
+                        $variableName = "SERVICE_FQDN_" . Str::of($resource->name)->upper()->replace('-', '');
+                        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                        $fqdn = Url::fromString($fqdn);
+                        $fqdn = $fqdn->getScheme() . '://' . $fqdn->getHost();
+                        if ($generatedEnv) {
+                            $generatedEnv->value = $fqdn;
+                            $generatedEnv->save();
+                        }
+                        $variableName = "SERVICE_URL_" . Str::of($resource->name)->upper()->replace('-', '');
+                        $generatedEnv = EnvironmentVariable::where('service_id', $resource->service_id)->where('key', $variableName)->first();
+                        $url = Url::fromString($fqdn);
+                        $url = $url->getHost();
+                        if ($generatedEnv) {
+                            $url = Str::of($fqdn)->after('://');
+                            $generatedEnv->value = $url;
+                            $generatedEnv->save();
+                        }
+                    }
+                }
             }
         }
-
     } catch (\Throwable $e) {
         return handleError($e);
     }

bootstrap/helpers/shared.php

@@ -39,6 +39,7 @@ use Lcobucci\JWT\Encoding\JoseEncoder;
 use Lcobucci\JWT\Signer\Key\InMemory;
 use Lcobucci\JWT\Signer\Hmac\Sha256;
 use Lcobucci\JWT\Token\Builder;
+use phpseclib3\Crypt\EC;
 use Poliander\Cron\CronExpression;
 use Visus\Cuid2\Cuid2;
 use phpseclib3\Crypt\RSA;
@@ -110,7 +111,7 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     ray($error);
     if ($error instanceof TooManyRequestsException) {
         if (isset($livewire)) {
-            return $livewire->dispatch('error', 'Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.');
+            return $livewire->dispatch('error', "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.");
         }
         return "Too many requests. Please try again in {$error->secondsUntilAvailable} seconds.";
     }
@@ -165,13 +166,22 @@ function generate_random_name(?string $cuid = null): string
     }
     return Str::kebab("{$generator->getName()}-$cuid");
 }
-function generateSSHKey()
+function generateSSHKey(string $type = 'rsa')
 {
-    $key = RSA::createKey();
+    if ($type === 'rsa') {
-    return [
+        $key = RSA::createKey();
-        'private' => $key->toString('PKCS1'),
+        return [
-        'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
+            'private' => $key->toString('PKCS1'),
-    ];
+            'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
+        ];
+    } else if ($type === 'ed25519') {
+        $key = EC::createKey('Ed25519');
+        return [
+            'private' => $key->toString('OpenSSH'),
+            'public' => $key->getPublicKey()->toString('OpenSSH', ['comment' => 'coolify-generated-ssh-key'])
+        ];
+    }
+    throw new Exception('Invalid key type');
 }
 function formatPrivateKey(string $privateKey)
 {
@@ -282,7 +292,7 @@ function base_url(bool $withPort = true): string
 
 function isSubscribed()
 {
-    return auth()->user()->currentTeam()->subscription()->exists() || auth()->user()->isInstanceAdmin();
+    return isSubscriptionActive() || auth()->user()->isInstanceAdmin();
 }
 function isDev(): bool
 {
@@ -433,7 +443,7 @@ function sslip(Server $server)
 
 function getServiceTemplates()
 {
-    if (!isDev()) {
+    if (isDev()) {
         $services = File::get(base_path('templates/service-templates.json'));
         $services = collect(json_decode($services))->sortKeys();
     } else {
@@ -944,11 +954,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
 
                             if (!$isDatabase) {
                                 if ($savedService->fqdn) {
-                                    $fqdn = $savedService->fqdn . ',' . $fqdn;
+                                    data_set($savedService, 'fqdn', $savedService->fqdn . ',' . $fqdn);
                                 } else {
-                                    $fqdn = $fqdn;
+                                    data_set($savedService, 'fqdn', $fqdn);
                                 }
-                                $savedService->fqdn = $fqdn;
                                 $savedService->save();
                             }
                             EnvironmentVariable::create([
@@ -960,7 +969,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             ]);
                         }
                         // Caddy needs exact port in some cases.
-
                         if ($predefinedPort && !$key->endsWith("_{$predefinedPort}")) {
                             if ($resource->server->proxyType() === 'CADDY') {
                                 $env = EnvironmentVariable::where([
@@ -1160,6 +1168,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                 // });
                 // ray($withoutServiceEnvs);
                 // data_set($service, 'environment', $withoutServiceEnvs->toArray());
+                updateCompose($savedService);
                 return $service;
             });
             $finalServices = [
@@ -1459,13 +1468,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     ])->first();
                     $value = Str::of(replaceVariables($value));
                     $key = $value;
-
                     if ($value->startsWith('SERVICE_')) {
                         $foundEnv = EnvironmentVariable::where([
                             'key' => $key,
                             'application_id' => $resource->id,
                         ])->first();
                         ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
+                        ray($command, $generatedValue);
                         if (!is_null($command)) {
                             if ($command?->value() === 'FQDN' || $command?->value() === 'URL') {
                                 if (Str::lower($forService) === $serviceName) {
@@ -1848,13 +1857,26 @@ function ip_match($ip, $cidrs, &$match = null)
     }
     return false;
 }
-function check_fqdn_usage(ServiceApplication|Application $own_resource)
+function check_domain_usage(ServiceApplication|Application|null $resource = null, ?string $domain = null)
 {
-    $domains = collect($own_resource->fqdns)->map(function ($domain) {
+    if ($resource) {
+        if ($resource->getMorphClass() === 'App\Models\Application' && $resource->build_pack === 'dockercompose') {
+            $domains = data_get(json_decode($resource->docker_compose_domains, true), "*.domain");
+            ray($domains);
+            $domains = collect($domains);
+        } else {
+            $domains = collect($resource->fqdns);
+        }
+    } else if ($domain) {
+        $domains = collect($domain);
+    } else {
+        throw new \RuntimeException("No resource or FQDN provided.");
+    }
+    $domains = $domains->map(function ($domain) {
         if (str($domain)->endsWith('/')) {
             $domain = str($domain)->beforeLast('/');
         }
-        return str($domain)->replace('http://', '')->replace('https://', '');
+        return str($domain);
     });
     $apps = Application::all();
     foreach ($apps as $app) {
@@ -1863,10 +1885,15 @@ function check_fqdn_usage(ServiceApplication|Application $own_resource)
             if (str($domain)->endsWith('/')) {
                 $domain = str($domain)->beforeLast('/');
             }
-            $naked_domain = str($domain)->replace('http://', '')->replace('https://', '')->value();
+            $naked_domain = str($domain)->value();
             if ($domains->contains($naked_domain)) {
-                if ($app->uuid !== $own_resource->uuid) {
+                if (data_get($resource, 'uuid')) {
-                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource:<br> {$app->name}.");
+                    ray($resource->uuid, $app->uuid);
+                    if ($resource->uuid !== $app->uuid) {
+                        throw new \RuntimeException("Domain $naked_domain is already in use by another resource called: <br><br>{$app->name}.");
+                    }
+                } else if ($domain) {
+                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource called: <br><br>{$app->name}.");
                 }
             }
         }
@@ -1878,12 +1905,29 @@ function check_fqdn_usage(ServiceApplication|Application $own_resource)
             if (str($domain)->endsWith('/')) {
                 $domain = str($domain)->beforeLast('/');
             }
-            $naked_domain = str($domain)->replace('http://', '')->replace('https://', '')->value();
+            $naked_domain = str($domain)->value();
             if ($domains->contains($naked_domain)) {
-                if ($app->uuid !== $own_resource->uuid) {
+                if (data_get($resource, 'uuid')) {
-                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource.");
+                    if ($resource->uuid !== $app->uuid) {
+                        throw new \RuntimeException("Domain $naked_domain is already in use by another resource called: <br><br>{$app->name}.");
+                    }
+                } else if ($domain) {
+                    throw new \RuntimeException("Domain $naked_domain is already in use by another resource called: <br><br>{$app->name}.");
                 }
             }
         }
     }
+    if ($resource) {
+        $settings = InstanceSettings::get();
+        if (data_get($settings, 'fqdn')) {
+            $domain = data_get($settings, 'fqdn');
+            if (str($domain)->endsWith('/')) {
+                $domain = str($domain)->beforeLast('/');
+            }
+            $naked_domain = str($domain)->value();
+            if ($domains->contains($naked_domain)) {
+                throw new \RuntimeException("Domain $naked_domain is already in use by this Coolify instance.");
+            }
+        }
+    }
 }

bootstrap/helpers/subscriptions.php

@@ -66,7 +66,7 @@ function isSubscriptionActive()
     //     return $subscription->paddle_status === 'active';
     // }
     if (isStripe()) {
-        return $subscription->stripe_invoice_paid === true && $subscription->stripe_cancel_at_period_end === false;
+        return $subscription->stripe_invoice_paid === true;
     }
     return false;
 }

config/sentry.php

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

config/version.php

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

database/migrations/2024_03_28_114620_add_watch_paths_to_apps.php

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

package-lock.json

@@ -6,8 +6,8 @@
         "": {
             "dependencies": {
                 "@tailwindcss/forms": "0.5.7",
-                "@tailwindcss/typography": "0.5.10",
+                "@tailwindcss/typography": "0.5.12",
-                "alpinejs": "3.13.7",
+                "alpinejs": "3.13.8",
                 "ioredis": "5.3.2",
                 "tailwindcss-scrollbar": "0.1.0"
             },
@@ -19,8 +19,8 @@
                 "laravel-vite-plugin": "0.8.1",
                 "postcss": "8.4.38",
                 "pusher-js": "8.4.0-rc2",
-                "tailwindcss": "3.4.1",
+                "tailwindcss": "3.4.3",
-                "vite": "4.5.2",
+                "vite": "4.5.3",
                 "vue": "3.4.21"
             }
         },
@@ -496,9 +496,9 @@
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.10",
+            "version": "0.5.12",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.10.tgz",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.12.tgz",
-            "integrity": "sha512-Pe8BuPJQJd3FfRnm6H0ulKIGoMEQS+Vq01R6M5aCrFB/ccR/shT+0kXLjouGC1gFLm9hopTFN+DMP0pfwRWzPw==",
+            "integrity": "sha512-CNwpBpconcP7ppxmuq3qvaCxiRWnbhANpY/ruH4L5qs2GCiVDJXde/pjj2HWPV1+Q4G9+V/etrwUYopdcjAlyg==",
             "dependencies": {
                 "lodash.castarray": "^4.4.0",
                 "lodash.isplainobject": "^4.0.6",
@@ -683,9 +683,9 @@
             "integrity": "sha512-oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="
         },
         "node_modules/alpinejs": {
-            "version": "3.13.7",
+            "version": "3.13.8",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.7.tgz",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.13.8.tgz",
-            "integrity": "sha512-rcTyjTANbsePq1hb7eSekt3qjI94HLGeO6JaRjCssCVbIIc+qBrc7pO5S/+2JB6oojIibjM6FA+xRI3zhGPZIg==",
+            "integrity": "sha512-XolbBJryCndomtaHd/KHQjQeD/L72FJxy/YhLLFD4Lr7zzGcpcbg+UgXteMR2pYg1KhRUr6V4O3GfN1zJAmRWw==",
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
             }
@@ -1900,9 +1900,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.1",
+            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.3.tgz",
-            "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==",
+            "integrity": "sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==",
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
@@ -1912,7 +1912,7 @@
                 "fast-glob": "^3.3.0",
                 "glob-parent": "^6.0.2",
                 "is-glob": "^4.0.3",
-                "jiti": "^1.19.1",
+                "jiti": "^1.21.0",
                 "lilconfig": "^2.1.0",
                 "micromatch": "^4.0.5",
                 "normalize-path": "^3.0.0",
@@ -2020,9 +2020,9 @@
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
         },
         "node_modules/vite": {
-            "version": "4.5.2",
+            "version": "4.5.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz",
-            "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==",
+            "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.18.10",

package.json

@@ -13,14 +13,14 @@
         "laravel-vite-plugin": "0.8.1",
         "postcss": "8.4.38",
         "pusher-js": "8.4.0-rc2",
-        "tailwindcss": "3.4.1",
+        "tailwindcss": "3.4.3",
-        "vite": "4.5.2",
+        "vite": "4.5.3",
         "vue": "3.4.21"
     },
     "dependencies": {
         "@tailwindcss/forms": "0.5.7",
-        "@tailwindcss/typography": "0.5.10",
+        "@tailwindcss/typography": "0.5.12",
-        "alpinejs": "3.13.7",
+        "alpinejs": "3.13.8",
         "ioredis": "5.3.2",
         "tailwindcss-scrollbar": "0.1.0"
     }

resources/css/app.css

@@ -13,7 +13,7 @@ body {
 
 .input,
 .select {
-    @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-300 dark:ring-coolgray-300;
+    @apply text-black dark:bg-coolgray-100 dark:text-white ring-neutral-200 dark:ring-coolgray-300;
 }
 
 /* Readonly */
@@ -41,7 +41,7 @@ option {
 }
 
 .button {
-    @apply flex items-center justify-center gap-2 px-3 py-1 text-sm text-white normal-case rounded cursor-pointer hover:bg-black/80 bg-coolgray-200 hover:bg-coolgray-500 hover:text-white disabled:bg-coolgray-100/10 disabled:cursor-not-allowed min-w-fit focus:outline-1 dark:disabled:text-neutral-600;
+    @apply flex items-center justify-center gap-2 px-2 py-1 text-sm text-black normal-case border rounded cursor-pointer bg-neutral-200/50 border-neutral-300 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:text-white dark:hover:bg-coolgray-500 dark:border-black hover:text-black disabled:bg-coolgray-100/10 disabled:cursor-not-allowed min-w-fit focus:outline-1 dark:disabled:text-neutral-600;
 }
 
 button[isError]:not(:disabled) {
@@ -78,7 +78,7 @@ label {
 }
 
 table {
-    @apply min-w-full divide-y dark:divide-coolgray-200 divide-neutral-300;
+    @apply min-w-full divide-y dark:divide-coolgray-200 divide-neutral-300 ;
 }
 
 thead {
@@ -90,7 +90,7 @@ tbody {
 }
 
 tr {
-    @apply text-neutral-400;
+    @apply text-black dark:text-neutral-400 dark:hover:bg-black hover:bg-neutral-200;
 }
 
 tr th {
@@ -195,19 +195,22 @@ tr td:first-child {
 }
 
 .box {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border text-black dark:text-white hover:text-black border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 .box-boarding {
-    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black;
+    @apply flex lg:flex-row flex-col p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 dark:text-white bg-neutral-50 border border-neutral-200 dark:border-black hover:bg-neutral-100 dark:hover:bg-coollabs-100 dark:hover:text-white hover:text-black hover:no-underline text-black  ;
+}
+.box-without-bg {
+    @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]   border border-neutral-200 dark:border-black;
+}
+.box-without-bg-without-border {
+    @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem]   ;
 }
 
 .on-box {
     @apply rounded hover:bg-neutral-300 dark:hover:bg-coolgray-500/20;
 }
 
-.box-without-bg {
-    @apply flex p-2 transition-colors dark:hover:text-white hover:no-underline min-h-[4rem];
-}
 
 .box-title {
     @apply font-bold text-black dark:text-white group-hover:dark:text-white;
@@ -280,7 +283,7 @@ tr td:first-child {
 }
 
 .fullscreen {
-    @apply fixed top-0 left-0 w-full h-full z-[9999] bg-coolgray-100 overflow-y-auto scrollbar pb-4;
+    @apply fixed top-0 left-0 w-full h-full z-[9999] dark:bg-coolgray-100 bg-white overflow-y-auto scrollbar pb-4;
 }
 
 .toast {

resources/js/app.js

@@ -1,6 +1,6 @@
-import { createApp } from "vue";
+// import { createApp } from "vue";
-import MagicBar from "./components/MagicBar.vue";
+// import MagicBar from "./components/MagicBar.vue";
 
-const app = createApp({});
+// const app = createApp({});
-app.component("magic-bar", MagicBar);
+// app.component("magic-bar", MagicBar);
-app.mount("#vue");
+// app.mount("#vue");

resources/views/auth/forgot-password.blade.php

@@ -1,18 +1,15 @@
 <x-layout-simple>
-    <div class="flex items-center justify-center h-screen">
+    <section class="bg-gray-50 dark:bg-base">
-        <div>
+        <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
-            <div class="flex flex-col items-center pb-8">
+            <a class="flex items-center mb-1 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
-                <a href="{{ route('dashboard') }}">
+                Coolify
-                    <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
+            </a> <div class="flex items-center gap-2">
-                </a>
+                {{ __('auth.forgot_password') }}
-                {{-- <x-version /> --}}
             </div>
-
+            <div
-            <div class="flex items-center gap-2">
+                class="w-full bg-white shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
-                <h1>{{ __('auth.forgot_password') }}</h1>
+                <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
-            </div>
+                    @if (is_transactional_emails_active())
-            <div>
-                @if (is_transactional_emails_active())
                     <form action="/forgot-password" method="POST" class="flex flex-col gap-2">
                         @csrf
                         <x-forms.input required type="email" name="email" label="{{ __('input.email') }}" autofocus />
@@ -37,7 +34,9 @@
                         {{ session('status') }}
                     </div>
                 @endif
+                </div>
             </div>
         </div>
-    </div>
+    </section>
+
 </x-layout-simple>

resources/views/auth/login.blade.php

@@ -4,51 +4,31 @@
             <a class="flex items-center mb-6 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
                 Coolify
             </a>
-            <div
+            <div class="w-full bg-white shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
-                class="w-full bg-white shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
                 <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
                     <form action="/login" method="POST" class="flex flex-col gap-2">
                         @csrf
                         @env('local')
-                        <x-forms.input value="test@example.com" type="email" name="email" required
+                        <x-forms.input value="test@example.com" type="email" autocomplete="email" name="email"
-                            label="{{ __('input.email') }}" autofocus />
+                            required label="{{ __('input.email') }}" autofocus />
 
-                        <x-forms.input value="password" type="password" name="password" required
+                        <x-forms.input value="password" type="password" autocomplete="current-password" name="password"
-                            label="{{ __('input.password') }}" />
+                            required label="{{ __('input.password') }}" />
 
                         <a href="/forgot-password" class="text-xs">
                             {{ __('auth.forgot_password') }}?
                         </a>
                     @else
-                        <x-forms.input type="email" name="email" required label="{{ __('input.email') }}"
+                        <x-forms.input type="email" name="email" autocomplete="email" required
-                            autofocus />
+                            label="{{ __('input.email') }}" autofocus />
-                        <x-forms.input type="password" name="password" required label="{{ __('input.password') }}" />
+                        <x-forms.input type="password" name="password" autocomplete="current-password" required
+                            label="{{ __('input.password') }}" />
                         <a href="/forgot-password" class="text-xs">
                             {{ __('auth.forgot_password') }}?
                         </a>
                         @endenv
                         <x-forms.button class="mt-10" type="submit">{{ __('auth.login') }}</x-forms.button>
-                        @if ($is_registration_enabled)
+
-                            <a href="/register" class="button bg-coollabs-gradient">
-                                {{ __('auth.register_now') }}
-                            </a>
-                        @endif
-                        @if ($enabled_oauth_providers->isNotEmpty())
-                            <div class="relative">
-                                <div class="absolute inset-0 flex items-center" aria-hidden="true">
-                                    <div class="w-full border-t dark:border-coolgray-200"></div>
-                                </div>
-                                <div class="relative flex justify-center">
-                                    <span class="px-2 text-sm dark:text-neutral-500 dark:bg-base">or</span>
-                                </div>
-                            </div>
-                        @endif
-                        @foreach ($enabled_oauth_providers as $provider_setting)
-                            <x-forms.button type="button"
-                                onclick="document.location.href='/auth/{{ $provider_setting->provider }}/redirect'">
-                                {{ __("auth.login.$provider_setting->provider") }}
-                            </x-forms.button>
-                        @endforeach
                         @if (!$is_registration_enabled)
                             <div class="text-center text-neutral-500">{{ __('auth.registration_disabled') }}</div>
                         @endif
@@ -70,6 +50,27 @@
                             </div>
                         @endif
                     </form>
+                    @if ($is_registration_enabled)
+                        <a href="/register" class="button bg-coollabs-gradient">
+                            {{ __('auth.register_now') }}
+                        </a>
+                    @endif
+                    @if ($enabled_oauth_providers->isNotEmpty())
+                        <div class="relative">
+                            <div class="absolute inset-0 flex items-center" aria-hidden="true">
+                                <div class="w-full border-t dark:border-coolgray-200"></div>
+                            </div>
+                            <div class="relative flex justify-center">
+                                <span class="px-2 text-sm dark:text-neutral-500 dark:bg-base">or</span>
+                            </div>
+                        </div>
+                    @endif
+                    @foreach ($enabled_oauth_providers as $provider_setting)
+                        <x-forms.button class="w-full" type="button"
+                            onclick="document.location.href='/auth/{{ $provider_setting->provider }}/redirect'">
+                            {{ __("auth.login.$provider_setting->provider") }}
+                        </x-forms.button>
+                    @endforeach
                 </div>
             </div>
         </div>

resources/views/auth/two-factor-challenge.blade.php

@@ -1,42 +1,40 @@
 <x-layout-simple>
-    <div class="flex items-center justify-center h-screen">
+    <section class="bg-gray-50 dark:bg-base" x-data="{ showRecovery: false }">
-        <div>
+        <div class="flex flex-col items-center justify-center px-6 py-8 mx-auto md:h-screen lg:py-0">
-            <div class="flex flex-col items-center pb-8">
+            <a class="flex items-center mb-6 text-5xl font-extrabold tracking-tight text-gray-900 dark:text-white">
-                <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
+                Coolify
-                {{-- <x-version /> --}}
+            </a>
-            </div>
+            <div class="w-full bg-white shadow md:mt-0 sm:max-w-md xl:p-0 dark:bg-base ">
-            <div class="w-96">
+                <div class="p-6 space-y-4 md:space-y-6 sm:p-8">
-                <form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
+                    <form action="/two-factor-challenge" method="POST" class="flex flex-col gap-2">
-                    @csrf
+                        @csrf
-                    <div>
+                        <div>
-                        <x-forms.input autofocus type="number" name="code" label="{{ __('input.code') }}" autofocus />
+                            <x-forms.input type="number" name="code" autocomplete="one-time-code" label="{{ __('input.code') }}" autofocus />
-                        {{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
+                            <div x-show="!showRecovery"
-                            x-on:click="showRecovery = !showRecovery">Use
+                                class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
-                            Recovery Code
+                                x-on:click="showRecovery = !showRecovery">Enter
-                        </div> --}}
+                                Recovery Code
-                    </div>
+                            </div>
-                    <div>
+                        </div>
-                        <x-forms.input name="recovery_code" label="{{ __('input.recovery_code') }}" />
+                        <div x-show="showRecovery" x-cloak>
-                        {{-- <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
+                            <x-forms.input name="recovery_code" label="{{ __('input.recovery_code') }}" />
-                            x-on:click="showRecovery = !showRecovery">Use
+                        </div>
-                            One-Time Code
+                        <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
-                        </div> --}}
+                    </form>
-                    </div>
+                    @if ($errors->any())
-                    <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
+                        <div class="text-xs text-center text-error">
-                </form>
+                            @foreach ($errors->all() as $error)
-                @if ($errors->any())
+                                <p>{{ $error }}</p>
-                    <div class="text-xs text-center text-error">
+                            @endforeach
-                        @foreach ($errors->all() as $error)
+                        </div>
-                            <p>{{ $error }}</p>
+                    @endif
-                        @endforeach
+                    @if (session('status'))
-                    </div>
+                        <div class="mb-4 font-medium text-green-600">
-                @endif
+                            {{ session('status') }}
-                @if (session('status'))
+                        </div>
-                    <div class="mb-4 font-medium text-green-600">
+                    @endif
-                        {{ session('status') }}
+                </div>
-                    </div>
-                @endif
             </div>
         </div>
-    </div>
+    </section>
 </x-layout-simple>

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

@@ -3,7 +3,7 @@
     'w-full' => !$isMultiline,
 ])>
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif

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

@@ -1,6 +1,6 @@
 <div class="w-full">
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif

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

@@ -1,6 +1,6 @@
 <div class="flex-1 form-control">
     @if ($label)
-        <label for="small-input" class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
+        <label class="flex items-center gap-1 mb-1 text-sm font-medium">{{ $label }}
             @if ($required)
                 <x-highlighted text="*" />
             @endif

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

@@ -1 +1,3 @@
-<img class="inline-flex w-4 h-4" src="{{ asset('svgs/internal-link.svg') }}">
+<svg class="inline-flex w-4 h-4 text-black dark:text-white" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <path fill="currentColor" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 12h14m-6 6l6-6m-6-6l6 6"/>
+</svg>

resources/views/components/navbar.blade.php

@@ -1,5 +1,14 @@
-<nav class="flex flex-col flex-1 pl-2 bg-white border-r dark:border-coolgray-200 dark:bg-base" x-data="{
+<nav class="flex flex-col flex-1 bg-white border-r dark:border-coolgray-200 dark:bg-base" x-data="{
-    init() {
+    switchWidth() {
+            if (this.full === 'full') {
+                localStorage.removeItem('pageWidth');
+            } else {
+                localStorage.setItem('pageWidth', 'full');
+            }
+            window.location.reload();
+        },
+        init() {
+            this.full = localStorage.getItem('pageWidth');
             window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', e => {
                 const userSettings = localStorage.getItem('theme');
                 if (userSettings !== 'system') {
@@ -60,13 +69,16 @@
                     </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>
                     <button @click="setTheme('dark')" class="px-1 dropdown-item-no-padding">Dark</button>
                     <button @click="setTheme('light')" class="px-1 dropdown-item-no-padding">Light</button>
                     <button @click="setTheme('system')" class="px-1 dropdown-item-no-padding">System</button>
+                    <div class="my-1 font-bold border-b dark:border-coolgray-500 dark:text-white text-md">Width</div>
+                    <button @click="switchWidth()" class="px-1 dropdown-item-no-padding" x-show="full">Center</button>
+                    <button @click="switchWidth()" class="px-1 dropdown-item-no-padding" x-show="!full">Full</button>
                 </div>
             </x-dropdown>
         </div>
-
     </div>
     <div class="px-2 pt-2 pb-7">
         <livewire:switch-team />

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

@@ -48,7 +48,7 @@
             <div class="pb-10 text-xl text-center">For the detailed list of features, please visit our landing page: <a
                     class="font-bold underline dark:text-white" href="https://coolify.io">coolify.io</a></div>
             <div
-                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-3 lg:divide-x lg:divide-y-0 xl:-mx-4">
+                class="grid max-w-sm grid-cols-1 -mt-16 divide-y divide-neutral-200 dark:divide-coolgray-500 isolate gap-y-16 sm:mx-auto lg:-mx-8 lg:mt-0 lg:max-w-none lg:grid-cols-3 lg:divide-x lg:divide-y-0 xl:-mx-4">
 
                 <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
                     <h3 id="tier-basic" class="text-base font-semibold leading-7 dark:text-white">Basic</h3>
@@ -186,7 +186,7 @@
                         </li>
                     </ul>
                 </div>
-                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-14">
+                <div class="pt-16 lg:px-8 lg:pt-0 xl:px-12">
                     <h3 id="tier-ultimate" class="text-base font-semibold leading-7 dark:text-white">Ultimate</h3>
                    <p class="flex items-baseline mt-6 gap-x-1">
                         <span x-show="selected === 'monthly'" x-cloak>

resources/views/components/resource-view.blade.php

@@ -1,7 +1,7 @@
 <div @class([
-    'transition-all duration-150 box-without-bg dark:bg-coolgray-100 bg-white group border-l-2 border-transparent',
+    'transition-all duration-150 box-without-bg dark:bg-coolgray-100 bg-white group',
-    'hover:border-coollabs cursor-pointer' => !$upgrade,
+    'hover:border-l-coollabs cursor-pointer' => !$upgrade,
-    'hover:border-red-500 cursor-not-allowed' => $upgrade,
+    'hover:border-l-red-500 cursor-not-allowed' => $upgrade,
 ]) @if (!$upgrade) wire:click={{ $wire }} @endif>
     <div class="flex items-center">
         {{ $logo }}

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

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

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

@@ -1,11 +1,11 @@
 @props([
     'status' => 'Restarting',
 ])
-<div class="flex items-center" >
+<div class="flex items-center">
     <x-loading wire:loading.delay.longer />
     <span wire:loading.remove.delay.longer class="flex items-center">
         <div class="badge badge-warning "></div>
-        <div class="pl-2 pr-1 text-xs font-bold tracking-widerr dark:text-warning">
+        <div class="pl-2 pr-1 text-xs font-bold tracking-wider dark:text-warning">
             {{ str($status)->before(':')->headline() }}
         </div>
         @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))

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

@@ -1,7 +1,7 @@
 @props([
     'status' => 'Running',
 ])
-<div class="flex items-center" >
+<div class="flex items-center">
     <x-loading wire:loading.delay.longer />
     <span wire:loading.remove.delay.longer class="flex items-center">
     <div class="badge badge-success "></div>

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

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

resources/views/emails/high-disk-usage.blade.php

@@ -1,7 +1,7 @@
 <x-emails.layout>
 Your server ({{ $name }}) has high disk usage ({{ $disk_usage }}% used). Threshold is {{ $threshold }}%.
 
-Please cleanup your disk to prevent data-loss. Here are some [tips](https://coolify.io/docs/automated-cleanup).
+Please cleanup your disk to prevent data-loss. Here are some [tips](https://coolify.io/docs/knowledge-base/server/automated-cleanup).
 
 (You can change the threshold in the Server Settings menu.)
 </x-emails.layout>

resources/views/layouts/app.blade.php

@@ -5,7 +5,12 @@
         <livewire:layout-popups />
     @endif
     @auth
-        <div x-data="{ open: false }" x-cloak class="mx-auto max-w-7xl">
+        <div x-data="{
+            open: false,
+            init() {
+                this.pageWidth = localStorage.getItem('pageWidth');
+            }
+        }" x-cloak class="mx-auto" :class="pageWidth === 'full' ? '' : 'max-w-7xl'">
             <div class="relative z-50 lg:hidden" :class="open ? 'block' : 'hidden'" role="dialog" aria-modal="true">
                 <div class="fixed inset-0 bg-black/80"></div>
                 <div class="fixed inset-0 flex">
@@ -50,7 +55,7 @@
                 </a> --}}
             </div>
 
-            <main class="lg:pl-48" >
+            <main class="lg:pl-48">
                 <div class="p-4 sm:px-6 lg:px-8 lg:py-6">
                     {{ $slot }}
                 </div>

resources/views/layouts/base.blade.php

@@ -82,10 +82,12 @@
                 if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
                     if (element.type === 'password') {
                         element.type = 'text';
+                        if (element.disabled) return;
                         element.classList.add('truncate');
                         this.type = 'text';
                     } else {
                         element.type = 'password';
+                        if (element.disabled) return;
                         element.classList.remove('truncate');
                         this.type = 'password';
                     }

resources/views/layouts/simple.blade.php

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

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

@@ -1,17 +1,31 @@
 <div>
     <h1>Admin Dashboard</h1>
     <h3 class="pt-4">Who am I now?</h3>
-    {{ auth()->user()->name }}
+    <div class="pb-4">{{ auth()->user()->name }}</div>
-    <h3 class="pt-4">Users</h3>
+    <form wire:submit="submitSearch" class="flex flex-col gap-2 lg:flex-row">
+        <x-forms.input wire:model="search" placeholder="Search for a user" />
+        <x-forms.button type="submit">Search</x-forms.button>
+    </form>
+    <h3 class="pt-4">Active Subscribers</h3>
     <div class="flex flex-wrap gap-2">
-        <div class="dark:text-white cursor-pointer w-96 box-without-bg bg-coollabs-100" wire:click="switchUser('0')">
+        @forelse ($active_subscribers as $user)
-            Root
+            <div class="flex gap-2 box" wire:click="switchUser('{{ $user->id }}')">
-        </div>
-        @foreach ($users as $user)
-            <div class="w-96 box" wire:click="switchUser('{{ $user->id }}')">
                 <p>{{ $user->name }}</p>
                 <p>{{ $user->email }}</p>
             </div>
-        @endforeach
+        @empty
+            <p>No active subscribers</p>
+        @endforelse
+    </div>
+    <h3 class="pt-4">Inactive Subscribers</h3>
+    <div class="flex flex-col flex-wrap gap-2">
+        @forelse ($inactive_subscribers as $user)
+            <div class="flex gap-2 box" wire:click="switchUser('{{ $user->id }}')">
+                <p>{{ $user->name }}</p>
+                <p>{{ $user->email }}</p>
+            </div>
+        @empty
+            <p>No inactive subscribers</p>
+        @endforelse
     </div>
 </div>

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

@@ -60,7 +60,7 @@
                         server.
                         <br />
                         Check this <a target="_blank" class="underline"
-                            href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
+                            href="https://coolify.io/docs/knowledge-base/server/openssh">documentation</a> for further help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
                         <x-forms.button class="lg:w-64 box-boarding" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again

resources/views/livewire/dashboard.blade.php

@@ -19,22 +19,17 @@
     @if ($projects->count() > 0)
         <div class="grid grid-cols-1 gap-2 xl:grid-cols-2">
             @foreach ($projects as $project)
-                <div class="gap-2 border border-transparent cursor-pointer box group">
+                <div class="gap-2 border border-transparent cursor-pointer box group"
-                    @if (data_get($project, 'environments')->count() === 1)
+                    @if (data_get($project, 'environments')->count() === 1) onclick="gotoProject('{{ data_get($project, 'uuid') }}', '{{ data_get($project, 'environments.0.name', 'production') }}')"
-                        <a class="flex flex-col justify-center flex-1 mx-6"
+                @else
-                            href="{{ route('project.resource.index', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
+                    onclick="window.location.href = '{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}'" @endif>
-                            <div class="box-title">{{ $project->name }}</div>
+                    <div class="flex flex-col justify-center flex-1 mx-6">
-                            <div class="box-description"> {{ $project->description }}</div>
+                        <div class="box-title">{{ $project->name }}</div>
-                        </a>
+                        <div class="box-description">
-                    @else
+                            {{ $project->description }}</div>
-                        <a class="flex flex-col justify-center flex-1 mx-6"
+                    </div>
-                            href="{{ route('project.show', ['project_uuid' => data_get($project, 'uuid')]) }}">
+                    <span
-                            <div class="box-title">{{ $project->name }}</div>
+                        class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
-                            <div class="box-description">
-                                {{ $project->description }}</div>
-                        </a>
-                    @endif
-                    <div class="flex items-center justify-center gap-2 pt-4 pb-2 mr-4 text-xs lg:py-0 lg:justify-normal">
                         <a class="hover:underline"
                             href="{{ route('project.resource.create', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
                             <span class="p-2 font-bold">+
@@ -44,7 +39,7 @@
                             href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
                             Settings
                         </a>
-                    </div>
+                    </span>
                 </div>
             @endforeach
         </div>

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

@@ -18,7 +18,7 @@
                     if (checkNumber > 4) {
                         this.popups.realtime = true;
                         console.error(
-                            'Coolify could not connect to its real-time service. This will cause unusual problems on the UI if not fixed! Please check the related documentation (https://coolify.io/docs/cloudflare/tunnels) or get help on Discord (https://coollabs.io/discord).)'
+                            '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);
                     }
@@ -37,7 +37,7 @@
                     <span>Coolify could not connect to its real-time service.<br>This will cause unusual problems on the UI
                         if
                         not fixed! <br><br>Please check the
-                        related <a class="underline" href='https://coolify.io/docs/cloudflare/tunnels'
+                        related <a class="underline" href='https://coolify.io/docs/knowledge-base/cloudflare/tunnels'
                             target='_blank'>documentation</a> or get
                         help on <a class="underline" href='https://coollabs.io/discord' target='_blank'>Discord</a>. </span>
                 </x-slot:description>

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

@@ -19,8 +19,8 @@
         <div class="flex flex-col gap-2">
             <x-forms.input id="current_password" label="Current Password" required type="password" />
             <div class="flex gap-2">
-            <x-forms.input id="new_password" label="New Password" required type="password" />
+                <x-forms.input id="new_password" label="New Password" required type="password" />
-            <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
+                <x-forms.input id="new_password_confirmation" label="New Password Again" required type="password" />
             </div>
         </div>
     </form>

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

@@ -27,18 +27,17 @@
         @endif
         @forelse ($deployments as $deployment)
             <a @class([
-                'dark:bg-coolgray-100 p-2 border-l border-dashed transition-colors hover:no-underline',
+                'dark:bg-coolgray-100 p-2 border-l border-dashed transition-colors hover:no-underline box-without-bg-without-border bg-white flex-col',
                 'dark:hover:bg-coolgray-200' =>
                     data_get($deployment, 'status') === 'queued',
                 'border-warning hover:bg-warning hover:text-black' =>
                     data_get($deployment, 'status') === 'in_progress' ||
                     data_get($deployment, 'status') === 'cancelled-by-user',
-                'border-error hover:bg-error' =>
+                'border-error dark:hover:bg-error hover:bg-neutral-200' =>
                     data_get($deployment, 'status') === 'failed',
-                'border-success hover:bg-success' =>
+                'border-success dark:hover:bg-success hover:bg-neutral-200' =>
                     data_get($deployment, 'status') === 'finished',
-            ]) href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"
+            ]) href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}">
-                class="hover:no-underline">
                 <div class="flex flex-col justify-start">
                     <div class="flex gap-1">
                         {{ $deployment->created_at }} UTC

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

@@ -1,11 +1,45 @@
 <div>
     <h1 class="py-0">Deployment</h1>
     <livewire:project.application.heading :application="$application" />
-    <div class="pt-4" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }">
+    <div class="pt-4" x-data="{
+        fullscreen: false,
+        alwaysScroll: false,
+        intervalId: null,
+        makeFullscreen() {
+            this.fullscreen = !this.fullscreen;
+            if (this.fullscreen === false) {
+                this.alwaysScroll = false;
+                clearInterval(this.intervalId);
+            }
+        },
+        toggleScroll() {
+            this.alwaysScroll = !this.alwaysScroll;
+
+            if (this.alwaysScroll) {
+                this.intervalId = setInterval(() => {
+                    const screen = document.getElementById('screen');
+                    const logs = document.getElementById('logs');
+                    if (screen.scrollTop !== logs.scrollHeight) {
+                        screen.scrollTop = logs.scrollHeight;
+                    }
+                }, 100);
+            } else {
+                clearInterval(this.intervalId);
+                this.intervalId = null;
+            }
+        },
+        goTop() {
+            this.alwaysScroll = false;
+            clearInterval(this.intervalId);
+            const screen = document.getElementById('screen');
+            screen.scrollTop = 0;
+        }
+    }">
         <livewire:project.application.deployment-navbar :application_deployment_queue="$application_deployment_queue" />
         @if (data_get($application_deployment_queue, 'status') === 'in_progress')
             <div class="flex items-center gap-1 pt-2 ">Deployment is
-                <div class="dark:text-warning"> {{ Str::headline(data_get($this->application_deployment_queue, 'status')) }}.
+                <div class="dark:text-warning">
+                    {{ Str::headline(data_get($this->application_deployment_queue, 'status')) }}.
                 </div>
                 <x-loading class="loading-ring" />
             </div>
@@ -17,7 +51,7 @@
         @endif
         <div id="screen" :class="fullscreen ? 'fullscreen' : ''">
             <div @if ($isKeepAliveOn) wire:poll.2000ms="polling" @endif
-                class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto dark:text-white bg-coolgray-100 scrollbar border-coolgray-300"
+                class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto bg-white dark:text-white dark:bg-coolgray-100 scrollbar dark:border-coolgray-300"
                 :class="fullscreen ? '' : 'max-h-[40rem] border border-dotted rounded'">
                 <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
@@ -47,23 +81,26 @@
                                 d="M9.793 12.793a1 1 0 0 1 1.497 1.32l-.083.094L6.414 19H9a1 1 0 0 1 .117 1.993L9 21H4a1 1 0 0 1-.993-.883L3 20v-5a1 1 0 0 1 1.993-.117L5 15v2.586l4.793-4.793ZM20 3a1 1 0 0 1 .993.883L21 4v5a1 1 0 0 1-1.993.117L19 9V6.414l-4.793 4.793a1 1 0 0 1-1.497-1.32l.083-.094L17.586 5H15a1 1 0 0 1-.117-1.993L15 3h5Z" />
                         </g>
                     </svg></button>
-                <div id="logs" class="flex flex-col">
+                <div id="logs" class="flex flex-col font-mono">
                     @if (decode_remote_command_output($application_deployment_queue)->count() > 0)
                         @foreach (decode_remote_command_output($application_deployment_queue) as $line)
-                            <div @class([
+                            <span @class([
-                                'font-mono',
+                                'dark:text-warning' => $line['hidden'],
-                                'dark:text-warning whitespace-pre-line' => $line['hidden'],
+                                'text-red-500 font-bold' => $line['type'] == 'stderr',
-                                'text-red-500 whitespace-pre-line' => $line['type'] == 'stderr',
                             ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])
-                                    <br>COMMAND: <br>{{ $line['command'] }} <br><br>OUTPUT:
+                                    <br>COMMAND: {{ $line['command'] }}<br>OUTPUT :
                                     @endif @if (str($line['output'])->contains('http://') || str($line['output'])->contains('https://'))
                                         @php
-                                            $line['output'] = preg_replace('/(https?:\/\/[^\s]+)/', '<a href="$1" target="_blank" class="underline text-neutral-400">$1</a>', $line['output']);
+                                            $line['output'] = preg_replace(
+                                                '/(https?:\/\/[^\s]+)/',
+                                                '<a href="$1" target="_blank" class="underline text-neutral-400">$1</a>',
+                                                $line['output'],
+                                            );
                                         @endphp {!! $line['output'] !!}
                                     @else
                                         {{ $line['output'] }}
                                     @endif
-                            </div>
+                            </span>
                         @endforeach
                     @else
                         <span class="font-mono text-neutral-400">No logs yet.</span>
@@ -71,39 +108,5 @@
                 </div>
             </div>
         </div>
-        <script>
-            function makeFullscreen() {
-                this.fullscreen = !this.fullscreen;
-                if (this.fullscreen === false) {
-                    this.alwaysScroll = false;
-                    clearInterval(this.intervalId);
-                }
-            }
-
-            function toggleScroll() {
-                this.alwaysScroll = !this.alwaysScroll;
-
-                if (this.alwaysScroll) {
-                    this.intervalId = setInterval(() => {
-                        const screen = document.getElementById('screen');
-                        const logs = document.getElementById('logs');
-                        if (screen.scrollTop !== logs.scrollHeight) {
-                            screen.scrollTop = logs.scrollHeight;
-                        }
-                    }, 100);
-                } else {
-                    clearInterval(this.intervalId);
-                    this.intervalId = null;
-                }
-            }
-
-            function goTop() {
-                this.alwaysScroll = false;
-                clearInterval(this.intervalId);
-                const screen = document.getElementById('screen');
-                screen.scrollTop = 0;
-            }
-        </script>
     </div>
-
 </div>

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

@@ -48,7 +48,7 @@
                         <div class="w-96">
                             <x-forms.checkbox instantSave id="application.settings.is_raw_compose_deployment_enabled"
                                 label="Raw Compose Deployment"
-                                helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
+                                helper="WARNING: Advanced use cases only. Your docker compose file will be deployed as-is. Nothing is modified by Coolify. You need to configure the proxy parts. More info in the <a href='https://coolify.io/docs/knowledge-base/docker/compose#raw-docker-compose-deployment'>documentation.</a>" />
                         </div>
                         @if (count($parsedServices) > 0 && !$application->settings->is_raw_compose_deployment_enabled)
                             <h3>Domains</h3>
@@ -59,10 +59,8 @@
                                             helper="You can specify one domain with path or more with comma. You can specify a port to bind the domain to.<br><br><span class='text-helper'>Example</span><br>- http://app.coolify.io, https://cloud.coolify.io/dashboard<br>- http://app.coolify.io/api/v3<br>- http://app.coolify.io:3000 -> app.coolify.io will point to port 3000 inside the container. "
                                             label="Domains for {{ str($serviceName)->headline() }}"
                                             id="parsedServiceDomains.{{ $serviceName }}.domain"></x-forms.input>
-                                        @if (!data_get($parsedServiceDomains, "$serviceName.domain"))
+                                        <x-forms.button wire:click="generateDomain('{{ $serviceName }}')">Generate
-                                            <x-forms.button wire:click="generateDomain('{{ $serviceName }}')">Generate
+                                            Domain</x-forms.button>
-                                                Domain</x-forms.button>
-                                        @endif
                                     </div>
                                 @endif
                             @endforeach
@@ -84,13 +82,13 @@
                     <h3>Docker Registry</h3>
                     @if ($application->build_pack !== 'dockerimage' && !$application->destination->server->isSwarm())
                         <x-helper
-                            helper="Push the built image to a docker registry. More info <a class='underline' href='https://coolify.io/docs/docker/registry' target='_blank'>here</a>." />
+                            helper="Push the built image to a docker registry. More info <a class='underline' href='https://coolify.io/docs/knowledge-base/docker/registry' target='_blank'>here</a>." />
                     @endif
                 </div>
                 @if ($application->destination->server->isSwarm())
                     @if ($application->build_pack !== 'dockerimage')
                         <div>Docker Swarm requires the image to be available in a registry. More info <a
-                                class="underline" href="https://coolify.io/docs/docker/registry"
+                                class="underline" href="https://coolify.io/docs/knowledge-base/docker/registry"
                                 target="_blank">here</a>.</div>
                     @endif
                 @endif
@@ -132,7 +130,7 @@
                 @if ($application->build_pack !== 'dockercompose')
                     <div class="w-96">
                         <x-forms.checkbox
-                            helper="Use a build server to build your application. You can configure your build server in the Server settings. This is experimental. For more info, check the <a href='https://coolify.io/docs/server/build-server' class='underline' target='_blank'>documentation</a>."
+                            helper="Use a build server to build your application. You can configure your build server in the Server settings. This is experimental. For more info, check the <a href='https://coolify.io/docs/knowledge-base/server/build-server' class='underline' target='_blank'>documentation</a>."
                             instantSave id="application.settings.is_build_server_enabled"
                             label="Use a Build Server? (experimental)" />
                     </div>
@@ -147,8 +145,9 @@
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"
                                 id="application.start_command" label="Start Command" />
                         </div>
-                        <div>Nixpacks will detect the required configuration automatically.
+                        <div class="pb-4 text-xs">Nixpacks will detect the required configuration automatically.
-                            <a class="underline" href="https://coolify.io/docs/frameworks/">Framework Specific Docs</a>
+                            <a class="underline" href="https://coolify.io/docs/resources/introduction">Framework
+                                Specific Docs</a>
                         </div>
                     @endif
                 @endif
@@ -201,18 +200,22 @@
                                     label="Publish Directory" />
                             @endif
                         @endif
+
                     </div>
-                    <div>The following options are for advanced use cases. Only modify them if you
+                    @if ($this->application->is_github_based() && !$this->application->is_public_repository())
-                        know what are
+                        <div class="pb-4">
-                        you doing.</div>
+                            <x-forms.textarea helper="Gitignore-style rules to filter Git based webhook deployments."
+                                placeholder="src/pages/**" id="application.watch_paths" label="Watch Paths" />
+                        </div>
+                    @endif
                     <x-forms.input
-                        helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/custom-docker-options'>docs.</a>"
+                        helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
                         placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k"
                         id="application.custom_docker_run_options" label="Custom Docker Options" />
                 @endif
             @else
                 <x-forms.input
-                    helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/custom-docker-options'>docs.</a>"
+                    helper="You can add custom docker run options that will be used when your container is started.<br>Note: Not all options are supported, as they could mess up Coolify's automation and could cause bad experience for users.<br><br>Check the <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/docker/custom-commands'>docs.</a>"
                     placeholder="--cap-add SYS_ADMIN --device=/dev/fuse --security-opt apparmor:unconfined --ulimit nofile=1024:1024 --tmpfs /run:rw,noexec,nosuid,size=65536k"
                     id="application.custom_docker_run_options" label="Custom Docker Options" />
             @endif

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

@@ -57,7 +57,7 @@
         <div class="pb-4">Previews</div>
         <div class="flex flex-wrap gap-6">
             @foreach ($application->previews as $preview)
-                <div class="flex flex-col p-4 bg-coolgray-200">
+                <div class="flex flex-col p-4 dark:bg-coolgray-200">
                     <div class="flex gap-2">PR #{{ data_get($preview, 'pull_request_id') }} |
                         @if (Str::of(data_get($preview, 'status'))->startsWith('running'))
                             <x-status.running :status="data_get($preview, 'status')" />
@@ -78,7 +78,7 @@
                         </a>
                     </div>
                     <div class="flex items-center gap-2 pt-6">
-                        <x-forms.button class="bg-coolgray-500"
+                        <x-forms.button class="dark:bg-coolgray-500"
                             wire:click="deploy({{ data_get($preview, 'pull_request_id') }})">
                             @if (data_get($preview, 'status') === 'exited')
                                 Deploy
@@ -88,17 +88,17 @@
                         </x-forms.button>
                         <a
                             href="{{ route('project.application.deployment.index', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
-                            <x-forms.button class="bg-coolgray-500">
+                            <x-forms.button class="dark:bg-coolgray-500">
                                 Deployment Logs
                             </x-forms.button>
                         </a>
                         <a
                             href="{{ route('project.application.logs', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
-                            <x-forms.button class="bg-coolgray-500">
+                            <x-forms.button class="dark:bg-coolgray-500">
                                 Application Logs
                             </x-forms.button>
                         </a>
-                        <x-forms.button isError class="bg-coolgray-500"
+                        <x-forms.button isError class="dark:bg-coolgray-500"
                             wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Delete
                         </x-forms.button>
                     </div>

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

@@ -25,14 +25,16 @@
         </div>
         <div class="pb-4">Code source of your application.</div>
 
-        <div class="flex gap-2">
+        <div class="flex flex-col gap-2">
-            <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository"
+            <div class="flex gap-2">
-                label="Repository" />
+                <x-forms.input placeholder="coollabsio/coolify-example" id="application.git_repository"
-            <x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
+                    label="Repository" />
-        </div>
+                <x-forms.input placeholder="main" id="application.git_branch" label="Branch" />
-        <div class="flex items-end gap-2">
+            </div>
-            <x-forms.input placeholder="HEAD" id="application.git_commit_sha" placeholder="HEAD" label="Commit SHA" />
+            <div class="flex items-end gap-2">
-
+                <x-forms.input placeholder="HEAD" id="application.git_commit_sha" placeholder="HEAD"
+                    label="Commit SHA" />
+            </div>
         </div>
         @isset($application->private_key_id)
             <h3 class="pt-4">Deploy Key</h3>

resources/views/livewire/project/clone-me.blade.php

@@ -15,8 +15,8 @@
                 <div class="pt-4 pb-2">Docker Networks</div>
                 <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
                     @foreach ($server->destinations() as $destination)
-                        <div class="cursor-pointer box-without-bg bg-coolgray-200 group"
+                        <div class="cursor-pointer box-without-bg group"
-                            :class="'{{ $selectedDestination === $destination->id }}' && 'bg-coollabs dark:text-white'"
+                            :class="'{{ $selectedDestination === $destination->id }}' ? 'bg-coollabs text-white' : 'dark:bg-coolgray-100 bg-white'"
                             wire:click="selectServer('{{ $server->id }}', '{{ $destination->id }}')">
                             {{ $destination->name }}
                         </div>
@@ -30,7 +30,7 @@
     <div>These will be cloned to the new project</div>
     <div class="grid grid-cols-1 gap-2 pt-4 opacity-95 lg:grid-cols-2 xl:grid-cols-3">
         @foreach ($environment->applications->sortBy('name') as $application)
-            <div class="cursor-default box-without-bg bg-coolgray-100 group">
+            <div class="bg-white cursor-default box-without-bg dark:bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold dark:text-white">{{ $application->name }}</div>
                     <div class="description">{{ $application->description }}</div>
@@ -38,7 +38,7 @@
             </div>
         @endforeach
         @foreach ($environment->databases()->sortBy('name') as $database)
-            <div class="cursor-default box-without-bg bg-coolgray-100 group">
+            <div class="bg-white cursor-default box-without-bg dark:bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold dark:text-white">{{ $database->name }}</div>
                     <div class="description">{{ $database->description }}</div>
@@ -46,7 +46,7 @@
             </div>
         @endforeach
         @foreach ($environment->services->sortBy('name') as $service)
-            <div class="cursor-default box-without-bg bg-coolgray-100 group">
+            <div class="bg-white cursor-default box-without-bg dark:bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold dark:text-white">{{ $service->name }}</div>
                     <div class="description">{{ $service->description }}</div>

resources/views/livewire/project/database/backup-executions.blade.php

@@ -1,7 +1,7 @@
 <div class="flex flex-col-reverse gap-2">
     @forelse($executions as $execution)
         <form wire:key="{{ data_get($execution, 'id') }}"
-            class="relative flex flex-col p-4 border-dotted border-1 bg-coolgray-100" @class([
+            class="relative flex flex-col p-4 bg-white box-without-bg dark:bg-coolgray-100" @class([
                 'border-green-500' => data_get($execution, 'status') === 'success',
                 'border-red-500' => data_get($execution, 'status') === 'failed',
             ])>
@@ -23,7 +23,7 @@
             <div class="flex gap-2">
                 <div class="flex-1"></div>
                 @if (data_get($execution, 'status') === 'success')
-                    <x-forms.button class=" hover:bg-coolgray-400"
+                    <x-forms.button class=" dark:hover:bg-coolgray-400"
                         wire:click="download({{ data_get($execution, 'id') }})">Download</x-forms.button>
                 @endif
                 <x-modal-confirmation isErrorButton action="deleteBackup({{ data_get($execution, 'id') }})">

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

@@ -24,10 +24,10 @@
         <div>You can use these variables anywhere with</div>
         <div class=" dark:text-warning text-coollabs">@{{ project.VARIABLENAME }} </div>
         <x-helper
-            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">
-        @forelse ($project->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($project->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" type="project" />
         @empty

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

@@ -49,10 +49,10 @@
         </x-modal-input>
     </div>
     <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="dark:text-warning text-coollabs">@{{environment.VARIABLENAME}}</span><x-helper
-            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
+            helper="More info <a class='underline dark:text-white' href='https://coolify.io/docs/knowledge-base/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">
-        @forelse ($environment->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($environment->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" type="environment" />
         @empty

resources/views/livewire/project/new/github-private-repository.blade.php

@@ -1,9 +1,9 @@
 <div>
     <div class="flex items-end gap-2">
         <h1>Create a new Application</h1>
-        <x-forms.button wire:click="saveFromRedirect('source.new')" class="group-hover:dark:text-white">
+        <x-modal-input buttonTitle="+ Add GitHub App" title="New GitHub App">
-            + Add New GitHub App
+            <livewire:source.github.create />
-        </x-forms.button>
+        </x-modal-input>
         @if ($repositories->count() > 0)
             <a target="_blank" class="flex hover:no-underline" href="{{ get_installation_path($github_app) }}">
                 <x-forms.button>

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

@@ -377,16 +377,16 @@
             <div class="flex items-center gap-4" wire:init='loadServices'>
                 <h2 class="py-4">Services</h2>
                 <x-forms.button wire:click="loadServices('force')">Reload List</x-forms.button>
-                <input class="input" autofocus wire:model.live.debounce.200ms="search" autofocus
-                    placeholder="Search...">
             </div>
             <div class="pb-4 text-xs">Trademarks Policy: The respective trademarks mentioned here are owned by the
                 respective
                 companies, and use of them does not imply any affiliation or endorsement.</div>
-            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
+            <input class="input" autofocus wire:model.live.debounce.200ms="search" autofocus
-                @if ($loadingServices)
+                placeholder="Search...">
-                    <span class="loading loading-xs loading-spinner"></span>
+            @if ($loadingServices)
-                @else
+                <x-loading text="Loading services..." />
+            @else
+                <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-2">
                     @forelse ($services as $serviceName => $service)
                         @if (data_get($service, 'minversion') && version_compare(config('version'), data_get($service, 'minversion'), '<'))
                             <x-resource-view wire="setType('one-click-service-{{ $serviceName }}')">
@@ -457,74 +457,73 @@
                     @empty
                         <div class="w-96">No service found. Please try to reload the list!</div>
                     @endforelse
-                @endif
+            @endif
-            </div>
+    </div>
 
-        @endif
+    @endif
-        @if ($current_step === 'servers')
+    @if ($current_step === 'servers')
-            <h2>Select a server</h2>
+        <h2>Select a server</h2>
-            <div class="pb-5"></div>
+        <div class="pb-5"></div>
-            <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
+        <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
-                @forelse($servers as $server)
+            @forelse($servers as $server)
-                    <div class="w-full lg:w-64 box group" wire:click="setServer({{ $server }})">
+                <div class="w-full lg:w-64 box group" wire:click="setServer({{ $server }})">
-                        <div class="flex flex-col mx-6">
+                    <div class="flex flex-col mx-6">
-                            <div class="font-bold group-hover:dark:text-white">
+                        <div class="font-bold group-hover:dark:text-white">
-                                {{ $server->name }}
+                            {{ $server->name }}
-                            </div>
-                            <div class="text-xs group-hover:dark:text-white">
-                                {{ $server->description }}</div>
                         </div>
+                        <div class="text-xs group-hover:dark:text-white">
+                            {{ $server->description }}</div>
                     </div>
-                @empty
+                </div>
-                    <div>
+            @empty
-                        <div>No validated & reachable servers found. <a class="underline dark:text-white"
+                <div>
-                                href="/servers">
+                    <div>No validated & reachable servers found. <a class="underline dark:text-white" href="/servers">
-                                Go to servers page
+                            Go to servers page
-                            </a></div>
+                        </a></div>
-                    </div>
+                </div>
-                @endforelse
+            @endforelse
-            </div>
+        </div>
-            {{-- @if ($isDatabase)
+        {{-- @if ($isDatabase)
                 <div class="text-center">Swarm clusters are excluded from this type of resource at the moment. It will
                     be activated soon. Stay tuned.</div>
             @endif --}}
-        @endif
+    @endif
-        @if ($current_step === 'destinations')
+    @if ($current_step === 'destinations')
-            <h2>Select a destination</h2>
+        <h2>Select a destination</h2>
-            <div>Destinations are used to segregate resources by network. If you are unsure, select the default
+        <div>Destinations are used to segregate resources by network. If you are unsure, select the default
-                Standalone Docker (coolify).</div>
+            Standalone Docker (coolify).</div>
-            <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
+        <div class="flex flex-col justify-center gap-4 text-left xl:flex-row xl:flex-wrap">
-                @if ($server->isSwarm())
+            @if ($server->isSwarm())
-                    @foreach ($swarmDockers as $swarmDocker)
+                @foreach ($swarmDockers as $swarmDocker)
-                        <div class="box group" wire:click="setDestination('{{ $swarmDocker->uuid }}')">
+                    <div class="box group" wire:click="setDestination('{{ $swarmDocker->uuid }}')">
-                            <div class="flex flex-col mx-6">
+                        <div class="flex flex-col mx-6">
-                                <div class="font-bold group-hover:dark:text-white">
+                            <div class="font-bold group-hover:dark:text-white">
-                                    Swarm Docker <span class="text-xs">({{ $swarmDocker->name }})</span>
+                                Swarm Docker <span class="text-xs">({{ $swarmDocker->name }})</span>
-                                </div>
                             </div>
                         </div>
-                    @endforeach
+                    </div>
-                @else
+                @endforeach
-                    @foreach ($standaloneDockers as $standaloneDocker)
+            @else
-                        <div class="box group" wire:click="setDestination('{{ $standaloneDocker->uuid }}')">
+                @foreach ($standaloneDockers as $standaloneDocker)
-                            <div class="flex flex-col mx-6">
+                    <div class="box group" wire:click="setDestination('{{ $standaloneDocker->uuid }}')">
-                                <div class="font-bold group-hover:dark:text-white">
+                        <div class="flex flex-col mx-6">
-                                    Standalone Docker <span class="text-xs">({{ $standaloneDocker->name }})</span>
+                            <div class="font-bold group-hover:dark:text-white">
-                                </div>
+                                Standalone Docker <span class="text-xs">({{ $standaloneDocker->name }})</span>
-                                <div class="text-xs group-hover:dark:text-white">
-                                    Network: {{ $standaloneDocker->network }}</div>
                             </div>
+                            <div class="text-xs group-hover:dark:text-white">
+                                Network: {{ $standaloneDocker->network }}</div>
                         </div>
-                    @endforeach
+                    </div>
-                @endif
+                @endforeach
-            </div>
+            @endif
-        @endif
+        </div>
-        @if ($current_step === 'existing-postgresql')
+    @endif
-            <form wire:submit='addExistingPostgresql' class="flex items-end gap-4">
+    @if ($current_step === 'existing-postgresql')
-                <x-forms.input placeholder="postgres://username:password@database:5432" label="Database URL"
+        <form wire:submit='addExistingPostgresql' class="flex items-end gap-4">
-                    id="existingPostgresqlUrl" />
+            <x-forms.input placeholder="postgres://username:password@database:5432" label="Database URL"
-                <x-forms.button type="submit">Add Database</x-forms.button>
+                id="existingPostgresqlUrl" />
-            </form>
+            <x-forms.button type="submit">Add Database</x-forms.button>
-        @endif
+        </form>
-    </div>
+    @endif
+</div>
 </div>

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

@@ -51,7 +51,7 @@
                                 $application->status)->contains(['running']),
                             'border-l border-dashed border-warning' => Str::of(
                                 $application->status)->contains(['starting']),
-                            'flex gap-2 box-without-bg bg-coolgray-100 hover:text-neutral-300 group',
+                            'flex gap-2 box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-300 group',
                         ])>
                             <div class="flex flex-row w-full">
                                 <div class="flex flex-col flex-1">
@@ -95,7 +95,7 @@
                                 $database->status)->contains(['running']),
                             'border-l border-dashed border-warning' => Str::of(
                                 $database->status)->contains(['restarting']),
-                            'flex gap-2 box-without-bg bg-coolgray-100 hover:text-neutral-300 group',
+                            'flex gap-2 box-without-bg dark:bg-coolgray-100 bg-white dark:hover:text-neutral-300 group',
                         ])>
                             <div class="flex flex-row w-full">
                                 <div class="flex flex-col flex-1">

resources/views/livewire/project/service/file-storage.blade.php

@@ -1,27 +1,17 @@
-<div tabindex="0" x-data="{ open: false }"
+<div class="p-4 transition border rounded cursor-pointer border-coolgray-200">
-    class="transition border rounded cursor-pointer collapse collapse-arrow border-coolgray-200"
+    <div class="flex flex-col justify-center pb-4 text-sm select-text">
-    :class="open ? 'collapse-open' : 'collapse-close'">
+        <h2>{{ $service->name }}</h2>
-    <div class="flex flex-col justify-center text-sm select-text collapse-title" x-on:click="open = !open">
         <div>{{ $workdir }}{{ $fs_path }} -> {{ $fileStorage->mount_path }}</div>
     </div>
-    <div class="collapse-content">
+    <div>
         <form wire:submit='submit' class="flex flex-col gap-2">
             <div class="w-64">
                 <x-forms.checkbox instantSave label="Is directory?" id="fileStorage.is_directory"></x-forms.checkbox>
             </div>
-            {{-- @if ($fileStorage->is_directory)
-                <x-forms.input readonly label="Directory on Filesystem (save files here)" id="fs_path"></x-forms.input>
-            @else --}}
-            {{-- <div class="flex gap-2">
-                    <x-forms.input readonly label="File in Docker Compose file" id="fileStorage.fs_path"></x-forms.input>
-                    <x-forms.input readonly label="File on Filesystem (save files here)" id="fs_path"></x-forms.input>
-                </div>
-                <x-forms.input readonly label="Mount (in container)" id="fileStorage.mount_path"></x-forms.input> --}}
             @if (!$fileStorage->is_directory)
                 <x-forms.textarea label="Content" rows="20" id="fileStorage.content"></x-forms.textarea>
                 <x-forms.button type="submit">Save</x-forms.button>
             @endif
-            {{-- @endif --}}
         </form>
     </div>
 </div>

resources/views/livewire/project/service/stack-form.blade.php

@@ -15,7 +15,7 @@
     </div>
     <div class="w-96">
         <x-forms.checkbox instantSave id="service.connect_to_docker_network" label="Connect To Predefined Network"
-            helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/docker/compose#connect-to-predefined-networks'>this</a>." />
+            helper="By default, you do not reach the Coolify defined networks.<br>Starting a docker compose based resource will have an internal network. <br>If you connect to a Coolify defined network, you maybe need to use different internal DNS names to connect to a resource.<br><br>For more information, check <a class='underline dark:text-white' target='_blank' href='https://coolify.io/docs/knowledge-base/docker/compose#connect-to-predefined-networks'>this</a>." />
     </div>
     @if ($fields)
         <div>

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

@@ -32,7 +32,7 @@
             @endif
         @endif
     @else
-        @if ($resource->persistentStorages()->get()->count() > 0 || $resource->fileStorages()->get()->count() > 0)
+        @if ($resource->persistentStorages()->get()->count() > 0)
             <h3 class="pt-4">{{ Str::headline($resource->name) }} </h3>
         @endif
         @if ($resource->persistentStorages()->get()->count() > 0)

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

@@ -2,9 +2,10 @@
     <h2>Servers</h2>
     <div class="">Server related configurations.</div>
     <div class="grid grid-cols-1 gap-4 py-4">
-        <div class="flex gap-2">
+        <div class="flex flex-col gap-2">
-            <div class="relative flex flex-col bg-white border cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96 dark:border-black">
+            <h3>Primary Server</h3>
-                <div class="text-xl font-bold">Primary Server</div>
+            <div
+                class="relative flex flex-col bg-white border cursor-default dark:text-white box-without-bg dark:bg-coolgray-100 w-96 dark:border-black">
                 @if (str($resource->realStatus())->startsWith('running'))
                     <div title="{{ $resource->realStatus() }}" class="absolute bg-success -top-1 -left-1 badge ">
                     </div>
@@ -12,26 +13,29 @@
                     <div title="{{ $resource->realStatus() }}" class="absolute bg-error -top-1 -left-1 badge ">
                     </div>
                 @endif
-                <div>
+                <div class="box-title">
                     Server: {{ data_get($resource, 'destination.server.name') }}
                 </div>
-                <div>
+                <div class="box-description">
                     Network: {{ data_get($resource, 'destination.network') }}
                 </div>
             </div>
             @if ($resource?->additional_networks?->count() > 0)
-                <x-forms.button
+                <div class="flex gap-2">
-                    wire:click="redeploy('{{ data_get($resource, 'destination.id') }}','{{ data_get($resource, 'destination.server.id') }}')">Deploy</x-forms.button>
+                    <x-forms.button
-                @if (str($resource->realStatus())->startsWith('running'))
+                        wire:click="redeploy('{{ data_get($resource, 'destination.id') }}','{{ data_get($resource, 'destination.server.id') }}')">Deploy</x-forms.button>
-                    <x-forms.button isError
+                    @if (str($resource->realStatus())->startsWith('running'))
-                        wire:click="stop('{{ data_get($resource, 'destination.server.id') }}')">Stop</x-forms.button>
+                        <x-forms.button isError
-                @endif
+                            wire:click="stop('{{ data_get($resource, 'destination.server.id') }}')">Stop</x-forms.button>
+                    @endif
+                </div>
             @endif
         </div>
         @if ($resource?->additional_networks?->count() > 0)
+            <h3>Additional Server(s)</h3>
             @foreach ($resource->additional_networks as $destination)
-                <div class="flex gap-2">
+                <div class="flex flex-col gap-2">
-                    <div class="relative flex flex-col box w-96">
+                    <div class="relative flex flex-col w-full box">
                         @if (str(data_get($destination, 'pivot.status'))->startsWith('running'))
                             <div title="{{ data_get($destination, 'pivot.status') }}"
                                 class="absolute bg-success -top-1 -left-1 badge "></div>
@@ -40,28 +44,31 @@
                                 class="absolute bg-error -top-1 -left-1 badge "></div>
                         @endif
                         <div>
-                            Server: {{ data_get($destination, 'server.name') }}
+                            <div class="box-title">
-                        </div>
+                                Server: {{ data_get($destination, 'server.name') }}
-                        <div>
+                            </div>
-                            Network: {{ data_get($destination, 'network') }}
+                            <div class="box-description">
+                                Network: {{ data_get($destination, 'network') }}
+                            </div>
                         </div>
                     </div>
-                    <x-forms.button
+                    <div class="flex gap-2">
-                        wire:click="redeploy('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">Deploy</x-forms.button>
+                        <x-forms.button
-                    <x-forms.button
+                            wire:click="redeploy('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">Deploy</x-forms.button>
-                        wire:click="promote('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">Promote
+                        <x-forms.button
-                        to Primary </x-forms.button>
+                            wire:click="promote('{{ data_get($destination, 'id') }}','{{ data_get($destination, 'server.id') }}')">Promote
-                    @if (data_get_str($destination, 'pivot.status')->startsWith('running'))
+                            to Primary </x-forms.button>
-                        <x-forms.button isError
+                        @if (data_get_str($destination, 'pivot.status')->startsWith('running'))
-                            wire:click="stop('{{ data_get($destination, 'server.id') }}')">Stop</x-forms.button>
+                            <x-forms.button isError
-                    @endif
+                                wire:click="stop('{{ data_get($destination, 'server.id') }}')">Stop</x-forms.button>
-                    <x-modal-confirmation
+                        @endif
-                        action="removeServer({{ data_get($destination, 'id') }},{{ data_get($destination, 'server.id') }})"
+                        <x-modal-confirmation
-                        isErrorButton buttonTitle="Remove Server">
+                            action="removeServer({{ data_get($destination, 'id') }},{{ data_get($destination, 'server.id') }})"
-                        This will stop the running application in this server and remove it as a deployment
+                            isErrorButton buttonTitle="Remove Server">
-                        destination.<br><br>Please think again.
+                            This will stop the running application in this server and remove it as a deployment
-                    </x-modal-confirmation>
+                            destination.<br><br>Please think again.
-
+                        </x-modal-confirmation>
+                    </div>
                 </div>
             @endforeach
         @endif
@@ -75,10 +82,12 @@
                     <div wire:click="addServer('{{ $network->id }}','{{ data_get($network, 'server.id') }}')"
                         class="relative flex flex-col cursor-default dark:text-white box w-96">
                         <div>
-                            Server: {{ data_get($network, 'server.name') }}
+                            <div class="box-title">
-                        </div>
+                                Server: {{ data_get($network, 'server.name') }}
-                        <div>
+                            </div>
-                            Network: {{ data_get($network, 'name') }}
+                            <div class="box-description">
+                                Network: {{ data_get($network, 'name') }}
+                            </div>
                         </div>
                     </div>
                 @endforeach

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

@@ -16,7 +16,7 @@
         @endif
     </div>
     @if ($view === 'normal')
-        @forelse ($resource->environment_variables->sort()->sortBy('real_value') as $env)
+        @forelse ($resource->environment_variables->sort()->sortBy('key') as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />
         @empty
@@ -27,7 +27,7 @@
                 <h3>Preview Deployments</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
-            @foreach ($resource->environment_variables_preview->sort()->sortBy('real_value') as $env)
+            @foreach ($resource->environment_variables_preview->sort()->sortBy('key') as $env)
                 <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                     :env="$env" :type="$resource->type()" />
             @endforeach