Merge pull request #1223 from coollabsio/next

v4.0.0-beta.35

.dockerignore

@@ -20,3 +20,5 @@ yarn-error.log
 /.npm
 /.bash_history
 /_data
+.rnd
+/.ssh

.env.development.example

@@ -6,6 +6,7 @@
 USERID=
 GROUPID=
 ############################################################################################################
+APP_NAME=Coolify-localhost
 APP_ID=development
 APP_ENV=local
 APP_KEY=
@@ -14,3 +15,9 @@ APP_URL=http://localhost
 APP_PORT=8000
 
 DUSK_DRIVER_URL=http://selenium:4444
+
+## For Andras only
+# To purge cache
+BUNNY_API_KEY=
+# To upload assets
+BUNNY_STORAGE_API_KEY=

.env.secrets.example

@@ -1,6 +0,0 @@
-# Secrets related to pushing to GH, Sync files to BunnyCDN etc. Only for maintainers.
-# Not related to Coolify, but to how we publish new versions.
-
-GITHUB_TOKEN=
-BUNNY_API_KEY=
-BUNNY_STORAGE_API_KEY=

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -0,0 +1,26 @@
+name: Bug report
+description: Create a new bug report
+title: '[Bug]: '
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: A clear and concise description of the problem
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Minimal Reproduction (if possible, example repository)
+      description: Please provide a step by step guide to reproduce the issue
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Exception or Error
+      description: Please provide error logs if possible.
+  - type: input
+    attributes:
+      label: Version
+      description: Coolify's version (see bottom left corner).
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 🤔 Community Support (Chat)
+    url: https://coollabs.io/discord
+    about: Reach out to us on Discord.
+  - name: 🙋‍♂️ Feature Requests
+    url: https://github.com/coollabsio/coolify/discussions/categories/feature-requests-ideas
+    about: All feature requests will be discussed here.

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

@@ -0,0 +1,84 @@
+name: Coolify Helper Image Development (v4)
+
+on:
+  push:
+    branches: [ "next" ]
+    paths:
+      - .github/workflows/coolify-helper.yml
+      - docker/coolify-helper/Dockerfile
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: "coollabsio/coolify-helper"
+
+jobs:
+  amd64:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v3
+        with:
+          no-cache: true
+          context: .
+          file: docker/coolify-helper/Dockerfile
+          platforms: linux/amd64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+  aarch64:
+    runs-on: [ self-hosted, arm64 ]
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Build image and push to registry
+        uses: docker/build-push-action@v3
+        with:
+          no-cache: true
+          context: .
+          file: docker/coolify-helper/Dockerfile
+          platforms: linux/aarch64
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
+  merge-manifest:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: [ amd64, aarch64 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to ghcr.io
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN  }}
+      - name: Create & publish manifest
+        run: |
+          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.github/workflows/coolify-helper.yml

@@ -2,7 +2,7 @@ name: Coolify Helper Image (v4)
 
 on:
   push:
-    branches: [ "main", "next" ]
+    branches: [ "main" ]
     paths:
       - .github/workflows/coolify-helper.yml
       - docker/coolify-helper/Dockerfile
@@ -55,7 +55,7 @@ jobs:
           file: docker/coolify-helper/Dockerfile
           platforms: linux/aarch64
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest-aarch64
   merge-manifest:
     runs-on: ubuntu-latest
     permissions:
@@ -78,3 +78,7 @@ jobs:
       - name: Create & publish manifest
         run: |
           docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+      - uses: sarisia/actions-status-discord@v1
+        if: always()
+        with:
+          webhook: ${{ secrets.DISCORD_WEBHOOK_PROD_RELEASE_CHANNEL  }}

.github/workflows/development-build.yml

@@ -3,6 +3,9 @@ name: Development Build (v4)
 on:
   push:
     branches: ["next"]
+    paths-ignore:
+      - .github/workflows/coolify-helper.yml
+      - docker/coolify-helper/Dockerfile
 
 env:
   REGISTRY: ghcr.io
@@ -10,7 +13,7 @@ env:
 
 jobs:
   amd64:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, x64]
     steps:
       - uses: actions/checkout@v3
       - name: Login to ghcr.io
@@ -49,7 +52,7 @@ jobs:
             push: true
             tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:next-aarch64
   merge-manifest:
-      runs-on: ubuntu-latest
+      runs-on: [self-hosted, x64]
       permissions:
         contents: read
         packages: write
@@ -73,4 +76,4 @@ jobs:
         - uses: sarisia/actions-status-discord@v1
           if: always()
           with:
-            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}
+            webhook: ${{ secrets.DISCORD_WEBHOOK_DEV_RELEASE_CHANNEL  }}

.gitignore

@@ -29,3 +29,6 @@ _ide_helper.php
 .gitignore
 .phpstorm.meta.php
 _ide_helper_models.php
+.rnd
+/.ssh
+scripts/load-test/*

README.md

@@ -1,20 +1,30 @@
-# Coolify v4 Beta
+# About the Project
 
-An open-source & self-hostable Heroku / Netlify alternative.
+Coolify is an open-source & self-hostable alternative to Heroku / Netlify / Vercel / etc. 
+
+It helps you to manage your servers, applications, databases on your own hardware, all you need is SSH connection. You can manage VPS, Bare Metal, Raspberry PI's anything.
+
+Image if you could have the ease of a cloud but with your own servers. That is **Coolify**.
+
+No vendor lock-in, which means that all the configuration for your applications/databases/etc are saved to your server. So if you decide to stop using Coolify (oh nooo), you could still manage your running resources. You just lose the automations and all the magic. 🪄️
+
+For more information, take a look at our landing page [here](https://coolify.io).
+
+> If you are looking for previous (v3) version, it is [here](https://github.com/coollabsio/coolify/tree/v3).
+
+# Cloud
+
+If you do not want to self-host Coolify, there is a paid cloud version available: https://app.coolify.io
+
+You can easily attach your own servers, get all the automations, free email notifications, etc.
+
+For more information & pricing, take a look at our landing page [here](https://coolify.io).
 
 # Beta
 
-You are checking the next-gen of Coolify, aka v4. Hi 👋
+The latest version (v4) is still in beta. That does not mean it is unstable. All the features that are available are stable enough be usable in real-life. 
 
-It is still in beta, lots of improvements will come every day. Things could break, but we are working hard to make it stable as soon as possible. If you find any bugs, please report them.
-
-Automatic updates are available, so you will receive the latest version as soon as it is released.
-
-If you are looking for v3, check out the [v3 branch](https://github.com/coollabsio/coolify/tree/v3).
-
-## What's new?
-
-Well, the whole tech stack changed, core is different, so yeah, a lot (documentation incoming).
+There are hundreds of people using it for managing their client's applications, freelancers, hobbyists, businesses.
 
 # Installation
 
@@ -26,13 +36,19 @@ You can find the installation script [here](./scripts/install.sh).
 
 ## Support
 
--   Twitter: [@heyandras](https://twitter.com/heyandras)
--   Mastodon: [@andrasbacsai@fosstodon.org](https://fosstodon.org/@andrasbacsai)
--   Email: [andras@coollabs.io](mailto:andras@coollabs.io)
--   Discord: [Invitation](https://coollabs.io/discord)
--   Telegram: [@andrasbacsai](https://t.me/andrasbacsai)
+Contact us [here](https://docs.coollabs.io/contact).
 
----
+## Recognitions
+
+<a href="https://news.ycombinator.com/item?id=26624341">
+  <img
+    style="width: 250px; height: 54px;" width="250" height="54"
+    alt="Featured on Hacker News"
+    src="https://hackernews-badge.vercel.app/api?id=26624341"
+  />
+</a>
+
+<a href="https://www.producthunt.com/posts/coolify?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-coolify" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=338273&theme=light" alt="Coolify - An&#0032;open&#0045;source&#0032;&#0038;&#0032;self&#0045;hostable&#0032;Heroku&#0044;&#0032;Netlify&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
 ## 💰 Financial Contributors
 

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -97,7 +97,6 @@ class RunRemoteProcess
             'status' => $status->value,
         ]);
         $this->activity->save();
-
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
             throw new \RuntimeException($processResult->errorOutput());
         }

app/Actions/Database/StartPostgresql.php

@@ -17,7 +17,7 @@ class StartPostgresql
     public function __invoke(Server $server, StandalonePostgresql $database)
     {
         $this->database = $database;
-        $container_name = generate_container_name($this->database->uuid);
+        $container_name = $this->database->uuid;
         $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
 
         $this->commands = [
@@ -36,7 +36,7 @@ class StartPostgresql
                     'image' => $this->database->image,
                     'container_name' => $container_name,
                     'environment' => $environment_variables,
-                    'restart' => 'always',
+                    'restart' => RESTART_MODE,
                     'networks' => [
                         $this->database->destination->network,
                     ],
@@ -65,7 +65,7 @@ class StartPostgresql
             ],
             'networks' => [
                 $this->database->destination->network => [
-                    'external' => false,
+                    'external' => true,
                     'name' => $this->database->destination->network,
                     'attachable' => true,
                 ]

app/Actions/License/CheckResaleLicense.php

@@ -14,14 +14,14 @@ class CheckResaleLicense
             $settings->update([
                 'is_resale_license_active' => false,
             ]);
-            if (is_dev()) {
+            if (isDev()) {
                 return;
             }
             if (!$settings->resale_license) {
                 return;
             }
             $base_url = config('coolify.license_url');
-            if (is_dev()) {
+            if (isDev()) {
                 $base_url = 'http://host.docker.internal:8787';
             }
             $instance_id = config('app.id');
@@ -57,13 +57,13 @@ class CheckResaleLicense
                 throw new \Exception('Invalid license key.');
             }
             throw new \Exception('Cannot activate license key.');
-        } catch (\Throwable $th) {
-            ray($th);
+        } catch (\Throwable $e) {
+            ray($e);
             $settings->update([
                 'resale_license' => null,
                 'is_resale_license_active' => false,
             ]);
-            throw $th;
+            throw $e;
         }
     }
 }

app/Actions/Proxy/SaveConfigurationSync.php

@@ -9,15 +9,20 @@ class SaveConfigurationSync
 {
     public function __invoke(Server $server, string $configuration)
     {
-        $proxy_path = get_proxy_path();
-        $docker_compose_yml_base64 = base64_encode($configuration);
+        try {
+            $proxy_path = get_proxy_path();
+            $docker_compose_yml_base64 = base64_encode($configuration);
 
-        $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-        $server->save();
+            $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
+            $server->save();
+
+            instant_remote_process([
+                "mkdir -p $proxy_path",
+                "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
+            ], $server);
+        } catch (\Throwable $e) {
+            ray($e);
+        }
 
-        instant_remote_process([
-            "mkdir -p $proxy_path",
-            "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
-        ], $server);
     }
 }

app/Actions/Proxy/StartProxy.php

@@ -2,8 +2,6 @@
 
 namespace App\Actions\Proxy;
 
-use App\Enums\ProxyStatus;
-use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Spatie\Activitylog\Models\Activity;
@@ -12,12 +10,6 @@ class StartProxy
 {
     public function __invoke(Server $server): Activity
     {
-        // TODO: check for other proxies
-        if (is_null(data_get($server, 'proxy.type'))) {
-            $server->proxy->type = ProxyTypes::TRAEFIK_V2->value;
-            $server->proxy->status = ProxyStatus::EXITED->value;
-            $server->save();
-        }
         $proxy_path = get_proxy_path();
         $networks = collect($server->standaloneDockers)->map(function ($docker) {
             return $docker['network'];
@@ -36,19 +28,22 @@ class StartProxy
         $server->save();
 
         $activity = remote_process([
-            "echo 'Creating required Docker networks...'",
+            "echo '####### Creating required Docker networks...'",
             ...$create_networks_command,
             "cd $proxy_path",
-            "echo 'Creating Docker Compose file...'",
-            "echo 'Pulling docker image...'",
-            'docker compose pull -q',
-            "echo 'Stopping existing proxy...'",
+            "echo '####### Creating Docker Compose file...'",
+            "echo '####### Pulling docker image...'",
+            'docker compose pull',
+            "echo '####### Stopping existing coolify-proxy...'",
             'docker compose down -v --remove-orphans',
             "lsof -nt -i:80 | xargs -r kill -9",
             "lsof -nt -i:443 | xargs -r kill -9",
-            "echo 'Starting proxy...'",
+            "systemctl disable nginx > /dev/null 2>&1 || true",
+            "systemctl disable apache2 > /dev/null 2>&1 || true",
+            "systemctl disable apache > /dev/null 2>&1 || true",
+            "echo '####### Starting coolify-proxy...'",
             'docker compose up -d --remove-orphans',
-            "echo 'Proxy installed successfully...'"
+            "echo '####### Proxy installed successfully...'"
         ], $server);
 
         return $activity;

app/Actions/Server/InstallDocker.php

@@ -10,32 +10,50 @@ class InstallDocker
 {
     public function __invoke(Server $server, Team $team)
     {
-        $dockerVersion = '23.0';
-        $config = base64_encode('{ "live-restore": true }');
-        $activity = remote_process([
-            "echo ####### Installing Prerequisites...",
-            "command -v jq >/dev/null || apt-get update",
-            "command -v jq >/dev/null || apt install -y jq",
-            "echo ####### Installing/updating Docker Engine...",
-            "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
-            "echo ####### Configuring Docker Engine (merging existing configuration with the required)...",
-            "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
-            "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
-            "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
-            "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
-            "echo ####### Restarting Docker Engine...",
-            "systemctl restart docker",
-            "echo ####### Creating default network...",
-            "docker network create --attachable coolify",
-            "echo ####### Done!"
-        ], $server);
-        StandaloneDocker::create([
-            'name' => 'coolify',
-            'network' => 'coolify',
-            'server_id' => $server->id,
-            'team_id' => $team->id
-        ]);
-
-        return $activity;
+        $dockerVersion = '24.0';
+        $config = base64_encode('{
+            "log-driver": "json-file",
+            "log-opts": {
+              "max-size": "10m",
+              "max-file": "3"
+            }
+          }');
+        $found = StandaloneDocker::where('server_id', $server->id);
+        if ($found->count() == 0) {
+            StandaloneDocker::create([
+                'name' => 'coolify',
+                'network' => 'coolify',
+                'server_id' => $server->id,
+            ]);
+        }
+        if (isDev()) {
+            return remote_process([
+                "echo '####### Installing Prerequisites...'",
+                "sleep 1",
+                "echo '####### Installing/updating Docker Engine...'",
+                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "sleep 4",
+                "echo '####### Restarting Docker Engine...'",
+                "ls -l /tmp"
+            ], $server);
+        } else {
+            return remote_process([
+                "echo '####### Installing Prerequisites...'",
+                "command -v jq >/dev/null || apt-get update",
+                "command -v jq >/dev/null || apt install -y jq",
+                "echo '####### Installing/updating Docker Engine...'",
+                "curl https://releases.rancher.com/install-docker/{$dockerVersion}.sh | sh",
+                "echo '####### Configuring Docker Engine (merging existing configuration with the required)...'",
+                "test -s /etc/docker/daemon.json && cp /etc/docker/daemon.json \"/etc/docker/daemon.json.original-`date +\"%Y%m%d-%H%M%S\"`\" || echo '{$config}' | base64 -d > /etc/docker/daemon.json",
+                "echo '{$config}' | base64 -d > /etc/docker/daemon.json.coolify",
+                "cat <<< $(jq . /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json.coolify",
+                "cat <<< $(jq -s '.[0] * .[1]' /etc/docker/daemon.json /etc/docker/daemon.json.coolify) > /etc/docker/daemon.json",
+                "echo '####### Restarting Docker Engine...'",
+                "systemctl restart docker",
+                "echo '####### Creating default Docker network (coolify)...'",
+                "docker network create --attachable coolify >/dev/null 2>&1 || true",
+                "echo '####### Done!'"
+            ], $server);
+        }
     }
 }

app/Actions/Server/UpdateCoolify.php

@@ -7,9 +7,9 @@ use App\Models\Server;
 
 class UpdateCoolify
 {
-    public Server $server;
-    public string $latest_version;
-    public string $current_version;
+    public ?Server $server = null;
+    public ?string $latestVersion = null;
+    public ?string $currentVersion = null;
 
     public function __invoke(bool $force)
     {
@@ -17,43 +17,44 @@ class UpdateCoolify
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
             $localhost_name = 'localhost';
-            if (is_dev()) {
-                $localhost_name = 'testing-local-docker-container';
+            $this->server = Server::where('name', $localhost_name)->first();
+            if (!$this->server) {
+                return;
             }
-            $this->server = Server::where('name', $localhost_name)->firstOrFail();
-            $this->latest_version = get_latest_version_of_coolify();
-            $this->current_version = config('version');
-            ray('latest version:' . $this->latest_version . " current version: " . $this->current_version . ' force: ' . $force);
+            $this->latestVersion = get_latest_version_of_coolify();
+            $this->currentVersion = config('version');
+            ray('latest version:' . $this->latestVersion . " current version: " . $this->currentVersion . ' force: ' . $force);
             if ($settings->next_channel) {
                 ray('next channel enabled');
-                $this->latest_version = 'next';
+                $this->latestVersion = 'next';
             }
             if ($force) {
                 $this->update();
             } else {
                 if (!$settings->is_auto_update_enabled) {
-                    throw new \Exception('Auto update is disabled');
+                    return 'Auto update is disabled';
                 }
-                if ($this->latest_version === $this->current_version) {
-                    throw new \Exception('Already on latest version');
+                if ($this->latestVersion === $this->currentVersion) {
+                    return 'Already on latest version';
                 }
-                if (version_compare($this->latest_version, $this->current_version, '<')) {
-                    throw new \Exception('Latest version is lower than current version?!');
+                if (version_compare($this->latestVersion, $this->currentVersion, '<')) {
+                    return 'Latest version is lower than current version?!';
                 }
                 $this->update();
             }
-            return;
-        } catch (\Exception $e) {
+            send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
+        } catch (\Throwable $e) {
             ray('InstanceAutoUpdateJob failed');
             ray($e->getMessage());
-            return;
+            send_internal_notification('InstanceAutoUpdateJob failed: ' . $e->getMessage());
+            throw $e;
         }
     }
 
     private function update()
     {
-        if (is_dev()) {
-            ray("Running update on local docker container. Updating to $this->latest_version");
+        if (isDev()) {
+            ray("Running update on local docker container. Updating to $this->latestVersion");
             remote_process([
                 "sleep 10"
             ], $this->server);
@@ -63,7 +64,7 @@ class UpdateCoolify
             ray('Running update on production server');
             remote_process([
                 "curl -fsSL https://cdn.coollabs.io/coolify/upgrade.sh -o /data/coolify/source/upgrade.sh",
-                "bash /data/coolify/source/upgrade.sh $this->latest_version"
+                "bash /data/coolify/source/upgrade.sh $this->latestVersion"
             ], $this->server);
             return;
         }

app/Console/Commands/Emails.php

@@ -0,0 +1,247 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\SendConfirmationForWaitlistJob;
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\StandalonePostgresql;
+use App\Models\Team;
+use App\Models\TeamInvitation;
+use App\Models\User;
+use App\Models\Waitlist;
+use App\Notifications\Application\DeploymentFailed;
+use App\Notifications\Application\DeploymentSuccess;
+use App\Notifications\Application\StatusChanged;
+use App\Notifications\Database\BackupFailed;
+use App\Notifications\Database\BackupSuccess;
+use App\Notifications\Test;
+use App\Notifications\TransactionalEmails\InvitationLink;
+use Exception;
+use Illuminate\Console\Command;
+use Illuminate\Mail\Message;
+use Illuminate\Notifications\Messages\MailMessage;
+use Mail;
+use Str;
+
+use function Laravel\Prompts\confirm;
+use function Laravel\Prompts\select;
+use function Laravel\Prompts\text;
+
+class Emails extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'emails';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send out test / prod emails';
+
+    /**
+     * Execute the console command.
+     */
+    private ?MailMessage $mail = null;
+    private ?string $email = null;
+    public function handle()
+    {
+        $type = select(
+            'Which Email should be sent?',
+            options: [
+                'emails-test' => 'Test',
+                'application-deployment-success' => 'Application - Deployment Success',
+                'application-deployment-failed' => 'Application - Deployment Failed',
+                'application-status-changed' => 'Application - Status Changed',
+                'backup-success' => 'Database - Backup Success',
+                'backup-failed' => 'Database - Backup Failed',
+                'invitation-link' => 'Invitation Link',
+                'waitlist-invitation-link' => 'Waitlist Invitation Link',
+                'waitlist-confirmation' => 'Waitlist Confirmation',
+                'realusers-before-trial' => 'REAL - Registered Users Before Trial without Subscription',
+                'realusers-server-lost-connection' => 'REAL - Server Lost Connection',
+            ],
+        );
+        $emailsGathered = ['realusers-before-trial','realusers-server-lost-connection'];
+        if (!in_array($type, $emailsGathered)) {
+            $this->email = text('Email Address to send to');
+        }
+        set_transanctional_email_settings();
+
+        $this->mail = new MailMessage();
+        $this->mail->subject("Test Email");
+        switch ($type) {
+            case 'emails-test':
+                $this->mail = (new Test())->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-success':
+                $application = Application::all()->first();
+                $this->mail = (new DeploymentSuccess($application, 'test'))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-deployment-failed':
+                $application = Application::all()->first();
+                $preview = ApplicationPreview::all()->first();
+                if (!$preview) {
+                    $preview = ApplicationPreview::create([
+                        'application_id' => $application->id,
+                        'pull_request_id' => 1,
+                        'pull_request_html_url' => 'http://example.com',
+                        'fqdn' => $application->fqdn,
+                    ]);
+                }
+                $this->mail = (new DeploymentFailed($application, 'test'))->toMail();
+                $this->sendEmail();
+                $this->mail = (new DeploymentFailed($application, 'test', $preview))->toMail();
+                $this->sendEmail();
+                break;
+            case 'application-status-changed':
+                $application = Application::all()->first();
+                $this->mail = (new StatusChanged($application))->toMail();
+                $this->sendEmail();
+                break;
+            case 'backup-failed':
+                $backup = ScheduledDatabaseBackup::all()->first();
+                $db = StandalonePostgresql::all()->first();
+                if (!$backup) {
+                    $backup = ScheduledDatabaseBackup::create([
+                        'enabled' => true,
+                        'frequency' => 'daily',
+                        'save_s3' => false,
+                        'database_id' => $db->id,
+                        'database_type' => $db->getMorphClass(),
+                        'team_id' => 0,
+                    ]);
+                }
+                $output = 'Because of an error, the backup of the database ' . $db->name . ' failed.';
+                $this->mail = (new BackupFailed($backup, $db, $output))->toMail();
+                $this->sendEmail();
+                break;
+            case 'backup-success':
+                $backup = ScheduledDatabaseBackup::all()->first();
+                $db = StandalonePostgresql::all()->first();
+                if (!$backup) {
+                    $backup = ScheduledDatabaseBackup::create([
+                        'enabled' => true,
+                        'frequency' => 'daily',
+                        'save_s3' => false,
+                        'database_id' => $db->id,
+                        'database_type' => $db->getMorphClass(),
+                        'team_id' => 0,
+                    ]);
+                }
+                $this->mail = (new BackupSuccess($backup, $db))->toMail();
+                $this->sendEmail();
+                break;
+            case 'invitation-link':
+                $user = User::all()->first();
+                $invitation = TeamInvitation::whereEmail($user->email)->first();
+                if (!$invitation) {
+                    $invitation = TeamInvitation::create([
+                        'uuid' => Str::uuid(),
+                        'email' => $user->email,
+                        'team_id' => 1,
+                        'link' => 'http://example.com',
+                    ]);
+                }
+                $this->mail = (new InvitationLink($user))->toMail();
+                $this->sendEmail();
+                break;
+            case 'waitlist-invitation-link':
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.waitlist-invitation', [
+                    'loginLink' => 'https://coolify.io',
+                ]);
+                $this->mail->subject('Congratulations! You are invited to join Coolify Cloud.');
+                $this->sendEmail();
+                break;
+            case 'waitlist-confirmation':
+                $found = Waitlist::where('email', $this->email)->first();
+                if ($found) {
+                    SendConfirmationForWaitlistJob::dispatch($this->email, $found->uuid);
+                } else {
+                    throw new Exception('Waitlist not found');
+                }
+
+                break;
+            case 'realusers-before-trial':
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.before-trial-conversion');
+                $this->mail->subject('Trial period has been added for all subscription plans.');
+                $teams = Team::doesntHave('subscription')->where('id', '!=', 0)->get();
+                if (!$teams || $teams->isEmpty()) {
+                    echo 'No teams found.' . PHP_EOL;
+                    return;
+                }
+                $emails = [];
+                foreach ($teams as $team) {
+                    foreach ($team->members as $member) {
+                        if ($member->email) {
+                            $emails[] = $member->email;
+                        }
+                    }
+                }
+                $emails = array_unique($emails);
+                $this->info("Sending to " . count($emails) . " emails.");
+                foreach ($emails as $email) {
+                    $this->info($email);
+                }
+                $confirmed = confirm('Are you sure?');
+                if ($confirmed) {
+                    foreach ($emails as $email) {
+                        $this->sendEmail($email);
+                    }
+                }
+                break;
+            case 'realusers-server-lost-connection':
+                $serverId = text('Server Id');
+                $server = Server::find($serverId);
+                if (!$server) {
+                    throw new Exception('Server not found');
+                }
+                $admins = [];
+                $members = $server->team->members;
+                foreach ($members as $member) {
+                    if ($member->isAdmin()) {
+                        $admins[] = $member->email;
+                    }
+                }
+                $this->info('Sending to ' . count($admins) . ' admins.');
+                foreach ($admins as $admin) {
+                    $this->info($admin);
+                }
+                $this->mail = new MailMessage();
+                $this->mail->view('emails.server-lost-connection', [
+                    'name' => $server->name,
+                ]);
+                $this->mail->subject('Action required: Server ' . $server->name . ' lost connection.');
+                foreach ($admins as $email) {
+                    $this->sendEmail($email);
+                }
+                break;
+        }
+    }
+    private function sendEmail(string $email = null)
+    {
+        if ($email) {
+            $this->email = $email;
+        }
+        Mail::send(
+            [],
+            [],
+            fn (Message $message) => $message
+                ->to($this->email)
+                ->subject($this->mail->subject)
+                ->html((string)$this->mail->render())
+        );
+        $this->info("Email sent to $this->email successfully. 📧");
+    }
+}

app/Console/Commands/Init.php

@@ -26,7 +26,7 @@ class Init extends Command
                 $deployment->status = ApplicationDeploymentStatus::FAILED->value;
                 $deployment->save();
             }
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo "Error: {$e->getMessage()}\n";
         }
     }

app/Console/Commands/SyncBunny.php

@@ -82,7 +82,7 @@ class SyncBunny extends Command
                 $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
             ]);
             echo "All files uploaded & purged...\n";
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             echo $e->getMessage();
         }
     }

app/Console/Commands/WaitlistInvite.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\User;
+use App\Models\Waitlist;
+use Illuminate\Console\Command;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+class WaitlistInvite extends Command
+{
+    public Waitlist|User|null $next_patient = null;
+    public string|null $password = null;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'waitlist:invite {--people=1} {--only-email} {email?}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send invitation to the next user (or by email) in the waitlist';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $people = $this->option('people');
+        for ($i = 0; $i < $people; $i++) {
+            $this->main();
+        }
+    }
+    private function main() {
+        if ($this->argument('email')) {
+            if ($this->option('only-email')) {
+                $this->next_patient = User::whereEmail($this->argument('email'))->first();
+                $this->password = Str::password();
+                $this->next_patient->update([
+                    'password' => Hash::make($this->password),
+                    'force_password_reset' => true,
+                ]);
+            } else {
+                $this->next_patient = Waitlist::where('email', $this->argument('email'))->first();
+            }
+            if (!$this->next_patient) {
+                $this->error("{$this->argument('email')} not found in the waitlist.");
+                return;
+            }
+        } else {
+            $this->next_patient = Waitlist::orderBy('created_at', 'asc')->where('verified', true)->first();
+        }
+        if ($this->next_patient) {
+            if ($this->option('only-email')) {
+                $this->send_email();
+                return;
+            }
+            $this->register_user();
+            $this->remove_from_waitlist();
+            $this->send_email();
+        } else {
+            $this->info('No verified user found in the waitlist. 👀');
+        }
+    }
+    private function register_user()
+    {
+        $already_registered = User::whereEmail($this->next_patient->email)->first();
+        if (!$already_registered) {
+            $this->password = Str::password();
+            User::create([
+                'name' => Str::of($this->next_patient->email)->before('@'),
+                'email' => $this->next_patient->email,
+                'password' => Hash::make($this->password),
+                'force_password_reset' => true,
+            ]);
+            $this->info("User registered ({$this->next_patient->email}) successfully. 🎉");
+        } else {
+            throw new \Exception('User already registered');
+        }
+    }
+    private function remove_from_waitlist()
+    {
+        $this->next_patient->delete();
+        $this->info("User removed from waitlist successfully.");
+    }
+    private function send_email()
+    {
+        $token = Crypt::encryptString("{$this->next_patient->email}@@@$this->password");
+        $loginLink = route('auth.link', ['token' => $token]);
+        $mail = new MailMessage();
+        $mail->view('emails.waitlist-invitation', [
+            'loginLink' => $loginLink,
+        ]);
+        $mail->subject('Congratulations! You are invited to join Coolify Cloud.');
+        send_user_an_email($mail, $this->next_patient->email);
+        $this->info("Email sent successfully. 📧");
+    }
+}

app/Console/Kernel.php

@@ -2,15 +2,21 @@
 
 namespace App\Console;
 
+use App\Enums\ProxyTypes;
+use App\Jobs\ApplicationContainerStatusJob;
 use App\Jobs\CheckResaleLicenseJob;
-use App\Jobs\CheckResaleLicenseKeys;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
+use App\Jobs\DatabaseContainerStatusJob;
 use App\Jobs\DockerCleanupJob;
-use App\Jobs\InstanceApplicationsStatusJob;
 use App\Jobs\InstanceAutoUpdateJob;
-use App\Jobs\ProxyCheckJob;
+use App\Jobs\ProxyContainerStatusJob;
+use App\Jobs\ServerDetailsCheckJob;
+use App\Models\Application;
+use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\Server;
+use App\Models\StandalonePostgresql;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -18,28 +24,56 @@ class Kernel extends ConsoleKernel
 {
     protected function schedule(Schedule $schedule): void
     {
-        //        $schedule->call(fn() => $this->check_scheduled_backups($schedule))->everyTenSeconds();
-        if (is_dev()) {
-            $schedule->command('horizon:snapshot')->everyMinute();
-            $schedule->job(new InstanceApplicationsStatusJob)->everyMinute();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
-
+        if (isDev()) {
+            $schedule->job(new ServerDetailsCheckJob(Server::find(0)))->everyTenMinutes()->onOneServer();
+            // $schedule->command('horizon:snapshot')->everyMinute();
+            // $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
             // $schedule->job(new CheckResaleLicenseJob)->hourly();
             // $schedule->job(new DockerCleanupJob)->everyOddHour();
-            // $schedule->job(new InstanceAutoUpdateJob(true))->everyMinute();
+            // $this->instance_auto_update($schedule);
+            // $this->check_scheduled_backups($schedule);
+            // $this->check_resources($schedule);
+            // $this->check_proxies($schedule);
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
-            $schedule->job(new InstanceApplicationsStatusJob)->everyMinute();
-            $schedule->job(new CheckResaleLicenseJob)->hourly();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
-            $schedule->job(new DockerCleanupJob)->everyTenMinutes();
-            $schedule->job(new InstanceAutoUpdateJob)->everyTenMinutes();
+            $schedule->job(new CleanupInstanceStuffsJob)->everyTenMinutes()->onOneServer();
+            $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
+            $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
+            $this->instance_auto_update($schedule);
+            $this->check_scheduled_backups($schedule);
+            $this->check_resources($schedule);
+            $this->check_proxies($schedule);
         }
-        $this->check_scheduled_backups($schedule);
     }
+    private function check_proxies($schedule)
+    {
+        $servers = Server::all()->where('settings.is_usable', true)->where('settings.is_reachable', true)->whereNotNull('proxy.type')->where('proxy.type', '!=', ProxyTypes::NONE->value);
+        foreach ($servers as $server) {
+            $schedule->job(new ProxyContainerStatusJob($server))->everyMinute()->onOneServer();
+        }
+    }
+    private function check_resources($schedule)
+    {
+        $applications = Application::all();
+        foreach ($applications as $application) {
+            $schedule->job(new ApplicationContainerStatusJob($application))->everyMinute()->onOneServer();
+        }
 
+        $postgresqls = StandalonePostgresql::all();
+        foreach ($postgresqls as $postgresql) {
+            $schedule->job(new DatabaseContainerStatusJob($postgresql))->everyMinute()->onOneServer();
+        }
+    }
+    private function instance_auto_update($schedule)
+    {
+        if (isDev()) {
+            return;
+        }
+        $settings = InstanceSettings::get();
+        if ($settings->is_auto_update_enabled) {
+            $schedule->job(new InstanceAutoUpdateJob)->everyTenMinutes()->onOneServer();
+        }
+    }
     private function check_scheduled_backups($schedule)
     {
         ray('check_scheduled_backups');
@@ -49,13 +83,21 @@ class Kernel extends ConsoleKernel
             return;
         }
         foreach ($scheduled_backups as $scheduled_backup) {
-            if (!$scheduled_backup->enabled) continue;
+            if (!$scheduled_backup->enabled) {
+                continue;
+            }
+            if (is_null(data_get($scheduled_backup, 'database'))) {
+                ray('database not found');
+                $scheduled_backup->delete();
+                continue;
+            }
+
             if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
                 $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
             }
             $schedule->job(new DatabaseBackupJob(
                 backup: $scheduled_backup
-            ))->cron($scheduled_backup->frequency);
+            ))->cron($scheduled_backup->frequency)->onOneServer();
         }
     }
 

app/Enums/ProxyTypes.php

@@ -4,6 +4,7 @@ namespace App\Enums;
 
 enum ProxyTypes: string
 {
+    case NONE = 'NONE';
     case TRAEFIK_V2 = 'TRAEFIK_V2';
     case NGINX = 'NGINX';
     case CADDY = 'CADDY';

app/Exceptions/Handler.php

@@ -5,6 +5,7 @@ namespace App\Exceptions;
 use App\Models\InstanceSettings;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
+use Sentry\State\Scope;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -24,7 +25,7 @@ class Handler extends ExceptionHandler
      * @var array<int, class-string<\Throwable>>
      */
     protected $dontReport = [
-        //
+        ProcessException::class
     ];
     /**
      * A list of the inputs that are never flashed to the session on validation exceptions.
@@ -45,9 +46,19 @@ class Handler extends ExceptionHandler
     {
         $this->reportable(function (Throwable $e) {
             $this->settings = InstanceSettings::get();
-            if ($this->settings->do_not_track || is_dev()) {
+            if ($this->settings->do_not_track || isDev()) {
                 return;
             }
+            app('sentry')->configureScope(
+                function (Scope $scope) {
+                    $scope->setUser(
+                        [
+                            'id' => config('sentry.server_name'),
+                            'email' => auth()->user()->email
+                        ]
+                    );
+                }
+            );
             Integration::captureUnhandledException($e);
         });
     }

app/Exceptions/ProcessException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Exceptions;
+
+use Exception;
+
+class ProcessException extends Exception
+{
+
+}

app/Http/Controllers/ApplicationController.php

@@ -12,7 +12,7 @@ class ApplicationController extends Controller
 
     public function configuration()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -29,7 +29,7 @@ class ApplicationController extends Controller
 
     public function deployments()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -49,7 +49,7 @@ class ApplicationController extends Controller
     {
         $deploymentUuid = request()->route('deployment_uuid');
 
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }

app/Http/Controllers/Controller.php

@@ -5,39 +5,57 @@ namespace App\Http\Controllers;
 use App\Models\InstanceSettings;
 use App\Models\Project;
 use App\Models\S3Storage;
-use App\Models\Server;
 use App\Models\StandalonePostgresql;
 use App\Models\TeamInvitation;
 use App\Models\User;
-use App\Models\Waitlist;
+use Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Http;
 use Throwable;
+use Str;
+
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 
-    public function waitlist() {
-        $waiting_in_line = Waitlist::whereVerified(true)->count();
-        return view('auth.waitlist', [
-            'waiting_in_line' => $waiting_in_line,
-        ]);
+    public function link()
+    {
+        $token = request()->get('token');
+        if ($token) {
+            $decrypted = Crypt::decryptString($token);
+            $email = Str::of($decrypted)->before('@@@');
+            $password = Str::of($decrypted)->after('@@@');
+            $user = User::whereEmail($email)->first();
+            if (!$user) {
+                return redirect()->route('login');
+            }
+            if (Hash::check($password, $user->password)) {
+                Auth::login($user);
+                $team = $user->teams()->first();
+                session(['currentTeam' => $team]);
+                return redirect()->route('dashboard');
+            }
+        }
+        return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
     public function subscription()
     {
-        if (!is_cloud()) {
+        if (!isCloud()) {
             abort(404);
         }
-        return view('subscription', [
+        return view('subscription.index', [
             'settings' => InstanceSettings::get(),
         ]);
     }
 
     public function license()
     {
-        if (!is_cloud()) {
+        if (!isCloud()) {
             abort(404);
         }
         return view('settings.license', [
@@ -45,31 +63,22 @@ class Controller extends BaseController
         ]);
     }
 
-    public function force_passoword_reset() {
+    public function force_passoword_reset()
+    {
         return view('auth.force-password-reset');
     }
-    public function dashboard()
+    public function boarding()
     {
-        $projects = Project::ownedByCurrentTeam()->get();
-        $servers = Server::ownedByCurrentTeam()->get();
-        $s3s = S3Storage::ownedByCurrentTeam()->get();
-        $resources = 0;
-        foreach ($projects as $project) {
-            $resources += $project->applications->count();
-            $resources += $project->postgresqls->count();
+        if (currentTeam()->boarding || isDev()) {
+            return view('boarding');
+        } else {
+            return redirect()->route('dashboard');
         }
-
-        return view('dashboard', [
-            'servers' => $servers->count(),
-            'projects' => $projects->count(),
-            'resources' => $resources,
-            's3s' => $s3s,
-        ]);
     }
 
     public function settings()
     {
-        if (is_instance_admin()) {
+        if (isInstanceAdmin()) {
             $settings = InstanceSettings::get();
             $database = StandalonePostgresql::whereName('coolify-db')->first();
             if ($database) {
@@ -89,9 +98,9 @@ class Controller extends BaseController
     {
         $invitations = [];
         if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
+            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
         }
-        return view('team.show', [
+        return view('team.index', [
             'invitations' => $invitations,
         ]);
     }
@@ -116,7 +125,7 @@ class Controller extends BaseController
     {
         $invitations = [];
         if (auth()->user()->isAdminFromSession()) {
-            $invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
+            $invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
         }
         return view('team.members', [
             'invitations' => $invitations,
@@ -140,13 +149,13 @@ class Controller extends BaseController
             if ($diff <= config('constants.invitation.link.expiration')) {
                 $user->teams()->attach($invitation->team->id, ['role' => $invitation->role]);
                 $invitation->delete();
-                return redirect()->route('team.show');
+                return redirect()->route('team.index');
             } else {
                 $invitation->delete();
                 abort(401);
             }
-        } catch (Throwable $th) {
-            throw $th;
+        } catch (Throwable $e) {
+            throw $e;
         }
     }
 
@@ -162,9 +171,9 @@ class Controller extends BaseController
                 abort(401);
             }
             $invitation->delete();
-            return redirect()->route('team.show');
-        } catch (Throwable $th) {
-            throw $th;
+            return redirect()->route('team.index');
+        } catch (Throwable $e) {
+            throw $e;
         }
     }
 }

app/Http/Controllers/DatabaseController.php

@@ -11,7 +11,7 @@ class DatabaseController extends Controller
 
     public function configuration()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -29,7 +29,7 @@ class DatabaseController extends Controller
     public function executions()
     {
         $backup_uuid = request()->route('backup_uuid');
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -50,13 +50,13 @@ class DatabaseController extends Controller
             'database' => $database,
             'backup' => $backup,
             'executions' => $executions,
-            's3s' => auth()->user()->currentTeam()->s3s,
+            's3s' => currentTeam()->s3s,
         ]);
     }
 
     public function backups()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -70,7 +70,7 @@ class DatabaseController extends Controller
         }
         return view('project.database.backups.all', [
             'database' => $database,
-            's3s' => auth()->user()->currentTeam()->s3s,
+            's3s' => currentTeam()->s3s,
         ]);
     }
 }

app/Http/Controllers/MagicController.php

@@ -41,7 +41,7 @@ class MagicController extends Controller
     {
         $project = Project::firstOrCreate(
             ['name' => request()->query('name') ?? generate_random_name()],
-            ['team_id' => auth()->user()->currentTeam()->id]
+            ['team_id' => currentTeam()->id]
         );
         return response()->json([
             'project_uuid' => $project->uuid
@@ -68,7 +68,7 @@ class MagicController extends Controller
             ],
         );
         auth()->user()->teams()->attach($team, ['role' => 'admin']);
-        session(['currentTeam' => $team]);
+        refreshSession();
         return redirect(request()->header('Referer'));
     }
 }

app/Http/Controllers/ProjectController.php

@@ -18,7 +18,7 @@ class ProjectController extends Controller
     public function edit()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = auth()->user()->currentTeam()->id;
+        $teamId = currentTeam()->id;
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
             return redirect()->route('dashboard');
@@ -29,7 +29,7 @@ class ProjectController extends Controller
     public function show()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = auth()->user()->currentTeam()->id;
+        $teamId = currentTeam()->id;
 
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
@@ -43,8 +43,9 @@ class ProjectController extends Controller
     {
         $type = request()->query('type');
         $destination_uuid = request()->query('destination');
+        $server = requesT()->query('server');
 
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -67,7 +68,7 @@ class ProjectController extends Controller
 
     public function resources()
     {
-        $project = auth()->user()->currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }

app/Http/Controllers/ServerController.php

@@ -12,20 +12,21 @@ class ServerController extends Controller
 
     public function new_server()
     {
-        if (!is_cloud() || is_instance_admin()) {
+        $privateKeys = PrivateKey::ownedByCurrentTeam()->get();
+        if (!isCloud()) {
             return view('server.create', [
                 'limit_reached' => false,
-                'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
+                'private_keys' => $privateKeys,
             ]);
         }
-        $servers = auth()->user()->currentTeam()->servers->count();
-        $subscription = auth()->user()->currentTeam()?->subscription->type();
-        $limits = config('constants.limits.server')[strtolower($subscription)];
-        $limit_reached = true ?? $servers >= $limits[$subscription];
+        $team = currentTeam();
+        $servers = $team->servers->count();
+        ['serverLimit' => $serverLimit] = $team->limits;
+        $limit_reached = $servers >= $serverLimit;
 
         return view('server.create', [
             'limit_reached' => $limit_reached,
-            'private_keys' => PrivateKey::ownedByCurrentTeam()->get(),
+            'private_keys' => $privateKeys,
         ]);
     }
 }

app/Http/Kernel.php

@@ -38,7 +38,8 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\CheckForcePasswordReset::class,
-            \App\Http\Middleware\SubscriptionValid::class,
+            \App\Http\Middleware\IsSubscriptionValid::class,
+            \App\Http\Middleware\IsBoardingFlow::class,
 
         ],
 

app/Http/Livewire/Boarding/Index.php

@@ -0,0 +1,258 @@
+<?php
+
+namespace App\Http\Livewire\Boarding;
+
+use App\Actions\Server\InstallDocker;
+use App\Models\PrivateKey;
+use App\Models\Project;
+use App\Models\Server;
+use App\Models\Team;
+use Illuminate\Support\Collection;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public string $currentState = 'welcome';
+
+    public ?Collection $privateKeys = null;
+    public ?int $selectedExistingPrivateKey = null;
+    public ?string $privateKeyType = null;
+    public ?string $privateKey = null;
+    public ?string $publicKey = null;
+    public ?string $privateKeyName = null;
+    public ?string $privateKeyDescription = null;
+    public ?PrivateKey $createdPrivateKey = null;
+
+    public ?Collection $servers = null;
+    public ?int $selectedExistingServer = null;
+    public ?string $remoteServerName = null;
+    public ?string $remoteServerDescription = null;
+    public ?string $remoteServerHost = null;
+    public ?int    $remoteServerPort = 22;
+    public ?string $remoteServerUser = 'root';
+    public ?Server $createdServer = null;
+
+    public Collection|array $projects = [];
+    public ?int $selectedExistingProject = null;
+    public ?Project $createdProject = null;
+
+    public function mount()
+    {
+        $this->privateKeyName = generate_random_name();
+        $this->remoteServerName = generate_random_name();
+        if (isDev()) {
+            $this->privateKey = '-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevAAAAJi/QySHv0Mk
+hwAAAAtzc2gtZWQyNTUxOQAAACBbhpqHhqv6aI67Mj9abM3DVbmcfYhZAhC7ca4d9UCevA
+AAAECBQw4jg1WRT2IGHMncCiZhURCts2s24HoDS0thHnnRKVuGmoeGq/pojrsyP1pszcNV
+uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
+-----END OPENSSH PRIVATE KEY-----';
+            $this->privateKeyDescription = 'Created by Coolify';
+            $this->remoteServerDescription = 'Created by Coolify';
+            $this->remoteServerHost = 'coolify-testing-host';
+        }
+    }
+    public function welcome() {
+        if (isCloud()) {
+            return $this->setServerType('remote');
+        }
+        $this->currentState = 'select-server-type';
+    }
+    public function restartBoarding()
+    {
+        if ($this->createdServer) {
+            $this->createdServer->delete();
+        }
+        if ($this->createdPrivateKey) {
+            $this->createdPrivateKey->delete();
+        }
+        return redirect()->route('boarding');
+    }
+    public function skipBoarding()
+    {
+        Team::find(currentTeam()->id)->update([
+            'show_boarding' => false
+        ]);
+        ray(currentTeam());
+        refreshSession();
+        return redirect()->route('dashboard');
+    }
+
+    public function setServerType(string $type)
+    {
+        if ($type === 'localhost') {
+            $this->createdServer = Server::find(0);
+            if (!$this->createdServer) {
+                return $this->emit('error', 'Localhost server is not found. Something went wrong during installation. Please try to reinstall or contact support.');
+            }
+            return $this->validateServer();
+        } elseif ($type === 'remote') {
+            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if ($this->privateKeys->count() > 0) {
+                $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
+            }
+            $this->servers = Server::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if ($this->servers->count() > 0) {
+                $this->selectedExistingServer = $this->servers->first()->id;
+                $this->currentState = 'select-existing-server';
+                return;
+            }
+            $this->currentState = 'private-key';
+        }
+    }
+    public function selectExistingServer()
+    {
+        $this->createdServer = Server::find($this->selectedExistingServer);
+        if (!$this->createdServer) {
+            $this->emit('error', 'Server is not found.');
+            $this->currentState = 'private-key';
+            return;
+        }
+        $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
+        $this->validateServer();
+        $this->getProxyType();
+        $this->getProjects();
+    }
+    public function getProxyType() {
+        $proxyTypeSet = $this->createdServer->proxy->type;
+        if (!$proxyTypeSet) {
+            $this->currentState = 'select-proxy';
+            return;
+        }
+        $this->getProjects();
+    }
+    public function selectExistingPrivateKey()
+    {
+        $this->currentState = 'create-server';
+    }
+    public function createNewServer()
+    {
+        $this->selectedExistingServer = null;
+        $this->currentState = 'private-key';
+    }
+    public function setPrivateKey(string $type)
+    {
+        $this->selectedExistingPrivateKey = null;
+        $this->privateKeyType = $type;
+        if ($type === 'create') {
+            $this->createNewPrivateKey();
+        }
+        $this->currentState = 'create-private-key';
+    }
+    public function savePrivateKey()
+    {
+        $this->validate([
+            'privateKeyName' => 'required',
+            'privateKey' => 'required',
+        ]);
+        $this->currentState = 'create-server';
+    }
+    public function saveServer()
+    {
+        $this->validate([
+            'remoteServerName' => 'required',
+            'remoteServerHost' => 'required',
+            'remoteServerPort' => 'required',
+            'remoteServerUser' => 'required',
+        ]);
+        $this->privateKey = formatPrivateKey($this->privateKey);
+        $this->createdPrivateKey = PrivateKey::create([
+            'name' => $this->privateKeyName,
+            'description' => $this->privateKeyDescription,
+            'private_key' => $this->privateKey,
+            'team_id' => currentTeam()->id
+        ]);
+        $this->createdServer = Server::create([
+            'name' => $this->remoteServerName,
+            'ip' => $this->remoteServerHost,
+            'port' => $this->remoteServerPort,
+            'user' => $this->remoteServerUser,
+            'description' => $this->remoteServerDescription,
+            'private_key_id' => $this->createdPrivateKey->id,
+            'team_id' => currentTeam()->id
+        ]);
+        $this->validateServer();
+    }
+    public function validateServer() {
+        try {
+            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->createdServer);
+            if (!$uptime) {
+                throw new \Exception('Server is not reachable.');
+            } else {
+                $this->createdServer->settings->update([
+                    'is_reachable' => true,
+                ]);
+                $this->emit('success', 'Server is reachable.');
+            }
+            ray($dockerVersion, $uptime);
+            if (!$dockerVersion) {
+                $this->emit('error', 'Docker is not installed on the server.');
+                $this->currentState = 'install-docker';
+                return;
+            }
+            $this->getProxyType();
+
+        } catch (\Throwable $e) {
+            return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
+        }
+    }
+    public function installDocker()
+    {
+        $activity = resolve(InstallDocker::class)($this->createdServer, currentTeam());
+        $this->emit('newMonitorActivity', $activity->id);
+        $this->currentState = 'select-proxy';
+    }
+    public function selectProxy(string|null $proxyType = null)
+    {
+        if (!$proxyType) {
+            return $this->getProjects();
+        }
+        $this->createdServer->proxy->type = $proxyType;
+        $this->createdServer->proxy->status = 'exited';
+        $this->createdServer->save();
+        $this->getProjects();
+    }
+
+    public function getProjects() {
+        $this->projects = Project::ownedByCurrentTeam(['name'])->get();
+        if ($this->projects->count() > 0) {
+            $this->selectedExistingProject = $this->projects->first()->id;
+        }
+        $this->currentState = 'create-project';
+    }
+    public function selectExistingProject() {
+        $this->createdProject = Project::find($this->selectedExistingProject);
+        $this->currentState = 'create-resource';
+    }
+    public function createNewProject()
+    {
+        $this->createdProject = Project::create([
+            'name' => "My first project",
+            'team_id' => currentTeam()->id
+        ]);
+        $this->currentState = 'create-resource';
+    }
+    public function showNewResource()
+    {
+        $this->skipBoarding();
+        return redirect()->route(
+            'project.resources.new',
+            [
+                'project_uuid' => $this->createdProject->uuid,
+                'environment_name' => 'production',
+                'server'=> $this->createdServer->id,
+            ]
+        );
+    }
+    private function createNewPrivateKey()
+    {
+        $this->privateKeyName = generate_random_name();
+        $this->privateKeyDescription = 'Created by Coolify';
+        ['private' => $this->privateKey, 'public' => $this->publicKey] = generateSSHKey();
+    }
+    public function render()
+    {
+        return view('livewire.boarding.index')->layout('layouts.boarding');
+    }
+}

app/Http/Livewire/CheckLicense.php

@@ -34,9 +34,9 @@ class CheckLicense extends Component
             try {
                 resolve(CheckResaleLicense::class)();
                 $this->emit('reloadWindow');
-            } catch (\Throwable $th) {
-                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $th->getMessage());
-                ray($th->getMessage());
+            } catch (\Throwable $e) {
+                session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
+                ray($e->getMessage());
                 return redirect()->to('/settings/license');
             }
         }

app/Http/Livewire/Dashboard.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use App\Models\Project;
+use App\Models\S3Storage;
+use App\Models\Server;
+use Livewire\Component;
+
+class Dashboard extends Component
+{
+    public int $projects = 0;
+    public int $servers = 0;
+    public int $s3s = 0;
+    public int $resources = 0;
+
+    public function mount()
+    {
+        $this->servers = Server::ownedByCurrentTeam()->get()->count();
+        $this->s3s = S3Storage::ownedByCurrentTeam()->get()->count();
+        $projects = Project::ownedByCurrentTeam()->get();
+        foreach ($projects as $project) {
+            $this->resources += $project->applications->count();
+            $this->resources += $project->postgresqls->count();
+        }
+        $this->projects = $projects->count();
+    }
+    // public function getIptables()
+    // {
+    //     $servers = Server::ownedByCurrentTeam()->get();
+    //     foreach ($servers as $server) {
+    //         checkRequiredCommands($server);
+    //         $iptables = instant_remote_process(['docker run --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c "iptables -L -n | jc --iptables"'], $server);
+    //         ray($iptables);
+    //     }
+    // }
+    public function render()
+    {
+        return view('livewire.dashboard');
+    }
+}

app/Http/Livewire/Destination/Form.php

@@ -37,7 +37,7 @@ class Form extends Component
             }
             $this->destination->delete();
             return redirect()->route('dashboard');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }

app/Http/Livewire/Destination/New/StandaloneDocker.php

@@ -60,20 +60,19 @@ class StandaloneDocker extends Component
             $found = $this->server->standaloneDockers()->where('network', $this->network)->first();
             if ($found) {
                 $this->createNetworkAndAttachToProxy();
-                $this->addError('network', 'Network already added to this server.');
+                $this->emit('error', 'Network already added to this server.');
                 return;
             } else {
                 $docker = ModelsStandaloneDocker::create([
                     'name' => $this->name,
                     'network' => $this->network,
                     'server_id' => $this->server_id,
-                    'team_id' => auth()->user()->currentTeam()->id
                 ]);
             }
             $this->createNetworkAndAttachToProxy();
             return redirect()->route('destination.show', $docker->uuid);
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e);
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
         }
     }
 

app/Http/Livewire/Dev/S3Test.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Dev;
-
-use App\Models\S3Storage;
-use Illuminate\Support\Facades\Storage;
-use Livewire\Component;
-use Livewire\WithFileUploads;
-
-class S3Test extends Component
-{
-    use WithFileUploads;
-
-    public $s3;
-    public $file;
-
-    public function mount()
-    {
-        $this->s3 = S3Storage::first();
-    }
-
-    public function save()
-    {
-        try {
-            $this->validate([
-                'file' => 'required|max:150', // 1MB Max
-            ]);
-            set_s3_target($this->s3);
-            $this->file->storeAs('files', $this->file->getClientOriginalName(), 'custom-s3');
-            $this->emit('success', 'File uploaded successfully.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this, false);
-        }
-    }
-
-    public function get_files()
-    {
-        set_s3_target($this->s3);
-        dd(Storage::disk('custom-s3')->files('files'));
-    }
-}

app/Http/Livewire/ForcePasswordReset.php

@@ -18,22 +18,26 @@ class ForcePasswordReset extends Component
         'password' => 'required|min:8',
         'password_confirmation' => 'required|same:password',
     ];
-    public function mount() {
+    public function mount()
+    {
         $this->email = auth()->user()->email;
     }
-    public function submit() {
+    public function submit()
+    {
         try {
             $this->rateLimit(10);
             $this->validate();
+            $firstLogin = auth()->user()->created_at == auth()->user()->updated_at;
             auth()->user()->forceFill([
                 'password' => Hash::make($this->password),
                 'force_password_reset' => false,
             ])->save();
-            auth()->logout();
-            return redirect()->route('login')->with('status', 'Your initial password has been set.');
-        } catch(\Exception $e) {
-            return general_error_handler(err:$e, that:$this);
+            if ($firstLogin) {
+                send_internal_notification('First login for ' . auth()->user()->email);
+            }
+            return redirect()->route('dashboard');
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
         }
     }
-
 }

app/Http/Livewire/Help.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
+use Illuminate\Notifications\Messages\MailMessage;
+use Livewire\Component;
+use Route;
+
+class Help extends Component
+{
+    use WithRateLimiting;
+    public string $description;
+    public string $subject;
+    public ?string $path = null;
+    protected $rules = [
+        'description' => 'required|min:10',
+        'subject' => 'required|min:3'
+    ];
+    public function mount()
+    {
+        $this->path = Route::current()->uri();
+        if (isDev()) {
+            $this->description = "I'm having trouble with {$this->path}";
+            $this->subject = "Help with {$this->path}";
+        }
+    }
+    public function submit()
+    {
+        try {
+            $this->rateLimit(1, 60);
+            $this->validate();
+            $subscriptionType = auth()->user()?->subscription?->type() ?? 'Free';
+            $debug = "Route: {$this->path}";
+            $mail = new MailMessage();
+            $mail->view(
+                'emails.help',
+                [
+                    'description' => $this->description,
+                    'debug' => $debug
+                ]
+            );
+            $mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
+            send_user_an_email($mail, 'hi@coollabs.io', auth()->user()?->email);
+            $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.help')->layout('layouts.app');
+    }
+}

app/Http/Livewire/Notifications/DiscordSettings.php

@@ -8,26 +8,30 @@ use Livewire\Component;
 
 class DiscordSettings extends Component
 {
-    public Team $model;
+    public Team $team;
     protected $rules = [
-        'model.discord_enabled' => 'nullable|boolean',
-        'model.discord_webhook_url' => 'required|url',
-        'model.discord_notifications_test' => 'nullable|boolean',
-        'model.discord_notifications_deployments' => 'nullable|boolean',
-        'model.discord_notifications_status_changes' => 'nullable|boolean',
-        'model.discord_notifications_database_backups' => 'nullable|boolean',
+        'team.discord_enabled' => 'nullable|boolean',
+        'team.discord_webhook_url' => 'required|url',
+        'team.discord_notifications_test' => 'nullable|boolean',
+        'team.discord_notifications_deployments' => 'nullable|boolean',
+        'team.discord_notifications_status_changes' => 'nullable|boolean',
+        'team.discord_notifications_database_backups' => 'nullable|boolean',
     ];
     protected $validationAttributes = [
-        'model.discord_webhook_url' => 'Discord Webhook',
+        'team.discord_webhook_url' => 'Discord Webhook',
     ];
 
+    public function mount()
+    {
+        $this->team = auth()->user()->currentTeam();
+    }
     public function instantSave()
     {
         try {
             $this->submit();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             ray($e->getMessage());
-            $this->model->discord_enabled = false;
+            $this->team->discord_enabled = false;
             $this->validate();
         }
     }
@@ -41,17 +45,16 @@ class DiscordSettings extends Component
 
     public function saveModel()
     {
-        ray($this->model);
-        $this->model->save();
-        if (is_a($this->model, Team::class)) {
-            session(['currentTeam' => $this->model]);
+        $this->team->save();
+        if (is_a($this->team, Team::class)) {
+            refreshSession();
         }
         $this->emit('success', 'Settings saved.');
     }
 
     public function sendTestNotification()
     {
-        $this->model->notify(new Test);
+        $this->team->notify(new Test());
         $this->emit('success', 'Test notification sent.');
     }
 }

app/Http/Livewire/Notifications/EmailSettings.php

@@ -6,60 +6,156 @@ use App\Models\InstanceSettings;
 use App\Models\Team;
 use App\Notifications\Test;
 use Livewire\Component;
+use Log;
 
 class EmailSettings extends Component
 {
-    public Team $model;
+    public Team $team;
     public string $emails;
+    public bool $sharedEmailEnabled = false;
 
     protected $rules = [
-        'model.smtp_enabled' => 'nullable|boolean',
-        'model.smtp_from_address' => 'required|email',
-        'model.smtp_from_name' => 'required',
-        'model.smtp_recipients' => 'nullable',
-        'model.smtp_host' => 'required',
-        'model.smtp_port' => 'required',
-        'model.smtp_encryption' => 'nullable',
-        'model.smtp_username' => 'nullable',
-        'model.smtp_password' => 'nullable',
-        'model.smtp_timeout' => 'nullable',
-        'model.smtp_notifications_test' => 'nullable|boolean',
-        'model.smtp_notifications_deployments' => 'nullable|boolean',
-        'model.smtp_notifications_status_changes' => 'nullable|boolean',
-        'model.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.smtp_enabled' => 'nullable|boolean',
+        'team.smtp_from_address' => 'required|email',
+        'team.smtp_from_name' => 'required',
+        'team.smtp_recipients' => 'nullable',
+        'team.smtp_host' => 'required',
+        'team.smtp_port' => 'required',
+        'team.smtp_encryption' => 'nullable',
+        'team.smtp_username' => 'nullable',
+        'team.smtp_password' => 'nullable',
+        'team.smtp_timeout' => 'nullable',
+        'team.smtp_notifications_test' => 'nullable|boolean',
+        'team.smtp_notifications_deployments' => 'nullable|boolean',
+        'team.smtp_notifications_status_changes' => 'nullable|boolean',
+        'team.smtp_notifications_database_backups' => 'nullable|boolean',
+        'team.use_instance_email_settings' => 'boolean',
+        'team.resend_enabled' => 'nullable|boolean',
+        'team.resend_api_key' => 'nullable',
     ];
     protected $validationAttributes = [
-        'model.smtp_from_address' => 'From Address',
-        'model.smtp_from_name' => 'From Name',
-        'model.smtp_recipients' => 'Recipients',
-        'model.smtp_host' => 'Host',
-        'model.smtp_port' => 'Port',
-        'model.smtp_encryption' => 'Encryption',
-        'model.smtp_username' => 'Username',
-        'model.smtp_password' => 'Password',
+        'team.smtp_from_address' => 'From Address',
+        'team.smtp_from_name' => 'From Name',
+        'team.smtp_recipients' => 'Recipients',
+        'team.smtp_host' => 'Host',
+        'team.smtp_port' => 'Port',
+        'team.smtp_encryption' => 'Encryption',
+        'team.smtp_username' => 'Username',
+        'team.smtp_password' => 'Password',
+        'team.smtp_timeout' => 'Timeout',
+        'team.resend_enabled' => 'Resend Enabled',
+        'team.resend_api_key' => 'Resend API Key',
     ];
 
     public function mount()
     {
-        $this->decrypt();
+        $this->team = auth()->user()->currentTeam();
+        ['sharedEmailEnabled' => $this->sharedEmailEnabled] = $this->team->limits;
         $this->emails = auth()->user()->email;
     }
-
-    private function decrypt()
+    public function submitFromFields()
     {
-        if (data_get($this->model, 'smtp_password')) {
-            try {
-                $this->model->smtp_password = decrypt($this->model->smtp_password);
-            } catch (\Exception $e) {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
+            ]);
+            $this->team->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function sendTestNotification()
+    {
+        $this->team->notify(new Test($this->emails));
+        $this->emit('success', 'Test Email sent successfully.');
+    }
+    public function instantSaveInstance()
+    {
+        try {
+            if (!$this->sharedEmailEnabled) {
+                throw new \Exception('Not allowed to change settings. Please upgrade your subscription.');
             }
+            $this->team->smtp_enabled = false;
+            $this->team->resend_enabled = false;
+            $this->team->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
+    public function instantSaveResend()
+    {
+        try {
+            $this->team->smtp_enabled = false;
+            $this->submitResend();
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return general_error_handler($e, $this);
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            $this->team->resend_enabled = false;
+            $this->submit();
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return general_error_handler($e, $this);
+        }
+    }
+    public function saveModel()
+    {
+        $this->team->save();
+        if (is_a($this->team, Team::class)) {
+            refreshSession();
+        }
+        $this->emit('success', 'Settings saved.');
+    }
+    public function submit()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.smtp_from_address' => 'required|email',
+                'team.smtp_from_name' => 'required',
+                'team.smtp_host' => 'required',
+                'team.smtp_port' => 'required|numeric',
+                'team.smtp_encryption' => 'nullable',
+                'team.smtp_username' => 'nullable',
+                'team.smtp_password' => 'nullable',
+                'team.smtp_timeout' => 'nullable',
+            ]);
+            $this->team->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            $this->team->smtp_enabled = false;
+            return general_error_handler($e, $this);
+        }
+    }
+    public function submitResend()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'team.resend_api_key' => 'required'
+            ]);
+            $this->team->save();
+            refreshSession();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            $this->team->resend_enabled = false;
+            return general_error_handler($e, $this);
+        }
+    }
     public function copyFromInstanceSettings()
     {
         $settings = InstanceSettings::get();
         if ($settings->smtp_enabled) {
-            $team = auth()->user()->currentTeam();
+            $team = currentTeam();
             $team->update([
                 'smtp_enabled' => $settings->smtp_enabled,
                 'smtp_from_address' => $settings->smtp_from_address,
@@ -72,55 +168,22 @@ class EmailSettings extends Component
                 'smtp_password' => $settings->smtp_password,
                 'smtp_timeout' => $settings->smtp_timeout,
             ]);
-            $this->decrypt();
-            if (is_a($team, Team::class)) {
-                session(['currentTeam' => $team]);
-            }
-            $this->model = $team;
+            refreshSession();
+            $this->team = $team;
             $this->emit('success', 'Settings saved.');
-        } else {
-            $this->emit('error', 'Instance SMTP settings are not enabled.');
+            return;
         }
-    }
-
-    public function sendTestNotification()
-    {
-        $this->model->notify(new Test($this->emails));
-        $this->emit('success', 'Test Email sent successfully.');
-    }
-
-    public function instantSave()
-    {
-        try {
-            $this->submit();
-        } catch (\Exception $e) {
-            $this->model->smtp_enabled = false;
-            $this->validate();
+        if ($settings->resend_enabled) {
+            $team = currentTeam();
+            $team->update([
+                'resend_enabled' => $settings->resend_enabled,
+                'resend_api_key' => $settings->resend_api_key,
+            ]);
+            refreshSession();
+            $this->team = $team;
+            $this->emit('success', 'Settings saved.');
+            return;
         }
-    }
-
-    public function submit()
-    {
-        $this->resetErrorBag();
-        $this->validate();
-
-        if ($this->model->smtp_password) {
-            $this->model->smtp_password = encrypt($this->model->smtp_password);
-        } else {
-            $this->model->smtp_password = null;
-        }
-
-        $this->model->smtp_recipients = str_replace(' ', '', $this->model->smtp_recipients);
-        $this->saveModel();
-    }
-
-    public function saveModel()
-    {
-        $this->model->save();
-        $this->decrypt();
-        if (is_a($this->model, Team::class)) {
-            session(['currentTeam' => $this->model]);
-        }
-        $this->emit('success', 'Settings saved.');
+        $this->emit('error', 'Instance SMTP/Resend settings are not enabled.');
     }
 }

app/Http/Livewire/Notifications/TelegramSettings.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Livewire\Notifications;
+
+use App\Models\Team;
+use App\Notifications\Test;
+use Livewire\Component;
+
+class TelegramSettings extends Component
+{
+    public Team $team;
+    protected $rules = [
+        'team.telegram_enabled' => 'nullable|boolean',
+        'team.telegram_token' => 'required|string',
+        'team.telegram_chat_id' => 'required|string',
+        'team.telegram_notifications_test' => 'nullable|boolean',
+        'team.telegram_notifications_deployments' => 'nullable|boolean',
+        'team.telegram_notifications_status_changes' => 'nullable|boolean',
+        'team.telegram_notifications_database_backups' => 'nullable|boolean',
+        'team.telegram_notifications_test_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_deployments_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_status_changes_message_thread_id' => 'nullable|string',
+        'team.telegram_notifications_database_backups_message_thread_id' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'team.telegram_token' => 'Token',
+        'team.telegram_chat_id' => 'Chat ID',
+    ];
+
+    public function mount()
+    {
+        $this->team = auth()->user()->currentTeam();
+    }
+    public function instantSave()
+    {
+        try {
+            $this->submit();
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            $this->team->telegram_enabled = false;
+            $this->validate();
+        }
+    }
+
+    public function submit()
+    {
+        $this->resetErrorBag();
+        $this->validate();
+        $this->saveModel();
+    }
+
+    public function saveModel()
+    {
+        $this->team->save();
+        if (is_a($this->team, Team::class)) {
+            refreshSession();
+        }
+        $this->emit('success', 'Settings saved.');
+    }
+
+    public function sendTestNotification()
+    {
+        $this->team->notify(new Test());
+        $this->emit('success', 'Test notification sent.');
+    }
+}

app/Http/Livewire/PrivateKey/Change.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 class Change extends Component
 {
     public PrivateKey $private_key;
-
+    public $public_key;
     protected $rules = [
         'private_key.name' => 'required|string',
         'private_key.description' => 'nullable|string',
@@ -21,16 +21,24 @@ class Change extends Component
         'private_key.private_key' => 'private key'
     ];
 
+    public function mount()
+    {
+        try {
+            $this->public_key = $this->private_key->publicKey();
+        }catch(\Exception $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
     public function delete()
     {
         try {
             if ($this->private_key->isEmpty()) {
                 $this->private_key->delete();
-                auth()->user()->currentTeam()->privateKeys = PrivateKey::where('team_id', auth()->user()->currentTeam()->id)->get();
-                return redirect()->route('private-key.all');
+                currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
+                return redirect()->route('security.private-key.index');
             }
             $this->emit('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
@@ -38,13 +46,10 @@ class Change extends Component
     public function changePrivateKey()
     {
         try {
-            $this->private_key->private_key = trim($this->private_key->private_key);
-            if (!str_ends_with($this->private_key->private_key, "\n")) {
-                $this->private_key->private_key .= "\n";
-            }
+            $this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
             $this->private_key->save();
-            refreshPrivateKey($this->private_key);
-        } catch (\Exception $e) {
+            refresh_server_connection($this->private_key);
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/PrivateKey/Create.php

@@ -32,13 +32,13 @@ class Create extends Component
                 'name' => $this->name,
                 'description' => $this->description,
                 'private_key' => $this->value,
-                'team_id' => auth()->user()->currentTeam()->id
+                'team_id' => currentTeam()->id
             ]);
             if ($this->from === 'server') {
                 return redirect()->route('server.create');
             }
-            return redirect()->route('private-key.show', ['private_key_uuid' => $private_key->uuid]);
-        } catch (\Exception $e) {
+            return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/AddEmpty.php

@@ -25,10 +25,10 @@ class AddEmpty extends Component
             $project = Project::create([
                 'name' => $this->name,
                 'description' => $this->description,
-                'team_id' => auth()->user()->currentTeam()->id,
+                'team_id' => currentTeam()->id,
             ]);
             return redirect()->route('project.show', $project->uuid);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->name = '';

app/Http/Livewire/Project/AddEnvironment.php

@@ -31,7 +31,7 @@ class AddEnvironment extends Component
                 'project_uuid' => $this->project->uuid,
                 'environment_name' => $environment->name,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->name = '';

app/Http/Livewire/Project/Application/General.php

@@ -136,15 +136,20 @@ class General extends Component
 
     public function submit()
     {
+        ray($this->application);
         try {
             $this->validate();
-
-            $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
-                return Str::of($domain)->trim()->lower();
-            });
-            $port = get_port_from_dockerfile($this->application->dockerfile);
-            if ($port) {
-                $this->application->ports_exposes = $port;
+            if (data_get($this->application,'fqdn')) {
+                $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
+                    return Str::of($domain)->trim()->lower();
+                });
+                $this->application->fqdn = $domains->implode(',');
+            }
+            if ($this->application->dockerfile) {
+                $port = get_port_from_dockerfile($this->application->dockerfile);
+                if ($port) {
+                    $this->application->ports_exposes = $port;
+                }
             }
             if ($this->application->base_directory && $this->application->base_directory !== '/') {
                 $this->application->base_directory = rtrim($this->application->base_directory, '/');
@@ -152,10 +157,9 @@ class General extends Component
             if ($this->application->publish_directory && $this->application->publish_directory !== '/') {
                 $this->application->publish_directory = rtrim($this->application->publish_directory, '/');
             }
-            $this->application->fqdn = $domains->implode(',');
             $this->application->save();
             $this->emit('success', 'Application settings updated!');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/Application/Heading.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Project\Application;
 
-use App\Jobs\ContainerStatusJob;
+use App\Jobs\ApplicationContainerStatusJob;
 use App\Models\Application;
 use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
@@ -22,9 +22,8 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob(
-            resource: $this->application,
-            container_name: generate_container_name($this->application->uuid),
+        dispatch_sync(new ApplicationContainerStatusJob(
+            application: $this->application,
         ));
         $this->application->refresh();
     }
@@ -58,12 +57,21 @@ class Heading extends Component
 
     public function stop()
     {
-        remote_process(
-            ["docker rm -f {$this->application->uuid}"],
-            $this->application->destination->server
-        );
-        $this->application->status = 'stopped';
-        $this->application->save();
-        $this->application->environment->project->team->notify(new StatusChanged($this->application));
+        $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
+        if ($containers->count() === 0) {
+            return;
+        }
+        foreach ($containers as $container) {
+            $containerName = data_get($container, 'Names');
+            if ($containerName) {
+                remote_process(
+                    ["docker rm -f {$containerName}"],
+                    $this->application->destination->server
+                );
+                $this->application->status = 'stopped';
+                $this->application->save();
+                // $this->application->environment->project->team->notify(new StatusChanged($this->application));
+            }
+        }
     }
 }

app/Http/Livewire/Project/Application/Previews.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Project\Application;
 
-use App\Jobs\ContainerStatusJob;
+use App\Jobs\ApplicationContainerStatusJob;
 use App\Models\Application;
 use App\Models\ApplicationPreview;
 use Illuminate\Support\Collection;
@@ -25,10 +25,9 @@ class Previews extends Component
 
     public function loadStatus($pull_request_id)
     {
-        dispatch(new ContainerStatusJob(
-            resource: $this->application,
-            container_name: generate_container_name($this->application->uuid, $pull_request_id),
-            pull_request_id: $pull_request_id
+        dispatch(new ApplicationContainerStatusJob(
+            application: $this->application,
+            pullRequestId: $pull_request_id
         ));
     }
 
@@ -82,7 +81,7 @@ class Previews extends Component
     public function stop(int $pull_request_id)
     {
         try {
-            $container_name = generate_container_name($this->application->uuid, $pull_request_id);
+            $container_name = generateApplicationContainerName($this->application->uuid, $pull_request_id);
             ray('Stopping container: ' . $container_name);
 
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);

app/Http/Livewire/Project/Application/Source.php

@@ -29,7 +29,7 @@ class Source extends Component
 
     private function get_private_keys()
     {
-        $this->private_keys = PrivateKey::whereTeamId(auth()->user()->currentTeam()->id)->get()->reject(function ($key) {
+        $this->private_keys = PrivateKey::whereTeamId(currentTeam()->id)->get()->reject(function ($key) {
             return $key->id == $this->application->private_key_id;
         });
     }

app/Http/Livewire/Project/Database/BackupEdit.php

@@ -51,7 +51,7 @@ class BackupEdit extends Component
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }
@@ -76,7 +76,7 @@ class BackupEdit extends Component
             $this->backup->save();
             $this->backup->refresh();
             $this->emit('success', 'Backup updated successfully');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             $this->emit('error', $e->getMessage());
         }
     }

app/Http/Livewire/Project/Database/BackupExecution.php

@@ -17,7 +17,7 @@ class BackupExecution extends Component
     {
         delete_backup_locally($this->execution->filename, $this->execution->scheduledDatabaseBackup->database->destination->server);
         $this->execution->delete();
-        $this->emit('success', 'Backup execution deleted successfully.');
+        $this->emit('success', 'Backup deleted successfully.');
         $this->emit('refreshBackupExecutions');
     }
 }

app/Http/Livewire/Project/Database/CreateScheduledBackup.php

@@ -39,10 +39,10 @@ class CreateScheduledBackup extends Component
                 's3_storage_id' => $this->s3_storage_id,
                 'database_id' => $this->database->id,
                 'database_type' => $this->database->getMorphClass(),
-                'team_id' => auth()->user()->currentTeam()->id,
+                'team_id' => currentTeam()->id,
             ]);
             $this->emit('refreshScheduledBackups');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             general_error_handler($e, $this);
         } finally {
             $this->frequency = '';

app/Http/Livewire/Project/Database/Heading.php

@@ -3,7 +3,7 @@
 namespace App\Http\Livewire\Project\Database;
 
 use App\Actions\Database\StartPostgresql;
-use App\Jobs\ContainerStatusJob;
+use App\Jobs\DatabaseContainerStatusJob;
 use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
 
@@ -25,9 +25,8 @@ class Heading extends Component
 
     public function check_status()
     {
-        dispatch_sync(new ContainerStatusJob(
-            resource: $this->database,
-            container_name: generate_container_name($this->database->uuid),
+        dispatch_sync(new DatabaseContainerStatusJob(
+            database: $this->database,
         ));
         $this->database->refresh();
     }
@@ -43,9 +42,14 @@ class Heading extends Component
             ["docker rm -f {$this->database->uuid}"],
             $this->database->destination->server
         );
+        if ($this->database->is_public) {
+            stopPostgresProxy($this->database);
+            $this->database->is_public = false;
+        }
         $this->database->status = 'stopped';
         $this->database->save();
-        $this->database->environment->project->team->notify(new StatusChanged($this->database));
+        $this->emit('refresh');
+        // $this->database->environment->project->team->notify(new StatusChanged($this->database));
     }
 
     public function start()

app/Http/Livewire/Project/Database/Postgresql/General.php

@@ -12,6 +12,7 @@ class General extends Component
     public StandalonePostgresql $database;
     public string $new_filename;
     public string $new_content;
+    public string $db_url;
 
     protected $listeners = ['refresh', 'save_init_script', 'delete_init_script'];
 
@@ -26,6 +27,8 @@ class General extends Component
         'database.init_scripts' => 'nullable',
         'database.image' => 'required',
         'database.ports_mappings' => 'nullable',
+        'database.is_public' => 'nullable|boolean',
+        'database.public_port' => 'nullable|integer',
     ];
     protected $validationAttributes = [
         'database.name' => 'Name',
@@ -38,8 +41,44 @@ class General extends Component
         'database.init_scripts' => 'Init Scripts',
         'database.image' => 'Image',
         'database.ports_mappings' => 'Port Mapping',
+        'database.is_public' => 'Is Public',
+        'database.public_port' => 'Public Port',
     ];
+    public function mount()
+    {
+        $this->getDbUrl();
+    }
+    public function getDbUrl() {
+        if ($this->database->is_public) {
+            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->destination->server->ip}:{$this->database->public_port}/{$this->database->postgres_db}";
+        } else {
+            $this->db_url = "postgres://{$this->database->postgres_user}:{$this->database->postgres_password}@{$this->database->uuid}:5432/{$this->database->postgres_db}";
+        }
+    }
+    public function instantSave()
+    {
+        try {
+            if ($this->database->is_public && !$this->database->public_port) {
+                $this->emit('error', 'Public port is required.');
+                $this->database->is_public = false;
+                return;
+            }
+            if ($this->database->is_public) {
+                $this->emit('success', 'Starting TCP proxy...');
+                startPostgresProxy($this->database);
+                $this->emit('success', 'Database is now publicly accessible.');
+            } else {
+                stopPostgresProxy($this->database);
+                $this->emit('success', 'Database is no longer publicly accessible.');
+            }
+            $this->getDbUrl();
+            $this->database->save();
+        } catch(Exception $e) {
+            $this->database->is_public = !$this->database->is_public;
+            return general_error_handler(err: $e, that: $this);
+        }
 
+    }
     public function save_init_script($script)
     {
         $this->database->init_scripts = filter($this->database->init_scripts, fn ($s) => $s['filename'] !== $script['filename']);

app/Http/Livewire/Project/Edit.php

@@ -19,7 +19,7 @@ class Edit extends Component
         try {
             $this->project->save();
             $this->emit('saved');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler($e, $this);
         }
     }

app/Http/Livewire/Project/New/EmptyProject.php

@@ -11,7 +11,7 @@ class EmptyProject extends Component
     {
         $project = Project::create([
             'name' => generate_random_name(),
-            'team_id' => auth()->user()->currentTeam()->id,
+            'team_id' => currentTeam()->id,
         ]);
         return redirect()->route('project.show', ['project_uuid' => $project->uuid, 'environment_name' => 'production']);
     }

app/Http/Livewire/Project/New/GithubPrivateRepository.php

@@ -7,15 +7,19 @@ 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 Livewire\Component;
+use Route;
 
 class GithubPrivateRepository extends Component
 {
+    use SaveFromRedirect;
     public $current_step = 'github_apps';
     public $github_apps;
     public GithubApp $github_app;
     public $parameters;
+    public $currentRoute;
     public $query;
     public $type;
 
@@ -36,14 +40,30 @@ class GithubPrivateRepository extends Component
     public string|null $publish_directory = null;
     protected int $page = 1;
 
+    // public function saveFromRedirect(string $route, ?Collection $parameters = null){
+    //     session()->forget('from');
+    //     if (!$parameters || $parameters->count() === 0) {
+    //         $parameters = $this->parameters;
+    //     }
+    //     $parameters = collect($parameters) ?? collect([]);
+    //     $queries = collect($this->query) ?? collect([]);
+    //     $parameters = $parameters->merge($queries);
+    //     session(['from'=> [
+    //         'back'=> $this->currentRoute,
+    //         'route' => $route,
+    //         'parameters' => $parameters
+    //     ]]);
+    //     return redirect()->route($route);
+    // }
+
     public function mount()
     {
+        $this->currentRoute = Route::currentRouteName();
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
         $this->repositories = $this->branches = collect();
         $this->github_apps = GithubApp::private();
     }
-
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
@@ -144,7 +164,7 @@ class GithubPrivateRepository extends Component
                 'environment_name' => $environment->name,
                 'project_uuid' => $project->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -43,19 +43,19 @@ class GithubPrivateRepositoryDeployKey extends Component
         'publish_directory' => 'Publish directory',
     ];
     private object $repository_url_parsed;
-    private GithubApp|GitlabApp $git_source;
+    private GithubApp|GitlabApp|null $git_source = null;
     private string $git_host;
     private string $git_repository;
     private string $git_branch;
 
     public function mount()
     {
-        if (is_dev()) {
+        if (isDev()) {
             $this->repository_url = 'https://github.com/coollabsio/coolify-examples';
         }
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->private_keys = PrivateKey::where('team_id', auth()->user()->currentTeam()->id)->where('id', '!=', 0)->get();
+        $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
     }
 
     public function instantSave()
@@ -117,7 +117,7 @@ class GithubPrivateRepositoryDeployKey extends Component
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/New/PublicGitRepository.php

@@ -39,13 +39,13 @@ class PublicGitRepository extends Component
         'publish_directory' => 'publish directory',
     ];
     private object $repository_url_parsed;
-    private GithubApp|GitlabApp $git_source;
+    private GithubApp|GitlabApp|null $git_source = null;
     private string $git_host;
     private string $git_repository;
 
     public function mount()
     {
-        if (is_dev()) {
+        if (isDev()) {
             $this->repository_url = 'https://github.com/coollabsio/coolify-examples';
             $this->port = 3000;
         }
@@ -67,23 +67,22 @@ class PublicGitRepository extends Component
 
     public function load_branch()
     {
-        $this->branch_found = false;
+        try {
+            $this->branch_found = false;
         $this->validate([
             'repository_url' => 'required|url'
         ]);
         $this->get_git_source();
-        try {
-            $this->get_branch();
-            $this->selected_branch = $this->git_branch;
-        } catch (\Exception $e) {
+        $this->get_branch();
+        $this->selected_branch = $this->git_branch;
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
-
         if (!$this->branch_found && $this->git_branch == 'main') {
             try {
                 $this->git_branch = 'master';
                 $this->get_branch();
-            } catch (\Exception $e) {
+            } catch (\Throwable $e) {
                 return general_error_handler(err: $e, that: $this);
             }
         }
@@ -103,6 +102,9 @@ class PublicGitRepository extends Component
         } elseif ($this->git_host == 'bitbucket.org') {
             // Not supported yet
         }
+        if (is_null($this->git_source)) {
+            throw new \Exception('Git source not found. What?!');
+        }
     }
 
     private function get_branch()
@@ -159,7 +161,7 @@ class PublicGitRepository extends Component
                 'environment_name' => $environment->name,
                 'application_uuid' => $application->uuid,
             ]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/New/Select.php

@@ -3,37 +3,79 @@
 namespace App\Http\Livewire\Project\New;
 
 use App\Models\Server;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Countable;
+use Illuminate\Support\Collection;
 use Livewire\Component;
+use Route;
 
 class Select extends Component
 {
     public $current_step = 'type';
+    public ?int $server = null;
     public string $type;
     public string $server_id;
     public string $destination_uuid;
-    public $servers = [];
-    public $destinations = [];
+    public Countable|array|Server $servers;
+    public Collection|array $standaloneDockers = [];
+    public Collection|array $swarmDockers = [];
     public array $parameters;
 
+    public ?string $existingPostgresqlUrl = null;
+
+    protected $queryString = [
+        'server',
+    ];
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        if (isDev()) {
+            $this->existingPostgresqlUrl = 'postgres://coolify:password@coolify-db:5432';
+        }
     }
 
-    public function set_type(string $type)
+    // public function addExistingPostgresql()
+    // {
+    //     try {
+    //         instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
+    //         $this->emit('success', 'Successfully connected to the database.');
+    //     } catch (\Throwable $e) {
+    //         return general_error_handler($e, $this);
+    //     }
+    // }
+    public function setType(string $type)
     {
         $this->type = $type;
+        if ($type === "existing-postgresql") {
+            $this->current_step = $type;
+            return;
+        }
+        if (count($this->servers) === 1) {
+            $server = $this->servers->first();
+            $this->setServer($server);
+            if (count($server->destinations()) === 1) {
+                $this->setDestination($server->destinations()->first()->uuid);
+            }
+        }
+        if (!is_null($this->server)) {
+            $foundServer = $this->servers->where('id', $this->server)->first();
+            if ($foundServer) {
+                return $this->setServer($foundServer);
+            }
+        }
         $this->current_step = 'servers';
     }
 
-    public function set_server(Server $server)
+    public function setServer(Server $server)
     {
         $this->server_id = $server->id;
-        $this->destinations = $server->destinations();
+        $this->standaloneDockers = $server->standaloneDockers;
+        $this->swarmDockers = $server->swarmDockers;
         $this->current_step = 'destinations';
     }
 
-    public function set_destination(string $destination_uuid)
+    public function setDestination(string $destination_uuid)
     {
         $this->destination_uuid = $destination_uuid;
         redirect()->route('project.resources.new', [
@@ -46,6 +88,6 @@ class Select extends Component
 
     public function load_servers()
     {
-        $this->servers = Server::ownedByCurrentTeam()->get();
+        $this->servers = Server::isUsable()->get();
     }
 }

app/Http/Livewire/Project/New/SimpleDockerfile.php

@@ -19,7 +19,7 @@ class SimpleDockerfile extends Component
     {
         $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        if (is_dev()) {
+        if (isDev()) {
             $this->dockerfile = 'FROM nginx
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]
@@ -59,6 +59,10 @@ CMD ["nginx", "-g", "daemon off;"]
             'source_id' => 0,
             'source_type' => GithubApp::class
         ]);
+        $application->update([
+            'name' => 'dockerfile-' . $application->id
+        ]);
+
         redirect()->route('project.application.configuration', [
             'application_uuid' => $application->uuid,
             'environment_name' => $environment->name,

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

@@ -5,21 +5,89 @@ namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 use App\Models\EnvironmentVariable;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
+use Str;
 
 class All extends Component
 {
     public $resource;
+    public bool $showPreview = false;
     public string|null $modalId = null;
+    public ?string $variables = null;
+    public ?string $variablesPreview = null;
+    public string $view = 'normal';
     protected $listeners = ['refreshEnvs', 'submit'];
 
     public function mount()
     {
+        $resourceClass = get_class($this->resource);
+        $resourceWithPreviews = ['App\Models\Application'];
+        $simpleDockerfile = !is_null(data_get($this->resource, 'dockerfile'));
+        if (Str::of($resourceClass)->contains($resourceWithPreviews) && !$simpleDockerfile) {
+            $this->showPreview = true;
+        }
         $this->modalId = new Cuid2(7);
+        $this->getDevView();
+    }
+    public function getDevView()
+    {
+        $this->variables = $this->resource->environment_variables->map(function ($item) {
+            return "$item->key=$item->value";
+        })->sort()->join('
+');
+        if ($this->showPreview) {
+            $this->variablesPreview = $this->resource->environment_variables_preview->map(function ($item) {
+                return "$item->key=$item->value";
+            })->sort()->join('
+');
+        }
+    }
+    public function switch()
+    {
+        $this->view = $this->view === 'normal' ? 'dev' : 'normal';
+    }
+    public function saveVariables($isPreview)
+    {
+        if ($isPreview) {
+            $variables = parseEnvFormatToArray($this->variablesPreview);
+            $existingVariables = $this->resource->environment_variables_preview();
+            $this->resource->environment_variables_preview()->delete();
+        } else {
+            $variables = parseEnvFormatToArray($this->variables);
+            $existingVariables = $this->resource->environment_variables();
+            $this->resource->environment_variables()->delete();
+        }
+        foreach ($variables as $key => $variable) {
+            $found = $existingVariables->where('key', $key)->first();
+            if ($found) {
+                $found->value = $variable;
+                $found->save();
+                continue;
+            } else {
+                $environment = new EnvironmentVariable();
+                $environment->key = $key;
+                $environment->value = $variable;
+                $environment->is_build_time = false;
+                $environment->is_preview = $isPreview ? true : false;
+                if ($this->resource->type() === 'application') {
+                    $environment->application_id = $this->resource->id;
+                }
+                if ($this->resource->type() === 'standalone-postgresql') {
+                    $environment->standalone_postgresql_id = $this->resource->id;
+                }
+                $environment->save();
+            }
+        }
+        if ($isPreview) {
+            $this->emit('success', 'Preview environment variables updated successfully.');
+        } else {
+            $this->emit('success', 'Environment variables updated successfully.');
+        }
+        $this->refreshEnvs();
     }
-
     public function refreshEnvs()
     {
         $this->resource->refresh();
+        $this->getDevView();
     }
 
     public function submit($data)
@@ -43,9 +111,9 @@ class All extends Component
                 $environment->standalone_postgresql_id = $this->resource->id;
             }
             $environment->save();
-            $this->resource->refresh();
+            $this->refreshEnvs();
             $this->emit('success', 'Environment variable added successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/Shared/ResourceLimits.php

@@ -53,7 +53,7 @@ class ResourceLimits extends Component
             $this->validate();
             $this->resource->save();
             $this->emit('success', 'Resource limits updated successfully.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Project/Shared/Storages/All.php

@@ -28,7 +28,7 @@ class All extends Component
             $this->resource->refresh();
             $this->emit('success', 'Storage added successfully');
             $this->emit('clearAddStorage');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/RunCommand.php

@@ -32,7 +32,7 @@ class RunCommand extends Component
         try {
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
             $this->emit('newMonitorActivity', $activity->id);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }

app/Http/Livewire/Server/All.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use App\Models\Server;
+use Illuminate\Database\Eloquent\Collection;
+use Livewire\Component;
+
+class All extends Component
+{
+    public ?Collection $servers = null;
+
+    public function mount () {
+        $this->servers = Server::ownedByCurrentTeam()->get();
+    }
+    public function render()
+    {
+        return view('livewire.server.all');
+    }
+}

app/Http/Livewire/Server/Form.php

@@ -4,10 +4,12 @@ namespace App\Http\Livewire\Server;
 
 use App\Actions\Server\InstallDocker;
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
 
 class Form extends Component
 {
+    use AuthorizesRequests;
     public Server $server;
     public $uptime;
     public $dockerVersion;
@@ -42,7 +44,7 @@ class Form extends Component
 
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->server, auth()->user()->currentTeam());
+        $activity = resolve(InstallDocker::class)($this->server, currentTeam());
         $this->emit('newMonitorActivity', $activity->id);
     }
 
@@ -52,26 +54,37 @@ class Form extends Component
             ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
             if ($uptime) {
                 $this->uptime = $uptime;
+                $this->emit('success', 'Server is reachable!');
+            } else {
+                $this->emit('error', 'Server is not rachable');
+                return;
             }
             if ($dockerVersion) {
                 $this->dockerVersion = $dockerVersion;
                 $this->emit('proxyStatusUpdated');
+                $this->emit('success', 'Docker Engine 23+ is installed!');
+            } else {
+                $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
             }
-        } catch (\Exception $e) {
-            return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, that: $this);
         }
     }
 
     public function delete()
     {
-        if (!$this->server->isEmpty()) {
-            $this->emit('error', 'Server has defined resources. Please delete them first.');
-            return;
+        try {
+            $this->authorize('delete', $this->server);
+            if (!$this->server->isEmpty()) {
+                $this->emit('error', 'Server has defined resources. Please delete them first.');
+                return;
+            }
+            $this->server->delete();
+            return redirect()->route('server.all');
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
         }
-        $this->server->delete();
-        redirect()->route('server.all');
     }
-
     public function submit()
     {
         $this->validate();

app/Http/Livewire/Server/New/ByIp.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Livewire\Server\New;
 
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -56,7 +58,7 @@ class ByIp extends Component
     {
         $this->validate();
         try {
-            if (!$this->private_key_id) {
+            if (is_null($this->private_key_id)) {
                 return $this->emit('error', 'You must select a private key');
             }
             $server = Server::create([
@@ -65,13 +67,18 @@ class ByIp extends Component
                 'ip' => $this->ip,
                 'user' => $this->user,
                 'port' => $this->port,
-                'team_id' => auth()->user()->currentTeam()->id,
+                'team_id' => currentTeam()->id,
                 'private_key_id' => $this->private_key_id,
+                'proxy' => [
+                    "type" => ProxyTypes::TRAEFIK_V2->value,
+                    "status" => ProxyStatus::EXITED->value,
+                ]
+
             ]);
             $server->settings->is_part_of_swarm = $this->is_part_of_swarm;
             $server->settings->save();
             return redirect()->route('server.show', $server->uuid);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }

app/Http/Livewire/Server/PrivateKey.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Server;
-
-use App\Models\Server;
-use Livewire\Component;
-use Masmerise\Toaster\Toaster;
-
-class PrivateKey extends Component
-{
-    public Server $server;
-    public $privateKeys;
-    public $parameters;
-
-    public function setPrivateKey($private_key_id)
-    {
-        $this->server->update([
-            'private_key_id' => $private_key_id
-        ]);
-        refreshPrivateKey($this->server->privateKey);
-        $this->server->refresh();
-        $this->checkConnection();
-    }
-
-    public function checkConnection()
-    {
-        try {
-            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
-            if ($uptime) {
-                Toaster::success('Server is reachable with this private key.');
-            }
-            if ($dockerVersion) {
-                Toaster::success('Server is usable for Coolify.');
-            }
-        } catch (\Exception $e) {
-            return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
-        }
-    }
-
-    public function mount()
-    {
-        $this->parameters = get_route_parameters();
-    }
-}

app/Http/Livewire/Server/Proxy.php

@@ -12,15 +12,16 @@ class Proxy extends Component
 {
     public Server $server;
 
-    public ProxyTypes $selectedProxy = ProxyTypes::TRAEFIK_V2;
+    public ?string $selectedProxy = null;
     public $proxy_settings = null;
-    public string|null $redirect_url = null;
+    public ?string $redirect_url = null;
 
     protected $listeners = ['proxyStatusUpdated', 'saveConfiguration' => 'submit'];
 
     public function mount()
     {
-        $this->redirect_url = $this->server->proxy->redirect_url;
+        $this->selectedProxy = data_get($this->server, 'proxy.type');
+        $this->redirect_url = data_get($this->server, 'proxy.redirect_url');
     }
 
     public function proxyStatusUpdated()
@@ -35,11 +36,12 @@ class Proxy extends Component
         $this->emit('proxyStatusUpdated');
     }
 
-    public function select_proxy(string $proxy_type)
+    public function select_proxy($proxy_type)
     {
         $this->server->proxy->type = $proxy_type;
         $this->server->proxy->status = 'exited';
         $this->server->save();
+        $this->selectedProxy = $this->server->proxy->type;
         $this->emit('proxyStatusUpdated');
     }
 
@@ -53,7 +55,7 @@ class Proxy extends Component
 
             setup_default_redirect_404(redirect_url: $this->server->proxy->redirect_url, server: $this->server);
             $this->emit('success', 'Proxy configuration saved.');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
@@ -62,16 +64,17 @@ class Proxy extends Component
     {
         try {
             $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }
 
-    public function load_proxy_configuration()
+    public function loadProxyConfiguration()
     {
         try {
+            ray('loadProxyConfiguration');
             $this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e);
         }
     }

app/Http/Livewire/Server/Proxy/Deploy.php

@@ -10,15 +10,20 @@ class Deploy extends Component
 {
     public Server $server;
     public $proxy_settings = null;
+    protected $listeners = ['proxyStatusUpdated'];
 
-    public function start_proxy()
+    public function proxyStatusUpdated() {
+        $this->server->refresh();
+    }
+    public function startProxy()
     {
         if (
             $this->server->proxy->last_applied_settings &&
             $this->server->proxy->last_saved_settings !== $this->server->proxy->last_applied_settings
         ) {
-            $this->emit('saveConfiguration', $server);
+            resolve(SaveConfigurationSync::class)($this->server, $this->proxy_settings);
         }
+
         $activity = resolve(StartProxy::class)($this->server);
         $this->emit('newMonitorActivity', $activity->id);
     }

app/Http/Livewire/Server/Proxy/Status.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Server\Proxy;
 
-use App\Jobs\ProxyContainerStatusJob;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -10,12 +9,27 @@ class Status extends Component
 {
     public Server $server;
 
-    public function get_status()
+    protected $listeners = ['proxyStatusUpdated'];
+    public function proxyStatusUpdated()
     {
-        dispatch_sync(new ProxyContainerStatusJob(
-            server: $this->server
-        ));
         $this->server->refresh();
-        $this->emit('proxyStatusUpdated');
+    }
+    public function getProxyStatus()
+    {
+        try {
+            if ($this->server->isFunctional()) {
+                $container = getContainerStatus(server: $this->server, container_id: 'coolify-proxy');
+                $this->server->proxy->status = $container;
+                $this->server->save();
+                $this->emit('proxyStatusUpdated');
+            }
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e);
+        }
+    }
+    public function getProxyStatusWithNoti()
+    {
+        $this->emit('success', 'Refreshed proxy status.');
+        $this->getProxyStatus();
     }
 }

app/Http/Livewire/Server/Show.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Livewire\Component;
+
+class Show extends Component
+{
+    use AuthorizesRequests;
+    public ?Server $server = null;
+    public function mount()
+    {
+        try {
+            $this->server = Server::ownedByCurrentTeam(['name', 'description', 'ip', 'port', 'user', 'proxy'])->whereUuid(request()->server_uuid)->firstOrFail();
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.show');
+    }
+}

app/Http/Livewire/Server/ShowPrivateKey.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Http\Livewire\Server;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class ShowPrivateKey extends Component
+{
+    public Server $server;
+    public $privateKeys;
+    public $parameters;
+
+    public function setPrivateKey($newPrivateKeyId)
+    {
+        try {
+            $oldPrivateKeyId = $this->server->private_key_id;
+            $this->server->update([
+                'private_key_id' => $newPrivateKeyId
+            ]);
+            $this->server->refresh();
+            refresh_server_connection($this->server->privateKey);
+            $this->checkConnection();
+        } catch (\Throwable $e) {
+            $this->server->update([
+                'private_key_id' => $oldPrivateKeyId
+            ]);
+            $this->server->refresh();
+             refresh_server_connection($this->server->privateKey);
+            return general_error_handler($e, that: $this);
+        }
+    }
+
+    public function checkConnection()
+    {
+        try {
+            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
+            if ($uptime) {
+                $this->emit('success', 'Server is reachable with this private key.');
+            } else {
+                $this->emit('error', 'Server is not reachable with this private key.');
+                return;
+            }
+            if ($dockerVersion) {
+                $this->emit('success', 'Server is usable for Coolify.');
+            } else {
+                $this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
+            }
+        } catch (\Throwable $e) {
+            throw new \Exception($e->getMessage());
+        }
+    }
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+}

app/Http/Livewire/Settings/Backup.php

@@ -65,7 +65,7 @@ class Backup extends Component
             'frequency' => '0 0 * * *',
             'database_id' => $this->database->id,
             'database_type' => 'App\Models\StandalonePostgresql',
-            'team_id' => auth()->user()->currentTeam()->id,
+            'team_id' => currentTeam()->id,
         ]);
         $this->database->refresh();
         $this->backup->refresh();

app/Http/Livewire/Settings/Configuration.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Settings;
 
-use App\Jobs\ProxyStartJob;
+use App\Jobs\ProxyContainerStatusJob;
 use App\Models\InstanceSettings as ModelsInstanceSettings;
 use App\Models\Server;
 use Livewire\Component;
@@ -124,7 +124,7 @@ class Configuration extends Component
                 ];
             }
             $this->save_configuration_to_disk($traefik_dynamic_conf, $file);
-            dispatch(new ProxyStartJob($this->server));
+            dispatch(new ProxyContainerStatusJob($this->server));
         }
     }
 

app/Http/Livewire/Settings/Email.php

@@ -20,6 +20,9 @@ class Email extends Component
         'settings.smtp_timeout' => 'nullable',
         'settings.smtp_from_address' => 'required|email',
         'settings.smtp_from_name' => 'required',
+        'settings.resend_enabled' => 'nullable|boolean',
+        'settings.resend_api_key' => 'nullable'
+
     ];
     protected $validationAttributes = [
         'settings.smtp_from_address' => 'From Address',
@@ -30,48 +33,75 @@ class Email extends Component
         'settings.smtp_encryption' => 'Encryption',
         'settings.smtp_username' => 'Username',
         'settings.smtp_password' => 'Password',
+        'settings.smtp_timeout' => 'Timeout',
+        'settings.resend_api_key' => 'Resend API Key'
     ];
-
     public function mount()
     {
-        $this->decrypt();
         $this->emails = auth()->user()->email;
     }
 
-    private function decrypt()
-    {
-        if (data_get($this->settings, 'smtp_password')) {
-            try {
-                $this->settings->smtp_password = decrypt($this->settings->smtp_password);
-            } catch (\Exception $e) {
-            }
+    public function submitFromFields() {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'settings.smtp_from_address' => 'required|email',
+                'settings.smtp_from_name' => 'required',
+            ]);
+            $this->settings->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function submitResend() {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'settings.resend_api_key' => 'required'
+            ]);
+            $this->settings->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            $this->settings->resend_enabled = false;
+            return general_error_handler($e, $this);
+        }
+    }
+    public function instantSaveResend() {
+        try {
+            $this->settings->smtp_enabled = false;
+            $this->submitResend();
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
-
     public function instantSave()
     {
         try {
+            $this->settings->resend_enabled = false;
             $this->submit();
-            $this->emit('success', 'Settings saved successfully.');
-        } catch (\Exception $e) {
-            $this->settings->smtp_enabled = false;
-            $this->validate();
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
     public function submit()
     {
-        $this->resetErrorBag();
-        $this->validate();
-        if ($this->settings->smtp_password) {
-            $this->settings->smtp_password = encrypt($this->settings->smtp_password);
-        } else {
-            $this->settings->smtp_password = null;
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'settings.smtp_host' => 'required',
+                'settings.smtp_port' => 'required|numeric',
+                'settings.smtp_encryption' => 'nullable',
+                'settings.smtp_username' => 'nullable',
+                'settings.smtp_password' => 'nullable',
+                'settings.smtp_timeout' => 'nullable',
+            ]);
+            $this->settings->save();
+            $this->emit('success', 'Settings saved successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
-
-        $this->settings->save();
-        $this->emit('success', 'Transaction email settings updated successfully.');
-        $this->decrypt();
     }
 
     public function sendTestNotification()

app/Http/Livewire/Source/Github/Change.php

@@ -37,9 +37,13 @@ class Change extends Component
 
     public function mount()
     {
-        $this->webhook_endpoint = $this->ipv4;
+        if (isCloud() && !isDev()) {
+            $this->webhook_endpoint = config('app.url');
+        } else {
+            $this->webhook_endpoint = $this->ipv4;
+            $this->is_system_wide = $this->github_app->is_system_wide;
+        }
         $this->parameters = get_route_parameters();
-        $this->is_system_wide = $this->github_app->is_system_wide;
     }
 
     public function submit()
@@ -47,7 +51,7 @@ class Change extends Component
         try {
             $this->validate();
             $this->github_app->save();
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }
@@ -61,7 +65,7 @@ class Change extends Component
         try {
             $this->github_app->delete();
             redirect()->route('source.all');
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Source/Github/Create.php

@@ -32,18 +32,24 @@ class Create extends Component
                 "custom_port" => 'required|int',
                 "is_system_wide" => 'required|bool',
             ]);
-            $github_app = GithubApp::create([
+            $payload = [
                 'name' => $this->name,
                 'organization' => $this->organization,
                 'api_url' => $this->api_url,
                 'html_url' => $this->html_url,
                 'custom_user' => $this->custom_user,
                 'custom_port' => $this->custom_port,
-                'is_system_wide' => $this->is_system_wide,
-                'team_id' => auth()->user()->currentTeam()->id,
-            ]);
+                'team_id' => currentTeam()->id,
+            ];
+            if (isCloud()) {
+                $payload['is_system_wide'] = $this->is_system_wide;
+            }
+            $github_app = GithubApp::create($payload);
+            if (session('from')) {
+                session(['from' => session('from') + ['source_id' => $github_app->id]]);
+            }
             redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Subscription/Actions.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Livewire\Subscription;
+
+use Illuminate\Support\Facades\Http;
+use Livewire\Component;
+
+class Actions extends Component
+{
+    public function cancel()
+    {
+        try {
+            $subscription_id = currentTeam()->subscription->lemon_subscription_id;
+            if (!$subscription_id) {
+                throw new \Exception('No subscription found');
+            }
+            $response = Http::withHeaders([
+                'Accept' => 'application/vnd.api+json',
+                'Content-Type' => 'application/vnd.api+json',
+                'Authorization' => 'Bearer ' . config('subscription.lemon_squeezy_api_key'),
+            ])->delete('https://api.lemonsqueezy.com/v1/subscriptions/' . $subscription_id);
+            $json = $response->json();
+            if ($response->failed()) {
+                $error = data_get($json, 'errors.0.status');
+                if ($error === '404') {
+                    throw new \Exception('Subscription not found.');
+                }
+                throw new \Exception(data_get($json, 'errors.0.title', 'Something went wrong. Please try again later.'));
+            } else {
+                $this->emit('success', 'Subscription cancelled successfully. Reloading in 5s.');
+                $this->emit('reloadWindow', 5000);
+            }
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function resume()
+    {
+        try {
+            $subscription_id = currentTeam()->subscription->lemon_subscription_id;
+            if (!$subscription_id) {
+                throw new \Exception('No subscription found');
+            }
+            $response = Http::withHeaders([
+                'Accept' => 'application/vnd.api+json',
+                'Content-Type' => 'application/vnd.api+json',
+                'Authorization' => 'Bearer ' . config('subscription.lemon_squeezy_api_key'),
+            ])->patch('https://api.lemonsqueezy.com/v1/subscriptions/' . $subscription_id, [
+                'data' => [
+                    'type' => 'subscriptions',
+                    'id' => $subscription_id,
+                    'attributes' => [
+                        'cancelled' => false,
+                    ],
+                ],
+            ]);
+            $json = $response->json();
+            if ($response->failed()) {
+                $error = data_get($json, 'errors.0.status');
+                if ($error === '404') {
+                    throw new \Exception('Subscription not found.');
+                }
+                throw new \Exception(data_get($json, 'errors.0.title', 'Something went wrong. Please try again later.'));
+            } else {
+                $this->emit('success', 'Subscription resumed successfully. Reloading in 5s.');
+                $this->emit('reloadWindow', 5000);
+            }
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function stripeCustomerPortal() {
+        $session = getStripeCustomerPortalSession(currentTeam());
+        redirect($session->url);
+    }
+}

app/Http/Livewire/Subscription/PricingPlans.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Livewire\Subscription;
+
+use Livewire\Component;
+use Stripe\Stripe;
+use Stripe\Checkout\Session;
+
+class PricingPlans extends Component
+{
+    public bool $isTrial = false;
+    public function mount() {
+        $this->isTrial = !data_get(currentTeam(),'subscription.stripe_trial_already_ended');
+    }
+    public function subscribeStripe($type)
+    {
+        $team = currentTeam();
+        Stripe::setApiKey(config('subscription.stripe_api_key'));
+        switch ($type) {
+            case 'basic-monthly':
+                $priceId = config('subscription.stripe_price_id_basic_monthly');
+                break;
+            case 'basic-yearly':
+                $priceId = config('subscription.stripe_price_id_basic_yearly');
+                break;
+            case 'ultimate-monthly':
+                $priceId = config('subscription.stripe_price_id_ultimate_monthly');
+                break;
+            case 'pro-monthly':
+                $priceId = config('subscription.stripe_price_id_pro_monthly');
+                break;
+            case 'pro-yearly':
+                $priceId = config('subscription.stripe_price_id_pro_yearly');
+                break;
+            case 'ultimate-yearly':
+                $priceId = config('subscription.stripe_price_id_ultimate_yearly');
+                break;
+            default:
+                $priceId = config('subscription.stripe_price_id_basic_monthly');
+                break;
+        }
+        if (!$priceId) {
+            $this->emit('error', 'Price ID not found! Please contact the administrator.');
+            return;
+        }
+        $payload = [
+            'client_reference_id' => auth()->user()->id . ':' . currentTeam()->id,
+            'line_items' => [[
+                'price' => $priceId,
+                'quantity' => 1,
+            ]],
+            'tax_id_collection' => [
+                'enabled' => true,
+            ],
+            'automatic_tax' => [
+                'enabled' => true,
+            ],
+
+            'mode' => 'subscription',
+            'success_url' => route('dashboard', ['success' => true]),
+            'cancel_url' => route('subscription.index', ['cancelled' => true]),
+        ];
+
+        if (!data_get($team,'subscription.stripe_trial_already_ended')) {
+            $payload['subscription_data'] = [
+                'trial_period_days' => config('constants.limits.trial_period'),
+                'trial_settings' => [
+                    'end_behavior' => [
+                        'missing_payment_method' => 'cancel',
+                    ]
+                ],
+            ];
+            $payload['payment_method_collection'] = 'if_required';
+        }
+        $customer = currentTeam()->subscription?->stripe_customer_id ?? null;
+        if ($customer) {
+            $payload['customer'] = $customer;
+            $payload['customer_update'] = [
+                'name' => 'auto'
+            ];
+        } else {
+            $payload['customer_email'] = auth()->user()->email;
+        }
+        $session = Session::create($payload);
+        return redirect($session->url, 303);
+    }
+}

app/Http/Livewire/SwitchTeam.php

@@ -23,7 +23,7 @@ class SwitchTeam extends Component
         if (!$team_to_switch_to) {
             return;
         }
-        session(['currentTeam' => $team_to_switch_to]);
+        refreshSession($team_to_switch_to);
         return redirect(request()->header('Referer'));
     }
 }

app/Http/Livewire/Team/Create.php

@@ -29,10 +29,10 @@ class Create extends Component
                 'personal_team' => false,
             ]);
             auth()->user()->teams()->attach($team, ['role' => 'admin']);
-            session(['currentTeam' => $team]);
-            return redirect()->route('team.show');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+            refreshSession();
+            return redirect()->route('team.index');
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }

app/Http/Livewire/Team/Delete.php

@@ -9,7 +9,7 @@ class Delete extends Component
 {
     public function delete()
     {
-        $currentTeam = auth()->user()->currentTeam();
+        $currentTeam = currentTeam();
         $currentTeam->delete();
 
         $team = auth()->user()->teams()->first();
@@ -24,7 +24,7 @@ class Delete extends Component
             }
         });
 
-        session(['currentTeam' => $team]);
-        return redirect()->route('team.show');
+        refreshSession();
+        return redirect()->route('team.index');
     }
 }

app/Http/Livewire/Team/Form.php

@@ -19,7 +19,7 @@ class Form extends Component
 
     public function mount()
     {
-        $this->team = auth()->user()->currentTeam();
+        $this->team = currentTeam();
     }
 
     public function submit()
@@ -27,10 +27,9 @@ class Form extends Component
         $this->validate();
         try {
             $this->team->save();
-            session(['currentTeam' => $this->team]);
-            $this->emit('reloadWindow');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+            refreshSession();
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }

app/Http/Livewire/Team/Invitations.php

@@ -14,10 +14,11 @@ class Invitations extends Component
     {
         TeamInvitation::find($invitation_id)->delete();
         $this->refreshInvitations();
+        $this->emit('success', 'Invitation revoked.');
     }
 
     public function refreshInvitations()
     {
-        $this->invitations = TeamInvitation::whereTeamId(auth()->user()->currentTeam()->id)->get();
+        $this->invitations = TeamInvitation::whereTeamId(currentTeam()->id)->get();
     }
 }

app/Http/Livewire/Team/InviteLink.php

@@ -15,7 +15,7 @@ class InviteLink extends Component
 
     public function mount()
     {
-        $this->email = is_dev() ? 'test3@example.com' : '';
+        $this->email = isDev() ? 'test3@example.com' : '';
     }
 
     public function viaEmail()
@@ -35,9 +35,9 @@ class InviteLink extends Component
                 return general_error_handler(that: $this, customErrorMessage: "$this->email must be registered first (or activate transactional emails to invite via email).");
             }
 
-            $member_emails = auth()->user()->currentTeam()->members()->get()->pluck('email');
+            $member_emails = currentTeam()->members()->get()->pluck('email');
             if ($member_emails->contains($this->email)) {
-                return general_error_handler(that: $this, customErrorMessage: "$this->email is already a member of " . auth()->user()->currentTeam()->name . ".");
+                return general_error_handler(that: $this, customErrorMessage: "$this->email is already a member of " . currentTeam()->name . ".");
             }
 
             $invitation = TeamInvitation::whereEmail($this->email);
@@ -53,7 +53,7 @@ class InviteLink extends Component
             }
 
             TeamInvitation::firstOrCreate([
-                'team_id' => auth()->user()->currentTeam()->id,
+                'team_id' => currentTeam()->id,
                 'uuid' => $uuid,
                 'email' => $this->email,
                 'role' => $this->role,

app/Http/Livewire/Team/Member.php

@@ -11,19 +11,19 @@ class Member extends Component
 
     public function makeAdmin()
     {
-        $this->member->teams()->updateExistingPivot(auth()->user()->currentTeam()->id, ['role' => 'admin']);
+        $this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'admin']);
         $this->emit('reloadWindow');
     }
 
     public function makeReadonly()
     {
-        $this->member->teams()->updateExistingPivot(auth()->user()->currentTeam()->id, ['role' => 'member']);
+        $this->member->teams()->updateExistingPivot(currentTeam()->id, ['role' => 'member']);
         $this->emit('reloadWindow');
     }
 
     public function remove()
     {
-        $this->member->teams()->detach(auth()->user()->currentTeam());
+        $this->member->teams()->detach(currentTeam());
         $this->emit('reloadWindow');
     }
 }

app/Http/Livewire/Team/Storage/Create.php

@@ -36,7 +36,7 @@ class Create extends Component
 
     public function mount()
     {
-        if (is_dev()) {
+        if (isDev()) {
             $this->name = 'Local MinIO';
             $this->description = 'Local MinIO';
             $this->key = 'minioadmin';
@@ -62,13 +62,13 @@ class Create extends Component
             } else {
                 $this->storage->endpoint = $this->endpoint;
             }
-            $this->storage->team_id = auth()->user()->currentTeam()->id;
+            $this->storage->team_id = currentTeam()->id;
             $this->storage->testConnection();
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             return redirect()->route('team.storages.show', $this->storage->uuid);
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -77,8 +77,8 @@ class Create extends Component
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }

app/Http/Livewire/Team/Storage/Form.php

@@ -32,8 +32,8 @@ class Form extends Component
         try {
             $this->storage->testConnection();
             return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -42,8 +42,8 @@ class Form extends Component
         try {
             $this->storage->delete();
             return redirect()->route('team.storages.all');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 
@@ -55,8 +55,8 @@ class Form extends Component
             $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
             $this->storage->save();
             $this->emit('success', 'Storage settings saved.');
-        } catch (\Throwable $th) {
-            return general_error_handler($th, $this);
+        } catch (\Throwable $e) {
+            return general_error_handler($e, $this);
         }
     }
 }

app/Http/Livewire/Upgrade.php

@@ -18,7 +18,7 @@ class Upgrade extends Component
         $this->latestVersion = get_latest_version_of_coolify();
         $currentVersion = config('version');
         version_compare($currentVersion, $this->latestVersion, '<') ? $this->isUpgradeAvailable = true : $this->isUpgradeAvailable = false;
-        if (is_dev()) {
+        if (isDev()) {
             $this->isUpgradeAvailable = true;
         }
         $settings = InstanceSettings::get();
@@ -37,7 +37,7 @@ class Upgrade extends Component
             $this->showProgress = true;
             resolve(UpdateCoolify::class)(true);
             Toaster::success("Upgrading to {$this->latestVersion} version...");
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
     }

app/Http/Livewire/Waitlist/Index.php

@@ -1,24 +1,31 @@
 <?php
 
-namespace App\Http\Livewire;
+namespace App\Http\Livewire\Waitlist;
 
 use App\Jobs\SendConfirmationForWaitlistJob;
 use App\Models\User;
-use App\Models\Waitlist as ModelsWaitlist;
+use App\Models\Waitlist;
 use Livewire\Component;
 
-class Waitlist extends Component
+class Index extends Component
 {
     public string $email;
-    public int $waiting_in_line = 0;
+    public int $users = 0;
+    public int $waitingInLine = 0;
 
     protected $rules = [
         'email' => 'required|email',
     ];
+    public function render()
+    {
+        return view('livewire.waitlist.index')->layout('layouts.simple');
+    }
     public function mount()
     {
-        if (is_dev()) {
-            $this->email = 'test@example.com';
+        $this->waitingInLine = Waitlist::whereVerified(true)->count();
+        $this->users = User::count();
+        if (isDev()) {
+            $this->email = 'waitlist@example.com';
         }
     }
     public function submit()
@@ -27,28 +34,26 @@ class Waitlist extends Component
         try {
             $already_registered = User::whereEmail($this->email)->first();
             if ($already_registered) {
-                $this->emit('success', 'You are already registered (Thank you 💜).');
-                return;
+                throw new \Exception('You are already on the waitlist or registered. <br>Please check your email to verify your email address or contact support.');
             }
-            $found = ModelsWaitlist::where('email', $this->email)->first();
+            $found = Waitlist::where('email', $this->email)->first();
             if ($found) {
                 if (!$found->verified) {
                     $this->emit('error', 'You are already on the waitlist. <br>Please check your email to verify your email address.');
                     return;
                 }
-                $this->emit('error', 'You are already on the waitlist.');
+                $this->emit('error', 'You are already on the waitlist. <br>You will be notified when your turn comes. <br>Thank you.');
                 return;
             }
-            $waitlist = ModelsWaitlist::create([
+            $waitlist = Waitlist::create([
                 'email' => $this->email,
                 'type' => 'registration',
             ]);
 
-            $this->emit('success', 'You have been added to the waitlist.');
+            $this->emit('success', 'Check your email to verify your email address.');
             dispatch(new SendConfirmationForWaitlistJob($this->email, $waitlist->uuid));
-        } catch (\Exception $e) {
+        } catch (\Throwable $e) {
             return general_error_handler(err: $e, that: $this);
         }
-
     }
 }

app/Http/Middleware/CheckForcePasswordReset.php

@@ -16,6 +16,12 @@ class CheckForcePasswordReset
     public function handle(Request $request, Closure $next): Response
     {
         if (auth()->user()) {
+            if ($request->path() === 'auth/link') {
+                auth()->logout();
+                request()->session()->invalidate();
+                request()->session()->regenerateToken();
+                return $next($request);
+            }
             $force_password_reset = auth()->user()->force_password_reset;
             if ($force_password_reset) {
                 if ($request->routeIs('auth.force-password-reset') || $request->path() === 'livewire/message/force-password-reset') {

app/Http/Middleware/IsBoardingFlow.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class IsBoardingFlow
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // ray()->showQueries()->color('orange');
+        if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+            return redirect('boarding');
+        }
+        return $next($request);
+    }
+}

app/Http/Middleware/IsSubscriptionValid.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class IsSubscriptionValid
+{
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (isInstanceAdmin()) {
+            return $next($request);
+        }
+        if (!auth()->user() || !isCloud()) {
+            if ($request->path() === 'subscription') {
+                return redirect('/');
+            } else {
+                return $next($request);
+            }
+        }
+        if (isSubscriptionActive() && $request->path() === 'subscription') {
+            // ray('active subscription Middleware');
+            return redirect('/');
+        }
+        if (isSubscriptionOnGracePeriod()) {
+            // ray('is_subscription_in_grace_period Middleware');
+            return $next($request);
+        }
+        if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
+            // ray('SubscriptionValid Middleware');
+            if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
+                return redirect('subscription');
+            } else {
+                return $next($request);
+            }
+        }
+        return $next($request);
+    }
+}

app/Http/Middleware/SubscriptionValid.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-class SubscriptionValid
-{
-    public function handle(Request $request, Closure $next): Response
-    {
-        if (!auth()->user() || !is_cloud()) {
-            if ($request->path() === 'subscription') {
-                return redirect('/');
-            } else {
-                return $next($request);
-            }
-        }
-        $is_instance_admin = is_instance_admin();
-        if ($is_instance_admin) {
-            return $next($request);
-        }
-
-        if (is_subscription_active() && $request->path() === 'subscription') {
-            return redirect('/');
-        }
-        if (is_subscription_in_grace_period()) {
-            return $next($request);
-        }
-        if (!is_subscription_active() && !is_subscription_in_grace_period()) {
-            ray('SubscriptionValid Middleware');
-
-            $allowed_paths = [
-                'subscription',
-                'login',
-                'register',
-                'waitlist',
-                'force-password-reset',
-                'logout',
-                'livewire/message/force-password-reset',
-                'livewire/message/check-license',
-                'livewire/message/switch-team',
-            ];
-            if (!in_array($request->path(), $allowed_paths)) {
-                return redirect('subscription');
-            } else {
-                return $next($request);
-            }
-        }
-        return $next($request);
-    }
-}

app/Jobs/ApplicationContainerStatusJob.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Notifications\Application\StatusChanged;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class ApplicationContainerStatusJob implements ShouldQueue, ShouldBeUnique
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    public string $containerName;
+
+    public function __construct(
+        public Application $application,
+        public int $pullRequestId = 0)
+    {
+        $this->containerName = generateApplicationContainerName($application->uuid, $pullRequestId);
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->containerName;
+    }
+
+    public function handle(): void
+    {
+        try {
+            $status = getApplicationContainerStatus(application: $this->application);
+            if ($this->application->status === 'running' && $status !== 'running') {
+                // $this->application->environment->project->team->notify(new StatusChanged($this->application));
+            }
+
+            if ($this->pullRequestId !== 0) {
+                $preview = ApplicationPreview::findPreviewByApplicationAndPullId($this->application->id, $this->pullRequestId);
+                $preview->status = $status;
+                $preview->save();
+            } else {
+                $this->application->status = $status;
+                $this->application->save();
+            }
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            throw $e;
+        }
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -20,6 +20,7 @@ use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
@@ -27,6 +28,8 @@ use Spatie\Url\Url;
 use Symfony\Component\Yaml\Yaml;
 use Throwable;
 use Visus\Cuid2\Cuid2;
+use Yosymfony\Toml\Toml;
+use Yosymfony\Toml\TomlArray;
 
 class ApplicationDeploymentJob implements ShouldQueue
 {
@@ -50,6 +53,7 @@ class ApplicationDeploymentJob implements ShouldQueue
     private ApplicationPreview|null $preview = null;
 
     private string $container_name;
+    private string|null $currently_running_container_name = null;
     private string $workdir;
     private string $configuration_dir;
     private string $build_workdir;
@@ -64,6 +68,7 @@ class ApplicationDeploymentJob implements ShouldQueue
     private $log_model;
     private Collection $saved_outputs;
 
+    public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
         ray()->clearScreen();
@@ -86,7 +91,7 @@ class ApplicationDeploymentJob implements ShouldQueue
         $this->build_workdir = "{$this->workdir}" . rtrim($this->application->base_directory, '/');
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        $this->container_name = generate_container_name($this->application->uuid, $this->pull_request_id);
+        $this->container_name = generateApplicationContainerName($this->application->uuid, $this->pull_request_id);
         $this->private_key_location = save_private_key_for_server($this->server);
         $this->saved_outputs = collect();
 
@@ -113,6 +118,10 @@ class ApplicationDeploymentJob implements ShouldQueue
     public function handle(): void
     {
         // ray()->measure();
+        $containers = getCurrentApplicationContainerStatus($this->server, $this->application->id);
+        if ($containers->count() > 0) {
+            $this->currently_running_container_name = data_get($containers[0], 'Names');
+        }
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
@@ -126,11 +135,12 @@ class ApplicationDeploymentJob implements ShouldQueue
                     $this->deploy();
                 }
             }
-            if ($this->application->fqdn) dispatch(new ProxyStartJob($this->server));
+            if ($this->application->fqdn) dispatch(new ProxyContainerStatusJob($this->server));
             $this->next(ApplicationDeploymentStatus::FINISHED->value);
         } catch (Exception $e) {
             ray($e);
             $this->fail($e);
+            throw $e;
         } finally {
             if (isset($this->docker_compose_base64)) {
                 $readme = generate_readme_file($this->application->name, $this->application_deployment_queue->updated_at);
@@ -168,16 +178,16 @@ class ApplicationDeploymentJob implements ShouldQueue
                 $this->execute_in_builder("echo '$dockerfile_base64' | base64 -d > $this->workdir/Dockerfile")
             ],
         );
-        $this->build_image_name = "{$this->application->git_repository}:build";
-        $this->production_image_name = "{$this->application->uuid}:latest";
+        $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        $this->stop_running_container();
-        $this->start_by_compose_file();
+        $this->rolling_update();
     }
+
     private function deploy()
     {
         $this->execute_remote_command(
@@ -193,8 +203,8 @@ class ApplicationDeploymentJob implements ShouldQueue
             $tag = $tag->substr(0, 128);
         }
 
-        $this->build_image_name = "{$this->application->git_repository}:{$tag}-build";
-        $this->production_image_name = "{$this->application->uuid}:{$tag}";
+        $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
 
         if (!$this->force_rebuild) {
@@ -206,8 +216,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                     "echo 'Docker Image found locally with the same Git Commit SHA {$this->application->uuid}:{$this->commit}. Build step skipped...'"
                 ]);
                 $this->generate_compose_file();
-                $this->stop_running_container();
-                $this->start_by_compose_file();
+                $this->rolling_update();
                 return;
             }
         }
@@ -219,13 +228,59 @@ class ApplicationDeploymentJob implements ShouldQueue
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        $this->stop_running_container();
+        $this->rolling_update();
+    }
+
+    private function rolling_update()
+    {
         $this->start_by_compose_file();
+        $this->health_check();
+        $this->stop_running_container();
+    }
+    private function health_check()
+    {
+        ray('New container name: ', $this->container_name);
+        if ($this->container_name) {
+            $counter = 0;
+            $this->execute_remote_command(
+                [
+                    "echo 'Waiting for health check to pass on the new version of your application.'"
+                ],
+            );
+            while ($counter < $this->application->health_check_retries) {
+                $this->execute_remote_command(
+                    [
+                        "echo 'Attempt {$counter} of {$this->application->health_check_retries}'"
+                    ],
+                    [
+                        "docker inspect --format='{{json .State.Health.Status}}' {$this->container_name}",
+                        "hidden" => true,
+                        "save" => "health_check"
+                    ],
+
+                );
+                $this->execute_remote_command(
+                    [
+                        "echo 'New version health check status: {$this->saved_outputs->get('health_check')}'"
+                    ],
+                );
+                if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
+                    $this->execute_remote_command(
+                        [
+                            "echo 'Rolling update completed.'"
+                        ],
+                    );
+                    break;
+                }
+                $counter++;
+                sleep($this->application->health_check_interval);
+            }
+        }
     }
     private function deploy_pull_request()
     {
-        $this->build_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}-build";
-        $this->production_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}";
+        $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->execute_remote_command([
             "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
@@ -241,18 +296,24 @@ class ApplicationDeploymentJob implements ShouldQueue
         // $this->generate_build_env_variables();
         // $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        $this->stop_running_container();
-        $this->start_by_compose_file();
+        $this->rolling_update();
     }
 
     private function prepare_builder_image()
     {
+        $pull = "--pull=always";
+        if (isDev()) {
+            $pull = "--pull=never";
+        }
+        $helperImage = config('coolify.helper_image');
+        $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host  --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+
         $this->execute_remote_command(
             [
-                "echo -n 'Pulling latest version of the builder image (ghcr.io/coollabsio/coolify-helper).'",
+                "echo -n 'Pulling helper image from $helperImage.'",
             ],
             [
-                "docker run --pull=always -d --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/coollabsio/coolify-helper",
+                $runCommand,
                 "hidden" => true,
             ],
             [
@@ -409,7 +470,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                 $this->container_name => [
                     'image' => $this->production_image_name,
                     'container_name' => $this->container_name,
-                    'restart' => 'always',
+                    'restart' => RESTART_MODE,
                     'environment' => $environment_variables,
                     'labels' => $this->set_labels_for_applications(),
                     'expose' => $ports,
@@ -437,9 +498,9 @@ class ApplicationDeploymentJob implements ShouldQueue
             ],
             'networks' => [
                 $this->destination->network => [
-                    'external' => false,
+                    'external' => true,
                     'name' => $this->destination->network,
-                    'attachable' => true,
+                    'attachable' => true
                 ]
             ]
         ];
@@ -539,8 +600,8 @@ class ApplicationDeploymentJob implements ShouldQueue
                     $schema = $url->getScheme();
                     $slug = Str::slug($host . $path);
 
-                    $http_label = "{$this->application->uuid}-{$slug}-http";
-                    $https_label = "{$this->application->uuid}-{$slug}-https";
+                    $http_label = "{$this->container_name}-{$slug}-http";
+                    $https_label = "{$this->container_name}-{$slug}-https";
 
                     if ($schema === 'https') {
                         // Set labels for https
@@ -579,6 +640,10 @@ class ApplicationDeploymentJob implements ShouldQueue
 
     private function generate_healthcheck_commands()
     {
+        if ($this->application->dockerfile) {
+            // TODO: disabled HC because there are several ways to hc a simple docker image, hard to figure out a good way. Like some docker images (pocketbase) does not have curl.
+            return 'exit 0';
+        }
         if (!$this->application->health_check_port) {
             $this->application->health_check_port = $this->application->ports_exposes_array[0];
         }
@@ -597,12 +662,12 @@ class ApplicationDeploymentJob implements ShouldQueue
     private function build_image()
     {
         $this->execute_remote_command([
-            "echo -n 'Building docker image.'",
+            "echo -n 'Building docker image for your application.'",
         ]);
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -635,35 +700,34 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     $this->execute_in_builder("echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
 
     private function stop_running_container()
     {
-        $this->execute_remote_command(
-            ["echo -n 'Removing old running application.'"],
-            [$this->execute_in_builder("docker rm -f $this->container_name >/dev/null 2>&1"), "hidden" => true],
-        );
+        if ($this->currently_running_container_name) {
+            $this->execute_remote_command(
+                ["echo -n 'Removing old version of your application.'"],
+                [$this->execute_in_builder("docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
+            );
+        }
     }
 
     private function start_by_compose_file()
     {
         $this->execute_remote_command(
-            ["echo -n 'Starting new application... '"],
+            ["echo -n 'Rolling update started.'"],
             [$this->execute_in_builder("docker compose --project-directory {$this->workdir} up -d >/dev/null"), "hidden" => true],
-            ["echo 'Done. 🎉'"],
         );
     }
 
-
-
     private function generate_build_env_variables()
     {
         $this->build_args = collect(["--build-arg SOURCE_COMMIT={$this->commit}"]);