Merge pull request #1200 from coollabsio/next

v4.0.0-beta.24

.env.development.example

@@ -6,6 +6,7 @@
 USERID=
 GROUPID=
 ############################################################################################################
+APP_NAME=Coolify-localhost
 APP_ID=development
 APP_ENV=local
 APP_KEY=

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

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

.github/workflows/coolify-helper.yml

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

.github/workflows/development-build.yml

@@ -3,6 +3,9 @@ name: Development Build (v4)
 on:
   push:
     branches: ["next"]
+    paths-ignore:
+      - .github/workflows/coolify-helper.yml
+      - docker/coolify-helper/Dockerfile
 
 env:
   REGISTRY: ghcr.io
@@ -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  }}

app/Actions/Database/StartPostgresql.php

@@ -65,7 +65,7 @@ class StartPostgresql
             ],
             'networks' => [
                 $this->database->destination->network => [
-                    'external' => false,
+                    'external' => true,
                     'name' => $this->database->destination->network,
                     'attachable' => true,
                 ]

app/Actions/Server/InstallDocker.php

@@ -10,8 +10,14 @@ class InstallDocker
 {
     public function __invoke(Server $server, Team $team)
     {
-        $dockerVersion = '23.0';
-        $config = base64_encode('{ "live-restore": true }');
+        $dockerVersion = '24.0';
+        $config = base64_encode('{
+            "log-driver": "json-file",
+            "log-opts": {
+              "max-size": "10m",
+              "max-file": "3"
+            }
+          }');
         if (isDev()) {
             $activity = remote_process([
                 "echo ####### Installing Prerequisites...",

app/Console/Commands/TestEmail.php

@@ -0,0 +1,184 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Application;
+use App\Models\ApplicationPreview;
+use App\Models\ScheduledDatabaseBackup;
+use App\Models\StandalonePostgresql;
+use App\Models\TeamInvitation;
+use App\Models\User;
+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\select;
+
+class TestEmail extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'email:test';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Send a test email to the admin';
+
+    /**
+     * Execute the console command.
+     */
+    private ?MailMessage $mail = null;
+    public function handle()
+    {
+        $email = 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',
+            ],
+        );
+        $type = set_transanctional_email_settings();
+        if (!$type) {
+            throw new Exception('No email settings found.');
+        }
+        $this->mail = new MailMessage();
+        $this->mail->subject("Test Email");
+        switch ($email) {
+            case 'emails-test':
+                $this->mail = (new Test())->toMail();
+                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', [
+                    'email' => 'test2@example.com',
+                    'password' => "supersecretpassword",
+                ]);
+                $this->mail->subject('Congratulations! You are invited to join Coolify Cloud.');
+                $this->sendEmail();
+                break;
+            case 'waitlist-confirmation':
+                $this->mail = new MailMessage();
+                $this->mail->view(
+                    'emails.waitlist-confirmation',
+                    [
+                        'confirmation_url' => 'http://example.com',
+                        'cancel_url' => 'http://example.com',
+                    ]
+                );
+                $this->mail->subject('You are on the waitlist!');
+                $this->sendEmail();
+                break;
+        }
+    }
+    private function sendEmail()
+    {
+        Mail::send(
+            [],
+            [],
+            fn (Message $message) => $message
+                ->from(
+                    'internal@example.com',
+                    'Test Email',
+                )
+                ->to('test@example.com')
+                ->subject($this->mail->subject)
+                ->html((string)$this->mail->render())
+        );
+    }
+}

app/Console/Commands/WaitlistInvite.php

@@ -6,20 +6,20 @@ 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 InviteFromWaitlist extends Command
+class WaitlistInvite extends Command
 {
-    public Waitlist|null $next_patient = null;
-    public User|null $new_user = null;
+    public Waitlist|User|null $next_patient = null;
     public string|null $password = null;
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'app:invite-from-waitlist {email?}';
+    protected $signature = 'waitlist:invite {email?} {--only-email}';
 
     /**
      * The console command description.
@@ -34,7 +34,16 @@ class InviteFromWaitlist extends Command
     public function handle()
     {
         if ($this->argument('email')) {
-            $this->next_patient = Waitlist::where('email', $this->argument('email'))->first();
+            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;
@@ -43,6 +52,10 @@ class InviteFromWaitlist extends Command
             $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();
@@ -55,7 +68,7 @@ class InviteFromWaitlist extends Command
         $already_registered = User::whereEmail($this->next_patient->email)->first();
         if (!$already_registered) {
             $this->password = Str::password();
-            $this->new_user = User::create([
+            User::create([
                 'name' => Str::of($this->next_patient->email)->before('@'),
                 'email' => $this->next_patient->email,
                 'password' => Hash::make($this->password),
@@ -73,10 +86,14 @@ class InviteFromWaitlist extends Command
     }
     private function send_email()
     {
+        ray($this->next_patient->email, $this->password);
+        $token = Crypt::encryptString("{$this->next_patient->email}@@@$this->password");
+        $loginLink = route('auth.link', ['token' => $token]);
         $mail = new MailMessage();
         $mail->view('emails.waitlist-invitation', [
             'email' => $this->next_patient->email,
             'password' => $this->password,
+            'loginLink' => $loginLink,
         ]);
         $mail->subject('Congratulations! You are invited to join Coolify Cloud.');
         send_user_an_email($mail, $this->next_patient->email);

app/Console/Kernel.php

@@ -2,14 +2,19 @@
 
 namespace App\Console;
 
+use App\Jobs\ApplicationContainerStatusJob;
 use App\Jobs\CheckResaleLicenseJob;
 use App\Jobs\CleanupInstanceStuffsJob;
 use App\Jobs\DatabaseBackupJob;
+use App\Jobs\DatabaseContainerStatusJob;
 use App\Jobs\DockerCleanupJob;
 use App\Jobs\InstanceAutoUpdateJob;
 use App\Jobs\ProxyCheckJob;
 use App\Jobs\ResourceStatusJob;
+use App\Models\Application;
+use App\Models\InstanceSettings;
 use App\Models\ScheduledDatabaseBackup;
+use App\Models\StandalonePostgresql;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -17,28 +22,46 @@ class Kernel extends ConsoleKernel
 {
     protected function schedule(Schedule $schedule): void
     {
-        //        $schedule->call(fn() => $this->check_scheduled_backups($schedule))->everyTenSeconds();
         if (isDev()) {
             $schedule->command('horizon:snapshot')->everyMinute();
-            $schedule->job(new ResourceStatusJob)->everyMinute();
+            // $schedule->job(new ResourceStatusJob)->everyMinute();
             $schedule->job(new ProxyCheckJob)->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyMinute();
-
             // $schedule->job(new CheckResaleLicenseJob)->hourly();
             $schedule->job(new DockerCleanupJob)->everyOddHour();
-            // $schedule->job(new InstanceAutoUpdateJob(true))->everyMinute();
         } else {
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
-            $schedule->job(new CleanupInstanceStuffsJob)->everyMinute()->onOneServer();
-            $schedule->job(new ResourceStatusJob)->everyMinute()->onOneServer();
+            $schedule->job(new CleanupInstanceStuffsJob)->everyTenMinutes()->onOneServer();
+            // $schedule->job(new ResourceStatusJob)->everyMinute()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
             $schedule->job(new ProxyCheckJob)->everyFiveMinutes()->onOneServer();
             $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
-            $schedule->job(new InstanceAutoUpdateJob)->everyTenMinutes();
         }
+        $this->instance_auto_update($schedule);
         $this->check_scheduled_backups($schedule);
+        $this->check_resources($schedule);
     }
+    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');
@@ -57,7 +80,7 @@ class Kernel extends ConsoleKernel
             }
             $schedule->job(new DatabaseBackupJob(
                 backup: $scheduled_backup
-            ))->cron($scheduled_backup->frequency);
+            ))->cron($scheduled_backup->frequency)->onOneServer();
         }
     }
 

app/Enums/ProxyTypes.php

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

app/Exceptions/Handler.php

@@ -5,6 +5,7 @@ namespace App\Exceptions;
 use App\Models\InstanceSettings;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Sentry\Laravel\Integration;
+use Sentry\State\Scope;
 use Throwable;
 
 class Handler extends ExceptionHandler
@@ -48,6 +49,11 @@ 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')]);
+                }
+            );
             Integration::captureUnhandledException($e);
         });
     }

app/Http/Controllers/Controller.php

@@ -8,15 +8,41 @@ 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\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()) {
@@ -37,10 +63,12 @@ class Controller extends BaseController
         ]);
     }
 
-    public function force_passoword_reset() {
+    public function force_passoword_reset()
+    {
         return view('auth.force-password-reset');
     }
-    public function boarding() {
+    public function boarding()
+    {
         if (currentTeam()->boarding || isDev()) {
             return view('boarding');
         } else {

app/Http/Controllers/ProjectController.php

@@ -60,9 +60,6 @@ class ProjectController extends Controller
                 'environment_name' => $environment->name,
                 'database_uuid' => $standalone_postgresql->uuid,
             ]);
-        }
-        if ($server) {
-
         }
         return view('project.new', [
             'type' => $type

app/Http/Livewire/Dashboard.php

@@ -25,6 +25,15 @@ class Dashboard extends Component
         }
         $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/ForcePasswordReset.php

@@ -18,22 +18,26 @@ class ForcePasswordReset extends Component
         'password' => 'required|min:8',
         'password_confirmation' => 'required|same:password',
     ];
-    public function mount() {
+    public function mount()
+    {
         $this->email = auth()->user()->email;
     }
-    public function submit() {
+    public function submit()
+    {
         try {
             $this->rateLimit(10);
             $this->validate();
+            $firstLogin = auth()->user()->created_at == auth()->user()->updated_at;
             auth()->user()->forceFill([
                 'password' => Hash::make($this->password),
                 'force_password_reset' => false,
             ])->save();
-            auth()->logout();
-            return redirect()->route('login')->with('status', 'Your initial password has been set.');
-        } catch(\Exception $e) {
-            return general_error_handler(err:$e, that:$this);
+            if ($firstLogin) {
+                send_internal_notification('First login for ' . auth()->user()->email);
+            }
+            return redirect()->route('dashboard');
+        } catch (\Exception $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() ?? 'unknown';
+            $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');
+            $this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
+        } catch (\Exception $e) {
+            return general_error_handler($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.help')->layout('layouts.app');
+    }
+}

app/Http/Livewire/Notifications/DiscordSettings.php

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

app/Http/Livewire/Notifications/EmailSettings.php

@@ -49,6 +49,7 @@ class EmailSettings extends Component
 
     public function mount()
     {
+        $this->team = auth()->user()->currentTeam();
         ['sharedEmailEnabled' => $this->sharedEmailEnabled] = $this->team->limits;
         $this->emails = auth()->user()->email;
     }

app/Http/Livewire/Notifications/TelegramSettings.php

@@ -0,0 +1,62 @@
+<?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',
+    ];
+    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 (\Exception $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

@@ -27,7 +27,7 @@ class Change extends Component
             if ($this->private_key->isEmpty()) {
                 $this->private_key->delete();
                 currentTeam()->privateKeys = PrivateKey::where('team_id', currentTeam()->id)->get();
-                return redirect()->route('private-key.all');
+                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) {

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

@@ -39,7 +39,7 @@ class PublicGitRepository extends Component
         'publish_directory' => 'publish directory',
     ];
     private object $repository_url_parsed;
-    private GithubApp|GitlabApp $git_source;
+    private GithubApp|GitlabApp|null $git_source = null;
     private string $git_host;
     private string $git_repository;
 
@@ -67,18 +67,17 @@ class PublicGitRepository extends Component
 
     public function load_branch()
     {
-        $this->branch_found = false;
+        try {
+            $this->branch_found = false;
         $this->validate([
             'repository_url' => 'required|url'
         ]);
         $this->get_git_source();
-        try {
-            $this->get_branch();
-            $this->selected_branch = $this->git_branch;
+        $this->get_branch();
+        $this->selected_branch = $this->git_branch;
         } catch (\Exception $e) {
             return general_error_handler(err: $e, that: $this);
         }
-
         if (!$this->branch_found && $this->git_branch == 'main') {
             try {
                 $this->git_branch = 'master';
@@ -103,6 +102,9 @@ class PublicGitRepository extends Component
         } elseif ($this->git_host == 'bitbucket.org') {
             // Not supported yet
         }
+        if (is_null($this->git_source)) {
+            throw new \Exception('Git source not found. What?!');
+        }
     }
 
     private function get_branch()

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

@@ -22,34 +22,52 @@ class Select extends Component
     public Collection|array $swarmDockers = [];
     public array $parameters;
 
+    public ?string $existingPostgresqlUrl = null;
+
     protected $queryString = [
         'server',
     ];
     public function mount()
     {
         $this->parameters = get_route_parameters();
+        if (isDev()) {
+            $this->existingPostgresqlUrl = 'postgres://coolify:password@coolify-db:5432';
+        }
     }
 
-    public function set_type(string $type)
+    // public function addExistingPostgresql()
+    // {
+    //     try {
+    //         instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
+    //         $this->emit('success', 'Successfully connected to the database.');
+    //     } catch (\Exception $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->set_server($server);
+            $this->setServer($server);
             if (count($server->destinations()) === 1) {
-                $this->set_destination($server->destinations()->first()->uuid);
+                $this->setDestination($server->destinations()->first()->uuid);
             }
         }
         if (!is_null($this->server)) {
             $foundServer = $this->servers->where('id', $this->server)->first();
             if ($foundServer) {
-                return $this->set_server($foundServer);
+                return $this->setServer($foundServer);
             }
         }
         $this->current_step = 'servers';
     }
 
-    public function set_server(Server $server)
+    public function setServer(Server $server)
     {
         $this->server_id = $server->id;
         $this->standaloneDockers = $server->standaloneDockers;
@@ -57,7 +75,7 @@ class Select extends Component
         $this->current_step = 'destinations';
     }
 
-    public function set_destination(string $destination_uuid)
+    public function setDestination(string $destination_uuid)
     {
         $this->destination_uuid = $destination_uuid;
         redirect()->route('project.resources.new', [

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

@@ -2,6 +2,8 @@
 
 namespace App\Http\Livewire\Server\New;
 
+use App\Enums\ProxyStatus;
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -67,6 +69,11 @@ class ByIp extends Component
                 'port' => $this->port,
                 'team_id' => currentTeam()->id,
                 'private_key_id' => $this->private_key_id,
+                'proxy' => [
+                    "type" => ProxyTypes::TRAEFIK_V2->value,
+                    "status" => ProxyStatus::EXITED->value,
+                ]
+
             ]);
             $server->settings->is_part_of_swarm = $this->is_part_of_swarm;
             $server->settings->save();

app/Http/Livewire/Server/Proxy.php

@@ -12,7 +12,7 @@ class Proxy extends Component
 {
     public Server $server;
 
-    public ProxyTypes $selectedProxy = ProxyTypes::TRAEFIK_V2;
+    public ?string $selectedProxy = null;
     public $proxy_settings = null;
     public string|null $redirect_url = null;
 
@@ -20,6 +20,7 @@ class Proxy extends Component
 
     public function mount()
     {
+        $this->selectedProxy = $this->server->proxy->type;
         $this->redirect_url = $this->server->proxy->redirect_url;
     }
 
@@ -35,11 +36,12 @@ class Proxy extends Component
         $this->emit('proxyStatusUpdated');
     }
 
-    public function select_proxy(ProxyTypes $proxy_type)
+    public function select_proxy($proxy_type)
     {
         $this->server->proxy->type = $proxy_type;
         $this->server->proxy->status = 'exited';
         $this->server->save();
+        $this->selectedProxy = $this->server->proxy->type;
         $this->emit('proxyStatusUpdated');
     }
 

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

@@ -32,16 +32,19 @@ class Create extends Component
                 "custom_port" => 'required|int',
                 "is_system_wide" => 'required|bool',
             ]);
-            $github_app = GithubApp::create([
+            $payload = [
                 'name' => $this->name,
                 'organization' => $this->organization,
                 'api_url' => $this->api_url,
                 'html_url' => $this->html_url,
                 'custom_user' => $this->custom_user,
                 'custom_port' => $this->custom_port,
-                'is_system_wide' => $this->is_system_wide,
                 'team_id' => currentTeam()->id,
-            ]);
+            ];
+            if (isCloud()) {
+                $payload['is_system_wide'] = $this->is_system_wide;
+            }
+            $github_app = GithubApp::create($payload);
             if (session('from')) {
                 session(['from' => session('from') + ['source_id' => $github_app->id]]);
             }

app/Http/Livewire/Subscription/PricingPlans.php

@@ -47,6 +47,9 @@ class PricingPlans extends Component
             'tax_id_collection' => [
                 'enabled' => true,
             ],
+            'automatic_tax' => [
+                'enabled' => true,
+            ],
             'mode' => 'subscription',
             'success_url' => route('dashboard', ['success' => true]),
             'cancel_url' => route('subscription.index', ['cancelled' => true]),

app/Http/Middleware/CheckForcePasswordReset.php

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

app/Jobs/ApplicationDeploymentJob.php

@@ -66,12 +66,7 @@ class ApplicationDeploymentJob implements ShouldQueue
     private $log_model;
     private Collection $saved_outputs;
 
-    public function middleware(): array
-    {
-        return [
-            (new WithoutOverlapping("dockerimagejobs"))->shared(),
-        ];
-    }
+    public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
         ray()->clearScreen();
@@ -181,8 +176,8 @@ class ApplicationDeploymentJob implements ShouldQueue
                 $this->execute_in_builder("echo '$dockerfile_base64' | base64 -d > $this->workdir/Dockerfile")
             ],
         );
-        $this->build_image_name = "{$this->application->git_repository}:build";
-        $this->production_image_name = "{$this->application->uuid}:latest";
+        $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->generate_compose_file();
         $this->generate_build_env_variables();
@@ -206,8 +201,8 @@ class ApplicationDeploymentJob implements ShouldQueue
             $tag = $tag->substr(0, 128);
         }
 
-        $this->build_image_name = "{$this->application->git_repository}:{$tag}-build";
-        $this->production_image_name = "{$this->application->uuid}:{$tag}";
+        $this->build_image_name = Str::lower("{$this->application->git_repository}:{$tag}-build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:{$tag}");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
 
         if (!$this->force_rebuild) {
@@ -242,7 +237,7 @@ class ApplicationDeploymentJob implements ShouldQueue
     }
     private function health_check()
     {
-        ray('New container name: ',$this->container_name);
+        ray('New container name: ', $this->container_name);
         if ($this->container_name) {
             $counter = 0;
             $this->execute_remote_command(
@@ -264,7 +259,7 @@ class ApplicationDeploymentJob implements ShouldQueue
                 );
                 $this->execute_remote_command(
                     [
-                        "echo 'New application version health check status: {$this->saved_outputs->get('health_check')}'"
+                        "echo 'New version health check status: {$this->saved_outputs->get('health_check')}'"
                     ],
                 );
                 if (Str::of($this->saved_outputs->get('health_check'))->contains('healthy')) {
@@ -282,8 +277,8 @@ class ApplicationDeploymentJob implements ShouldQueue
     }
     private function deploy_pull_request()
     {
-        $this->build_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}-build";
-        $this->production_image_name = "{$this->application->uuid}:pr-{$this->pull_request_id}";
+        $this->build_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}-build");
+        $this->production_image_name = Str::lower("{$this->application->uuid}:pr-{$this->pull_request_id}");
         ray('Build Image Name: ' . $this->build_image_name . ' & Production Image Name: ' . $this->production_image_name)->green();
         $this->execute_remote_command([
             "echo 'Starting pull request (#{$this->pull_request_id}) deployment of {$this->application->git_repository}:{$this->application->git_branch}.'",
@@ -304,12 +299,19 @@ class ApplicationDeploymentJob implements ShouldQueue
 
     private function prepare_builder_image()
     {
+        $pull = "--pull=always";
+        if (isDev()) {
+            $pull = "--pull=never";
+        }
+        $helperImage = config('coolify.helper_image');
+        $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host  --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+
         $this->execute_remote_command(
             [
-                "echo -n 'Pulling latest version of the builder image (ghcr.io/coollabsio/coolify-helper).'",
+                "echo -n 'Pulling helper image from $helperImage.'",
             ],
             [
-                "docker run --pull=always -d --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/coollabsio/coolify-helper",
+                $runCommand,
                 "hidden" => true,
             ],
             [
@@ -494,7 +496,7 @@ class ApplicationDeploymentJob implements ShouldQueue
             ],
             'networks' => [
                 $this->destination->network => [
-                    'external' => false,
+                    'external' => true,
                     'name' => $this->destination->network,
                     'attachable' => true,
                 ]
@@ -654,12 +656,12 @@ class ApplicationDeploymentJob implements ShouldQueue
     private function build_image()
     {
         $this->execute_remote_command([
-            "echo -n 'Building docker image.'",
+            "echo -n 'Building docker image for your application.'",
         ]);
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -692,12 +694,12 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     $this->execute_in_builder("echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
             $this->execute_remote_command([
-                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                $this->execute_in_builder("docker build --network host -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
@@ -706,7 +708,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
     {
         if ($this->currently_running_container_name) {
             $this->execute_remote_command(
-                ["echo -n 'Removing old application version.'"],
+                ["echo -n 'Removing old version of your application.'"],
                 [$this->execute_in_builder("docker rm -f $this->currently_running_container_name >/dev/null 2>&1"), "hidden" => true],
             );
         }

app/Jobs/DatabaseBackupJob.php

@@ -77,7 +77,7 @@ class DatabaseBackupJob implements ShouldQueue
                 $ip = Str::slug($this->server->ip);
                 $this->backup_dir = backup_dir() . "/coolify" . "/coolify-db-$ip";
             }
-            $this->backup_file = "/dumpall-" . Carbon::now()->timestamp . ".sql";
+            $this->backup_file = "/pg_dump-" . Carbon::now()->timestamp . ".dump";
             $this->backup_location = $this->backup_dir . $this->backup_file;
 
             $this->backup_log = ScheduledDatabaseBackupExecution::create([
@@ -107,7 +107,7 @@ class DatabaseBackupJob implements ShouldQueue
         try {
             ray($this->backup_dir);
             $commands[] = "mkdir -p " . $this->backup_dir;
-            $commands[] = "docker exec $this->container_name pg_dumpall -U {$this->database->postgres_user} > $this->backup_location";
+            $commands[] = "docker exec $this->container_name pg_dump -Fc -U {$this->database->postgres_user} > $this->backup_location";
 
             $this->backup_output = instant_remote_process($commands, $this->server);
 

app/Jobs/DockerCleanupJob.php

@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -9,7 +10,6 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
 use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Str;
 
 class DockerCleanupJob implements ShouldQueue
 {
@@ -30,6 +30,11 @@ class DockerCleanupJob implements ShouldQueue
     }
     public function handle(): void
     {
+        $queue = ApplicationDeploymentQueue::where('status', '==', 'in_progress')->get();
+        if ($queue->count() > 0) {
+            ray('DockerCleanupJob: ApplicationDeploymentQueue is not empty, skipping')->color('orange');
+            return;
+        }
         try {
             ray()->showQueries()->color('orange');
             $servers = Server::all();

app/Jobs/SendMessageToTelegramJob.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Http;
+use Str;
+
+class SendMessageToTelegramJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * The number of times the job may be attempted.
+     *
+     * @var int
+     */
+    public $tries = 5;
+
+    /**
+     * The maximum number of unhandled exceptions to allow before failing.
+     */
+    public int $maxExceptions = 3;
+
+    public function __construct(
+        public string $text,
+        public array $buttons,
+        public string $token,
+        public string $chatId,
+    ) {
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $url = 'https://api.telegram.org/bot' . $this->token . '/sendMessage';
+        $inlineButtons = [];
+        if (!empty($this->buttons)) {
+            foreach ($this->buttons as $button) {
+                $buttonUrl = data_get($button, 'url');
+                if ($buttonUrl && Str::contains($buttonUrl, 'http://localhost')) {
+                    $buttonUrl = str_replace('http://localhost', config('app.url'), $buttonUrl);
+                }
+                $inlineButtons[] = [
+                    'text' => $button['text'],
+                    'url' => $buttonUrl,
+                ];
+            }
+        }
+        $payload = [
+            'parse_mode' => 'markdown',
+            'reply_markup' => json_encode([
+                'inline_keyboard' => [
+                    [...$inlineButtons],
+                ],
+            ]),
+            'chat_id' => $this->chatId,
+            'text' => $this->text,
+        ];
+        ray($payload);
+        $response = Http::post($url, $payload);
+        if ($response->failed()) {
+            throw new \Exception('Telegram notification failed with ' . $response->status() . ' status code.' . $response->body());
+        }
+    }
+}

app/Models/ApplicationPreview.php

@@ -4,15 +4,7 @@ namespace App\Models;
 
 class ApplicationPreview extends BaseModel
 {
-    protected $fillable = [
-        'uuid',
-        'pull_request_id',
-        'pull_request_html_url',
-        'pull_request_issue_comment_id',
-        'fqdn',
-        'status',
-        'application_id',
-    ];
+    protected $guarded = [];
 
     static function findPreviewByApplicationAndPullId(int $application_id, int $pull_request_id)
     {

app/Models/Team.php

@@ -24,6 +24,14 @@ class Team extends Model implements SendsDiscord, SendsEmail
         return data_get($this, 'discord_webhook_url', null);
     }
 
+    public function routeNotificationForTelegram()
+    {
+        return [
+            "token" => data_get($this, 'telegram_token', null),
+            "chat_id" => data_get($this, 'telegram_chat_id', null)
+        ];
+    }
+
     public function getRecepients($notification)
     {
         $recipients = data_get($notification, 'emails', null);

app/Notifications/Application/DeploymentFailed.php

@@ -18,15 +18,15 @@ class DeploymentFailed extends Notification implements ShouldQueue
 
     public Application $application;
     public string $deployment_uuid;
-    public ApplicationPreview|null $preview;
+    public ?ApplicationPreview $preview = null;
 
     public string $application_name;
-    public string|null $deployment_url = null;
+    public ?string $deployment_url = null;
     public string $project_uuid;
     public string $environment_name;
-    public string|null $fqdn;
+    public ?string $fqdn = null;
 
-    public function __construct(Application $application, string $deployment_uuid, ApplicationPreview|null $preview)
+    public function __construct(Application $application, string $deployment_uuid, ?ApplicationPreview $preview = null)
     {
         $this->application = $application;
         $this->deployment_uuid = $deployment_uuid;
@@ -43,19 +43,7 @@ class DeploymentFailed extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = isEmailEnabled($notifiable);
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_deployments');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_deployments');
-
-        if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-            $channels[] = EmailChannel::class;
-        }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'deployments');
     }
 
     public function toMail(): MailMessage
@@ -67,9 +55,8 @@ class DeploymentFailed extends Notification implements ShouldQueue
             $mail->subject('❌ Deployment failed of ' . $this->application_name . '.');
         } else {
             $fqdn = $this->preview->fqdn;
-            $mail->subject('❌ Pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . ' deployment failed.');
+            $mail->subject('❌ Deployment failed of pull request #' . $this->preview->pull_request_id . ' of ' . $this->application_name . '.');
         }
-
         $mail->view('emails.application-deployment-failed', [
             'name' => $this->application_name,
             'fqdn' => $fqdn,
@@ -90,4 +77,19 @@ class DeploymentFailed extends Notification implements ShouldQueue
         }
         return $message;
     }
+    public function toTelegram(): array
+    {
+        if ($this->preview) {
+            $message = '❌ Pull request #' . $this->preview->pull_request_id . ' of **' . $this->application_name . '** (' . $this->preview->fqdn . ') deployment failed: ';
+        } else {
+            $message = '❌ Deployment failed of **' . $this->application_name . '** (' . $this->fqdn . '): ';
+        }
+        return [
+            "message" => $message,
+            "buttons" => [
+                "text" => "View Deployment Logs",
+                "url" => $this->deployment_url
+            ],
+        ];
+    }
 }

app/Notifications/Application/DeploymentSuccess.php

@@ -43,19 +43,7 @@ class DeploymentSuccess extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = data_get($notifiable, 'smtp_enabled');
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_deployments');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_deployments');
-
-        if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-            $channels[] = EmailChannel::class;
-        }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'deployments');
     }
 
     public function toMail(): MailMessage
@@ -99,4 +87,34 @@ class DeploymentSuccess extends Notification implements ShouldQueue
         }
         return $message;
     }
+    public function toTelegram(): array
+    {
+        if ($this->preview) {
+            $message = '✅ New PR' . $this->preview->pull_request_id . ' version successfully deployed of ' . $this->application_name . '';
+            if ($this->preview->fqdn) {
+                $buttons[] = [
+                    "text" => "Open Application",
+                    "url" => $this->preview->fqdn
+                ];
+            }
+        } else {
+            $message = '✅ New version successfully deployed of ' . $this->application_name . '';
+            if ($this->fqdn) {
+                $buttons[] = [
+                    "text" => "Open Application",
+                    "url" => $this->fqdn
+                ];
+            }
+        }
+        $buttons[] = [
+            "text" => "Deployment logs",
+            "url" => $this->deployment_url
+        ];
+        return [
+            "message" => $message,
+            "buttons" => [
+                ...$buttons
+            ],
+        ];
+    }
 }

app/Notifications/Application/StatusChanged.php

@@ -37,19 +37,7 @@ class StatusChanged extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = data_get($notifiable, 'smtp_enabled');
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_status_changes');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_status_changes');
-
-        if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-            $channels[] = EmailChannel::class;
-        }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'status_changes');
     }
 
     public function toMail(): MailMessage
@@ -70,7 +58,20 @@ class StatusChanged extends Notification implements ShouldQueue
         $message = '⛔ ' . $this->application_name . ' has been stopped.
 
 ';
-        $message .= '[Application URL](' . $this->application_url . ')';
+        $message .= '[Open Application in Coolify](' . $this->application_url . ')';
         return $message;
     }
+    public function toTelegram(): array
+    {
+        $message = '⛔ ' . $this->application_name . ' has been stopped.';
+        return [
+            "message" => $message,
+            "buttons" => [
+                [
+                    "text" => "Open Application in Coolify",
+                    "url" => $this->application_url
+                ]
+            ],
+        ];
+    }
 }

app/Notifications/Channels/EmailChannel.php

@@ -9,7 +9,6 @@ use Illuminate\Support\Facades\Mail;
 
 class EmailChannel
 {
-    private bool $isResend = false;
     public function send(SendsEmail $notifiable, Notification $notification): void
     {
         $this->bootConfigs($notifiable);
@@ -20,35 +19,14 @@ class EmailChannel
         }
 
         $mailMessage = $notification->toMail($notifiable);
-        if ($this->isResend) {
-            foreach ($recepients as $receipient) {
-                Mail::send(
-                    [],
-                    [],
-                    fn (Message $message) => $message
-                        ->from(
-                            data_get($notifiable, 'smtp_from_address'),
-                            data_get($notifiable, 'smtp_from_name'),
-                        )
-                        ->to($receipient)
-                        ->subject($mailMessage->subject)
-                        ->html((string)$mailMessage->render())
-                );
-            }
-        } else {
-            Mail::send(
-                [],
-                [],
-                fn (Message $message) => $message
-                    ->from(
-                        data_get($notifiable, 'smtp_from_address'),
-                        data_get($notifiable, 'smtp_from_name'),
-                    )
-                    ->bcc($recepients)
-                    ->subject($mailMessage->subject)
-                    ->html((string)$mailMessage->render())
-            );
-        }
+        Mail::send(
+            [],
+            [],
+            fn (Message $message) => $message
+                ->to($recepients)
+                ->subject($mailMessage->subject)
+                ->html((string)$mailMessage->render())
+        );
     }
 
     private function bootConfigs($notifiable): void
@@ -58,13 +36,11 @@ class EmailChannel
             if (!$type) {
                 throw new Exception('No email settings found.');
             }
-            if ($type === 'resend') {
-                $this->isResend = true;
-            }
             return;
         }
+        config()->set('mail.from.address', data_get($notifiable, 'smtp_from_address'));
+        config()->set('mail.from.name', data_get($notifiable, 'smtp_from_name'));
         if (data_get($notifiable, 'resend_enabled')) {
-            $this->isResend = true;
             config()->set('mail.default', 'resend');
             config()->set('resend.api_key', data_get($notifiable, 'resend_api_key'));
         }

app/Notifications/Channels/SendsTelegram.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Notifications\Channels;
+
+interface SendsTelegram
+{
+    public function routeNotificationForTelegram();
+    
+}

app/Notifications/Channels/TelegramChannel.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Notifications\Channels;
+
+use App\Jobs\SendMessageToTelegramJob;
+
+class TelegramChannel
+{
+    public function send($notifiable, $notification): void
+    {
+        $data = $notification->toTelegram($notifiable);
+        $telegramData = $notifiable->routeNotificationForTelegram();
+
+        $message = data_get($data, 'message');
+        $buttons = data_get($data, 'buttons', []);
+        ray($message, $buttons);
+        $telegramToken = data_get($telegramData, 'token');
+        $chatId = data_get($telegramData, 'chat_id');
+
+        if (!$telegramToken || !$chatId || !$message) {
+            throw new \Exception('Telegram token, chat id and message are required');
+        }
+        dispatch(new SendMessageToTelegramJob($message, $buttons, $telegramToken, $chatId));
+    }
+}

app/Notifications/Channels/TransactionalEmailChannel.php

@@ -12,7 +12,6 @@ use Log;
 
 class TransactionalEmailChannel
 {
-    private bool $isResend = false;
     public function send(User $notifiable, Notification $notification): void
     {
         $settings = InstanceSettings::get();
@@ -26,33 +25,14 @@ class TransactionalEmailChannel
         }
         $this->bootConfigs();
         $mailMessage = $notification->toMail($notifiable);
-        if ($this->isResend) {
-            Mail::send(
-                [],
-                [],
-                fn (Message $message) => $message
-                    ->from(
-                        data_get($settings, 'smtp_from_address'),
-                        data_get($settings, 'smtp_from_name'),
-                    )
-                    ->to($email)
-                    ->subject($mailMessage->subject)
-                    ->html((string)$mailMessage->render())
-            );
-        } else {
-            Mail::send(
-                [],
-                [],
-                fn (Message $message) => $message
-                    ->from(
-                        data_get($settings, 'smtp_from_address'),
-                        data_get($settings, 'smtp_from_name'),
-                    )
-                    ->bcc($email)
-                    ->subject($mailMessage->subject)
-                    ->html((string)$mailMessage->render())
-            );
-        }
+        Mail::send(
+            [],
+            [],
+            fn (Message $message) => $message
+                ->to($email)
+                ->subject($mailMessage->subject)
+                ->html((string)$mailMessage->render())
+        );
     }
 
     private function bootConfigs(): void
@@ -61,8 +41,5 @@ class TransactionalEmailChannel
         if (!$type) {
             throw new Exception('No email settings found.');
         }
-        if ($type === 'resend') {
-            $this->isResend = true;
-        }
     }
 }

app/Notifications/Database/BackupFailed.php

@@ -14,42 +14,41 @@ class BackupFailed extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public string $message = 'Backup FAILED';
-
+    public string $name;
+    public string $frequency;
 
     public function __construct(ScheduledDatabaseBackup $backup, public $database, public $output)
     {
-        $this->message = "❌ Database backup for {$database->name} with frequency of $backup->frequency was FAILED.\n\nReason: $output";
+        $this->name = $database->name;
+        $this->frequency = $backup->frequency;
     }
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = isEmailEnabled($notifiable);
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_database_backups');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_database_backups');
-
-        if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-            $channels[] = EmailChannel::class;
-        }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        ray($channels);
-        return $channels;
+        return setNotificationChannels($notifiable, 'database_backups');
     }
 
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("❌ Backup FAILED for {$this->database->name}");
-        $mail->line($this->message);
+        $mail->subject("❌ [ACTION REQUIRED] Backup FAILED for {$this->database->name}");
+        $mail->view('emails.backup-failed', [
+            'name' => $this->name,
+            'frequency' => $this->frequency,
+            'output' => $this->output,
+        ]);
         return $mail;
     }
 
     public function toDiscord(): string
     {
-        return $this->message;
+        return "❌ Database backup for {$this->name} with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+    }
+    public function toTelegram(): array
+    {
+        $message = "❌ Database backup for {$this->name} with frequency of {$this->frequency} was FAILED.\n\nReason: {$this->output}";
+        return [
+            "message" => $message,
+        ];
     }
 }

app/Notifications/Database/BackupSuccess.php

@@ -14,41 +14,40 @@ class BackupSuccess extends Notification implements ShouldQueue
 {
     use Queueable;
 
-    public string $message = 'Backup Success';
-
+    public string $name;
+    public string $frequency;
 
     public function __construct(ScheduledDatabaseBackup $backup, public $database)
     {
-        $this->message = "✅ Database backup for {$database->name} with frequency of $backup->frequency was successful.";
+        $this->name = $database->name;
+        $this->frequency = $backup->frequency;
     }
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = isEmailEnabled($notifiable);
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_database_backups');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_database_backups');
-
-        if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-            $channels[] = EmailChannel::class;
-        }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'database_backups');
     }
 
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("✅ Backup success for {$this->database->name}");
-        $mail->line($this->message);
+        $mail->subject("✅ Backup successfully done for {$this->database->name}");
+        $mail->view('emails.backup-success', [
+            'name' => $this->name,
+            'frequency' => $this->frequency,
+        ]);
         return $mail;
     }
 
     public function toDiscord(): string
     {
-        return $this->message;
+        return "✅ Database backup for {$this->name} with frequency of {$this->frequency} was successful.";
+    }
+    public function toTelegram(): array
+    {
+        $message = "✅ Database backup for {$this->name} with frequency of {$this->frequency} was successful.";
+        return [
+            "message" => $message,
+        ];
     }
 }

app/Notifications/Internal/GeneralNotification.php

@@ -3,6 +3,7 @@
 namespace App\Notifications\Internal;
 
 use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\TelegramChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Notification;
@@ -12,16 +13,22 @@ class GeneralNotification extends Notification implements ShouldQueue
     use Queueable;
 
     public function __construct(public string $message)
-    {}
+    {
+    }
 
     public function via(object $notifiable): array
     {
-        $channels[] = DiscordChannel::class;
-        return $channels;
+        return [TelegramChannel::class, DiscordChannel::class];
     }
 
     public function toDiscord(): string
     {
         return $this->message;
     }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => $this->message,
+        ];
+    }
 }

app/Notifications/Server/NotReachable.php

@@ -22,19 +22,7 @@ class NotReachable extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = isEmailEnabled($notifiable);
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-        $isSubscribedToEmailEvent = data_get($notifiable, 'smtp_notifications_status_changes');
-        $isSubscribedToDiscordEvent = data_get($notifiable, 'discord_notifications_status_changes');
-
-        // if ($isEmailEnabled && $isSubscribedToEmailEvent) {
-        //     $channels[] = EmailChannel::class;
-        // }
-        if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
-            $channels[] = DiscordChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'status_changes');
     }
 
     public function toMail(): MailMessage
@@ -55,4 +43,10 @@ class NotReachable extends Notification implements ShouldQueue
         $message = '⛔ Server \'' . $this->server->name . '\' is unreachable (could be a temporary issue). If you receive this more than twice in a row, please check your server.';
         return $message;
     }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => '⛔ Server \'' . $this->server->name . '\' is unreachable (could be a temporary issue). If you receive this more than twice in a row, please check your server.'
+        ];
+    }
 }

app/Notifications/Test.php

@@ -4,6 +4,7 @@ namespace App\Notifications;
 
 use App\Notifications\Channels\DiscordChannel;
 use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
@@ -19,24 +20,13 @@ class Test extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        $channels = [];
-        $isEmailEnabled = isEmailEnabled($notifiable);
-        $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
-
-        if ($isDiscordEnabled && empty($this->emails)) {
-            $channels[] = DiscordChannel::class;
-        }
-
-        if ($isEmailEnabled && !empty($this->emails)) {
-            $channels[] = EmailChannel::class;
-        }
-        return $channels;
+        return setNotificationChannels($notifiable, 'test');
     }
 
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject("Coolify Test Notification");
+        $mail->subject("Test Email");
         $mail->view('emails.test');
         return $mail;
     }
@@ -48,4 +38,16 @@ class Test extends Notification implements ShouldQueue
         $message .= '[Go to your dashboard](' . base_url() . ')';
         return $message;
     }
+    public function toTelegram(): array
+    {
+        return [
+            "message" => 'This is a test Telegram notification from Coolify.',
+            "buttons" => [
+                [
+                    "text" => "Go to your dashboard",
+                    "url" => 'https://coolify.io'
+                ]
+            ],
+        ];
+    }
 }

app/Notifications/TransactionalEmails/InvitationLink.php

@@ -20,16 +20,19 @@ class InvitationLink extends Notification implements ShouldQueue
         return [TransactionalEmailChannel::class];
     }
 
-    public function toMail(User $user): MailMessage
+    public function __construct(public User $user)
     {
-        $invitation = TeamInvitation::whereEmail($user->email)->first();
+    }
+    public function toMail(): MailMessage
+    {
+        $invitation = TeamInvitation::whereEmail($this->user->email)->first();
         $invitation_team = Team::find($invitation->team->id);
 
         $mail = new MailMessage();
         $mail->subject('Invitation for ' . $invitation_team->name);
         $mail->view('emails.invitation-link', [
             'team' => $invitation_team->name,
-            'email' => $user->email,
+            'email' => $this->user->email,
             'invitation_link' => $invitation->link,
         ]);
         return $mail;

app/Notifications/TransactionalEmails/ResetPassword.php

@@ -50,10 +50,6 @@ class ResetPassword extends Notification
     protected function buildMailMessage($url)
     {
         $mail = new MailMessage();
-        $mail->from(
-            data_get($this->settings, 'smtp_from_address'),
-            data_get($this->settings, 'smtp_from_name'),
-        );
         $mail->subject('Reset Password');
         $mail->view('emails.reset-password', ['url' => $url, 'count' => config('auth.passwords.' . config('auth.defaults.passwords') . '.expire')]);
         return $mail;

app/Notifications/TransactionalEmails/Test.php

@@ -24,7 +24,7 @@ class Test extends Notification implements ShouldQueue
     public function toMail(): MailMessage
     {
         $mail = new MailMessage();
-        $mail->subject('Test Notification');
+        $mail->subject('Test Email');
         $mail->view('emails.test');
         return $mail;
     }

bootstrap/helpers/docker.php

@@ -86,7 +86,7 @@ function getContainerStatus(Server $server, string $container_id, bool $all_data
 
 function generateApplicationContainerName(string $uuid, int $pull_request_id = 0)
 {
-    $now = now()->format('YmdHis');
+    $now = now()->format('Hisu');
     if ($pull_request_id !== 0 && $pull_request_id !== null) {
         return $uuid . '-pr-' . $pull_request_id . '-' . $now;
     } else {

bootstrap/helpers/remoteProcess.php

@@ -77,6 +77,7 @@ function generate_ssh_command(string $private_key_location, string $server_ip, s
     if ($isMux && config('coolify.mux_enabled')) {
         $ssh_command .= '-o ControlMaster=auto -o ControlPersist=1m -o ControlPath=/var/www/html/storage/app/ssh/mux/%h_%p_%r ';
     }
+    $command = "PATH=\$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin && $command";
     $ssh_command .= "-i {$private_key_location} "
         . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null '
         . '-o PasswordAuthentication=no '
@@ -92,7 +93,18 @@ function generate_ssh_command(string $private_key_location, string $server_ip, s
 
     return $ssh_command;
 }
-
+function instantCommand(string $command, $throwError = true) {
+    $process = Process::run($command);
+    $output = trim($process->output());
+    $exitCode = $process->exitCode();
+    if ($exitCode !== 0) {
+        if (!$throwError) {
+            return null;
+        }
+        throw new \RuntimeException($process->errorOutput(), $exitCode);
+    }
+    return $output;
+}
 function instant_remote_process(array $command, Server $server, $throwError = true, $repeat = 1)
 {
     $command_string = implode("\n", $command);
@@ -216,3 +228,29 @@ function check_server_connection(Server $server)
         $server->save();
     }
 }
+
+function checkRequiredCommands(Server $server)
+{
+    $commands = collect(["jq", "jc"]);
+    foreach ($commands as $command) {
+        $commandFound = instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'command -v {$command}'"], $server, false);
+        if ($commandFound) {
+            ray($command . ' found');
+            continue;
+        }
+        try {
+            instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'apt update && apt install -y {$command}'"], $server);
+        } catch (\Exception $e) {
+            ray('could not install ' . $command);
+            ray($e);
+            break;
+        }
+        $commandFound = instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'command -v {$command}'"], $server, false);
+        if ($commandFound) {
+            ray($command . ' found');
+            continue;
+        }
+        ray('could not install ' . $command);
+        break;
+    }
+}

bootstrap/helpers/shared.php

@@ -2,12 +2,14 @@
 
 use App\Models\InstanceSettings;
 use App\Models\Team;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\EmailChannel;
+use App\Notifications\Channels\TelegramChannel;
 use App\Notifications\Internal\GeneralNotification;
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use Illuminate\Database\QueryException;
 use Illuminate\Mail\Message;
 use Illuminate\Notifications\Messages\MailMessage;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Route;
@@ -149,6 +151,8 @@ function set_transanctional_email_settings(InstanceSettings | null $settings = n
     if (!$settings) {
         $settings = InstanceSettings::get();
     }
+    config()->set('mail.from.address', data_get($settings, 'smtp_from_address'));
+    config()->set('mail.from.name', data_get($settings, 'smtp_from_name'));
     if (data_get($settings, 'resend_enabled')) {
         config()->set('mail.default', 'resend');
         config()->set('resend.api_key', data_get($settings, 'resend_api_key'));
@@ -241,9 +245,9 @@ function validate_cron_expression($expression_to_validate): bool
 function send_internal_notification(string $message): void
 {
     try {
-        $baseUrl = base_url(false);
+        $baseUrl = config('app.name');
         $team = Team::find(0);
-        $team->notify(new GeneralNotification("👀 Internal notifications from {$baseUrl}: " . $message));
+        $team->notify(new GeneralNotification("👀 {$baseUrl}: " . $message));
     } catch (\Throwable $th) {
         ray($th->getMessage());
     }
@@ -259,17 +263,32 @@ function send_user_an_email(MailMessage $mail, string $email): void
         [],
         [],
         fn (Message $message) => $message
-            ->from(
-                data_get($settings, 'smtp_from_address'),
-                data_get($settings, 'smtp_from_name')
-            )
             ->to($email)
             ->subject($mail->subject)
             ->html((string) $mail->render())
     );
-
 }
 function isEmailEnabled($notifiable)
 {
     return data_get($notifiable, 'smtp_enabled') || data_get($notifiable, 'resend_enabled') || data_get($notifiable, 'use_instance_email_settings');
 }
+function setNotificationChannels($notifiable, $event)
+{
+    $channels = [];
+    $isEmailEnabled = isEmailEnabled($notifiable);
+    $isDiscordEnabled = data_get($notifiable, 'discord_enabled');
+    $isTelegramEnabled = data_get($notifiable, 'telegram_enabled');
+    $isSubscribedToDiscordEvent = data_get($notifiable, "discord_notifications_$event");
+    $isSubscribedToTelegramEvent = data_get($notifiable, "telegram_notifications_$event");
+
+    if ($isDiscordEnabled && $isSubscribedToDiscordEvent) {
+        $channels[] = DiscordChannel::class;
+    }
+    if ($isEmailEnabled) {
+        $channels[] = EmailChannel::class;
+    }
+    if ($isTelegramEnabled && $isSubscribedToTelegramEvent) {
+        $channels[] = TelegramChannel::class;
+    }
+    return $channels;
+}

bootstrap/helpers/subscriptions.php

@@ -47,6 +47,9 @@ function getEndDate()
 
 function isSubscriptionActive()
 {
+    if (!isCloud()) {
+        return false;
+    }
     $team = currentTeam();
     if (!$team) {
         return false;

composer.json

@@ -15,6 +15,7 @@
         "laravel/fortify": "^v1.16.0",
         "laravel/framework": "^v10.7.1",
         "laravel/horizon": "^5.15",
+        "laravel/prompts": "^0.1.6",
         "laravel/sanctum": "^v3.2.1",
         "laravel/tinker": "^v2.8.1",
         "laravel/ui": "^4.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "dbb08df7a80c46ce2b9b9fa397ed71c1",
+    "content-hash": "0603276b60e77cd859fabacdaaf31550",
     "packages": [
         {
             "name": "aws/aws-crt-php",

config/app.php

@@ -17,7 +17,7 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Coolify'),
 
     /*
     |--------------------------------------------------------------------------

config/auth.php

@@ -94,7 +94,7 @@ return [
         'users' => [
             'provider' => 'users',
             'table' => 'password_reset_tokens',
-            'expire' => 60,
+            'expire' => 10,
             'throttle' => 60,
         ],
     ],

config/coolify.php

@@ -7,4 +7,5 @@ return [
     'mux_enabled' => env('MUX_ENABLED', true),
     'dev_webhook' => env('SERVEO_URL'),
     'base_config_path' => env('BASE_CONFIG_PATH', '/data/coolify'),
+    'helper_image' => env('HELPER_IMAGE', 'ghcr.io/coollabsio/coolify-helper:latest'),
 ];

config/sentry.php

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

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.22';
+return '4.0.0-beta.24';

database/migrations/2023_08_22_071054_add_stripe_reasons.php

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

database/migrations/2023_08_22_071055_add_discord_notifications_to_teams.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->boolean('telegram_enabled')->default(false);
+            $table->text('telegram_token')->nullable();
+            $table->text('telegram_chat_id')->nullable();
+            $table->boolean('telegram_notifications_test')->default(true);
+            $table->boolean('telegram_notifications_deployments')->default(true);
+            $table->boolean('telegram_notifications_status_changes')->default(true);
+            $table->boolean('telegram_notifications_database_backups')->default(true);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumn('telegram_enabled');
+            $table->dropColumn('telegram_token');
+            $table->dropColumn('telegram_chat_id');
+            $table->dropColumn('telegram_notifications_test');
+            $table->dropColumn('telegram_notifications_deployments');
+            $table->dropColumn('telegram_notifications_status_changes');
+            $table->dropColumn('telegram_notifications_database_backups');
+        });
+    }
+};

database/seeders/ProductionSeeder.php

@@ -45,7 +45,7 @@ class ProductionSeeder extends Seeder
             ]);
         }
 
-        if (config('app.name') !== 'coolify-cloud') {
+        if (config('app.name') !== 'Coolify Cloud') {
             // Save SSH Keys for the Coolify Host
             $coolify_key_name = "id.root@host.docker.internal";
             $coolify_key = Storage::disk('ssh-keys')->get("{$coolify_key_name}");

docker-compose.dev.yml

@@ -6,6 +6,7 @@ x-testing-host: &testing-host-base
     context: ./docker/testing-host
   networks:
     - coolify
+  init: true
 
 services:
   coolify:
@@ -53,6 +54,7 @@ services:
     <<: *testing-host-base
     container_name: coolify-testing-host
     volumes:
+      - /:/host
       - /var/run/docker.sock:/var/run/docker.sock
       - /data/coolify/:/data/coolify
   mailpit:

docker/coolify-helper/Dockerfile

@@ -2,15 +2,15 @@ FROM alpine:3.17
 
 ARG TARGETPLATFORM
 # https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=23.0.6
+ARG DOCKER_VERSION=24.0.5
 # https://github.com/docker/compose/releases
-ARG DOCKER_COMPOSE_VERSION=2.18.1
+ARG DOCKER_COMPOSE_VERSION=2.21.0
 # https://github.com/docker/buildx/releases
-ARG DOCKER_BUILDX_VERSION=0.10.5
+ARG DOCKER_BUILDX_VERSION=0.11.2
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=0.29.0
+ARG PACK_VERSION=0.30.0
 # https://github.com/railwayapp/nixpacks/releases
-ARG NIXPACKS_VERSION=1.12.0
+ARG NIXPACKS_VERSION=1.13.0
 
 USER root
 WORKDIR /artifacts
@@ -38,5 +38,5 @@ COPY --from=minio/mc /usr/bin/mc /usr/bin/mc
 RUN chmod +x /usr/bin/mc
 
 ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["sh", "-c", "while true; do sleep 1; done"]
+CMD ["tail", "-f", "/dev/null"]
 

docker/testing-host/Dockerfile

@@ -1,29 +1,28 @@
-FROM alpine:3.17
+FROM debian:12-slim
 
 ARG TARGETPLATFORM
 # https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=23.0.6
+ARG DOCKER_VERSION=24.0.5
 # https://github.com/docker/compose/releases
-ARG DOCKER_COMPOSE_VERSION=2.18.1
+ARG DOCKER_COMPOSE_VERSION=2.21.0
 # https://github.com/docker/buildx/releases
-ARG DOCKER_BUILDX_VERSION=0.10.5
+ARG DOCKER_BUILDX_VERSION=0.11.2
 # https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=0.29.0
+ARG PACK_VERSION=0.30.0
 # https://github.com/railwayapp/nixpacks/releases
-ARG NIXPACKS_VERSION=1.12.0
+ARG NIXPACKS_VERSION=1.13.0
 
 USER root
 WORKDIR /root
-RUN apk add --no-cache bash curl git git-lfs openssh-client openssh-server tar tini postgresql-client lsof
+ENV PATH "$PATH:/host/usr/local/sbin:/host/usr/local/bin:/host/usr/sbin:/host/usr/bin:/host/sbin:/host/bin"
+
+RUN apt update && apt -y install openssh-client openssh-server curl wget git jq jc
 RUN mkdir -p ~/.docker/cli-plugins
-RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
-    curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
-    curl -sSL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose && \
-    (curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar -C /usr/bin/ --no-same-owner -xzv --strip-components=1 docker/docker) && \
-    (curl -sSL https://github.com/buildpacks/pack/releases/download/v${PACK_VERSION}/pack-v${PACK_VERSION}-linux.tgz | tar -C /usr/local/bin/ --no-same-owner -xzv pack) && \
-    curl -sSL https://nixpacks.com/install.sh | bash && \
-    chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack /root/.docker/cli-plugins/docker-buildx \
-    ;fi
+RUN curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx
+RUN curl -sSL https://github.com/docker/compose/releases/download/v${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
+RUN (curl -sSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz | tar -C /usr/bin/ --no-same-owner -xzv --strip-components=1 docker/docker)
+RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /root/.docker/cli-plugins/docker-buildx
+
 
 # Setup sshd
 RUN ssh-keygen -A
@@ -32,6 +31,4 @@ RUN mkdir -p ~/.ssh
 RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuGmoeGq/pojrsyP1pszcNVuZx9iFkCELtxrh31QJ68 coolify@coolify-instance" >> ~/.ssh/authorized_keys
 
 EXPOSE 22
-ENTRYPOINT ["/sbin/tini", "--"]
 CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
-

resources/js/components/MagicBar.vue

@@ -593,7 +593,7 @@ async function redirect() {
             targetUrl.pathname = `/source/new`
             break;
         case 7:
-            targetUrl.pathname = `/private-key/new`
+            targetUrl.pathname = `/security/private-key/new`
             break;
         case 8:
             targetUrl.pathname = `/destination/new`
@@ -612,7 +612,7 @@ async function redirect() {
             targetUrl.pathname = `/servers`
             break;
         case 13:
-            targetUrl.pathname = `/private-keys`
+            targetUrl.pathname = `/security/private-key`
             break;
         case 14:
             targetUrl.pathname = `/projects`

resources/views/auth/login.blade.php

@@ -51,6 +51,11 @@
                             {{ session('status') }}
                         </div>
                     @endif
+                    @if (session('error'))
+                        <div class="mb-4 font-medium text-red-600">
+                            {{ session('error') }}
+                        </div>
+                    @endif
                 </form>
             </div>
         </div>

resources/views/components/emails/footer.blade.php

@@ -0,0 +1,6 @@
+{{ Illuminate\Mail\Markdown::parse('---') }}
+
+Thank you,<br>
+{{ config('app.name') ?? 'Coolify' }}
+
+{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://docs.coollabs.io)') }}

resources/views/components/emails/header.blade.php

@@ -0,0 +1 @@
+Hello,

resources/views/components/emails/layout.blade.php

@@ -0,0 +1,6 @@
+<x-emails.header />
+{{ Illuminate\Mail\Markdown::parse($slot) }}
+<x-emails.footer />
+
+
+

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

@@ -12,8 +12,8 @@
     @if ($attributes->get('type') === 'submit')
         <span wire:target="submit" wire:loading.delay class="loading loading-xs text-warning loading-spinner"></span>
     @else
-        @if ($attributes->has('wire:click'))
-            <span wire:target="{{ $attributes->get('wire:click') }}" wire:loading.delay
+        @if ($attributes->whereStartsWith('wire:click')->first())
+            <span wire:target="{{ $attributes->whereStartsWith('wire:click')->first() }}" wire:loading.delay
                 class="loading loading-xs loading-spinner"></span>
         @endif
     @endif

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

@@ -26,7 +26,8 @@
                 wire:model.defer={{ $id }} wire:dirty.class.remove='text-white'
                 wire:dirty.class="input-warning" wire:loading.attr="disabled" type="{{ $type }}"
                 @readonly($readonly) @disabled($disabled) id="{{ $id }}" name="{{ $name }}"
-                placeholder="{{ $attributes->get('placeholder') }}">
+                placeholder="{{ $attributes->get('placeholder') }}"
+                aria-placeholder="{{ $attributes->get('placeholder') }}">
 
         </div>
     @else

resources/views/components/helper.blade.php

@@ -5,8 +5,8 @@
                 d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
         </svg>
     </div>
-    <div class="absolute hidden text-xs rounded group-hover:block border-coolgray-400 bg-coolgray-500">
-        <div class="p-4 card-body">
+    <div class="absolute z-40 hidden text-xs rounded group-hover:block border-coolgray-400 bg-coolgray-500">
+        <div class="p-4">
             {!! $helper !!}
         </div>
     </div>

resources/views/components/modal.blade.php

@@ -43,10 +43,6 @@
             @endisset
             @if ($modalSubmit)
                 {{ $modalSubmit }}
-            @else
-                <x-forms.button onclick="{{ $modalId }}.close()" type="submit">
-                    Save
-                </x-forms.button>
             @endif
 
         </form>

resources/views/components/navbar.blade.php

@@ -50,6 +50,23 @@
                     </svg>
                 </a>
             </li>
+            <li title="Source">
+                <a class="hover:bg-transparent" href="{{ route('source.all') }}">
+                    <svg class="icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+                        <path fill="currentColor"
+                            d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" />
+                    </svg>
+                </a>
+            </li>
+            <li title="Security">
+                <a class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
+                    <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2"
+                            d="m16.555 3.843l3.602 3.602a2.877 2.877 0 0 1 0 4.069l-2.643 2.643a2.877 2.877 0 0 1-4.069 0l-.301-.301l-6.558 6.558a2 2 0 0 1-1.239.578L5.172 21H4a1 1 0 0 1-.993-.883L3 20v-1.172a2 2 0 0 1 .467-1.284l.119-.13L4 17h2v-2h2v-2l2.144-2.144l-.301-.301a2.877 2.877 0 0 1 0-4.069l2.643-2.643a2.877 2.877 0 0 1 4.069 0zM15 9h.01" />
+                    </svg>
+                </a>
+            </li>
             <li title="Teams">
                 <a class="hover:bg-transparent" href="{{ route('team.index') }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
@@ -64,6 +81,7 @@
                     </svg>
                 </a>
             </li>
+
             <div class="flex-1"></div>
             @if (isInstanceAdmin() && !isCloud())
                 <livewire:upgrade />
@@ -95,6 +113,20 @@
                     </a>
                 </li>
             @endif
+            @if (isSubscriptionActive() || isDev())
+                <li title="Help" class="mt-auto">
+                    <div class="justify-center icons" wire:click="help" onclick="help.showModal()">
+                        <svg class="{{ request()->is('help*') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
+                            xmlns="http://www.w3.org/2000/svg">
+                            <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                                stroke-width="2">
+                                <path d="M3 12a9 9 0 1 0 18 0a9 9 0 0 0-18 0m9 4v.01" />
+                                <path d="M12 13a2 2 0 0 0 .914-3.782a1.98 1.98 0 0 0-2.414.483" />
+                            </g>
+                        </svg>
+                    </div>
+                </li>
+            @endif
             <li class="pb-6" title="Logout">
                 <form action="/logout" method="POST" class=" hover:bg-transparent">
                     @csrf

resources/views/components/security/navbar.blade.php

@@ -0,0 +1,17 @@
+<div class="pb-6">
+    <h1>Security</h1>
+    <nav class="flex pt-2 pb-10">
+        <ol class="inline-flex items-center">
+            <li>
+                <div class="flex items-center">
+                    <span>Security related settings</span>
+                </div>
+            </li>
+        </ol>
+    </nav>
+    <nav class="navbar-main">
+        <a class="{{ request()->routeIs('security.private-key.index') ? 'text-white' : '' }}" href="{{ route('security.private-key.index') }}">
+            <button>Private Keys</button>
+        </a>
+    </nav>
+</div>

resources/views/emails/application-deployment-failed.blade.php

@@ -1,8 +1,11 @@
-@if ($pull_request_id !== 0)
-    Pull Request #{{ $pull_request_id }} of {{ $name }} (<a target="_blank"
-        href="{{ $fqdn }}">{{ $fqdn }}</a>) deployment failed:
-@else
-    Deployment failed of {{ $name }} (<a target="_blank" href="{{ $fqdn }}">{{ $fqdn }}</a>):
-@endif
+<x-emails.layout>
+    @if ($pull_request_id === 0)
+        Failed to deploy a new version of {{ $name }} at [{{ $fqdn }}]({{ $fqdn }}) .
+    @else
+        Failed to deploy a pull request #{{ $pull_request_id }} of {{ $name }} at
+        [{{ $fqdn }}]({{ $fqdn }}).
+    @endif
 
-<a target="_blank" href="{{ $deployment_url }}">View Deployment Logs</a><br><br>
+[View Deployment Logs]({{ $deployment_url }})
+
+</x-emails.layout>

resources/views/emails/application-deployment-success.blade.php

@@ -1,8 +1,10 @@
-@if ($pull_request_id === 0)
-    A new version of <a target="_blank" href="{{ $fqdn }}">{{ $fqdn }}</a> is available:
-@else
-    Pull request #{{ $pull_request_id }} of {{ $name }} deployed successfully: <a target="_blank"
-        href="{{ $fqdn }}">Application Link</a> |
-@endif
-<a target="_blank" href="{{ $deployment_url }}">View
-    Deployment Logs</a><br><br>
+<x-emails.layout>
+    @if ($pull_request_id === 0)
+        A new version of {{ $name }} is available at [{{ $fqdn }}]({{ $fqdn }}) .
+    @else
+        Pull request #{{ $pull_request_id }} of {{ $name }} deployed successfully [{{ $fqdn }}]({{ $fqdn }}).
+    @endif
+
+[View Deployment Logs]({{ $deployment_url }})
+
+</x-emails.layout>

resources/views/emails/application-status-changes.blade.php

@@ -1,2 +1,9 @@
-{{ $name }} has been stopped.<br><br>
-<a target="_blank" href="{{ $application_url }}">Open in Coolify</a><br><br>
+<x-emails.layout>
+
+{{ $name }} has been stopped.
+
+If it was your intention to stop this application, you can ignore this email.
+
+If not, [check what is going on]({{ $application_url }}).
+
+</x-emails.layout>

resources/views/emails/backup-failed.blade.php

@@ -0,0 +1,8 @@
+<x-emails.layout>
+Database backup for {{ $name }} with frequency of {{ $frequency }} was FAILED.
+
+### Reason
+
+{{ $output }}
+
+</x-emails.layout>

resources/views/emails/backup-success.blade.php

@@ -0,0 +1,3 @@
+<x-emails.layout>
+Database backup for {{ $name }} with frequency of {{ $frequency }} was successful.
+</x-emails.layout>

resources/views/emails/help.blade.php

@@ -0,0 +1,5 @@
+{{ $description }}
+
+{{ Illuminate\Mail\Markdown::parse('---') }}
+
+{{ Illuminate\Mail\Markdown::parse($debug) }}

resources/views/emails/invitation-link.blade.php

@@ -1,13 +1,11 @@
-Hello,<br><br>
+<x-emails.layout>
 
-You have been invited to "{{ $team }}" on "{{ config('app.name') }}".<br><br>
+You have been invited to "{{ $team }}" on "{{ config('app.name') }}".
 
-Please click here to accept the invitation: <a target="_blank" href="{{ $invitation_link }}">Accept Invitation</a><br>
-<br>
+Please [click here]({{ $invitation_link }}) to accept the invitation.
 
 If you have any questions, please contact the team owner.<br><br>
 
-If it was not you who requested this invitation, please ignore this ema il, or instantly revoke the invitation by
-clicking here: <a target="_blank" href="{{ $invitation_link }}/revoke">Revoke Invitation</a><br><br>
+If it was not you who requested this invitation, please ignore this email, or instantly revoke the invitation by clicking [here]({{ $invitation_link }}/revoke).
 
-Thank you.
+</x-emails.layout>

resources/views/emails/reset-password.blade.php

@@ -1,6 +1,7 @@
-A password reset requested for your email address on "{{ config('app.name') }}".<br><br>
+<x-emails.layout>
+A password reset has been requested for this email address.
 
-Please click the following link to reset your password: <a target="_blank" href="{{ $url }}">Password
-    Reset</a><br><br>
+Click [here]({{ $url }}) to reset your password.
 
-This password reset link will expire in {{ $count }} minutes.
+This link will expire in {{ $count }} minutes.
+</x-emails.layout>

resources/views/emails/subscription-invoice-failed.blade.php

@@ -1,4 +1,6 @@
-Your last invoice has failed to be paid for Coolify Cloud. Please <a href="{{$stripeCustomerPortal}}">update payment details on your Stripe Customer Portal</a>.
-<br><br>
-Thanks,<br>
-Coolify Cloud
+<x-emails.layout>
+Your last invoice has failed to be paid for Coolify Cloud.
+
+Please update payment details [here]({{$stripeCustomerPortal}}).
+
+</x-emails.layout>

resources/views/emails/test.blade.php

@@ -1 +1,3 @@
-If you are seeing this, it means that your SMTP settings are correct.
+<x-emails.layout>
+If you are seeing this, it means that your Email settings are correct.
+</x-emails.layout>

resources/views/emails/waitlist-confirmation.blade.php

@@ -1,4 +1,9 @@
-Someone added this email to the Coolify Cloud's waitlist.
-<br>
-<a href="{{ $confirmation_url }}">Click here to confirm</a>! The link will expire in {{config('constants.waitlist.expiration')}} minutes.<br><br>
-You have no idea what <a href="https://coolify.io">Coolify Cloud</a> is or this waitlist? <a href="{{ $cancel_url }}">Click here to remove</a> you from the waitlist.
+<x-emails.layout>
+Someone added this email to the Coolify Cloud's waitlist. [Click here]({{ $confirmation_url }}) to confirm!
+
+The link will expire in {{config('constants.waitlist.expiration')}} minutes.
+
+
+You have no idea what [Coolify Cloud](https://coolify.io) is or this waitlist? [Click here]({{ $cancel_url }}) to remove you from the waitlist.
+
+</x-emails.layout>

resources/views/emails/waitlist-invitation.blade.php

@@ -1,13 +1,4 @@
-You have been invited to join the Coolify Cloud. <a href="{{base_url()}}/login">Login here</a>
-<br>
-<br>
-Here is your initial login information.
-<br>
-Email: <br>
-{{ $email }}
-<br><br>
-Password:<br>
-{{ $password }}
-<br><br>
-(You will forced to change it on first login.)
+<x-emails.layout>
+You have been invited to join the Coolify Cloud: [Get Started]({{$loginLink}})
+</x-emails.layout>
 

resources/views/errors/401.blade.php

@@ -1,5 +1,20 @@
-@extends('errors::minimal')
-
-@section('title', __('Unauthorized'))
-@section('code', '401')
-@section('message', __('Unauthorized'))
+@extends('layouts.base')
+<div class="min-h-screen hero">
+    <div class="text-center hero-content">
+        <div class="">
+            <p class="font-mono text-6xl font-semibold text-warning">401</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">You shall not pass!</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">You don't have permission to access this page.
+            </p>
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="/">
+                    <x-forms.button>Go back home</x-forms.button>
+                </a>
+                <a target="_blank" class="text-xs" href="https://docs.coollabs.io/contact.html">Contact
+                    support
+                    <x-external-link />
+                </a>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/errors/403.blade.php

@@ -1,5 +1,20 @@
-@extends('errors::minimal')
-
-@section('title', __('Forbidden'))
-@section('code', '403')
-@section('message', __($exception->getMessage() ?: 'Forbidden'))
+@extends('layouts.base')
+<div class="min-h-screen hero">
+    <div class="text-center hero-content">
+        <div class="">
+            <p class="font-mono text-6xl font-semibold text-warning">403</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">You shall not pass!</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">You don't have permission to access this page.
+            </p>
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="/">
+                    <x-forms.button>Go back home</x-forms.button>
+                </a>
+                <a target="_blank" class="text-xs" href="https://docs.coollabs.io/contact.html">Contact
+                    support
+                    <x-external-link />
+                </a>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/errors/404.blade.php

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

resources/views/errors/419.blade.php

@@ -1,21 +1,20 @@
-<x-layout>
-    <div class="min-h-screen hero">
-        <div class="text-center hero-content">
-            <div class="">
-                <p class="font-mono text-6xl font-semibold text-warning">419</p>
-                <h1 class="mt-4 font-bold tracking-tight text-white">This page is definitely old</h1>
-                <p class="mt-6 text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
-                    for.
-                </p>
-                <div class="flex items-center justify-center mt-10 gap-x-6">
-                    <a href="/"
-                        class="rounded-md bg-coollabs px-3.5 py-2.5  font-semibold text-white shadow-sm hover:bg-coollabs-100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600 hover:no-underline">Go
-                        back home</a>
-                    <a href="https://docs.coollabs.io/contact.html" class="font-semibold text-white ">Contact
-                        support
-                        <span aria-hidden="true">&rarr;</span></a>
-                </div>
+@extends('layouts.base')
+<div class="min-h-screen hero">
+    <div class="text-center hero-content">
+        <div class="">
+            <p class="font-mono text-6xl font-semibold text-warning">419</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">This page is definitely old, not like you!</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">Sorry, we couldn’t find the page you’re looking
+                for.
+            </p>
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="/">
+                    <x-forms.button>Go back home</x-forms.button>
+                </a>
+                <a href="https://docs.coollabs.io/contact.html" class="font-semibold text-white ">Contact
+                    support
+                    <span aria-hidden="true">&rarr;</span></a>
             </div>
         </div>
     </div>
-</x-layout>
+</div>

resources/views/errors/429.blade.php

@@ -1,5 +1,19 @@
-@extends('errors::minimal')
-
-@section('title', __('Too Many Requests'))
-@section('code', '429')
-@section('message', __('Too Many Requests'))
+@extends('layouts.base')
+<div class="min-h-screen hero">
+    <div class="text-center hero-content">
+        <div class="">
+            <p class="font-mono text-6xl font-semibold text-warning">429</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">Woah, slow down there!</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">You're making too many requests. Please wait a few seconds before trying again.
+            </p>
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="/">
+                    <x-forms.button>Go back home</x-forms.button>
+                </a>
+                <a href="https://docs.coollabs.io/contact.html" class="font-semibold text-white ">Contact
+                    support
+                    <span aria-hidden="true">&rarr;</span></a>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/errors/500.blade.php

@@ -1,5 +1,23 @@
-@extends('errors::minimal')
-
-@section('title', __('Server Error'))
-@section('code', '500')
-@section('message', __('Server Error'))
+@extends('layouts.base')
+<div class="min-h-screen hero ">
+    <div class="text-center hero-content">
+        <div>
+            <p class="font-mono text-6xl font-semibold text-warning">500</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">Something is not okay, are you okay?</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">There has been an error, we are working on it.
+            </p>
+            @if ($exception->getMessage() !== '')
+                <p class="mt-6 text-base leading-7 text-red-500">Error: {{ $exception->getMessage() }}
+                </p>
+            @endif
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="/">
+                    <x-forms.button>Go back home</x-forms.button>
+                </a>
+                <a href="https://docs.coollabs.io/contact.html" class="font-semibold text-white ">Contact
+                    support
+                    <span aria-hidden="true">&rarr;</span></a>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/errors/503.blade.php

@@ -1,5 +1,17 @@
-@extends('errors::minimal')
-
-@section('title', __('Service Unavailable'))
-@section('code', '503')
-@section('message', __('Service Unavailable'))
+@extends('layouts.base')
+<div class="min-h-screen hero ">
+    <div class="text-center hero-content">
+        <div>
+            <p class="font-mono text-6xl font-semibold text-warning">503</p>
+            <h1 class="mt-4 font-bold tracking-tight text-white">We are working on serious things.</h1>
+            <p class="mt-6 text-base leading-7 text-neutral-300">Service Unavailable. Be right back. Thanks for your
+                patience.
+            </p>
+            <div class="flex items-center justify-center mt-10 gap-x-6">
+                <a href="https://docs.coollabs.io/contact.html" class="font-semibold text-white ">Contact
+                    support
+                    <span aria-hidden="true">&rarr;</span></a>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/errors/layout.blade.php

@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <title>@yield('title')</title>
-
-    <!-- Styles -->
-    <style>
-        html,
-        body {
-            background-color: #fff;
-            color: #636b6f;
-            font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-            font-weight: 100;
-            height: 100vh;
-            margin: 0;
-        }
-
-        .full-height {
-            height: 100vh;
-        }
-
-        .flex-center {
-            align-items: center;
-            display: flex;
-            justify-content: center;
-        }
-
-        .position-ref {
-            position: relative;
-        }
-
-        .content {
-            text-align: center;
-        }
-
-        .title {
-            font-size: 36px;
-            padding: 20px;
-        }
-    </style>
-</head>
-
-<body>
-    <div class="flex-center position-ref full-height">
-        <div class="content">
-            <div class="title">
-                @yield('message')
-            </div>
-        </div>
-    </div>
-</body>
-
-</html>

resources/views/errors/minimal.blade.php

@@ -1,552 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <title>@yield('title')</title>
-
-    <style>
-        /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
-        html {
-            line-height: 1.15;
-            -webkit-text-size-adjust: 100%
-        }
-
-        body {
-            margin: 0
-        }
-
-        a {
-            background-color: transparent
-        }
-
-        code {
-            font-family: monospace, monospace;
-            font-size: 1em
-        }
-
-        [hidden] {
-            display: none
-        }
-
-        html {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji;
-            line-height: 1.5
-        }
-
-        *,
-        :after,
-        :before {
-            box-sizing: border-box;
-            border: 0 solid #e2e8f0
-        }
-
-        a {
-            color: inherit;
-            text-decoration: inherit
-        }
-
-        code {
-            font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace
-        }
-
-        svg,
-        video {
-            display: block;
-            vertical-align: middle
-        }
-
-        video {
-            max-width: 100%;
-            height: auto
-        }
-
-        .bg-white {
-            --bg-opacity: 1;
-            background-color: #fff;
-            background-color: rgba(255, 255, 255, var(--bg-opacity))
-        }
-
-        .bg-gray-100 {
-            --bg-opacity: 1;
-            background-color: #f7fafc;
-            background-color: rgba(247, 250, 252, var(--bg-opacity))
-        }
-
-        .border-gray-200 {
-            --border-opacity: 1;
-            border-color: #edf2f7;
-            border-color: rgba(237, 242, 247, var(--border-opacity))
-        }
-
-        .border-gray-400 {
-            --border-opacity: 1;
-            border-color: #cbd5e0;
-            border-color: rgba(203, 213, 224, var(--border-opacity))
-        }
-
-        .border-t {
-            border-top-width: 1px
-        }
-
-        .border-r {
-            border-right-width: 1px
-        }
-
-        .flex {
-            display: flex
-        }
-
-        .grid {
-            display: grid
-        }
-
-        .hidden {
-            display: none
-        }
-
-        .items-center {
-            align-items: center
-        }
-
-        .justify-center {
-            justify-content: center
-        }
-
-        .font-semibold {
-            font-weight: 600
-        }
-
-        .h-5 {
-            height: 1.25rem
-        }
-
-        .h-8 {
-            height: 2rem
-        }
-
-        .h-16 {
-            height: 4rem
-        }
-
-        .text-sm {
-            font-size: .875rem
-        }
-
-        .text-lg {
-            font-size: 1.125rem
-        }
-
-        .leading-7 {
-            line-height: 1.75rem
-        }
-
-        .mx-auto {
-            margin-left: auto;
-            margin-right: auto
-        }
-
-        .ml-1 {
-            margin-left: .25rem
-        }
-
-        .mt-2 {
-            margin-top: .5rem
-        }
-
-        .mr-2 {
-            margin-right: .5rem
-        }
-
-        .ml-2 {
-            margin-left: .5rem
-        }
-
-        .mt-4 {
-            margin-top: 1rem
-        }
-
-        .ml-4 {
-            margin-left: 1rem
-        }
-
-        .mt-8 {
-            margin-top: 2rem
-        }
-
-        .ml-12 {
-            margin-left: 3rem
-        }
-
-        .-mt-px {
-            margin-top: -1px
-        }
-
-        .max-w-xl {
-            max-width: 36rem
-        }
-
-        .max-w-6xl {
-            max-width: 72rem
-        }
-
-        .min-h-screen {
-            min-height: 100vh
-        }
-
-        .overflow-hidden {
-            overflow: hidden
-        }
-
-        .p-6 {
-            padding: 1.5rem
-        }
-
-        .py-4 {
-            padding-top: 1rem;
-            padding-bottom: 1rem
-        }
-
-        .px-4 {
-            padding-left: 1rem;
-            padding-right: 1rem
-        }
-
-        .px-6 {
-            padding-left: 1.5rem;
-            padding-right: 1.5rem
-        }
-
-        .pt-8 {
-            padding-top: 2rem
-        }
-
-        .fixed {
-            position: fixed
-        }
-
-        .relative {
-            position: relative
-        }
-
-        .top-0 {
-            top: 0
-        }
-
-        .right-0 {
-            right: 0
-        }
-
-        .shadow {
-            box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .1), 0 1px 2px 0 rgba(0, 0, 0, .06)
-        }
-
-        .text-center {
-            text-align: center
-        }
-
-        .text-gray-200 {
-            --text-opacity: 1;
-            color: #edf2f7;
-            color: rgba(237, 242, 247, var(--text-opacity))
-        }
-
-        .text-gray-300 {
-            --text-opacity: 1;
-            color: #e2e8f0;
-            color: rgba(226, 232, 240, var(--text-opacity))
-        }
-
-        .text-gray-400 {
-            --text-opacity: 1;
-            color: #cbd5e0;
-            color: rgba(203, 213, 224, var(--text-opacity))
-        }
-
-        .text-gray-500 {
-            --text-opacity: 1;
-            color: #a0aec0;
-            color: rgba(160, 174, 192, var(--text-opacity))
-        }
-
-        .text-gray-600 {
-            --text-opacity: 1;
-            color: #718096;
-            color: rgba(113, 128, 150, var(--text-opacity))
-        }
-
-        .text-gray-700 {
-            --text-opacity: 1;
-            color: #4a5568;
-            color: rgba(74, 85, 104, var(--text-opacity))
-        }
-
-        .text-gray-900 {
-            --text-opacity: 1;
-            color: #1a202c;
-            color: rgba(26, 32, 44, var(--text-opacity))
-        }
-
-        .uppercase {
-            text-transform: uppercase
-        }
-
-        .underline {
-            text-decoration: underline
-        }
-
-        .antialiased {
-            -webkit-font-smoothing: antialiased;
-            -moz-osx-font-smoothing: grayscale
-        }
-
-        .tracking-wider {
-            letter-spacing: .05em
-        }
-
-        .w-5 {
-            width: 1.25rem
-        }
-
-        .w-8 {
-            width: 2rem
-        }
-
-        .w-auto {
-            width: auto
-        }
-
-        .grid-cols-1 {
-            grid-template-columns: repeat(1, minmax(0, 1fr))
-        }
-
-        @-webkit-keyframes spin {
-            0% {
-                transform: rotate(0deg)
-            }
-
-            to {
-                transform: rotate(1turn)
-            }
-        }
-
-        @keyframes spin {
-            0% {
-                transform: rotate(0deg)
-            }
-
-            to {
-                transform: rotate(1turn)
-            }
-        }
-
-        @-webkit-keyframes ping {
-            0% {
-                transform: scale(1);
-                opacity: 1
-            }
-
-            75%,
-            to {
-                transform: scale(2);
-                opacity: 0
-            }
-        }
-
-        @keyframes ping {
-            0% {
-                transform: scale(1);
-                opacity: 1
-            }
-
-            75%,
-            to {
-                transform: scale(2);
-                opacity: 0
-            }
-        }
-
-        @-webkit-keyframes pulse {
-
-            0%,
-            to {
-                opacity: 1
-            }
-
-            50% {
-                opacity: .5
-            }
-        }
-
-        @keyframes pulse {
-
-            0%,
-            to {
-                opacity: 1
-            }
-
-            50% {
-                opacity: .5
-            }
-        }
-
-        @-webkit-keyframes bounce {
-
-            0%,
-            to {
-                transform: translateY(-25%);
-                -webkit-animation-timing-function: cubic-bezier(.8, 0, 1, 1);
-                animation-timing-function: cubic-bezier(.8, 0, 1, 1)
-            }
-
-            50% {
-                transform: translateY(0);
-                -webkit-animation-timing-function: cubic-bezier(0, 0, .2, 1);
-                animation-timing-function: cubic-bezier(0, 0, .2, 1)
-            }
-        }
-
-        @keyframes bounce {
-
-            0%,
-            to {
-                transform: translateY(-25%);
-                -webkit-animation-timing-function: cubic-bezier(.8, 0, 1, 1);
-                animation-timing-function: cubic-bezier(.8, 0, 1, 1)
-            }
-
-            50% {
-                transform: translateY(0);
-                -webkit-animation-timing-function: cubic-bezier(0, 0, .2, 1);
-                animation-timing-function: cubic-bezier(0, 0, .2, 1)
-            }
-        }
-
-        @media (min-width: 640px) {
-            .sm\:rounded-lg {
-                border-radius: .5rem
-            }
-
-            .sm\:block {
-                display: block
-            }
-
-            .sm\:items-center {
-                align-items: center
-            }
-
-            .sm\:justify-start {
-                justify-content: flex-start
-            }
-
-            .sm\:justify-between {
-                justify-content: space-between
-            }
-
-            .sm\:h-20 {
-                height: 5rem
-            }
-
-            .sm\:ml-0 {
-                margin-left: 0
-            }
-
-            .sm\:px-6 {
-                padding-left: 1.5rem;
-                padding-right: 1.5rem
-            }
-
-            .sm\:pt-0 {
-                padding-top: 0
-            }
-
-            .sm\:text-left {
-                text-align: left
-            }
-
-            .sm\:text-right {
-                text-align: right
-            }
-        }
-
-        @media (min-width: 768px) {
-            .md\:border-t-0 {
-                border-top-width: 0
-            }
-
-            .md\:border-l {
-                border-left-width: 1px
-            }
-
-            .md\:grid-cols-2 {
-                grid-template-columns: repeat(2, minmax(0, 1fr))
-            }
-        }
-
-        @media (min-width: 1024px) {
-            .lg\:px-8 {
-                padding-left: 2rem;
-                padding-right: 2rem
-            }
-        }
-
-        @media (prefers-color-scheme: dark) {
-            .dark\:bg-gray-800 {
-                --bg-opacity: 1;
-                background-color: #2d3748;
-                background-color: rgba(45, 55, 72, var(--bg-opacity))
-            }
-
-            .dark\:bg-gray-900 {
-                --bg-opacity: 1;
-                background-color: #1a202c;
-                background-color: rgba(26, 32, 44, var(--bg-opacity))
-            }
-
-            .dark\:border-gray-700 {
-                --border-opacity: 1;
-                border-color: #4a5568;
-                border-color: rgba(74, 85, 104, var(--border-opacity))
-            }
-
-            .dark\:text-white {
-                --text-opacity: 1;
-                color: #fff;
-                color: rgba(255, 255, 255, var(--text-opacity))
-            }
-
-            .dark\:text-gray-400 {
-                --text-opacity: 1;
-                color: #cbd5e0;
-                color: rgba(203, 213, 224, var(--text-opacity))
-            }
-        }
-    </style>
-
-    <style>
-        body {
-            font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-        }
-    </style>
-</head>
-
-<body class="antialiased">
-    <div
-        class="relative flex justify-center min-h-screen bg-gray-100 items-top dark:bg-gray-900 sm:items-center sm:pt-0">
-        <div class="max-w-xl mx-auto sm:px-6 lg:px-8">
-            <div class="flex items-center pt-8 sm:justify-start sm:pt-0">
-                <div class="px-4 text-lg tracking-wider text-gray-500 border-r border-gray-400">
-                    @yield('code')
-                </div>
-
-                <div class="ml-4 text-lg tracking-wider text-gray-500 uppercase">
-                    @yield('message')
-                </div>
-            </div>
-        </div>
-    </div>
-</body>
-
-</html>

resources/views/layouts/base.blade.php

@@ -25,6 +25,14 @@
 
     <body>
         @livewireScripts
+        @if (isSubscriptionActive() || isDev())
+            <dialog id="help" class="modal">
+                <livewire:help />
+                <form method="dialog" class="modal-backdrop">
+                    <button>close</button>
+                </form>
+            </dialog>
+        @endif
         <x-toaster-hub />
         <x-version class="fixed left-2 bottom-1" />
         <script>

resources/views/livewire/dashboard.blade.php

@@ -35,5 +35,5 @@
             <div class="stat-value">{{ $s3s }}</div>
         </div>
     </div>
-
+    {{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
 </div>

resources/views/livewire/help.blade.php

@@ -0,0 +1,10 @@
+<div class="flex flex-col gap-2 rounded modal-box">
+    <h3>How can we help?</h3>
+    <div>You can report bug about the current page (details will be included automatically), or send us general feedback.</div>
+    <form wire:submit.prevent="submit" class="flex flex-col gap-4 pt-4">
+        <x-forms.input id="subject" label="Subject" placeholder="Summary of your problem."></x-forms.input>
+        <x-forms.textarea id="description" label="Message"
+            placeholder="Please provide as much information as possible."></x-forms.textarea>
+        <x-forms.button class="w-full mt-4" type="submit">Send Request</x-forms.button>
+    </form>
+</div>