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

@@ -1,15 +1,15 @@
-name: Coolify Builder (v4)
+name: Coolify Helper Image (v4)
 
 on:
   push:
-    branches: ["main", "v4"]
+    branches: [ "main" ]
     paths:
-      - .github/workflows/coolify-builder.yml
-      - docker/coolify-builder/Dockerfile
+      - .github/workflows/coolify-helper.yml
+      - docker/coolify-helper/Dockerfile
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: "coollabsio/coolify-builder"
+  IMAGE_NAME: "coollabsio/coolify-helper"
 
 jobs:
   amd64:
@@ -30,12 +30,12 @@ jobs:
         with:
           no-cache: true
           context: .
-          file: docker/coolify-builder/Dockerfile
+          file: docker/coolify-helper/Dockerfile
           platforms: linux/amd64
           push: true
           tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
   aarch64:
-    runs-on: [self-hosted, arm64]
+    runs-on: [ self-hosted, arm64 ]
     permissions:
       contents: read
       packages: write
@@ -52,16 +52,16 @@ jobs:
         with:
           no-cache: true
           context: .
-          file: docker/coolify-builder/Dockerfile
+          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:
       contents: read
       packages: write
-    needs: [amd64, aarch64]
+    needs: [ amd64, aarch64 ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -77,4 +77,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
       - name: Create & publish manifest
         run: |
-          docker buildx imagetools create --append ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:aarch64 --tag ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          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/PrepareCoolifyTask.php

@@ -15,6 +15,7 @@ class PrepareCoolifyTask
 {
     protected Activity $activity;
     protected CoolifyTaskArgs $remoteProcessArgs;
+
     public function __construct(CoolifyTaskArgs $remoteProcessArgs)
     {
         $this->remoteProcessArgs = $remoteProcessArgs;

app/Actions/CoolifyTask/RunRemoteProcess.php

@@ -49,6 +49,28 @@ class RunRemoteProcess
         $this->ignore_errors = $ignore_errors;
     }
 
+    public static function decodeOutput(?Activity $activity = null): string
+    {
+        if (is_null($activity)) {
+            return '';
+        }
+
+        try {
+            $decoded = json_decode(
+                data_get($activity, 'description'),
+                associative: true,
+                flags: JSON_THROW_ON_ERROR
+            );
+        } catch (\JsonException $exception) {
+            return '';
+        }
+
+        return collect($decoded)
+            ->sortBy(fn ($i) => $i['order'])
+            ->map(fn ($i) => $i['output'])
+            ->implode("");
+    }
+
     public function __invoke(): ProcessResult
     {
         $this->time_start = hrtime(true);
@@ -75,7 +97,6 @@ class RunRemoteProcess
             'status' => $status->value,
         ]);
         $this->activity->save();
-
         if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
             throw new \RuntimeException($processResult->errorOutput());
         }
@@ -83,15 +104,6 @@ class RunRemoteProcess
         return $processResult;
     }
 
-    protected function getLatestCounter(): int
-    {
-        $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR);
-        if ($description === null || count($description) === 0) {
-            return 1;
-        }
-        return end($description)['order'] + 1;
-    }
-
     protected function getCommand(): string
     {
         $user = $this->activity->getExtraProperty('user');
@@ -120,6 +132,13 @@ class RunRemoteProcess
         }
     }
 
+    protected function elapsedTime(): int
+    {
+        $timeMs = (hrtime(true) - $this->time_start) / 1_000_000;
+
+        return intval($timeMs);
+    }
+
     public function encodeOutput($type, $output)
     {
         $outputStack = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR);
@@ -135,26 +154,13 @@ class RunRemoteProcess
         return json_encode($outputStack, flags: JSON_THROW_ON_ERROR);
     }
 
-    public static function decodeOutput(?Activity $activity = null): string
+    protected function getLatestCounter(): int
     {
-        if (is_null($activity)) {
-            return '';
+        $description = json_decode($this->activity->description, associative: true, flags: JSON_THROW_ON_ERROR);
+        if ($description === null || count($description) === 0) {
+            return 1;
         }
-
-        try {
-            $decoded = json_decode(
-                data_get($activity, 'description'),
-                associative: true,
-                flags: JSON_THROW_ON_ERROR
-            );
-        } catch (\JsonException $exception) {
-            return '';
-        }
-
-        return collect($decoded)
-            ->sortBy(fn ($i) => $i['order'])
-            ->map(fn ($i) => $i['output'])
-            ->implode("");
+        return end($description)['order'] + 1;
     }
 
     /**
@@ -171,11 +177,4 @@ class RunRemoteProcess
 
         return ($this->current_time - $this->throttle_interval_ms) > $this->last_write_at;
     }
-
-    protected function elapsedTime(): int
-    {
-        $timeMs = (hrtime(true) - $this->time_start) / 1_000_000;
-
-        return intval($timeMs);
-    }
 }

app/Actions/Database/StartPostgresql.php

@@ -0,0 +1,164 @@
+<?php
+
+namespace App\Actions\Database;
+
+use App\Models\Server;
+use App\Models\StandalonePostgresql;
+use Illuminate\Support\Str;
+use Symfony\Component\Yaml\Yaml;
+
+class StartPostgresql
+{
+    public StandalonePostgresql $database;
+    public array $commands = [];
+    public array $init_scripts = [];
+    public string $configuration_dir;
+
+    public function __invoke(Server $server, StandalonePostgresql $database)
+    {
+        $this->database = $database;
+        $container_name = $this->database->uuid;
+        $this->configuration_dir = database_configuration_dir() . '/' . $container_name;
+
+        $this->commands = [
+            "mkdir -p $this->configuration_dir",
+            "mkdir -p $this->configuration_dir/docker-entrypoint-initdb.d/"
+        ];
+
+        $persistent_storages = $this->generate_local_persistent_volumes();
+        $volume_names = $this->generate_local_persistent_volumes_only_volume_names();
+        $environment_variables = $this->generate_environment_variables();
+        $this->generate_init_scripts();
+        $docker_compose = [
+            'version' => '3.8',
+            'services' => [
+                $container_name => [
+                    'image' => $this->database->image,
+                    'container_name' => $container_name,
+                    'environment' => $environment_variables,
+                    'restart' => RESTART_MODE,
+                    'networks' => [
+                        $this->database->destination->network,
+                    ],
+                    'healthcheck' => [
+                        'test' => [
+                            'CMD-SHELL',
+                            'pg_isready',
+                            '-d',
+                            $this->database->postgres_db,
+                            '-U',
+                            $this->database->postgres_user,
+                        ],
+                        'interval' => '5s',
+                        'timeout' => '5s',
+                        'retries' => 10,
+                        'start_period' => '5s'
+                    ],
+                    'mem_limit' => $this->database->limits_memory,
+                    'memswap_limit' => $this->database->limits_memory_swap,
+                    'mem_swappiness' => $this->database->limits_memory_swappiness,
+                    'mem_reservation' => $this->database->limits_memory_reservation,
+                    'cpus' => $this->database->limits_cpus,
+                    'cpuset' => $this->database->limits_cpuset,
+                    'cpu_shares' => $this->database->limits_cpu_shares,
+                ]
+            ],
+            'networks' => [
+                $this->database->destination->network => [
+                    'external' => true,
+                    'name' => $this->database->destination->network,
+                    'attachable' => true,
+                ]
+            ]
+        ];
+        if (count($this->database->ports_mappings_array) > 0) {
+            $docker_compose['services'][$container_name]['ports'] = $this->database->ports_mappings_array;
+        }
+        if (count($persistent_storages) > 0) {
+            $docker_compose['services'][$container_name]['volumes'] = $persistent_storages;
+        }
+        if (count($volume_names) > 0) {
+            $docker_compose['volumes'] = $volume_names;
+        }
+        if (count($this->init_scripts) > 0) {
+            foreach ($this->init_scripts as $init_script) {
+                $docker_compose['services'][$container_name]['volumes'][] = [
+                    'type' => 'bind',
+                    'source' => $init_script,
+                    'target' => '/docker-entrypoint-initdb.d/' . basename($init_script),
+                    'read_only' => true,
+                ];
+            }
+        }
+        $docker_compose = Yaml::dump($docker_compose, 10);
+        $docker_compose_base64 = base64_encode($docker_compose);
+        $this->commands[] = "echo '{$docker_compose_base64}' | base64 -d > $this->configuration_dir/docker-compose.yml";
+        $readme = generate_readme_file($this->database->name, now());
+        $this->commands[] = "echo '{$readme}' > $this->configuration_dir/README.md";
+        $this->commands[] = "docker compose -f $this->configuration_dir/docker-compose.yml up -d";
+        return remote_process($this->commands, $server);
+    }
+
+    private function generate_local_persistent_volumes()
+    {
+        $local_persistent_volumes = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            $volume_name = $persistentStorage->host_path ?? $persistentStorage->name;
+            $local_persistent_volumes[] = $volume_name . ':' . $persistentStorage->mount_path;
+        }
+        return $local_persistent_volumes;
+    }
+
+    private function generate_local_persistent_volumes_only_volume_names()
+    {
+        $local_persistent_volumes_names = [];
+        foreach ($this->database->persistentStorages as $persistentStorage) {
+            if ($persistentStorage->host_path) {
+                continue;
+            }
+            $name = $persistentStorage->name;
+            $local_persistent_volumes_names[$name] = [
+                'name' => $name,
+                'external' => false,
+            ];
+        }
+        return $local_persistent_volumes_names;
+    }
+
+    private function generate_environment_variables()
+    {
+        $environment_variables = collect();
+        ray('Generate Environment Variables')->green();
+        ray($this->database->runtime_environment_variables)->green();
+        foreach ($this->database->runtime_environment_variables as $env) {
+            $environment_variables->push("$env->key=$env->value");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_USER'))->isEmpty()) {
+            $environment_variables->push("POSTGRES_USER={$this->database->postgres_user}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_PASSWORD'))->isEmpty()) {
+            $environment_variables->push("POSTGRES_PASSWORD={$this->database->postgres_password}");
+        }
+
+        if ($environment_variables->filter(fn ($env) => Str::of($env)->contains('POSTGRES_DB'))->isEmpty()) {
+            $environment_variables->push("POSTGRES_DB={$this->database->postgres_db}");
+        }
+        return $environment_variables->all();
+    }
+
+    private function generate_init_scripts()
+    {
+        if (is_null($this->database->init_scripts) || count($this->database->init_scripts) === 0) {
+            return;
+        }
+        foreach ($this->database->init_scripts as $init_script) {
+            $filename = data_get($init_script, 'filename');
+            $content = data_get($init_script, 'content');
+            $content_base64 = base64_encode($content);
+            $this->commands[] = "echo '{$content_base64}' | base64 -d > $this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
+            $this->init_scripts[] = "$this->configuration_dir/docker-entrypoint-initdb.d/{$filename}";
+        }
+    }
+}

app/Actions/Fortify/CreateNewUser.php

@@ -3,11 +3,8 @@
 namespace App\Actions\Fortify;
 
 use App\Models\InstanceSettings;
-use App\Models\Team;
 use App\Models\User;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
@@ -19,13 +16,12 @@ class CreateNewUser implements CreatesNewUsers
     /**
      * Validate and create a newly registered user.
      *
-     * @param  array<string, string>  $input
+     * @param array<string, string> $input
      */
     public function create(array $input): User
     {
         $settings = InstanceSettings::get();
         if (!$settings->is_registration_enabled) {
-            Log::info('Registration is disabled');
             abort(403);
         }
         Validator::make($input, [

app/Actions/Fortify/ResetUserPassword.php

@@ -14,7 +14,7 @@ class ResetUserPassword implements ResetsUserPasswords
     /**
      * Validate and reset the user's forgotten password.
      *
-     * @param  array<string, string>  $input
+     * @param array<string, string> $input
      */
     public function reset(User $user, array $input): void
     {

app/Actions/Fortify/UpdateUserPassword.php

@@ -14,7 +14,7 @@ class UpdateUserPassword implements UpdatesUserPasswords
     /**
      * Validate and update the user's password.
      *
-     * @param  array<string, string>  $input
+     * @param array<string, string> $input
      */
     public function update(User $user, array $input): void
     {

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -13,7 +13,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
     /**
      * Validate and update the given user's profile information.
      *
-     * @param  array<string, string>  $input
+     * @param array<string, string> $input
      */
     public function update(User $user, array $input): void
     {
@@ -29,8 +29,10 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
             ],
         ])->validateWithBag('updateProfileInformation');
 
-        if ($input['email'] !== $user->email &&
-            $user instanceof MustVerifyEmail) {
+        if (
+            $input['email'] !== $user->email &&
+            $user instanceof MustVerifyEmail
+        ) {
             $this->updateVerifiedUser($user, $input);
         } else {
             $user->forceFill([
@@ -43,7 +45,7 @@ class UpdateUserProfileInformation implements UpdatesUserProfileInformation
     /**
      * Update the given verified user's profile information.
      *
-     * @param  array<string, string>  $input
+     * @param array<string, string> $input
      */
     protected function updateVerifiedUser(User $user, array $input): void
     {

app/Actions/License/CheckResaleLicense.php

@@ -4,7 +4,6 @@ namespace App\Actions\License;
 
 use App\Models\InstanceSettings;
 use Illuminate\Support\Facades\Http;
-use Visus\Cuid2\Cuid2;
 
 class CheckResaleLicense
 {
@@ -12,48 +11,59 @@ class CheckResaleLicense
     {
         try {
             $settings = InstanceSettings::get();
-            $instance_id = config('app.id');
+            $settings->update([
+                'is_resale_license_active' => false,
+            ]);
+            if (isDev()) {
+                return;
+            }
             if (!$settings->resale_license) {
                 return;
             }
-            ray('Checking license key');
+            $base_url = config('coolify.license_url');
+            if (isDev()) {
+                $base_url = 'http://host.docker.internal:8787';
+            }
+            $instance_id = config('app.id');
+
+            ray("Checking license key against $base_url/lemon/validate");
             $data = Http::withHeaders([
                 'Accept' => 'application/json',
-            ])->post('https://api.lemonsqueezy.com/v1/licenses/validate', [
+            ])->get("$base_url/lemon/validate", [
                 'license_key' => $settings->resale_license,
-                'instance_name' => $instance_id,
-            ])->throw()->json();
-            $product_id = (int)data_get($data, 'meta.product_id');
-            $valid_product_id = (int)config('coolify.lemon_squeezy_product_id');
-            if ($product_id !== $valid_product_id) {
-                throw new \Exception('Invalid product id');
-            }
-            ray('Valid Product Id');
-
-            ['valid' => $valid, 'license_key' => $license_key] = $data;
-
-            if ($valid) {
-                if (data_get($license_key, 'status') === 'inactive') {
-                    Http::withHeaders([
-                        'Accept' => 'application/json',
-                    ])->post('https://api.lemonsqueezy.com/v1/licenses/activate', [
-                        'license_key' => $settings->resale_license,
-                        'instance_name' => $instance_id,
-                    ])->throw()->json();
-                }
+                'instance_id' => $instance_id,
+            ])->json();
+            if (data_get($data, 'valid') === true && data_get($data, 'license_key.status') === 'active') {
+                ray('Valid & active license key');
                 $settings->update([
                     'is_resale_license_active' => true,
                 ]);
                 return;
             }
-            throw new \Exception('Invalid license key');
-        } catch (\Throwable $th) {
-            ray($th);
+            $data = Http::withHeaders([
+                'Accept' => 'application/json',
+            ])->get("$base_url/lemon/activate", [
+                'license_key' => $settings->resale_license,
+                'instance_id' => $instance_id,
+            ])->json();
+            if (data_get($data, 'activated') === true) {
+                ray('Activated license key');
+                $settings->update([
+                    'is_resale_license_active' => true,
+                ]);
+                return;
+            }
+            if (data_get($data, 'license_key.status') === 'active') {
+                throw new \Exception('Invalid license key.');
+            }
+            throw new \Exception('Cannot activate license key.');
+        } catch (\Throwable $e) {
+            ray($e);
             $settings->update([
                 'resale_license' => null,
                 'is_resale_license_active' => false,
             ]);
-            throw $th;
+            throw $e;
         }
     }
 }

app/Actions/Proxy/CheckConfigurationSync.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Illuminate\Support\Str;
+
+class CheckConfigurationSync
+{
+    public function __invoke(Server $server, bool $reset = false)
+    {
+        $proxy_path = get_proxy_path();
+        $proxy_configuration = instant_remote_process([
+            "cat $proxy_path/docker-compose.yml",
+        ], $server, false);
+
+        if ($reset || is_null($proxy_configuration)) {
+            $proxy_configuration = Str::of(generate_default_proxy_configuration($server))->trim()->value;
+            resolve(SaveConfigurationSync::class)($server, $proxy_configuration);
+            return $proxy_configuration;
+        }
+
+        return $proxy_configuration;
+    }
+}

app/Actions/Proxy/CheckProxySettingsInSync.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Actions\Proxy;
-
-use App\Enums\ProxyTypes;
-use App\Models\Server;
-use Illuminate\Support\Str;
-
-class CheckProxySettingsInSync
-{
-    public function __invoke(Server $server, bool $reset = false)
-    {
-        $proxy_path = config('coolify.proxy_config_path');
-        $output = instant_remote_process([
-            "cat $proxy_path/docker-compose.yml",
-        ], $server, false);
-        if (is_null($output) || $reset) {
-            $final_output = Str::of(getProxyConfiguration($server))->trim()->value;
-        } else {
-            $final_output = Str::of($output)->trim()->value;
-        }
-        $docker_compose_yml_base64 = base64_encode($final_output);
-        $server->proxy->last_saved_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
-        $server->save();
-        if (is_null($output) || $reset) {
-            instant_remote_process([
-                "mkdir -p $proxy_path",
-                "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
-            ], $server);
-        }
-        return $final_output;
-    }
-}

app/Actions/Proxy/SaveConfigurationSync.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Actions\Proxy;
+
+use App\Models\Server;
+use Illuminate\Support\Str;
+
+class SaveConfigurationSync
+{
+    public function __invoke(Server $server, string $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();
+
+            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);
+        }
+
+    }
+}

app/Actions/Proxy/StartProxy.php

@@ -2,24 +2,15 @@
 
 namespace App\Actions\Proxy;
 
-use App\Enums\ProxyStatus;
-use App\Enums\ProxyTypes;
 use App\Models\Server;
-use Spatie\Activitylog\Models\Activity;
 use Illuminate\Support\Str;
+use Spatie\Activitylog\Models\Activity;
 
 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 = config('coolify.proxy_config_path');
-
+        $proxy_path = get_proxy_path();
         $networks = collect($server->standaloneDockers)->map(function ($docker) {
             return $docker['network'];
         })->unique();
@@ -30,31 +21,29 @@ class StartProxy
             return "docker network ls --format '{{.Name}}' | grep '^$network$' >/dev/null 2>&1 || docker network create --attachable $network > /dev/null 2>&1";
         });
 
-        $configuration = instant_remote_process([
-            "cat $proxy_path/docker-compose.yml",
-        ], $server, false);
-        if (is_null($configuration)) {
-            $configuration = Str::of(getProxyConfiguration($server))->trim()->value;
-        } else {
-            $configuration = Str::of($configuration)->trim()->value;
-        }
+        $configuration = resolve(CheckConfigurationSync::class)($server);
+
         $docker_compose_yml_base64 = base64_encode($configuration);
         $server->proxy->last_applied_settings = Str::of($docker_compose_yml_base64)->pipe('md5')->value;
         $server->save();
+
         $activity = remote_process([
-            "echo 'Creating required Docker networks...'",
+            "echo '####### Creating required Docker networks...'",
             ...$create_networks_command,
-            "mkdir -p $proxy_path",
             "cd $proxy_path",
-            "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
-            "echo 'Creating Docker Compose file...'",
-            "echo 'Pulling docker image...'",
-            'docker compose pull -q',
-            "echo 'Stopping old proxy...'",
+            "echo '####### Creating Docker Compose file...'",
+            "echo '####### Pulling docker image...'",
+            'docker compose pull',
+            "echo '####### Stopping existing coolify-proxy...'",
             'docker compose down -v --remove-orphans',
-            "echo 'Starting new proxy...'",
+            "lsof -nt -i:80 | xargs -r kill -9",
+            "lsof -nt -i:443 | xargs -r kill -9",
+            "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,42 +17,44 @@ class UpdateCoolify
             $settings = InstanceSettings::get();
             ray('Running InstanceAutoUpdateJob');
             $localhost_name = 'localhost';
-            if (isDev()) {
-                $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 (isDev()) {
-            ray("Running update on local docker container. Updating to $this->latest_version");
+            ray("Running update on local docker container. Updating to $this->latestVersion");
             remote_process([
                 "sleep 10"
             ], $this->server);
@@ -62,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

@@ -10,10 +10,12 @@ class Init extends Command
 {
     protected $signature = 'app:init';
     protected $description = 'Cleanup instance related stuffs';
+
     public function handle()
     {
         $this->cleanup_in_progress_application_deployments();
     }
+
     private function cleanup_in_progress_application_deployments()
     {
         // Cleanup any failed deployments
@@ -24,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/NotifyDemo.php

@@ -43,15 +43,16 @@ class NotifyDemo extends Command
         style('coolify')->color('#9333EA');
         style('title-box')->apply('mt-1 px-2 py-1 bg-coolify');
 
-        render(<<<'HTML'
+        render(
+            <<<'HTML'
         <div>
             <div class="title-box">
                 Coolify
             </div>
-            <p class="ml-1 mt-1 ">
+            <p class="mt-1 ml-1 ">
               Demo Notify <strong class="text-coolify">=></strong> Send a demo notification to a given channel.
             </p>
-            <p class="ml-1 mt-1 bg-coolify px-1">
+            <p class="px-1 mt-1 ml-1 bg-coolify">
               php artisan app:demo-notify {channel}
             </p>
             <div class="my-1">
@@ -64,7 +65,8 @@ class NotifyDemo extends Command
                 </ul>
             </div>
         </div>
-        HTML);
+        HTML
+        );
 
         ask(<<<'HTML'
         <div class="mr-1">

app/Console/Commands/SyncBunny.php

@@ -4,8 +4,8 @@ namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
 use Illuminate\Http\Client\PendingRequest;
-use Illuminate\Support\Facades\Http;
 use Illuminate\Http\Client\Pool;
+use Illuminate\Support\Facades\Http;
 
 class SyncBunny extends Command
 {
@@ -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,11 +2,21 @@
 
 namespace App\Console;
 
+use App\Enums\ProxyTypes;
+use App\Jobs\ApplicationContainerStatusJob;
 use App\Jobs\CheckResaleLicenseJob;
-use App\Jobs\InstanceAutoUpdateJob;
-use App\Jobs\ProxyCheckJob;
+use App\Jobs\CleanupInstanceStuffsJob;
+use App\Jobs\DatabaseBackupJob;
+use App\Jobs\DatabaseContainerStatusJob;
 use App\Jobs\DockerCleanupJob;
-use App\Jobs\CheckResaleLicenseKeys;
+use App\Jobs\InstanceAutoUpdateJob;
+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;
 
@@ -15,19 +25,82 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule): void
     {
         if (isDev()) {
-            $schedule->command('horizon:snapshot')->everyMinute();
-            $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
+            $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 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);
         }
     }
+    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');
+        $scheduled_backups = ScheduledDatabaseBackup::all();
+        if ($scheduled_backups->isEmpty()) {
+            ray('no scheduled backups');
+            return;
+        }
+        foreach ($scheduled_backups as $scheduled_backup) {
+            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)->onOneServer();
+        }
+    }
+
     protected function commands(): void
     {
         $this->load(__DIR__ . '/Commands');

app/Data/ServerMetadata.php

@@ -9,7 +9,7 @@ use Spatie\LaravelData\Data;
 class ServerMetadata extends Data
 {
     public function __construct(
-        public ?ProxyTypes $type,
+        public ?ProxyTypes  $type,
         public ?ProxyStatus $status
     ) {
     }

app/Enums/ProxyTypes.php

@@ -4,10 +4,12 @@ namespace App\Enums;
 
 enum ProxyTypes: string
 {
+    case NONE = 'NONE';
     case TRAEFIK_V2 = 'TRAEFIK_V2';
     case NGINX = 'NGINX';
     case CADDY = 'CADDY';
 }
+
 enum ProxyStatus: string
 {
     case EXITED = 'exited';

app/Exceptions/Handler.php

@@ -4,13 +4,13 @@ namespace App\Exceptions;
 
 use App\Models\InstanceSettings;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Throwable;
 use Sentry\Laravel\Integration;
+use Sentry\State\Scope;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
 
-    private InstanceSettings $settings;
     /**
      * A list of exception types with their corresponding custom log levels.
      *
@@ -19,16 +19,14 @@ class Handler extends ExceptionHandler
     protected $levels = [
         //
     ];
-
     /**
      * A list of the exception types that are not reported.
      *
      * @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.
      *
@@ -39,6 +37,7 @@ class Handler extends ExceptionHandler
         'password',
         'password_confirmation',
     ];
+    private InstanceSettings $settings;
 
     /**
      * Register the exception handling callbacks for the application.
@@ -50,6 +49,16 @@ class Handler extends ExceptionHandler
             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

@@ -5,15 +5,14 @@ namespace App\Http\Controllers;
 use App\Models\ApplicationDeploymentQueue;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Http\Request;
-use Spatie\Activitylog\Models\Activity;
 
 class ApplicationController extends Controller
 {
     use AuthorizesRequests, ValidatesRequests;
+
     public function configuration()
     {
-        $project = session('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');
         }
@@ -27,9 +26,10 @@ class ApplicationController extends Controller
         }
         return view('project.application.configuration', ['application' => $application]);
     }
+
     public function deployments()
     {
-        $project = session('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 = session('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

@@ -2,97 +2,136 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Livewire\Team\Invitations;
 use App\Models\InstanceSettings;
 use App\Models\Project;
-use App\Models\Server;
+use App\Models\S3Storage;
+use App\Models\StandalonePostgresql;
 use App\Models\TeamInvitation;
 use App\Models\User;
+use Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Support\Facades\DB;
+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 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 (!isCloud()) {
             abort(404);
         }
-        return view('subscription', [
-            'settings' => InstanceSettings::get()
+        return view('subscription.index', [
+            'settings' => InstanceSettings::get(),
         ]);
     }
+
     public function license()
     {
         if (!isCloud()) {
             abort(404);
         }
         return view('settings.license', [
-            'settings' => InstanceSettings::get()
+            'settings' => InstanceSettings::get(),
         ]);
     }
-    public function dashboard()
+
+    public function force_passoword_reset()
     {
-        $projects = Project::ownedByCurrentTeam()->get();
-        $servers = Server::ownedByCurrentTeam()->get();
-
-        $resources = 0;
-        foreach ($projects as $project) {
-            $resources += $project->applications->count();
-        }
-
-        return view('dashboard', [
-            'servers' => $servers->count(),
-            'projects' => $projects->count(),
-            'resources' => $resources,
-        ]);
+        return view('auth.force-password-reset');
     }
+    public function boarding()
+    {
+        if (currentTeam()->boarding || isDev()) {
+            return view('boarding');
+        } else {
+            return redirect()->route('dashboard');
+        }
+    }
+
     public function settings()
     {
-        if (auth()->user()->isInstanceAdmin()) {
+        if (isInstanceAdmin()) {
             $settings = InstanceSettings::get();
+            $database = StandalonePostgresql::whereName('coolify-db')->first();
+            if ($database) {
+                $s3s = S3Storage::whereTeamId(0)->get();
+            }
             return view('settings.configuration', [
-                'settings' => $settings
-            ]);
-        } else {
-            return redirect()->route('dashboard');
-        }
-    }
-    public function emails()
-    {
-        if (auth()->user()->isInstanceAdmin()) {
-            $settings = InstanceSettings::get();
-            return view('settings.emails', [
-                'settings' => $settings
+                'settings' => $settings,
+                'database' => $database,
+                's3s' => $s3s ?? [],
             ]);
         } else {
             return redirect()->route('dashboard');
         }
     }
+
     public function team()
     {
         $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,
         ]);
     }
+
+    public function storages()
+    {
+        $s3 = S3Storage::ownedByCurrentTeam()->get();
+        return view('team.storages.all', [
+            's3' => $s3,
+        ]);
+    }
+
+    public function storages_show()
+    {
+        $storage = S3Storage::ownedByCurrentTeam()->whereUuid(request()->storage_uuid)->firstOrFail();
+        return view('team.storages.show', [
+            'storage' => $storage,
+        ]);
+    }
+
     public function members()
     {
         $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,
         ]);
     }
+
     public function acceptInvitation()
     {
         try {
@@ -110,15 +149,16 @@ 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;
         }
     }
+
     public function revokeInvitation()
     {
         try {
@@ -131,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

@@ -0,0 +1,76 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+
+class DatabaseController extends Controller
+{
+    use AuthorizesRequests, ValidatesRequests;
+
+    public function configuration()
+    {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        return view('project.database.configuration', ['database' => $database]);
+    }
+
+    public function executions()
+    {
+        $backup_uuid = request()->route('backup_uuid');
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        $backup = $database->scheduledBackups->where('uuid', $backup_uuid)->first();
+        if (!$backup) {
+            return redirect()->route('dashboard');
+        }
+        $executions = collect($backup->executions)->sortByDesc('created_at');
+        return view('project.database.backups.executions', [
+            'database' => $database,
+            'backup' => $backup,
+            'executions' => $executions,
+            's3s' => currentTeam()->s3s,
+        ]);
+    }
+
+    public function backups()
+    {
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        if (!$project) {
+            return redirect()->route('dashboard');
+        }
+        $environment = $project->load(['environments'])->environments->where('name', request()->route('environment_name'))->first()->load(['applications']);
+        if (!$environment) {
+            return redirect()->route('dashboard');
+        }
+        $database = $environment->databases->where('uuid', request()->route('database_uuid'))->first();
+        if (!$database) {
+            return redirect()->route('dashboard');
+        }
+        return view('project.database.backups.all', [
+            'database' => $database,
+            's3s' => currentTeam()->s3s,
+        ]);
+    }
+}

app/Http/Controllers/MagicController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Livewire\Server\PrivateKey;
 use App\Models\Environment;
 use App\Models\Project;
 use App\Models\Server;
@@ -16,34 +15,39 @@ class MagicController extends Controller
             'servers' => Server::isUsable()->get()
         ]);
     }
+
     public function destinations()
     {
         return response()->json([
             'destinations' => Server::destinationsByServer(request()->query('server_id'))->sortBy('name')
         ]);
     }
+
     public function projects()
     {
         return response()->json([
             'projects' => Project::ownedByCurrentTeam()->get()
         ]);
     }
+
     public function environments()
     {
         return response()->json([
             'environments' => Project::ownedByCurrentTeam()->whereUuid(request()->query('project_uuid'))->first()->environments
         ]);
     }
+
     public function newProject()
     {
         $project = Project::firstOrCreate(
             ['name' => request()->query('name') ?? generate_random_name()],
-            ['team_id' => session('currentTeam')->id]
+            ['team_id' => currentTeam()->id]
         );
         return response()->json([
             'project_uuid' => $project->uuid
         ]);
     }
+
     public function newEnvironment()
     {
         $environment = Environment::firstOrCreate(
@@ -54,6 +58,7 @@ class MagicController extends Controller
             'environment_name' => $environment->name,
         ]);
     }
+
     public function newTeam()
     {
         $team = Team::create(
@@ -63,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

@@ -3,46 +3,49 @@
 namespace App\Http\Controllers;
 
 use App\Models\Project;
+use App\Models\Server;
 
 class ProjectController extends Controller
 {
     public function all()
     {
-        $teamId = session('currentTeam')->id;
-
-        $projects = Project::where('team_id', $teamId)->get();
-        return view('projects', ['projects' => $projects]);
+        return view('projects', [
+            'projects' => Project::ownedByCurrentTeam()->get(),
+            'servers' => Server::ownedByCurrentTeam()->count(),
+        ]);
     }
 
     public function edit()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = session('currentTeam')->id;
+        $teamId = currentTeam()->id;
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
         return view('project.edit', ['project' => $project]);
     }
+
     public function show()
     {
         $projectUuid = request()->route('project_uuid');
-        $teamId = session('currentTeam')->id;
+        $teamId = currentTeam()->id;
 
         $project = Project::where('team_id', $teamId)->where('uuid', $projectUuid)->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
         $project->load(['environments']);
-        if (count($project->environments) == 1) {
-            return redirect()->route('project.resources', ['project_uuid' => $project->uuid, 'environment_name' => $project->environments->first()->name]);
-        }
         return view('project.show', ['project' => $project]);
     }
 
     public function new()
     {
-        $project = session('currentTeam')->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
+        $type = request()->query('type');
+        $destination_uuid = request()->query('destination');
+        $server = requesT()->query('server');
+
+        $project = currentTeam()->load(['projects'])->projects->where('uuid', request()->route('project_uuid'))->first();
         if (!$project) {
             return redirect()->route('dashboard');
         }
@@ -50,16 +53,22 @@ class ProjectController extends Controller
         if (!$environment) {
             return redirect()->route('dashboard');
         }
-
-        $type = request()->query('type');
-
+        if (in_array($type, DATABASE_TYPES)) {
+            $standalone_postgresql = create_standalone_postgresql($environment->id, $destination_uuid);
+            return redirect()->route('project.database.configuration', [
+                'project_uuid' => $project->uuid,
+                'environment_name' => $environment->name,
+                'database_uuid' => $standalone_postgresql->uuid,
+            ]);
+        }
         return view('project.new', [
             'type' => $type
         ]);
     }
+
     public function resources()
     {
-        $project = session('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

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\PrivateKey;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+
+class ServerController extends Controller
+{
+    use AuthorizesRequests, ValidatesRequests;
+
+    public function new_server()
+    {
+        $privateKeys = PrivateKey::ownedByCurrentTeam()->get();
+        if (!isCloud()) {
+            return view('server.create', [
+                'limit_reached' => false,
+                'private_keys' => $privateKeys,
+            ]);
+        }
+        $team = currentTeam();
+        $servers = $team->servers->count();
+        ['serverLimit' => $serverLimit] = $team->limits;
+        $limit_reached = $servers >= $serverLimit;
+
+        return view('server.create', [
+            'limit_reached' => $limit_reached,
+            'private_keys' => $privateKeys,
+        ]);
+    }
+}

app/Http/Kernel.php

@@ -37,7 +37,9 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\SubscriptionValid::class,
+            \App\Http\Middleware\CheckForcePasswordReset::class,
+            \App\Http\Middleware\IsSubscriptionValid::class,
+            \App\Http\Middleware\IsBoardingFlow::class,
 
         ],
 

app/Http/Livewire/ActivityMonitor.php

@@ -8,19 +8,13 @@ use Spatie\Activitylog\Models\Activity;
 
 class ActivityMonitor extends Component
 {
-    public bool $header = false;
+    public string|null $header = null;
     public $activityId;
     public $isPollingActive = false;
 
     protected $activity;
     protected $listeners = ['newMonitorActivity'];
 
-    public function hydrateActivity()
-    {
-        $this->activity = Activity::query()
-            ->find($this->activityId);
-    }
-
     public function newMonitorActivity($activityId)
     {
         $this->activityId = $activityId;
@@ -30,6 +24,12 @@ class ActivityMonitor extends Component
         $this->isPollingActive = true;
     }
 
+    public function hydrateActivity()
+    {
+        $this->activity = Activity::query()
+            ->find($this->activityId);
+    }
+
     public function polling()
     {
         $this->hydrateActivity();
@@ -42,8 +42,10 @@ class ActivityMonitor extends Component
                 $this->setStatus(ProcessStatus::ERROR);
             }
             $this->isPollingActive = false;
+            $this->emit('activityFinished');
         }
     }
+
     protected function setStatus($status)
     {
         $this->activity->properties = $this->activity->properties->merge([

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

@@ -19,11 +19,13 @@ class CheckLicense extends Component
         'instance_id' => 'Instance Id (Do not change this)',
         'settings.is_resale_license_active' => 'Is License Active',
     ];
+
     public function mount()
     {
         $this->instance_id = config('app.id');
         $this->settings = InstanceSettings::get();
     }
+
     public function submit()
     {
         $this->validate();
@@ -32,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

@@ -18,11 +18,13 @@ class Form extends Component
         'destination.network' => 'network',
         'destination.server.ip' => 'IP Address',
     ];
+
     public function submit()
     {
         $this->validate();
         $this->destination->save();
     }
+
     public function delete()
     {
         try {
@@ -35,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

@@ -5,6 +5,7 @@ namespace App\Http\Livewire\Destination\New;
 use App\Models\Server;
 use App\Models\StandaloneDocker as ModelsStandaloneDocker;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Str;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -27,6 +28,7 @@ class StandaloneDocker extends Component
         'network' => 'network',
         'server_id' => 'server'
     ];
+
     public function mount()
     {
         if (request()->query('server_id')) {
@@ -41,36 +43,42 @@ class StandaloneDocker extends Component
         } else {
             $this->network = new Cuid2(7);
         }
-        $this->name = generate_random_name();
+        $this->name = Str::kebab("{$this->servers->first()->name}-{$this->network}");
     }
-    private function createNetworkAndAttachToProxy()
+
+    public function generate_name()
     {
-        instant_remote_process(['docker network create --attachable ' . $this->network], $this->server, throwError: false);
-        instant_remote_process(["docker network connect $this->network coolify-proxy"], $this->server, throwError: false);
+        $this->server = Server::find($this->server_id);
+        $this->name = Str::kebab("{$this->server->name}-{$this->network}");
     }
+
     public function submit()
     {
-
         $this->validate();
         try {
             $this->server = Server::find($this->server_id);
             $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' => session('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);
         }
     }
+
+    private function createNetworkAndAttachToProxy()
+    {
+        instant_remote_process(['docker network create --attachable ' . $this->network], $this->server, throwError: false);
+        instant_remote_process(["docker network connect $this->network coolify-proxy"], $this->server, throwError: false);
+    }
 }

app/Http/Livewire/Destination/Show.php

@@ -10,6 +10,7 @@ class Show extends Component
 {
     public Server $server;
     public Collection|array $networks = [];
+
     public function scan()
     {
         $alreadyAddedNetworks = $this->server->standaloneDockers;

app/Http/Livewire/ForcePasswordReset.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Livewire;
+
+use Illuminate\Support\Facades\Hash;
+use DanHarrin\LivewireRateLimiting\WithRateLimiting;
+use Livewire\Component;
+
+class ForcePasswordReset extends Component
+{
+    use WithRateLimiting;
+    public string $email;
+    public string $password;
+    public string $password_confirmation;
+
+    protected $rules = [
+        'email' => 'required|email',
+        'password' => 'required|min:8',
+        'password_confirmation' => 'required|same:password',
+    ];
+    public function mount()
+    {
+        $this->email = auth()->user()->email;
+    }
+    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();
+            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/License.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace App\Http\Livewire;
-
-use Illuminate\Support\Facades\Cache;
-use Livewire\Component;
-
-class License extends Component
-{
-    public string $license;
-    public function submit()
-    {
-        ray('checking license');
-        $this->validate([
-            'license' => 'required'
-        ]);
-        // Pretend we're checking the license
-        // if ($this->license === '123') {
-        //     ray('license is valid');
-        //     Cache::put('license_key', '123');
-        //     return redirect()->to('/');
-        // } else {
-        //     ray('license is invalid');
-        // }
-    }
-}

app/Http/Livewire/Notifications/DiscordSettings.php

@@ -3,48 +3,58 @@
 namespace App\Http\Livewire\Notifications;
 
 use App\Models\Team;
-use App\Notifications\Notifications\TestNotification;
+use App\Notifications\Test;
 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',
-
+        '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) {
-            $this->model->discord->enabled = false;
+        } catch (\Throwable $e) {
+            ray($e->getMessage());
+            $this->team->discord_enabled = false;
             $this->validate();
         }
     }
-    public function saveModel()
-    {
-        $this->model->save();
-        if (is_a($this->model, Team::class)) {
-            session(['currentTeam' => $this->model]);
-        }
-        $this->emit('success', 'Settings saved.');
-    }
+
     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->model->notify(new TestNotification('discord'));
+        $this->team->notify(new Test());
         $this->emit('success', 'Test notification sent.');
     }
 }

app/Http/Livewire/Notifications/EmailSettings.php

@@ -4,110 +4,186 @@ namespace App\Http\Livewire\Notifications;
 
 use App\Models\InstanceSettings;
 use App\Models\Team;
-use App\Notifications\Notifications\TestNotification;
+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.test_recipients' => 'nullable',
-        'model.smtp_notifications.test' => 'nullable|boolean',
-        'model.smtp_notifications.deployments' => 'nullable|boolean',
-        'model.discord_notifications.test' => 'nullable|boolean',
-        'model.discord_notifications.deployments' => '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',
-        'model.smtp.test_recipients' => 'Test Recipients',
+        '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',
     ];
-    private function decrypt()
-    {
-        if (data_get($this->model, 'smtp.password')) {
-            try {
-                $this->model->smtp->password = decrypt($this->model->smtp->password);
-            } catch (\Exception $e) {
-            }
-        }
-    }
+
     public function mount()
     {
-        $this->decrypt();
+        $this->team = auth()->user()->currentTeam();
+        ['sharedEmailEnabled' => $this->sharedEmailEnabled] = $this->team->limits;
+        $this->emails = auth()->user()->email;
     }
-    public function copyFromInstanceSettings()
+    public function submitFromFields()
     {
-        $settings = InstanceSettings::get();
-        if ($settings->smtp->enabled) {
-            $this->model->smtp->enabled = true;
-            $this->model->smtp->from_address = $settings->smtp->from_address;
-            $this->model->smtp->from_name = $settings->smtp->from_name;
-            $this->model->smtp->recipients = $settings->smtp->recipients;
-            $this->model->smtp->host = $settings->smtp->host;
-            $this->model->smtp->port = $settings->smtp->port;
-            $this->model->smtp->encryption = $settings->smtp->encryption;
-            $this->model->smtp->username = $settings->smtp->username;
-            $this->model->smtp->password = $settings->smtp->password;
-            $this->model->smtp->timeout = $settings->smtp->timeout;
-            $this->model->smtp->test_recipients = $settings->smtp->test_recipients;
-            $this->saveModel();
-        } else {
-            $this->emit('error', 'Instance SMTP settings are not enabled.');
+        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 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->model->smtp->test_recipients = str_replace(' ', '', $this->model->smtp->test_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.');
-    }
     public function sendTestNotification()
     {
-        $this->model->notify(new TestNotification('smtp'));
-        $this->emit('success', 'Test notification sent.');
+        $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 (\Exception $e) {
-            $this->model->smtp->enabled = false;
-            $this->validate();
+        } 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 = currentTeam();
+            $team->update([
+                'smtp_enabled' => $settings->smtp_enabled,
+                'smtp_from_address' => $settings->smtp_from_address,
+                'smtp_from_name' => $settings->smtp_from_name,
+                'smtp_recipients' => $settings->smtp_recipients,
+                'smtp_host' => $settings->smtp_host,
+                'smtp_port' => $settings->smtp_port,
+                'smtp_encryption' => $settings->smtp_encryption,
+                'smtp_username' => $settings->smtp_username,
+                'smtp_password' => $settings->smtp_password,
+                'smtp_timeout' => $settings->smtp_timeout,
+            ]);
+            refreshSession();
+            $this->team = $team;
+            $this->emit('success', 'Settings saved.');
+            return;
+        }
+        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;
+        }
+        $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',
@@ -20,29 +20,36 @@ class Change extends Component
         'private_key.description' => 'description',
         '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();
-                session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('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);
         }
     }
+
     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();
-            session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get();
-        } 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

@@ -7,7 +7,7 @@ use Livewire\Component;
 
 class Create extends Component
 {
-    protected string|null $from = null;
+    public string|null $from = null;
     public string $name;
     public string|null $description = null;
     public string $value;
@@ -19,6 +19,7 @@ class Create extends Component
         'name' => 'name',
         'value' => 'private Key',
     ];
+
     public function createPrivateKey()
     {
         $this->validate();
@@ -31,13 +32,13 @@ class Create extends Component
                 'name' => $this->name,
                 'description' => $this->description,
                 'private_key' => $this->value,
-                'team_id' => session('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/Profile/Form.php

@@ -17,12 +17,14 @@ class Form extends Component
     protected $validationAttributes = [
         'name' => 'name',
     ];
+
     public function mount()
     {
         $this->userId = auth()->user()->id;
         $this->name = auth()->user()->name;
         $this->email = auth()->user()->email;
     }
+
     public function submit()
 
     {

app/Http/Livewire/Project/AddEmpty.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Livewire\Project;
+
+use App\Models\Project;
+use Livewire\Component;
+
+class AddEmpty extends Component
+{
+    public string $name = '';
+    public string $description = '';
+    protected $rules = [
+        'name' => 'required|string|min:3',
+        'description' => 'nullable|string',
+    ];
+    protected $validationAttributes = [
+        'name' => 'Project Name',
+        'description' => 'Project Description',
+    ];
+
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $project = Project::create([
+                'name' => $this->name,
+                'description' => $this->description,
+                'team_id' => currentTeam()->id,
+            ]);
+            return redirect()->route('project.show', $project->uuid);
+        } catch (\Throwable $e) {
+            general_error_handler($e, $this);
+        } finally {
+            $this->name = '';
+        }
+    }
+}

app/Http/Livewire/Project/AddEnvironment.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Livewire\Project;
+
+use App\Models\Environment;
+use App\Models\Project;
+use Livewire\Component;
+
+class AddEnvironment extends Component
+{
+    public Project $project;
+    public string $name = '';
+    public string $description = '';
+    protected $rules = [
+        'name' => 'required|string|min:3',
+    ];
+    protected $validationAttributes = [
+        'name' => 'Environment Name',
+    ];
+
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $environment = Environment::create([
+                'name' => $this->name,
+                'project_id' => $this->project->id,
+            ]);
+
+            return redirect()->route('project.resources', [
+                'project_uuid' => $this->project->uuid,
+                'environment_name' => $environment->name,
+            ]);
+        } catch (\Throwable $e) {
+            general_error_handler($e, $this);
+        } finally {
+            $this->name = '';
+        }
+    }
+}

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

@@ -10,10 +10,12 @@ class DeploymentLogs extends Component
     public ApplicationDeploymentQueue $application_deployment_queue;
     public $isKeepAliveOn = true;
     protected $listeners = ['refreshQueue'];
+
     public function refreshQueue()
     {
         $this->application_deployment_queue->refresh();
     }
+
     public function polling()
     {
         $this->emit('deploymentFinished');

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

@@ -8,17 +8,16 @@ use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Process;
-use Livewire\Component;
 use Illuminate\Support\Str;
+use Livewire\Component;
 
 class DeploymentNavbar extends Component
 {
-    protected $listeners = ['deploymentFinished'];
-
     public ApplicationDeploymentQueue $application_deployment_queue;
     public Application $application;
     public Server $server;
     public bool $is_debug_enabled = false;
+    protected $listeners = ['deploymentFinished'];
 
     public function mount()
     {
@@ -26,10 +25,12 @@ class DeploymentNavbar extends Component
         $this->server = $this->application->destination->server;
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
     }
+
     public function deploymentFinished()
     {
         $this->application_deployment_queue->refresh();
     }
+
     public function show_debug()
     {
         $this->application->settings->is_debug_enabled = !$this->application->settings->is_debug_enabled;
@@ -37,6 +38,7 @@ class DeploymentNavbar extends Component
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
         $this->emit('refreshQueue');
     }
+
     public function cancel()
     {
         try {
@@ -66,4 +68,4 @@ class DeploymentNavbar extends Component
             return general_error_handler(err: $e, that: $this);
         }
     }
-}
+}

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

@@ -20,6 +20,7 @@ class Deployments extends Component
         $this->current_url = url()->current();
         $this->show_more();
     }
+
     private function show_more()
     {
         if (count($this->deployments) !== 0) {
@@ -30,10 +31,12 @@ class Deployments extends Component
             return;
         }
     }
+
     public function reload_deployments()
     {
         $this->load_deployments();
     }
+
     public function load_deployments(int|null $take = null)
     {
         if ($take) {

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

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application\EnvironmentVariable;
-
-use App\Models\Application;
-use App\Models\EnvironmentVariable;
-use Livewire\Component;
-use Visus\Cuid2\Cuid2;
-
-class All extends Component
-{
-    public Application $application;
-    public string|null $modalId = null;
-    protected $listeners = ['refreshEnvs', 'submit'];
-    public function mount()
-    {
-        $this->modalId = new Cuid2(7);
-    }
-    public function refreshEnvs()
-    {
-        $this->application->refresh();
-    }
-    public function submit($data)
-    {
-        try {
-            $found = $this->application->environment_variables()->where('key', $data['key'])->first();
-            if ($found) {
-                $this->emit('error', 'Environment variable already exists.');
-                return;
-            }
-            EnvironmentVariable::create([
-                'key' => $data['key'],
-                'value' => $data['value'],
-                'is_build_time' => $data['is_build_time'],
-                'is_preview' => $data['is_preview'],
-                'application_id' => $this->application->id,
-            ]);
-            $this->application->refresh();
-
-            $this->emit('success', 'Environment variable added successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
-        }
-    }
-}

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

@@ -4,8 +4,8 @@ namespace App\Http\Livewire\Project\Application;
 
 use App\Models\Application;
 use App\Models\InstanceSettings;
-use Livewire\Component;
 use Illuminate\Support\Str;
+use Livewire\Component;
 use Spatie\Url\Url;
 
 class General extends Component
@@ -33,6 +33,7 @@ class General extends Component
 
     protected $rules = [
         'application.name' => 'required',
+        'application.description' => 'nullable',
         'application.fqdn' => 'nullable',
         'application.git_repository' => 'required',
         'application.git_branch' => 'required',
@@ -46,9 +47,11 @@ class General extends Component
         'application.publish_directory' => 'nullable',
         'application.ports_exposes' => 'required',
         'application.ports_mappings' => 'nullable',
+        'application.dockerfile' => 'nullable',
     ];
     protected $validationAttributes = [
         'application.name' => 'name',
+        'application.description' => 'description',
         'application.fqdn' => 'FQDN',
         'application.git_repository' => 'Git repository',
         'application.git_branch' => 'Git branch',
@@ -62,7 +65,9 @@ class General extends Component
         'application.publish_directory' => 'Publish directory',
         'application.ports_exposes' => 'Ports exposes',
         'application.ports_mappings' => 'Ports mappings',
+        'application.dockerfile' => 'Dockerfile',
     ];
+
     public function instantSave()
     {
         // @TODO: find another way - if possible
@@ -84,6 +89,7 @@ class General extends Component
         $this->emit('success', 'Application settings updated!');
         $this->checkWildCardDomain();
     }
+
     protected function checkWildCardDomain()
     {
         $coolify_instance_settings = InstanceSettings::get();
@@ -91,6 +97,7 @@ class General extends Component
         $this->global_wildcard_domain = data_get($coolify_instance_settings, 'wildcard_domain');
         $this->wildcard_domain = $this->server_wildcard_domain ?? $this->global_wildcard_domain ?? null;
     }
+
     public function mount()
     {
         $this->is_static = $this->application->settings->is_static;
@@ -102,6 +109,7 @@ class General extends Component
         $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled;
         $this->checkWildCardDomain();
     }
+
     public function generateGlobalRandomDomain()
     {
         // Set wildcard domain based on Global wildcard domain
@@ -113,6 +121,7 @@ class General extends Component
         $this->application->save();
         $this->emit('success', 'Application settings updated!');
     }
+
     public function generateServerRandomDomain()
     {
         // Set wildcard domain based on Server wildcard domain
@@ -124,24 +133,33 @@ class General extends Component
         $this->application->save();
         $this->emit('success', 'Application settings updated!');
     }
+
     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();
-            });
+            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, '/');
             }
             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

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Http\Livewire\Application;
+namespace App\Http\Livewire\Project\Application;
 
 use App\Jobs\ApplicationContainerStatusJob;
 use App\Models\Application;
+use App\Notifications\Application\StatusChanged;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
@@ -16,17 +17,22 @@ class Heading extends Component
 
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
 
     public function check_status()
     {
         dispatch_sync(new ApplicationContainerStatusJob(
             application: $this->application,
-            container_name: generate_container_name($this->application->uuid),
         ));
         $this->application->refresh();
     }
+
+    public function force_deploy_without_cache()
+    {
+        $this->deploy(force_rebuild: true);
+    }
+
     public function deploy(bool $force_rebuild = false)
     {
         $this->setDeploymentUuid();
@@ -42,22 +48,30 @@ class Heading extends Component
             'environment_name' => $this->parameters['environment_name'],
         ]);
     }
-    public function force_deploy_without_cache()
-    {
-        $this->deploy(force_rebuild: true);
-    }
-    public function stop()
-    {
-        remote_process(
-            ["docker rm -f {$this->application->uuid}"],
-            $this->application->destination->server
-        );
-        $this->application->status = 'stopped';
-        $this->application->save();
-    }
+
     protected function setDeploymentUuid()
     {
         $this->deploymentUuid = new Cuid2(7);
         $this->parameters['deployment_uuid'] = $this->deploymentUuid;
     }
+
+    public function stop()
+    {
+        $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/Preview/Form.php

@@ -17,6 +17,7 @@ class Form extends Component
     protected $validationAttributes = [
         'application.preview_url_template' => 'preview url template',
     ];
+
     public function resetToDefault()
     {
         $this->application->preview_url_template = '{{pr_id}}.{{domain}}';
@@ -24,6 +25,7 @@ class Form extends Component
         $this->application->save();
         $this->generate_real_url();
     }
+
     public function generate_real_url()
     {
         if (data_get($this->application, 'fqdn')) {
@@ -32,10 +34,12 @@ class Form extends Component
             $this->preview_url_template = Str::of($this->application->preview_url_template)->replace('{{domain}}', $host);
         }
     }
+
     public function mount()
     {
         $this->generate_real_url();
     }
+
     public function submit()
     {
         $this->validate();

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

@@ -20,21 +20,17 @@ class Previews extends Component
     public function mount()
     {
         $this->pull_requests = collect();
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function loadStatus($pull_request_id)
     {
         dispatch(new ApplicationContainerStatusJob(
             application: $this->application,
-            container_name: generate_container_name($this->application->uuid, $pull_request_id),
-            pull_request_id: $pull_request_id
+            pullRequestId: $pull_request_id
         ));
     }
-    protected function setDeploymentUuid()
-    {
-        $this->deployment_uuid = new Cuid2(7);
-        $this->parameters['deployment_uuid'] = $this->deployment_uuid;
-    }
+
     public function load_prs()
     {
         try {
@@ -46,6 +42,7 @@ class Previews extends Component
             return general_error_handler(err: $e, that: $this);
         }
     }
+
     public function deploy(int $pull_request_id, string|null $pull_request_html_url = null)
     {
         try {
@@ -74,10 +71,17 @@ class Previews extends Component
             return general_error_handler(err: $e, that: $this);
         }
     }
+
+    protected function setDeploymentUuid()
+    {
+        $this->deployment_uuid = new Cuid2(7);
+        $this->parameters['deployment_uuid'] = $this->deployment_uuid;
+    }
+
     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);
@@ -87,6 +91,7 @@ class Previews extends Component
             return general_error_handler(err: $e, that: $this);
         }
     }
+
     public function previewRefresh()
     {
         $this->application->previews->each(function ($preview) {

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

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Http\Livewire\Project\Application;
-
-use App\Models\Application;
-use Livewire\Component;
-
-class ResourceLimits extends Component
-{
-    public Application $application;
-    protected $rules = [
-        'application.limits_memory' => 'required|string',
-        'application.limits_memory_swap' => 'required|string',
-        'application.limits_memory_swappiness' => 'required|integer|min:0|max:100',
-        'application.limits_memory_reservation' => 'required|string',
-        'application.limits_cpus' => 'nullable',
-        'application.limits_cpuset' => 'nullable',
-        'application.limits_cpu_shares' => 'nullable',
-    ];
-    protected $validationAttributes = [
-        'application.limits_memory' => 'memory',
-        'application.limits_memory_swap' => 'swap',
-        'application.limits_memory_swappiness' => 'swappiness',
-        'application.limits_memory_reservation' => 'reservation',
-        'application.limits_cpus' => 'cpus',
-        'application.limits_cpuset' => 'cpuset',
-        'application.limits_cpu_shares' => 'cpu shares',
-    ];
-    public function submit()
-    {
-        try {
-            if (!$this->application->limits_memory) {
-                $this->application->limits_memory = "0";
-            }
-            if (!$this->application->limits_memory_swap) {
-                $this->application->limits_memory_swap = "0";
-            }
-            if (!$this->application->limits_memory_swappiness) {
-                $this->application->limits_memory_swappiness = "60";
-            }
-            if (!$this->application->limits_memory_reservation) {
-                $this->application->limits_memory_reservation = "0";
-            }
-            if (!$this->application->limits_cpus) {
-                $this->application->limits_cpus = "0";
-            }
-            if (!$this->application->limits_cpuset) {
-                $this->application->limits_cpuset = "0";
-            }
-            if (!$this->application->limits_cpu_shares) {
-                $this->application->limits_cpu_shares = 1024;
-            }
-            $this->validate();
-            $this->application->save();
-            $this->emit('success', 'Resource limits updated successfully.');
-        } catch (\Exception $e) {
-            return general_error_handler(err: $e, that: $this);
-        }
-    }
-}

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

@@ -3,8 +3,8 @@
 namespace App\Http\Livewire\Project\Application;
 
 use App\Models\Application;
-use Livewire\Component;
 use Illuminate\Support\Str;
+use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Rollback extends Component
@@ -16,8 +16,9 @@ class Rollback extends Component
 
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function rollbackImage($commit)
     {
         $deployment_uuid = new Cuid2(7);
@@ -36,6 +37,7 @@ class Rollback extends Component
             'environment_name' => $this->parameters['environment_name'],
         ]);
     }
+
     public function loadImages()
     {
         try {

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

@@ -21,16 +21,19 @@ class Source extends Component
         'application.git_branch' => 'branch',
         'application.git_commit_sha' => 'commit sha',
     ];
-    private function get_private_keys()
-    {
-        $this->private_keys = PrivateKey::whereTeamId(session('currentTeam')->id)->get()->reject(function ($key) {
-            return $key->id == $this->application->private_key_id;
-        });
-    }
+
     public function mount()
     {
         $this->get_private_keys();
     }
+
+    private function get_private_keys()
+    {
+        $this->private_keys = PrivateKey::whereTeamId(currentTeam()->id)->get()->reject(function ($key) {
+            return $key->id == $this->application->private_key_id;
+        });
+    }
+
     public function setPrivateKey(int $private_key_id)
     {
         $this->application->private_key_id = $private_key_id;
@@ -38,6 +41,7 @@ class Source extends Component
         $this->application->refresh();
         $this->get_private_keys();
     }
+
     public function submit()
     {
         $this->validate();

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

@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class BackupEdit extends Component
+{
+    public $backup;
+    public $s3s;
+    public array $parameters;
+
+    protected $rules = [
+        'backup.enabled' => 'required|boolean',
+        'backup.frequency' => 'required|string',
+        'backup.number_of_backups_locally' => 'required|integer|min:1',
+        'backup.save_s3' => 'required|boolean',
+        'backup.s3_storage_id' => 'nullable|integer',
+    ];
+    protected $validationAttributes = [
+        'backup.enabled' => 'Enabled',
+        'backup.frequency' => 'Frequency',
+        'backup.number_of_backups_locally' => 'Number of Backups Locally',
+        'backup.save_s3' => 'Save to S3',
+        'backup.s3_storage_id' => 'S3 Storage',
+    ];
+    protected $messages = [
+        'backup.s3_storage_id' => 'Select a S3 Storage',
+    ];
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        if (is_null($this->backup->s3_storage_id)) {
+            $this->backup->s3_storage_id = 'default';
+        }
+    }
+
+
+    public function delete()
+    {
+        // TODO: Delete backup from server and add a confirmation modal
+        $this->backup->delete();
+        redirect()->route('project.database.backups.all', $this->parameters);
+    }
+
+    public function instantSave()
+    {
+        try {
+            $this->custom_validate();
+            $this->backup->save();
+            $this->backup->refresh();
+            $this->emit('success', 'Backup updated successfully');
+        } catch (\Throwable $e) {
+            $this->emit('error', $e->getMessage());
+        }
+    }
+
+    private function custom_validate()
+    {
+        if (!is_numeric($this->backup->s3_storage_id)) {
+            $this->backup->s3_storage_id = null;
+        }
+        $isValid = validate_cron_expression($this->backup->frequency);
+        if (!$isValid) {
+            throw new \Exception('Invalid Cron / Human expression');
+        }
+        $this->validate();
+    }
+
+    public function submit()
+    {
+        ray($this->backup->s3_storage_id);
+        try {
+            $this->custom_validate();
+            $this->backup->save();
+            $this->backup->refresh();
+            $this->emit('success', 'Backup updated successfully');
+        } catch (\Throwable $e) {
+            $this->emit('error', $e->getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use App\Models\ScheduledDatabaseBackupExecution;
+use Livewire\Component;
+
+class BackupExecution extends Component
+{
+    public ScheduledDatabaseBackupExecution $execution;
+
+    public function download()
+    {
+    }
+
+    public function delete(): void
+    {
+        delete_backup_locally($this->execution->filename, $this->execution->scheduledDatabaseBackup->database->destination->server);
+        $this->execution->delete();
+        $this->emit('success', 'Backup deleted successfully.');
+        $this->emit('refreshBackupExecutions');
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class BackupExecutions extends Component
+{
+    public $backup;
+    public $executions;
+    protected $listeners = ['refreshBackupExecutions'];
+
+    public function refreshBackupExecutions(): void
+    {
+        $this->executions = $this->backup->executions;
+    }
+}

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

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use App\Jobs\DatabaseBackupJob;
+use Livewire\Component;
+
+class BackupNow extends Component
+{
+    public $backup;
+    public function backup_now()
+    {
+        dispatch(new DatabaseBackupJob(
+            backup: $this->backup
+        ));
+        $this->emit('success', 'Backup queued. It will be available in a few minutes');
+    }
+}

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

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use App\Models\ScheduledDatabaseBackup;
+use Livewire\Component;
+
+class CreateScheduledBackup extends Component
+{
+    public $database;
+    public $frequency;
+    public bool $enabled = true;
+    public bool $save_s3 = true;
+    public $s3_storage_id;
+    public $s3s;
+
+    protected $rules = [
+        'frequency' => 'required|string',
+        'save_s3' => 'required|boolean',
+    ];
+    protected $validationAttributes = [
+        'frequency' => 'Backup Frequency',
+        'save_s3' => 'Save to S3',
+    ];
+
+    public function submit(): void
+    {
+        try {
+            $this->validate();
+            $isValid = validate_cron_expression($this->frequency);
+            if (!$isValid) {
+                $this->emit('error', 'Invalid Cron / Human expression.');
+                return;
+            }
+            ScheduledDatabaseBackup::create([
+                'enabled' => true,
+                'frequency' => $this->frequency,
+                'save_s3' => $this->save_s3,
+                's3_storage_id' => $this->s3_storage_id,
+                'database_id' => $this->database->id,
+                'database_type' => $this->database->getMorphClass(),
+                'team_id' => currentTeam()->id,
+            ]);
+            $this->emit('refreshScheduledBackups');
+        } catch (\Throwable $e) {
+            general_error_handler($e, $this);
+        } finally {
+            $this->frequency = '';
+            $this->save_s3 = true;
+        }
+    }
+}

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

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use App\Actions\Database\StartPostgresql;
+use App\Jobs\DatabaseContainerStatusJob;
+use App\Notifications\Application\StatusChanged;
+use Livewire\Component;
+
+class Heading extends Component
+{
+    public $database;
+    public array $parameters;
+
+    protected $listeners = ['activityFinished'];
+
+    public function activityFinished()
+    {
+        $this->database->update([
+            'started_at' => now(),
+        ]);
+        $this->emit('refresh');
+        $this->check_status();
+    }
+
+    public function check_status()
+    {
+        dispatch_sync(new DatabaseContainerStatusJob(
+            database: $this->database,
+        ));
+        $this->database->refresh();
+    }
+
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+    }
+
+    public function stop()
+    {
+        remote_process(
+            ["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->emit('refresh');
+        // $this->database->environment->project->team->notify(new StatusChanged($this->database));
+    }
+
+    public function start()
+    {
+        if ($this->database->type() === 'standalone-postgresql') {
+            $activity = resolve(StartPostgresql::class)($this->database->destination->server, $this->database);
+            $this->emit('newMonitorActivity', $activity->id);
+        }
+    }
+}

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

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class InitScript extends Component
+{
+    public array $script;
+    public int $index;
+    public string|null $filename;
+    public string|null $content;
+
+    protected $rules = [
+        'filename' => 'required|string',
+        'content' => 'required|string',
+    ];
+    protected $validationAttributes = [
+        'filename' => 'Filename',
+        'content' => 'Content',
+    ];
+
+    public function mount()
+    {
+        $this->index = data_get($this->script, 'index');
+        $this->filename = data_get($this->script, 'filename');
+        $this->content = data_get($this->script, 'content');
+    }
+
+    public function submit()
+    {
+        $this->validate();
+        try {
+            $this->script['index'] = $this->index;
+            $this->script['content'] = $this->content;
+            $this->script['filename'] = $this->filename;
+            $this->emitUp('save_init_script', $this->script);
+        } catch (Exception $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
+
+    public function delete()
+    {
+        $this->emitUp('delete_init_script', $this->script);
+    }
+}

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

@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database\Postgresql;
+
+use App\Models\StandalonePostgresql;
+use Exception;
+use Livewire\Component;
+use function Aws\filter;
+
+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'];
+
+    protected $rules = [
+        'database.name' => 'required',
+        'database.description' => 'nullable',
+        'database.postgres_user' => 'required',
+        'database.postgres_password' => 'required',
+        'database.postgres_db' => 'required',
+        'database.postgres_initdb_args' => 'nullable',
+        'database.postgres_host_auth_method' => 'nullable',
+        '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',
+        'database.description' => 'Description',
+        'database.postgres_user' => 'Postgres User',
+        'database.postgres_password' => 'Postgres Password',
+        'database.postgres_db' => 'Postgres DB',
+        'database.postgres_initdb_args' => 'Postgres Initdb Args',
+        'database.postgres_host_auth_method' => 'Postgres Host Auth Method',
+        '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']);
+        $this->database->init_scripts = array_merge($this->database->init_scripts, [$script]);
+        $this->database->save();
+        $this->emit('success', 'Init script saved successfully.');
+    }
+
+    public function delete_init_script($script)
+    {
+        $collection = collect($this->database->init_scripts);
+        $found = $collection->firstWhere('filename', $script['filename']);
+        if ($found) {
+            ray($collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray());
+            $this->database->init_scripts = $collection->filter(fn ($s) => $s['filename'] !== $script['filename'])->toArray();
+            $this->database->save();
+            $this->refresh();
+            $this->emit('success', 'Init script deleted successfully.');
+            return;
+        }
+    }
+
+    public function refresh(): void
+    {
+        $this->database->refresh();
+    }
+
+    public function save_new_init_script()
+    {
+        $this->validate([
+            'new_filename' => 'required|string',
+            'new_content' => 'required|string',
+        ]);
+        $found = collect($this->database->init_scripts)->firstWhere('filename', $this->new_filename);
+        if ($found) {
+            $this->emit('error', 'Filename already exists.');
+            return;
+        }
+        if (!isset($this->database->init_scripts)) {
+            $this->database->init_scripts = [];
+        }
+        $this->database->init_scripts = array_merge($this->database->init_scripts, [
+            [
+                'index' => count($this->database->init_scripts),
+                'filename' => $this->new_filename,
+                'content' => $this->new_content,
+            ]
+        ]);
+        $this->database->save();
+        $this->emit('success', 'Init script added successfully.');
+        $this->new_content = '';
+        $this->new_filename = '';
+    }
+
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->database->save();
+            $this->emit('success', 'Database updated successfully.');
+        } catch (Exception $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
+}

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Livewire\Project\Database;
+
+use Livewire\Component;
+
+class ScheduledBackups extends Component
+{
+    public $database;
+    public $parameters;
+    protected $listeners = ['refreshScheduledBackups'];
+
+    public function mount(): void
+    {
+        $this->parameters = get_route_parameters();
+    }
+
+    public function delete($scheduled_backup_id): void
+    {
+        $this->database->scheduledBackups->find($scheduled_backup_id)->delete();
+        $this->emit('success', 'Scheduled backup deleted successfully.');
+        $this->refreshScheduledBackups();
+    }
+
+    public function refreshScheduledBackups(): void
+    {
+        ray('refreshScheduledBackups');
+        $this->database->refresh();
+    }
+}

app/Http/Livewire/Project/DeleteEnvironment.php

@@ -12,8 +12,9 @@ class DeleteEnvironment extends Component
 
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function delete()
     {
         $this->validate([

app/Http/Livewire/Project/DeleteProject.php

@@ -12,8 +12,9 @@ class DeleteProject extends Component
 
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function delete()
     {
         $this->validate([

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' => session('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

@@ -5,19 +5,21 @@ namespace App\Http\Livewire\Project\New;
 use App\Models\Application;
 use App\Models\GithubApp;
 use App\Models\Project;
-use App\Models\Server;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
-use Illuminate\Support\Collection;
+use App\Traits\SaveFromRedirect;
 use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Facades\Log;
 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;
 
@@ -29,52 +31,39 @@ class GithubPrivateRepository extends Component
     public string $selected_branch_name = 'main';
 
     public string $token;
-
-    protected int $page = 1;
-
     public $repositories;
     public int $total_repositories_count = 0;
-
     public $branches;
     public int $total_branches_count = 0;
-
     public int $port = 3000;
     public bool $is_static = false;
     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->parameters = getRouteParameters();
+        $this->currentRoute = Route::currentRouteName();
+        $this->parameters = get_route_parameters();
         $this->query = request()->query();
         $this->repositories = $this->branches = collect();
         $this->github_apps = GithubApp::private();
     }
-    protected function loadRepositoryByPage()
-    {
-        $response = Http::withToken($this->token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100&page={$this->page}");
-        $json = $response->json();
-        if ($response->status() !== 200) {
-            return $this->emit('error', $json['message']);
-        }
-
-        if ($json['total_count'] === 0) {
-            return;
-        }
-        $this->total_repositories_count = $json['total_count'];
-        $this->repositories = $this->repositories->concat(collect($json['repositories']));
-    }
-    protected function loadBranchByPage()
-    {
-        Log::info('Loading page ' . $this->page);
-        $response = Http::withToken($this->token)->get("{$this->github_app->api_url}/repos/{$this->selected_repository_owner}/{$this->selected_repository_repo}/branches?per_page=100&page={$this->page}");
-        $json = $response->json();
-        if ($response->status() !== 200) {
-            return $this->emit('error', $json['message']);
-        }
-
-        $this->total_branches_count = count($json);
-        $this->branches = $this->branches->concat(collect($json));
-    }
     public function loadRepositories($github_app_id)
     {
         $this->repositories = collect();
@@ -90,7 +79,24 @@ class GithubPrivateRepository extends Component
             }
         }
         $this->selected_repository_id = $this->repositories[0]['id'];
+        $this->current_step = 'repository';
     }
+
+    protected function loadRepositoryByPage()
+    {
+        $response = Http::withToken($this->token)->get("{$this->github_app->api_url}/installation/repositories?per_page=100&page={$this->page}");
+        $json = $response->json();
+        if ($response->status() !== 200) {
+            return $this->emit('error', $json['message']);
+        }
+
+        if ($json['total_count'] === 0) {
+            return;
+        }
+        $this->total_repositories_count = $json['total_count'];
+        $this->repositories = $this->repositories->concat(collect($json['repositories']));
+    }
+
     public function loadBranches()
     {
         $this->selected_repository_owner = $this->repositories->where('id', $this->selected_repository_id)->first()['owner']['login'];
@@ -105,6 +111,20 @@ class GithubPrivateRepository extends Component
             }
         }
     }
+
+    protected function loadBranchByPage()
+    {
+        ray('Loading page ' . $this->page);
+        $response = Http::withToken($this->token)->get("{$this->github_app->api_url}/repos/{$this->selected_repository_owner}/{$this->selected_repository_repo}/branches?per_page=100&page={$this->page}");
+        $json = $response->json();
+        if ($response->status() !== 200) {
+            return $this->emit('error', $json['message']);
+        }
+
+        $this->total_branches_count = count($json);
+        $this->branches = $this->branches->concat(collect($json));
+    }
+
     public function submit()
     {
         try {
@@ -134,7 +154,7 @@ class GithubPrivateRepository extends Component
                 'destination_id' => $destination->id,
                 'destination_type' => $destination_class,
                 'source_id' => $this->github_app->id,
-                'source_type' =>  $this->github_app->getMorphClass()
+                'source_type' => $this->github_app->getMorphClass()
             ]);
             $application->settings->is_static = $this->is_static;
             $application->settings->save();
@@ -144,10 +164,11 @@ 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);
         }
     }
+
     public function instantSave()
     {
         if ($this->is_static) {

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

@@ -14,6 +14,7 @@ use Spatie\Url\Url;
 
 class GithubPrivateRepositoryDeployKey extends Component
 {
+    public $current_step = 'private_keys';
     public $parameters;
     public $query;
     public $private_keys;
@@ -26,14 +27,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public null|string $publish_directory = null;
 
     public string $repository_url;
-    private object $repository_url_parsed;
     public string $branch;
-
-    private GithubApp|GitlabApp $git_source;
-    private string $git_host;
-    private string $git_repository;
-    private string $git_branch;
-
     protected $rules = [
         'repository_url' => 'required|url',
         'branch' => 'required|string',
@@ -48,15 +42,22 @@ class GithubPrivateRepositoryDeployKey extends Component
         'is_static' => 'Is static',
         'publish_directory' => 'Publish directory',
     ];
+    private object $repository_url_parsed;
+    private GithubApp|GitlabApp|null $git_source = null;
+    private string $git_host;
+    private string $git_repository;
+    private string $git_branch;
+
     public function mount()
     {
         if (isDev()) {
             $this->repository_url = 'https://github.com/coollabsio/coolify-examples';
         }
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
         $this->query = request()->query();
-        $this->private_keys = PrivateKey::where('team_id', session('currentTeam')->id)->where('id', '!=', 0)->get();
+        $this->private_keys = PrivateKey::where('team_id', currentTeam()->id)->where('id', '!=', 0)->get();
     }
+
     public function instantSave()
     {
         if ($this->is_static) {
@@ -67,29 +68,13 @@ class GithubPrivateRepositoryDeployKey extends Component
             $this->publish_directory = null;
         }
     }
+
     public function setPrivateKey($private_key_id)
     {
         $this->private_key_id = $private_key_id;
+        $this->current_step = 'repository';
     }
-    private function get_git_source()
-    {
-        $this->repository_url_parsed = Url::fromString($this->repository_url);
-        $this->git_host = $this->repository_url_parsed->getHost();
-        $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
-        if ($this->branch) {
-            $this->git_branch = $this->branch;
-        } else {
-            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
-        }
 
-        if ($this->git_host == 'github.com') {
-            $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
-        } elseif ($this->git_host == 'gitlab.com') {
-            $this->git_source = GitlabApp::where('name', 'Public GitLab')->first();
-        } elseif ($this->git_host == 'bitbucket.org') {
-            // Not supported yet
-        }
-    }
     public function submit()
     {
         $this->validate();
@@ -121,7 +106,7 @@ class GithubPrivateRepositoryDeployKey extends Component
                 'destination_type' => $destination_class,
                 'private_key_id' => $this->private_key_id,
                 'source_id' => $this->git_source->id,
-                'source_type' =>  $this->git_source->getMorphClass()
+                'source_type' => $this->git_source->getMorphClass()
             ];
             $application = Application::create($application_init);
             $application->settings->is_static = $this->is_static;
@@ -132,8 +117,28 @@ 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);
         }
     }
+
+    private function get_git_source()
+    {
+        $this->repository_url_parsed = Url::fromString($this->repository_url);
+        $this->git_host = $this->repository_url_parsed->getHost();
+        $this->git_repository = $this->repository_url_parsed->getSegment(1) . '/' . $this->repository_url_parsed->getSegment(2);
+        if ($this->branch) {
+            $this->git_branch = $this->branch;
+        } else {
+            $this->git_branch = $this->repository_url_parsed->getSegment(4) ?? 'main';
+        }
+
+        if ($this->git_host == 'github.com') {
+            $this->git_source = GithubApp::where('name', 'Public GitHub')->first();
+        } elseif ($this->git_host == 'gitlab.com') {
+            $this->git_source = GitlabApp::where('name', 'Public GitLab')->first();
+        } elseif ($this->git_host == 'bitbucket.org') {
+            // Not supported yet
+        }
+    }
 }

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

@@ -15,13 +15,10 @@ use Spatie\Url\Url;
 class PublicGitRepository extends Component
 {
     public string $repository_url;
-    private object $repository_url_parsed;
-
     public int $port = 3000;
     public string $type;
     public $parameters;
     public $query;
-
     public bool $branch_found = false;
     public string $selected_branch = 'main';
     public bool $is_static = false;
@@ -29,11 +26,6 @@ class PublicGitRepository extends Component
     public string $git_branch = 'main';
     public int $rate_limit_remaining = 0;
     public $rate_limit_reset = 0;
-
-    private GithubApp|GitlabApp $git_source;
-    private string $git_host;
-    private string $git_repository;
-
     protected $rules = [
         'repository_url' => 'required|url',
         'port' => 'required|numeric',
@@ -46,13 +38,18 @@ class PublicGitRepository extends Component
         'is_static' => 'static',
         'publish_directory' => 'publish directory',
     ];
+    private object $repository_url_parsed;
+    private GithubApp|GitlabApp|null $git_source = null;
+    private string $git_host;
+    private string $git_repository;
+
     public function mount()
     {
         if (isDev()) {
             $this->repository_url = 'https://github.com/coollabsio/coolify-examples';
             $this->port = 3000;
         }
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
         $this->query = request()->query();
     }
 
@@ -67,33 +64,30 @@ class PublicGitRepository extends Component
         }
         $this->emit('success', 'Application settings updated!');
     }
-    private function get_branch()
-    {
-        ['rate_limit_remaining' => $this->rate_limit_remaining, 'rate_limit_reset' => $this->rate_limit_reset] = git_api(source: $this->git_source, endpoint: "/repos/{$this->git_repository}/branches/{$this->git_branch}");
-        $this->rate_limit_reset = Carbon::parse((int)$this->rate_limit_reset)->format('Y-M-d H:i:s');
-        $this->branch_found = true;
-    }
+
     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();
-        } 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);
             }
         }
     }
+
     private function get_git_source()
     {
         $this->repository_url_parsed = Url::fromString($this->repository_url);
@@ -108,7 +102,18 @@ 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()
+    {
+        ['rate_limit_remaining' => $this->rate_limit_remaining, 'rate_limit_reset' => $this->rate_limit_reset] = git_api(source: $this->git_source, endpoint: "/repos/{$this->git_repository}/branches/{$this->git_branch}");
+        $this->rate_limit_reset = Carbon::parse((int)$this->rate_limit_reset)->format('Y-M-d H:i:s');
+        $this->branch_found = true;
+    }
+
     public function submit()
     {
         try {
@@ -156,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

@@ -0,0 +1,93 @@
+<?php
+
+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 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 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 setServer(Server $server)
+    {
+        $this->server_id = $server->id;
+        $this->standaloneDockers = $server->standaloneDockers;
+        $this->swarmDockers = $server->swarmDockers;
+        $this->current_step = 'destinations';
+    }
+
+    public function setDestination(string $destination_uuid)
+    {
+        $this->destination_uuid = $destination_uuid;
+        redirect()->route('project.resources.new', [
+            'project_uuid' => $this->parameters['project_uuid'],
+            'environment_name' => $this->parameters['environment_name'],
+            'type' => $this->type,
+            'destination' => $this->destination_uuid,
+        ]);
+    }
+
+    public function load_servers()
+    {
+        $this->servers = Server::isUsable()->get();
+    }
+}

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Livewire\Project\New;
+
+use App\Models\Application;
+use App\Models\GithubApp;
+use App\Models\Project;
+use App\Models\StandaloneDocker;
+use App\Models\SwarmDocker;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class SimpleDockerfile extends Component
+{
+    public string $dockerfile = '';
+    public array $parameters;
+    public array $query;
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        $this->query = request()->query();
+        if (isDev()) {
+            $this->dockerfile = 'FROM nginx
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
+';
+        }
+    }
+    public function submit()
+    {
+        $this->validate([
+            'dockerfile' => 'required'
+        ]);
+        $destination_uuid = $this->query['destination'];
+        $destination = StandaloneDocker::where('uuid', $destination_uuid)->first();
+        if (!$destination) {
+            $destination = SwarmDocker::where('uuid', $destination_uuid)->first();
+        }
+        if (!$destination) {
+            throw new \Exception('Destination not found. What?!');
+        }
+        $destination_class = $destination->getMorphClass();
+
+        $project = Project::where('uuid', $this->parameters['project_uuid'])->first();
+        $environment = $project->load(['environments'])->environments->where('name', $this->parameters['environment_name'])->first();
+
+        $port = get_port_from_dockerfile($this->dockerfile);
+        $application = Application::create([
+            'name' => 'dockerfile-' . new Cuid2(7),
+            'repository_project_id' => 0,
+            'git_repository' => "coollabsio/coolify",
+            'git_branch' => 'main',
+            'build_pack' => 'dockerfile',
+            'dockerfile' => $this->dockerfile,
+            'ports_exposes' => $port,
+            'environment_id' => $environment->id,
+            'destination_id' => $destination->id,
+            'destination_type' => $destination_class,
+            '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,
+            'project_uuid' => $project->uuid,
+        ]);
+    }
+}

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

@@ -1,28 +1,28 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application;
+namespace App\Http\Livewire\Project\Shared;
 
-use App\Models\Application;
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
 
 class Danger extends Component
 {
-    public Application $application;
+    public $resource;
     public array $parameters;
     public string|null $modalId = null;
 
     public function mount()
     {
         $this->modalId = new Cuid2(7);
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function delete()
     {
-        $destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
+        $destination = $this->resource->destination->getMorphClass()::where('id', $this->resource->destination->id)->first();
 
-        instant_remote_process(["docker rm -f {$this->application->uuid}"], $destination->server);
-        $this->application->delete();
+        instant_remote_process(["docker rm -f {$this->resource->uuid}"], $destination->server);
+        $this->resource->delete();
         return redirect()->route('project.resources', [
             'project_uuid' => $this->parameters['project_uuid'],
             'environment_name' => $this->parameters['environment_name']

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application;
+namespace App\Http\Livewire\Project\Shared;
 
 use Livewire\Component;
 

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application\EnvironmentVariable;
+namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 
 use Livewire\Component;
 
@@ -23,10 +23,12 @@ class Add extends Component
         'value' => 'value',
         'is_build_time' => 'build',
     ];
+
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function submit()
     {
         ray('submitting');
@@ -39,6 +41,7 @@ class Add extends Component
         ]);
         $this->clear();
     }
+
     public function clear()
     {
         $this->key = '';

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

@@ -0,0 +1,120 @@
+<?php
+
+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)
+    {
+        try {
+            $found = $this->resource->environment_variables()->where('key', $data['key'])->first();
+            if ($found) {
+                $this->emit('error', 'Environment variable already exists.');
+                return;
+            }
+            $environment = new EnvironmentVariable();
+            $environment->key = $data['key'];
+            $environment->value = $data['value'];
+            $environment->is_build_time = $data['is_build_time'];
+            $environment->is_preview = $data['is_preview'];
+
+            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();
+            $this->refreshEnvs();
+            $this->emit('success', 'Environment variable added successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application\EnvironmentVariable;
+namespace App\Http\Livewire\Project\Shared\EnvironmentVariable;
 
 use App\Models\EnvironmentVariable as ModelsEnvironmentVariable;
 use Livewire\Component;
@@ -21,10 +21,16 @@ class Show extends Component
         'value' => 'value',
         'is_build_time' => 'build',
     ];
+
     public function mount()
     {
         $this->modalId = new Cuid2(7);
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
+    }
+
+    public function instantSave()
+    {
+        $this->submit();
     }
     public function submit()
     {
@@ -32,6 +38,7 @@ class Show extends Component
         $this->env->save();
         $this->emit('success', 'Environment variable updated successfully.');
     }
+
     public function delete()
     {
         $this->env->delete();

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

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Livewire\Project\Shared;
+
+use Livewire\Component;
+
+class ResourceLimits extends Component
+{
+    public $resource;
+    protected $rules = [
+        'resource.limits_memory' => 'required|string',
+        'resource.limits_memory_swap' => 'required|string',
+        'resource.limits_memory_swappiness' => 'required|integer|min:0|max:100',
+        'resource.limits_memory_reservation' => 'required|string',
+        'resource.limits_cpus' => 'nullable',
+        'resource.limits_cpuset' => 'nullable',
+        'resource.limits_cpu_shares' => 'nullable',
+    ];
+    protected $validationAttributes = [
+        'resource.limits_memory' => 'memory',
+        'resource.limits_memory_swap' => 'swap',
+        'resource.limits_memory_swappiness' => 'swappiness',
+        'resource.limits_memory_reservation' => 'reservation',
+        'resource.limits_cpus' => 'cpus',
+        'resource.limits_cpuset' => 'cpuset',
+        'resource.limits_cpu_shares' => 'cpu shares',
+    ];
+
+    public function submit()
+    {
+        try {
+            if (!$this->resource->limits_memory) {
+                $this->resource->limits_memory = "0";
+            }
+            if (!$this->resource->limits_memory_swap) {
+                $this->resource->limits_memory_swap = "0";
+            }
+            if (!$this->resource->limits_memory_swappiness) {
+                $this->resource->limits_memory_swappiness = "60";
+            }
+            if (!$this->resource->limits_memory_reservation) {
+                $this->resource->limits_memory_reservation = "0";
+            }
+            if (!$this->resource->limits_cpus) {
+                $this->resource->limits_cpus = "0";
+            }
+            if (!$this->resource->limits_cpuset) {
+                $this->resource->limits_cpuset = "0";
+            }
+            if (!$this->resource->limits_cpu_shares) {
+                $this->resource->limits_cpu_shares = 1024;
+            }
+            $this->validate();
+            $this->resource->save();
+            $this->emit('success', 'Resource limits updated successfully.');
+        } catch (\Throwable $e) {
+            return general_error_handler(err: $e, that: $this);
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application\Storages;
+namespace App\Http\Livewire\Project\Shared\Storages;
 
 use Livewire\Component;
 
@@ -22,10 +22,12 @@ class Add extends Component
         'mount_path' => 'mount',
         'host_path' => 'host',
     ];
+
     public function mount()
     {
-        $this->parameters = getRouteParameters();
+        $this->parameters = get_route_parameters();
     }
+
     public function submit()
     {
         $this->validate();
@@ -35,6 +37,7 @@ class Add extends Component
             'host_path' => $this->host_path,
         ]);
     }
+
     public function clear()
     {
         $this->name = '';

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

@@ -1,19 +1,20 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application\Storages;
+namespace App\Http\Livewire\Project\Shared\Storages;
 
-use App\Models\Application;
 use App\Models\LocalPersistentVolume;
 use Livewire\Component;
 
 class All extends Component
 {
-    public Application $application;
+    public $resource;
     protected $listeners = ['refreshStorages', 'submit'];
+
     public function refreshStorages()
     {
-        $this->application->refresh();
+        $this->resource->refresh();
     }
+
     public function submit($data)
     {
         try {
@@ -21,13 +22,13 @@ class All extends Component
                 'name' => $data['name'],
                 'mount_path' => $data['mount_path'],
                 'host_path' => $data['host_path'],
-                'resource_id' => $this->application->id,
-                'resource_type' => Application::class,
+                'resource_id' => $this->resource->id,
+                'resource_type' => $this->resource->getMorphClass(),
             ]);
-            $this->application->refresh();
+            $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/Project/Shared/Storages/Show.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Project\Application\Storages;
+namespace App\Http\Livewire\Project\Shared\Storages;
 
 use Livewire\Component;
 use Visus\Cuid2\Cuid2;
@@ -19,16 +19,19 @@ class Show extends Component
         'mount_path' => 'mount',
         'host_path' => 'host',
     ];
+
     public function mount()
     {
         $this->modalId = new Cuid2(7);
     }
+
     public function submit()
     {
         $this->validate();
         $this->storage->save();
         $this->emit('success', 'Storage updated successfully');
     }
+
     public function delete()
     {
         $this->storage->delete();

app/Http/Livewire/RunCommand.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire;
 
-use App\Enums\ActivityTypes;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -20,6 +19,7 @@ class RunCommand extends Component
         'server' => 'server',
         'command' => 'command',
     ];
+
     public function mount($servers)
     {
         $this->servers = $servers;
@@ -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,17 +4,17 @@ namespace App\Http\Livewire\Server;
 
 use App\Actions\Server\InstallDocker;
 use App\Models\Server;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Livewire\Component;
-use Visus\Cuid2\Cuid2;
 
 class Form extends Component
 {
+    use AuthorizesRequests;
     public Server $server;
     public $uptime;
     public $dockerVersion;
     public string|null $wildcard_domain = null;
     public int $cleanup_after_percentage;
-    public string|null $modalId = null;
 
     protected $rules = [
         'server.name' => 'required|min:6',
@@ -35,51 +35,55 @@ class Form extends Component
         'server.settings.is_reachable' => 'is reachable',
         'server.settings.is_part_of_swarm' => 'is part of swarm'
     ];
+
     public function mount()
     {
-        $this->modalId = new Cuid2(7);
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
+
     public function installDocker()
     {
-        $activity = resolve(InstallDocker::class)($this->server, session('currentTeam'));
+        $activity = resolve(InstallDocker::class)($this->server, currentTeam());
         $this->emit('newMonitorActivity', $activity->id);
     }
+
     public function validateServer()
     {
         try {
-            $this->uptime = instant_remote_process(['uptime'], $this->server);
-            if ($this->uptime) {
-                $this->server->settings->is_reachable = true;
-                $this->server->settings->save();
+            ['uptime' => $uptime, 'dockerVersion' => $dockerVersion] = validateServer($this->server);
+            if ($uptime) {
+                $this->uptime = $uptime;
+                $this->emit('success', 'Server is reachable!');
             } else {
-                $this->uptime = 'Server not reachable.';
-                throw new \Exception('Server not reachable.');
+                $this->emit('error', 'Server is not rachable');
+                return;
             }
-            $this->dockerVersion = instant_remote_process(['docker version|head -2|grep -i version'], $this->server, false);
-            if (!$this->dockerVersion) {
-                $this->dockerVersion = 'Not installed.';
-            } else {
-                $this->server->settings->is_usable = true;
-                $this->server->settings->save();
+            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) {
-            $this->server->settings->is_reachable = false;
-            $this->server->settings->is_usable = false;
-            $this->server->settings->save();
-            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()
     {