Merge pull request #1811 from coollabsio/next

v4.0.0-beta.235
2024-03-05 10:29:41 +01:00 · 2024-03-05 10:29:41 +01:00 · 3dd00dd91a
commit 3dd00dd91a
parent 0131f5e341 fd97c5085b
20 changed files with 613 additions and 526 deletions
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@ -72,36 +72,43 @@ private function check_resources($schedule)
            $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false);
        }
        foreach ($containerServers as $server) {
-            // $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
-            $schedule
-                ->call(function () use ($server) {
-                    $randomSeconds = rand(1, 40);
-                    $job = new ContainerStatusJob($server);
-                    $job->delay($randomSeconds);
-                    ray('dispatching container status job in ' . $randomSeconds . ' seconds');
-                    dispatch($job);
-                })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
+            $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer();
            if ($server->isLogDrainEnabled()) {
-                // $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
-                $schedule
-                    ->call(function () use ($server) {
-                        $randomSeconds = rand(1, 40);
-                        $job = new CheckLogDrainContainerJob($server);
-                        $job->delay($randomSeconds);
-                        dispatch($job);
-                    })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
+                $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer();
            }
        }
        foreach ($servers as $server) {
-            // $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
-            $schedule
-                ->call(function () use ($server) {
-                    $randomSeconds = rand(1, 40);
-                    $job = new ServerStatusJob($server);
-                    $job->delay($randomSeconds);
-                    dispatch($job);
-                })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
+            $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer();
        }
+        // Delayed Jobs
+        // foreach ($containerServers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ContainerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             ray('dispatching container status job in ' . $randomSeconds . ' seconds');
+        //             dispatch($job);
+        //         })->name('container-status-' . $server->id)->everyMinute()->onOneServer();
+        //     if ($server->isLogDrainEnabled()) {
+        //         $schedule
+        //             ->call(function () use ($server) {
+        //                 $randomSeconds = rand(1, 40);
+        //                 $job = new CheckLogDrainContainerJob($server);
+        //                 $job->delay($randomSeconds);
+        //                 dispatch($job);
+        //             })->name('log-drain-container-check-' . $server->id)->everyMinute()->onOneServer();
+        //     }
+        // }
+        // foreach ($servers as $server) {
+        //     $schedule
+        //         ->call(function () use ($server) {
+        //             $randomSeconds = rand(1, 40);
+        //             $job = new ServerStatusJob($server);
+        //             $job->delay($randomSeconds);
+        //             dispatch($job);
+        //         })->name('server-status-job-' . $server->id)->everyMinute()->onOneServer();
+        // }
    }
    private function instance_auto_update($schedule)
    {
--- a/app/Http/Middleware/DecideWhatToDoWithUser.php
+++ b/app/Http/Middleware/DecideWhatToDoWithUser.php
@ -12,6 +12,10 @@ class DecideWhatToDoWithUser
 {
    public function handle(Request $request, Closure $next): Response
    {
+        if (auth()?->user()?->teams?->count() === 0) {
+            $currentTeam = auth()->user()?->recreate_personal_team();
+            refreshSession($currentTeam);
+        }
        if(auth()?->user()?->currentTeam()){
            refreshSession(auth()->user()->currentTeam());
        }
--- a/app/Livewire/Boarding/Index.php
+++ b/app/Livewire/Boarding/Index.php
@ -122,7 +122,7 @@ public function selectExistingServer()
        }
        $this->selectedExistingPrivateKey = $this->createdServer->privateKey->id;
        $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
-        $this->installServer();
+        $this->currentState = 'validate-server';
    }
    public function getProxyType()
    {
--- a/app/Livewire/Project/New/GithubPrivateRepository.php
+++ b/app/Livewire/Project/New/GithubPrivateRepository.php
@ -79,7 +79,10 @@ public function loadRepositories($github_app_id)
                $this->loadRepositoryByPage();
            }
        }
-        $this->selected_repository_id = $this->repositories[0]['id'];
+        $this->repositories = $this->repositories->sortBy('name');
+        if ($this->repositories->count() > 0) {
+            $this->selected_repository_id = data_get($this->repositories->first(), 'id');
+        }
        $this->current_step = 'repository';
    }

--- a/app/Livewire/Project/Shared/Logs.php
+++ b/app/Livewire/Project/Shared/Logs.php
@ -45,60 +45,64 @@ public function loadContainers($server_id)
    }
    public function mount()
    {
-        $this->containers = collect();
-        $this->servers = collect();
-        $this->parameters = get_route_parameters();
-        $this->query = request()->query();
-        if (data_get($this->parameters, 'application_uuid')) {
-            $this->type = 'application';
-            $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
-            $this->status = $this->resource->status;
-            if ($this->resource->destination->server->isFunctional()) {
-                $this->servers = $this->servers->push($this->resource->destination->server);
-            }
-            foreach ($this->resource->additional_servers as $server) {
-                if ($server->isFunctional()) {
-                    $this->servers = $this->servers->push($server);
+        try {
+            $this->containers = collect();
+            $this->servers = collect();
+            $this->parameters = get_route_parameters();
+            $this->query = request()->query();
+            if (data_get($this->parameters, 'application_uuid')) {
+                $this->type = 'application';
+                $this->resource = Application::where('uuid', $this->parameters['application_uuid'])->firstOrFail();
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
                }
-            }
-        } else if (data_get($this->parameters, 'database_uuid')) {
-            $this->type = 'database';
-            $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
-            if (is_null($resource)) {
-                $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
+                foreach ($this->resource->additional_servers as $server) {
+                    if ($server->isFunctional()) {
+                        $this->servers = $this->servers->push($server);
+                    }
+                }
+            } else if (data_get($this->parameters, 'database_uuid')) {
+                $this->type = 'database';
+                $resource = StandalonePostgresql::where('uuid', $this->parameters['database_uuid'])->first();
                if (is_null($resource)) {
-                    $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
+                    $resource = StandaloneRedis::where('uuid', $this->parameters['database_uuid'])->first();
                    if (is_null($resource)) {
-                        $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
+                        $resource = StandaloneMongodb::where('uuid', $this->parameters['database_uuid'])->first();
                        if (is_null($resource)) {
-                            $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                            $resource = StandaloneMysql::where('uuid', $this->parameters['database_uuid'])->first();
                            if (is_null($resource)) {
-                                abort(404);
+                                $resource = StandaloneMariadb::where('uuid', $this->parameters['database_uuid'])->first();
+                                if (is_null($resource)) {
+                                    abort(404);
+                                }
                            }
                        }
                    }
                }
-            }
-            $this->resource = $resource;
-            $this->status = $this->resource->status;
-            if ($this->resource->destination->server->isFunctional()) {
-                $this->servers = $this->servers->push($this->resource->destination->server);
-            }
-            $this->container = $this->resource->uuid;
-            $this->containers->push($this->container);
-        } else if (data_get($this->parameters, 'service_uuid')) {
-            $this->type = 'service';
-            $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
-            $this->resource->applications()->get()->each(function ($application) {
-                $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
-            });
-            $this->resource->databases()->get()->each(function ($database) {
-                $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
-            });
+                $this->resource = $resource;
+                $this->status = $this->resource->status;
+                if ($this->resource->destination->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->destination->server);
+                }
+                $this->container = $this->resource->uuid;
+                $this->containers->push($this->container);
+            } else if (data_get($this->parameters, 'service_uuid')) {
+                $this->type = 'service';
+                $this->resource = Service::where('uuid', $this->parameters['service_uuid'])->firstOrFail();
+                $this->resource->applications()->get()->each(function ($application) {
+                    $this->containers->push(data_get($application, 'name') . '-' . data_get($this->resource, 'uuid'));
+                });
+                $this->resource->databases()->get()->each(function ($database) {
+                    $this->containers->push(data_get($database, 'name') . '-' . data_get($this->resource, 'uuid'));
+                });

-            if ($this->resource->server->isFunctional()) {
-                $this->servers = $this->servers->push($this->resource->server);
+                if ($this->resource->server->isFunctional()) {
+                    $this->servers = $this->servers->push($this->resource->server);
+                }
            }
+        } catch (\Exception $e) {
+            return handleError($e, $this);
        }
    }

--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@ -144,7 +144,6 @@ public function sources()
        $sources = collect([]);
        $github_apps = $this->hasMany(GithubApp::class)->whereisPublic(false)->get();
        $gitlab_apps = $this->hasMany(GitlabApp::class)->whereisPublic(false)->get();
-        // $bitbucket_apps = $this->hasMany(BitbucketApp::class)->get();
        $sources = $sources->merge($github_apps)->merge($gitlab_apps);
        return $sources;
    }
--- a/app/Models/TeamInvitation.php
+++ b/app/Models/TeamInvitation.php
@ -26,6 +26,7 @@ public function isValid() {
            return true;
        } else {
            $this->delete();
+            return false;
        }
    }
 }
--- a/app/Models/User.php
+++ b/app/Models/User.php
@ -50,6 +50,21 @@ protected static function boot()
            $user->teams()->attach($new_team, ['role' => 'owner']);
        });
    }
+    public function recreate_personal_team()
+    {
+        $team = [
+            'name' => $this->name . "'s Team",
+            'personal_team' => true,
+            'show_boarding' => true
+        ];
+        if ($this->id === 0) {
+            $team['id'] = 0;
+            $team['name'] = 'Root Team';
+        }
+        $new_team = Team::create($team);
+        $this->teams()->attach($new_team, ['role' => 'owner']);
+        return $new_team;
+    }
    public function createToken(string $name, array $abilities = ['*'], DateTimeInterface $expiresAt = null)
    {
        $plainTextToken = sprintf(
@ -143,7 +158,7 @@ public function isInstanceAdmin()
    public function currentTeam()
    {
        return Cache::remember('team:' . auth()->user()->id, 3600, function () {
-            if (is_null(data_get(session('currentTeam'), 'id'))) {
+            if (is_null(data_get(session('currentTeam'), 'id')) && auth()->user()->teams->count() > 0){
                return auth()->user()->teams[0];
            }
            return Team::find(session('currentTeam')->id);
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@ -8,14 +8,12 @@
 use App\Actions\Fortify\UpdateUserProfileInformation;
 use App\Models\InstanceSettings;
 use App\Models\User;
-use App\Models\Waitlist;
 use Illuminate\Cache\RateLimiting\Limit;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\RateLimiter;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Fortify\Contracts\RegisterResponse;
-use Laravel\Fortify\Features;
 use Laravel\Fortify\Fortify;

 class FortifyServiceProvider extends ServiceProvider
@ -76,7 +74,11 @@ public function boot(): void
            ) {
                $user->updated_at = now();
                $user->save();
-                session(['currentTeam' => $user->currentTeam = $user->teams->firstWhere('personal_team', true)]);
+                $user->currentTeam = $user->teams->firstWhere('personal_team', true);
+                if (!$user->currentTeam) {
+                    $user->currentTeam = $user->recreate_personal_team();
+                }
+                session(['currentTeam' => $user->currentTeam]);
                return $user;
            }
        });
--- a/composer.lock
+++ b/composer.lock
--- a/config/sentry.php
+++ b/config/sentry.php
@ -7,7 +7,7 @@

    // 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.234',
+    'release' => '4.0.0-beta.235',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.234';
+return '4.0.0-beta.235';
--- a/package-lock.json
+++ b/package-lock.json
@ -13,15 +13,15 @@
            },
            "devDependencies": {
                "@vitejs/plugin-vue": "4.5.1",
-                "autoprefixer": "10.4.17",
+                "autoprefixer": "10.4.18",
                "axios": "1.6.7",
-                "laravel-echo": "1.15.3",
+                "laravel-echo": "1.16.0",
                "laravel-vite-plugin": "0.8.1",
                "postcss": "8.4.35",
                "pusher-js": "8.4.0-rc2",
                "tailwindcss": "3.4.1",
                "vite": "4.5.2",
-                "vue": "3.4.19"
+                "vue": "3.4.21"
            }
        },
        "node_modules/@alloc/quick-lru": {
@ -36,9 +36,9 @@
            }
        },
        "node_modules/@babel/parser": {
-            "version": "7.23.9",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
-            "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==",
+            "version": "7.24.0",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.0.tgz",
+            "integrity": "sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==",
            "dev": true,
            "bin": {
                "parser": "bin/babel-parser.js"
@ -524,77 +524,77 @@
            }
        },
        "node_modules/@vue/compiler-core": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.19.tgz",
-            "integrity": "sha512-gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.21.tgz",
+            "integrity": "sha512-MjXawxZf2SbZszLPYxaFCjxfibYrzr3eYbKxwpLR9EQN+oaziSu3qKVbwBERj1IFIB8OLUewxB5m/BFzi613og==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.23.9",
-                "@vue/shared": "3.4.19",
+                "@vue/shared": "3.4.21",
                "entities": "^4.5.0",
                "estree-walker": "^2.0.2",
                "source-map-js": "^1.0.2"
            }
        },
        "node_modules/@vue/compiler-core/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/compiler-dom": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.19.tgz",
-            "integrity": "sha512-vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.21.tgz",
+            "integrity": "sha512-IZC6FKowtT1sl0CR5DpXSiEB5ayw75oT2bma1BEhV7RRR1+cfwLrxc2Z8Zq/RGFzJ8w5r9QtCOvTjQgdn0IKmA==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-core": "3.4.19",
-                "@vue/shared": "3.4.19"
+                "@vue/compiler-core": "3.4.21",
+                "@vue/shared": "3.4.21"
            }
        },
        "node_modules/@vue/compiler-dom/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/compiler-sfc": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz",
-            "integrity": "sha512-LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.21.tgz",
+            "integrity": "sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==",
            "dev": true,
            "dependencies": {
                "@babel/parser": "^7.23.9",
-                "@vue/compiler-core": "3.4.19",
-                "@vue/compiler-dom": "3.4.19",
-                "@vue/compiler-ssr": "3.4.19",
-                "@vue/shared": "3.4.19",
+                "@vue/compiler-core": "3.4.21",
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/compiler-ssr": "3.4.21",
+                "@vue/shared": "3.4.21",
                "estree-walker": "^2.0.2",
-                "magic-string": "^0.30.6",
-                "postcss": "^8.4.33",
+                "magic-string": "^0.30.7",
+                "postcss": "^8.4.35",
                "source-map-js": "^1.0.2"
            }
        },
        "node_modules/@vue/compiler-sfc/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/compiler-ssr": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz",
-            "integrity": "sha512-P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.21.tgz",
+            "integrity": "sha512-M5+9nI2lPpAsgXOGQobnIueVqc9sisBFexh5yMIMRAPYLa7+5wEJs8iqOZc1WAa9WQbx9GR2twgznU8LTIiZ4Q==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-dom": "3.4.19",
-                "@vue/shared": "3.4.19"
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/shared": "3.4.21"
            }
        },
        "node_modules/@vue/compiler-ssr/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/reactivity": {
@ -606,64 +606,64 @@
            }
        },
        "node_modules/@vue/runtime-core": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.19.tgz",
-            "integrity": "sha512-/Z3tFwOrerJB/oyutmJGoYbuoadphDcJAd5jOuJE86THNZji9pYjZroQ2NFsZkTxOq0GJbb+s2kxTYToDiyZzw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.21.tgz",
+            "integrity": "sha512-pQthsuYzE1XcGZznTKn73G0s14eCJcjaLvp3/DKeYWoFacD9glJoqlNBxt3W2c5S40t6CCcpPf+jG01N3ULyrA==",
            "dev": true,
            "dependencies": {
-                "@vue/reactivity": "3.4.19",
-                "@vue/shared": "3.4.19"
+                "@vue/reactivity": "3.4.21",
+                "@vue/shared": "3.4.21"
            }
        },
        "node_modules/@vue/runtime-core/node_modules/@vue/reactivity": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.19.tgz",
-            "integrity": "sha512-+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.21.tgz",
+            "integrity": "sha512-UhenImdc0L0/4ahGCyEzc/pZNwVgcglGy9HVzJ1Bq2Mm9qXOpP8RyNTjookw/gOCUlXSEtuZ2fUg5nrHcoqJcw==",
            "dev": true,
            "dependencies": {
-                "@vue/shared": "3.4.19"
+                "@vue/shared": "3.4.21"
            }
        },
        "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/runtime-dom": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.19.tgz",
-            "integrity": "sha512-IyZzIDqfNCF0OyZOauL+F4yzjMPN2rPd8nhqPP2N1lBn3kYqJpPHHru+83Rkvo2lHz5mW+rEeIMEF9qY3PB94g==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.21.tgz",
+            "integrity": "sha512-gvf+C9cFpevsQxbkRBS1NpU8CqxKw0ebqMvLwcGQrNpx6gqRDodqKqA+A2VZZpQ9RpK2f9yfg8VbW/EpdFUOJw==",
            "dev": true,
            "dependencies": {
-                "@vue/runtime-core": "3.4.19",
-                "@vue/shared": "3.4.19",
+                "@vue/runtime-core": "3.4.21",
+                "@vue/shared": "3.4.21",
                "csstype": "^3.1.3"
            }
        },
        "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/server-renderer": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.19.tgz",
-            "integrity": "sha512-eAj2p0c429RZyyhtMRnttjcSToch+kTWxFPHlzGMkR28ZbF1PDlTcmGmlDxccBuqNd9iOQ7xPRPAGgPVj+YpQw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.21.tgz",
+            "integrity": "sha512-aV1gXyKSN6Rz+6kZ6kr5+Ll14YzmIbeuWe7ryJl5muJ4uwSwY/aStXTixx76TwkZFJLm1aAlA/HSWEJ4EyiMkg==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-ssr": "3.4.19",
-                "@vue/shared": "3.4.19"
+                "@vue/compiler-ssr": "3.4.21",
+                "@vue/shared": "3.4.21"
            },
            "peerDependencies": {
-                "vue": "3.4.19"
+                "vue": "3.4.21"
            }
        },
        "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/@vue/shared": {
@ -708,9 +708,9 @@
            "dev": true
        },
        "node_modules/autoprefixer": {
-            "version": "10.4.17",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz",
-            "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==",
+            "version": "10.4.18",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
+            "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
            "dev": true,
            "funding": [
                {
@ -727,8 +727,8 @@
                }
            ],
            "dependencies": {
-                "browserslist": "^4.22.2",
-                "caniuse-lite": "^1.0.30001578",
+                "browserslist": "^4.23.0",
+                "caniuse-lite": "^1.0.30001591",
                "fraction.js": "^4.3.7",
                "normalize-range": "^0.1.2",
                "picocolors": "^1.0.0",
@ -789,9 +789,9 @@
            }
        },
        "node_modules/browserslist": {
-            "version": "4.22.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
-            "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
+            "version": "4.23.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
+            "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
            "dev": true,
            "funding": [
                {
@ -808,8 +808,8 @@
                }
            ],
            "dependencies": {
-                "caniuse-lite": "^1.0.30001565",
-                "electron-to-chromium": "^1.4.601",
+                "caniuse-lite": "^1.0.30001587",
+                "electron-to-chromium": "^1.4.668",
                "node-releases": "^2.0.14",
                "update-browserslist-db": "^1.0.13"
            },
@ -829,9 +829,9 @@
            }
        },
        "node_modules/caniuse-lite": {
-            "version": "1.0.30001580",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001580.tgz",
-            "integrity": "sha512-mtj5ur2FFPZcCEpXFy8ADXbDACuNFXg6mxVDqp7tqooX6l3zwm+d8EPoeOSIFRDvHs8qu7/SLFOGniULkcH2iA==",
+            "version": "1.0.30001594",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001594.tgz",
+            "integrity": "sha512-VblSX6nYqyJVs8DKFMldE2IVCJjZ225LW00ydtUWwh5hk9IfkTOffO6r8gJNsH0qqqeAF8KrbMYA2VEwTlGW5g==",
            "dev": true,
            "funding": [
                {
@ -1014,9 +1014,9 @@
            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
        },
        "node_modules/electron-to-chromium": {
-            "version": "1.4.647",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.647.tgz",
-            "integrity": "sha512-Z/fTNGwc45WrYQhPaEcz5tAJuZZ8G7S/DBnhS6Kgp4BxnS40Z/HqlJ0hHg3Z79IGVzuVartIlTcjw/cQbPLgOw==",
+            "version": "1.4.692",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.692.tgz",
+            "integrity": "sha512-d5rZRka9n2Y3MkWRN74IoAsxR0HK3yaAt7T50e3iT9VZmCCQDT3geXUO5ZRMhDToa1pkCeQXuNo+0g+NfDOVPA==",
            "dev": true
        },
        "node_modules/entities": {
@ -1069,9 +1069,9 @@
            }
        },
        "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
            "dev": true,
            "engines": {
                "node": ">=6"
@ -1347,9 +1347,9 @@
            }
        },
        "node_modules/laravel-echo": {
-            "version": "1.15.3",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.15.3.tgz",
-            "integrity": "sha512-SRXzccaat6w4qKgZ4/rjFKr3nJfVxB+ly4V0MEJNIF1/TpERNXepo3uk7NnOjBGsiV/np1fl2XitAzW4Sa1s/w==",
+            "version": "1.16.0",
+            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.0.tgz",
+            "integrity": "sha512-BJGUa4tcKvYmTkzTmcBGMHiO2tq+k7Do5wPmLbRswWfzKwyfZEUR+J5iwBTPEfLLwNPZlA9Kjo6R/NV6pmyIpg==",
            "dev": true,
            "engines": {
                "node": ">=10"
@ -1410,9 +1410,9 @@
            "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
        },
        "node_modules/magic-string": {
-            "version": "0.30.7",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
-            "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
+            "version": "0.30.8",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
+            "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
            "dev": true,
            "dependencies": {
                "@jridgewell/sourcemap-codec": "^1.4.15"
@ -2106,16 +2106,16 @@
            }
        },
        "node_modules/vue": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.19.tgz",
-            "integrity": "sha512-W/7Fc9KUkajFU8dBeDluM4sRGc/aa4YJnOYck8dkjgZoXtVsn3OeTGni66FV1l3+nvPA7VBFYtPioaGKUmEADw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/vue/-/vue-3.4.21.tgz",
+            "integrity": "sha512-5hjyV/jLEIKD/jYl4cavMcnzKwjMKohureP8ejn3hhEjwhWIhWeuzL2kJAjzl/WyVsgPY56Sy4Z40C3lVshxXA==",
            "dev": true,
            "dependencies": {
-                "@vue/compiler-dom": "3.4.19",
-                "@vue/compiler-sfc": "3.4.19",
-                "@vue/runtime-dom": "3.4.19",
-                "@vue/server-renderer": "3.4.19",
-                "@vue/shared": "3.4.19"
+                "@vue/compiler-dom": "3.4.21",
+                "@vue/compiler-sfc": "3.4.21",
+                "@vue/runtime-dom": "3.4.21",
+                "@vue/server-renderer": "3.4.21",
+                "@vue/shared": "3.4.21"
            },
            "peerDependencies": {
                "typescript": "*"
@ -2127,9 +2127,9 @@
            }
        },
        "node_modules/vue/node_modules/@vue/shared": {
-            "version": "3.4.19",
-            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz",
-            "integrity": "sha512-/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw==",
+            "version": "3.4.21",
+            "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.21.tgz",
+            "integrity": "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g==",
            "dev": true
        },
        "node_modules/wrappy": {
--- a/package.json
+++ b/package.json
@ -7,15 +7,15 @@
    },
    "devDependencies": {
        "@vitejs/plugin-vue": "4.5.1",
-        "autoprefixer": "10.4.17",
+        "autoprefixer": "10.4.18",
        "axios": "1.6.7",
-        "laravel-echo": "1.15.3",
+        "laravel-echo": "1.16.0",
        "laravel-vite-plugin": "0.8.1",
        "postcss": "8.4.35",
        "pusher-js": "8.4.0-rc2",
        "tailwindcss": "3.4.1",
        "vite": "4.5.2",
-        "vue": "3.4.19"
+        "vue": "3.4.21"
    },
    "dependencies": {
        "@tailwindcss/typography": "0.5.10",
--- a/resources/views/components/services/navbar.blade.php
+++ b/resources/views/components/services/navbar.blade.php
@ -5,27 +5,6 @@
    </a>
    <x-services.links />
    <div class="flex-1"></div>
-    @if (str($service->status())->contains('degraded'))
-        <button wire:click='deploy' onclick="startService.showModal()"
-            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
-                    <path d="M20 4v5h-5" />
-                </g>
-            </svg>
-            Restart Degraded Services
-        </button>
-        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
-            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
-                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
-                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
-                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
-            </svg>
-            Stop
-        </button>
-    @endif
    @if (str($service->status())->contains('running'))
        <button wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@ -45,8 +24,27 @@ class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400"
            </svg>
            Stop
        </button>
-    @endif
-    @if (str($service->status())->contains('exited'))
+    @elseif (str($service->status())->contains('degraded'))
+        <button wire:click='deploy' onclick="startService.showModal()"
+            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg class="w-5 h-5 text-warning" 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="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
+                    <path d="M20 4v5h-5" />
+                </g>
+            </svg>
+            Restart Degraded Services
+        </button>
+        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+            </svg>
+            Stop
+        </button>
+    @elseif (str($service->status())->contains('exited'))
        <button wire:click='stop(true)'
            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
            <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
@ -65,6 +63,25 @@ class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400"
            </svg>
            Deploy
        </button>
+    @else
+        <button wire:click='stop' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-error" viewBox="0 0 24 24" stroke-width="2"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
+                <path d="M6 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+                <path d="M14 5m0 1a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v12a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1 -1z"></path>
+            </svg>
+            Stop
+        </button>
+        <button wire:click='deploy' onclick="startService.showModal()"
+            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
+            <svg xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 text-warning" viewBox="0 0 24 24" stroke-width="1.5"
+                stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+                <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+                <path d="M7 4v16l13 -8z" />
+            </svg>
+            Deploy
+        </button>
    @endif
 </div>

--- a/resources/views/components/status/services.blade.php
+++ b/resources/views/components/status/services.blade.php
@ -1,8 +1,8 @@
-@if (Str::of($complexStatus)->startsWith('running'))
+@if (str($complexStatus)->contains('running'))
    <x-status.running :status="$complexStatus" />
-@elseif(Str::of($complexStatus)->startsWith('restarting'))
+@elseif(str($complexStatus)->contains('restarting'))
    <x-status.restarting :status="$complexStatus" />
-@elseif(Str::of($complexStatus)->startsWith('degraded'))
+@elseif(str($complexStatus)->contains('degraded'))
    <x-status.degraded :status="$complexStatus" />
@else
    <x-status.stopped :status="$complexStatus" />
--- a/resources/views/livewire/project/new/public-git-repository.blade.php
+++ b/resources/views/livewire/project/new/public-git-repository.blade.php
@ -12,12 +12,23 @@
                </div>
                @if (!$branch_found)
                    <div class="px-2 pt-4">
-                        <p>Public repositories: <span class='text-helper'>https://...</span></p>
-                        <p>Private repositories: <span class='text-helper'>git@...</span></p>
-                        <p>Preselect branch: <span
-                                class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</span> to
-                            select 'static' branch.</p>
-                    </div>
+                        <div class="flex gap-1">
+                            <div>Public:</div>
+                            <div class='text-helper'>https://..</div>
+                        </div>
+                        <div class="flex gap-1">
+                            <div>Private:</div>
+                            <div class='text-helper'>git@..</div>
+                        </div>
+                        <div class="flex gap-1">
+                            <div>Preselect branch (eg: static):</div>
+                            <div class='text-helper'>https://github.com/coollabsio/coolify-examples/tree/static</div>
+                        </div>
+                        <div>
+                            For example application deployments, checkout <a class="text-white underline"
+                                href="https://github.com/coollabsio/coolify-examples/" target="_blank">Coolify
+                                Examples</a>.
+                        </div>
                @endif
                @if ($branch_found)
                    @if ($rate_limit_remaining && $rate_limit_reset)
--- a/resources/views/livewire/team/index.blade.php
+++ b/resources/views/livewire/team/index.blade.php
@ -20,10 +20,11 @@
        <h4 class="pb-4">Delete Team</h4>
        @if (session('currentTeam.id') === 0)
            <div>This is the default team. You can't delete it.</div>
-        @elseif(auth()->user()->teams()->get()->count() === 1)
-            <div>You can't delete your last team.</div>
+        @elseif(auth()->user()->teams()->get()->count() === 1 || auth()->user()->currentTeam()->personal_team)
+            <div>You can't delete your last / personal team.</div>
        @elseif(currentTeam()->subscription && currentTeam()->subscription?->lemon_status !== 'cancelled')
-            <div>Please cancel your subscription <a class="text-white underline" href="{{route('subscription.show')}}">here</a> before delete this team.</div>
+            <div>Please cancel your subscription <a class="text-white underline"
+                    href="{{ route('subscription.show') }}">here</a> before delete this team.</div>
        @else
            @if (currentTeam()->isEmpty())
                <div class="pb-4">This will delete your team. Beware! There is no coming back!</div>
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -6,7 +6,7 @@ set -e # Exit immediately if a command exits with a non-zero status
 #set -u # Treat unset variables as an error and exit
 set -o pipefail # Cause a pipeline to return the status of the last command that exited with a non-zero status

-VERSION="1.2.1"
+VERSION="1.2.2"
 DOCKER_VERSION="24.0"

 CDN="https://cdn.coollabs.io/coolify"
@ -27,7 +27,7 @@ if [ $EUID != 0 ]; then
 fi

 case "$OS_TYPE" in
-arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed) ;;
+arch | ubuntu | debian | raspbian | centos | fedora | rhel | ol | rocky | sles | opensuse-leap | opensuse-tumbleweed | almalinux) ;;
 *)
    echo "This script only supports Debian, Redhat, Arch Linux, or SLES based operating systems for now."
    exit
@ -64,7 +64,7 @@ ubuntu | debian | raspbian)
    apt update -y >/dev/null 2>&1
    apt install -y curl wget git jq >/dev/null 2>&1
    ;;
-centos | fedora | rhel | ol | rocky)
+centos | fedora | rhel | ol | rocky | almalinux)
    dnf install -y curl wget git jq >/dev/null 2>&1
    ;;
 sles | opensuse-leap | opensuse-tumbleweed)
@ -123,33 +123,48 @@ if [ "$SSH_PERMIT_ROOT_LOGIN" != "true" ]; then
 fi

 if ! [ -x "$(command -v docker)" ]; then
-    echo "Docker is not installed. Installing Docker."
-    if [ "$OS_TYPE" = "arch" ]; then
-        pacman -Sy docker docker-compose --noconfirm
-        systemctl enable docker.service
-        if [ -x "$(command -v docker)" ]; then
-            echo "Docker installed successfully."
-        else
-            echo "Failed to install Docker with pacman. Try to install it manually."
-            echo "Please visit https://wiki.archlinux.org/title/docker for more information."
-            exit
+    if [ "$OS_TYPE" == 'almalinux' ]; then
+        dnf config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
+        dnf install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+        if ! [ -x "$(command -v docker)" ]; then
+            echo "Docker could not be installed automatically. Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+            exit 1
        fi
+        systemctl start docker
+        systemctl enable docker
    else
-        curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
-        if [ -x "$(command -v docker)" ]; then
-            echo "Docker installed successfully."
-        else
-            echo "Docker installation failed with Rancher script. Trying with official script."
-            curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
-            if [ -x "$(command -v docker)" ]; then
-                echo "Docker installed successfully."
+        set +e
+        if ! [ -x "$(command -v docker)" ]; then
+            echo "Docker is not installed. Installing Docker."
+            if [ "$OS_TYPE" = "arch" ]; then
+                pacman -Sy docker docker-compose --noconfirm
+                systemctl enable docker.service
+                if [ -x "$(command -v docker)" ]; then
+                    echo "Docker installed successfully."
+                else
+                    echo "Failed to install Docker with pacman. Try to install it manually."
+                    echo "Please visit https://wiki.archlinux.org/title/docker for more information."
+                    exit
+                fi
            else
-                echo "Docker installation failed with official script."
-                echo "Maybe your OS is not supported?"
-                echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
-                exit 1
+                curl https://releases.rancher.com/install-docker/${DOCKER_VERSION}.sh | sh
+                if [ -x "$(command -v docker)" ]; then
+                    echo "Docker installed successfully."
+                else
+                    echo "Docker installation failed with Rancher script. Trying with official script."
+                    curl https://get.docker.com | sh -s -- --version ${DOCKER_VERSION}
+                    if [ -x "$(command -v docker)" ]; then
+                        echo "Docker installed successfully."
+                    else
+                        echo "Docker installation failed with official script."
+                        echo "Maybe your OS is not supported?"
+                        echo "Please visit https://docs.docker.com/engine/install/ and install Docker manually to continue."
+                        exit 1
+                    fi
+                fi
            fi
        fi
+        set -e
    fi
 fi

--- a/versions.json
+++ b/versions.json
@ -4,7 +4,7 @@
            "version": "3.12.36"
        },
        "v4": {
-            "version": "4.0.0-beta.234"
+            "version": "4.0.0-beta.235"
        }
    }
 }