Merge pull request #1310 from coollabsio/next

v4.0.0-beta.80

README.md

@@ -36,7 +36,7 @@ You can find the installation script [here](./scripts/install.sh).
 
 ## Support
 
-Contact us [here](https://coolify.io/contact).
+Contact us [here](https://coolify.io/docs/contact).
 
 ## Recognitions
 

app/Actions/Proxy/StartProxy.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Proxy;
 
+use App\Enums\ProxyTypes;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Lorisleiva\Actions\Concerns\AsAction;
@@ -14,7 +15,7 @@ class StartProxy
     {
         $commands = collect([]);
         $proxyType = $server->proxyType();
-        if ($proxyType === 'none') {
+        if ($proxyType === ProxyTypes::NONE->value) {
             return 'OK';
         }
         $proxy_path = get_proxy_path();

app/Actions/Server/UpdateCoolify.php

@@ -2,16 +2,18 @@
 
 namespace App\Actions\Server;
 
+use Lorisleiva\Actions\Concerns\AsAction;
 use App\Models\InstanceSettings;
 use App\Models\Server;
 
 class UpdateCoolify
 {
+    use AsAction;
     public ?Server $server = null;
     public ?string $latestVersion = null;
     public ?string $currentVersion = null;
 
-    public function __invoke(bool $force)
+    public function handle(bool $force)
     {
         try {
             $settings = InstanceSettings::get();

app/Console/Commands/ResourcesDelete.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Models\Application;
+use App\Models\Server;
 use App\Models\Service;
 use App\Models\StandalonePostgresql;
 use Illuminate\Console\Command;
@@ -34,7 +35,7 @@ class ResourcesDelete extends Command
     {
         $resource = select(
             'What resource do you want to delete?',
-            ['Application', 'Database', 'Service'],
+            ['Application', 'Database', 'Service', 'Server'],
         );
         if ($resource === 'Application') {
             $this->deleteApplication();
@@ -42,6 +43,29 @@ class ResourcesDelete extends Command
             $this->deleteDatabase();
         } elseif ($resource === 'Service') {
             $this->deleteService();
+        } elseif($resource === 'Server') {
+            $this->deleteServer();
+        }
+    }
+    private function deleteServer() {
+        $servers = Server::all();
+        if ($servers->count() === 0) {
+            $this->error('There are no applications to delete.');
+            return;
+        }
+        $serversToDelete = multiselect(
+            'What server do you want to delete?',
+            $servers->pluck('id')->sort()->toArray(),
+        );
+
+        foreach ($serversToDelete as $id) {
+            $toDelete = Server::find($id);
+            $this->info($toDelete);
+            $confirmed = confirm("Are you sure you want to delete all selected resources?");
+            if (!$confirmed) {
+                break;
+            }
+            $toDelete->delete();
         }
     }
     private function deleteApplication()
@@ -53,14 +77,16 @@ class ResourcesDelete extends Command
         }
         $applicationsToDelete = multiselect(
             'What application do you want to delete?',
-            $applications->pluck('name')->toArray(),
+            $applications->pluck('name')->sort()->toArray(),
         );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
+
         foreach ($applicationsToDelete as $application) {
             $toDelete = $applications->where('name', $application)->first();
+            $this->info($toDelete);
+            $confirmed = confirm("Are you sure you want to delete all selected resources? ");
+            if (!$confirmed) {
+                break;
+            }
             $toDelete->delete();
         }
     }
@@ -73,14 +99,16 @@ class ResourcesDelete extends Command
         }
         $databasesToDelete = multiselect(
             'What database do you want to delete?',
-            $databases->pluck('name')->toArray(),
+            $databases->pluck('name')->sort()->toArray(),
         );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
+
         foreach ($databasesToDelete as $database) {
             $toDelete = $databases->where('name', $database)->first();
+            $this->info($toDelete);
+            $confirmed = confirm("Are you sure you want to delete all selected resources?");
+            if (!$confirmed) {
+                return;
+            }
             $toDelete->delete();
         }
 
@@ -94,14 +122,16 @@ class ResourcesDelete extends Command
         }
         $servicesToDelete = multiselect(
             'What service do you want to delete?',
-            $services->pluck('name')->toArray(),
+            $services->pluck('name')->sort()->toArray(),
         );
-        $confirmed = confirm("Are you sure you want to delete all selected resources?");
-        if (!$confirmed) {
-            return;
-        }
+
         foreach ($servicesToDelete as $service) {
             $toDelete = $services->where('name', $service)->first();
+            $this->info($toDelete);
+            $confirmed = confirm("Are you sure you want to delete all selected resources?");
+            if (!$confirmed) {
+                return;
+            }
             $toDelete->delete();
         }
     }

app/Console/Kernel.php

@@ -32,7 +32,6 @@ class Kernel extends ConsoleKernel
             $schedule->command('horizon:snapshot')->everyFiveMinutes();
             $schedule->job(new CleanupInstanceStuffsJob)->everyTwoMinutes()->onOneServer();
             $schedule->job(new CheckResaleLicenseJob)->hourly()->onOneServer();
-            // $schedule->job(new DockerCleanupJob)->everyTenMinutes()->onOneServer();
             $this->instance_auto_update($schedule);
             $this->check_scheduled_backups($schedule);
             $this->check_resources($schedule);

app/Http/Controllers/Controller.php

@@ -46,15 +46,6 @@ class Controller extends BaseController
         }
         return redirect()->route('login')->with('error', 'Invalid credentials.');
     }
-    public function subscription()
-    {
-        if (!isCloud()) {
-            abort(404);
-        }
-        return view('subscription.index', [
-            'settings' => InstanceSettings::get(),
-        ]);
-    }
 
     public function license()
     {

app/Http/Livewire/Boarding/Index.php

@@ -164,7 +164,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
     {
         $this->validate([
             'remoteServerName' => 'required',
-            'remoteServerHost' => 'required',
+            'remoteServerHost' => 'required|ip',
             'remoteServerPort' => 'required|integer',
             'remoteServerUser' => 'required',
         ]);

app/Http/Livewire/Dashboard.php

@@ -11,19 +11,11 @@ class Dashboard extends Component
 {
     public $projects = [];
     public $servers = [];
-    public int $s3s = 0;
-    public int $resources = 0;
 
     public function mount()
     {
         $this->servers = Server::ownedByCurrentTeam()->get();
-        $this->s3s = S3Storage::ownedByCurrentTeam()->get()->count();
-        $projects = Project::ownedByCurrentTeam()->get();
-        foreach ($projects as $project) {
-            $this->resources += $project->applications->count();
-            $this->resources += $project->postgresqls->count();
-        }
-        $this->projects = $projects;
+        $this->projects = Project::ownedByCurrentTeam()->get();
     }
     // public function getIptables()
     // {

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

@@ -76,6 +76,9 @@ class General extends Component
 
     ];
 
+    public function updatedApplicationBuildPack(){
+        $this->submit();
+    }
     public function instantSave()
     {
         // @TODO: find another way - if possible
@@ -125,6 +128,12 @@ class General extends Component
     {
         try {
             $this->validate();
+            if (data_get($this->application,'build_pack') === 'dockerimage') {
+                $this->validate([
+                    'application.docker_registry_image_name' => 'required',
+                    'application.docker_registry_image_tag' => 'required',
+                ]);
+            }
             if (data_get($this->application, 'fqdn')) {
                 $domains = Str::of($this->application->fqdn)->trim()->explode(',')->map(function ($domain) {
                     return Str::of($domain)->trim()->lower();

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

@@ -72,10 +72,14 @@ class PublicGitRepository extends Component
     public function load_branch()
     {
         try {
-            $this->branch_found = false;
             $this->validate([
                 'repository_url' => 'required|url'
             ]);
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+        try {
+            $this->branch_found = false;
             $this->get_git_source();
             $this->get_branch();
             $this->selected_branch = $this->git_branch;

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

@@ -2,12 +2,11 @@
 
 namespace App\Http\Livewire\Project\New;
 
+use App\Models\Project;
 use App\Models\Server;
 use Countable;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Http;
 use Livewire\Component;
 
 class Select extends Component
@@ -24,7 +23,8 @@ class Select extends Component
     public Collection|array $services = [];
     public bool $loadingServices = true;
     public bool $loading = false;
-
+    public $environments = [];
+    public ?string $selectedEnvironment = null;
     public ?string $existingPostgresqlUrl = null;
 
     protected $queryString = [
@@ -37,8 +37,18 @@ class Select extends Component
         if (isDev()) {
             $this->existingPostgresqlUrl = 'postgres://coolify:password@coolify-db:5432';
         }
+        $projectUuid = data_get($this->parameters, 'project_uuid');
+        $this->environments = Project::whereUuid($projectUuid)->first()->environments;
+        $this->selectedEnvironment = data_get($this->parameters, 'environment_name');
     }
 
+    public function updatedSelectedEnvironment()
+    {
+        return redirect()->route('project.resources.new', [
+            'project_uuid' => $this->parameters['project_uuid'],
+            'environment_name' => $this->selectedEnvironment,
+        ]);
+    }
     // public function addExistingPostgresql()
     // {
     //     try {

app/Http/Livewire/Project/Service/Index.php

@@ -13,13 +13,7 @@ class Index extends Component
     public $databases;
     public array $parameters;
     public array $query;
-    protected $rules = [
-        'service.docker_compose_raw' => 'required',
-        'service.docker_compose' => 'required',
-        'service.name' => 'required',
-        'service.description' => 'nullable',
-    ];
-    protected $listeners = ["saveCompose"];
+    protected $listeners = ["refreshStacks","checkStatus"];
     public function render()
     {
         return view('livewire.project.service.index');
@@ -32,17 +26,12 @@ class Index extends Component
         $this->applications = $this->service->applications->sort();
         $this->databases = $this->service->databases->sort();
     }
-    public function saveCompose($raw)
-    {
-        $this->service->docker_compose_raw = $raw;
-        $this->submit();
-    }
     public function checkStatus()
     {
         dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->refreshStack();
+        $this->refreshStacks();
     }
-    public function refreshStack()
+    public function refreshStacks()
     {
         $this->applications = $this->service->applications->sort();
         $this->applications->each(function ($application) {
@@ -53,21 +42,4 @@ class Index extends Component
             $database->refresh();
         });
     }
-
-
-    public function submit()
-    {
-        try {
-            $this->validate();
-            $this->service->save();
-            $this->service->parse();
-            $this->service->refresh();
-            $this->service->saveComposeConfigs();
-            $this->refreshStack();
-            $this->emit('refreshEnvs');
-            $this->emit('success', 'Service saved successfully.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
 }

app/Http/Livewire/Project/Service/Modal.php

@@ -6,8 +6,8 @@ use Livewire\Component;
 
 class Modal extends Component
 {
-    public function serviceStatusUpdated() {
-        $this->emit('serviceStatusUpdated');
+    public function checkStatus() {
+        $this->emit('checkStatus');
     }
     public function render()
     {

app/Http/Livewire/Project/Service/Navbar.php

@@ -13,20 +13,15 @@ class Navbar extends Component
     public Service $service;
     public array $parameters;
     public array $query;
-    protected $listeners = ['serviceStatusUpdated'];
 
     public function render()
     {
         return view('livewire.project.service.navbar');
     }
-    public function serviceStatusUpdated()
+
+    public function checkStatus()
     {
-        $this->check_status();
-    }
-    public function check_status()
-    {
-        dispatch_sync(new ContainerStatusJob($this->service->server));
-        $this->service->refresh();
+        $this->emit('checkStatus');
     }
     public function deploy()
     {

app/Http/Livewire/Project/Service/StackForm.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Livewire\Project\Service;
+
+use Livewire\Component;
+
+class StackForm extends Component
+{
+    protected $listeners = ["saveCompose"];
+    protected $rules = [
+        'service.docker_compose_raw' => 'required',
+        'service.docker_compose' => 'required',
+        'service.name' => 'required',
+        'service.description' => 'nullable',
+    ];
+    public $service;
+    public function saveCompose($raw)
+    {
+        $this->service->docker_compose_raw = $raw;
+        $this->submit();
+    }
+
+    public function submit()
+    {
+        try {
+            $this->validate();
+            $this->service->save();
+            $this->service->parse();
+            $this->service->refresh();
+            $this->service->saveComposeConfigs();
+            $this->emit('refreshStacks');
+            $this->emit('refreshEnvs');
+            $this->emit('success', 'Service saved successfully.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.service.stack-form');
+    }
+}

app/Http/Livewire/Server/Form.php

@@ -61,7 +61,18 @@ class Form extends Component
         $activity = InstallDocker::run($this->server);
         $this->emit('newMonitorActivity', $activity->id);
     }
-
+    public function checkLocalhostConnection() {
+        $uptime = $this->server->validateConnection();
+        if ($uptime) {
+            $this->emit('success', 'Server is reachable.');
+            $this->server->settings->is_reachable = true;
+            $this->server->settings->is_usable = true;
+            $this->server->settings->save();
+        } else {
+            $this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
+            return;
+        }
+    }
     public function validateServer($install = true)
     {
         try {
@@ -69,7 +80,7 @@ class Form extends Component
             if ($uptime) {
                 $install && $this->emit('success', 'Server is reachable.');
             } else {
-                $install &&$this->emit('error', 'Server is not reachable. Please check your connection and private key configuration.');
+                $install &&$this->emit('error', 'Server is not reachable. Please check your connection and configuration.');
                 return;
             }
             $dockerInstalled = $this->server->validateDockerEngine();
@@ -117,6 +128,7 @@ class Form extends Component
             $this->emit('error', 'IP address is already in use by another team.');
             return;
         }
+        refresh_server_connection($this->server->privateKey);
         $this->server->settings->wildcard_domain = $this->wildcard_domain;
         $this->server->settings->cleanup_after_percentage = $this->cleanup_after_percentage;
         $this->server->settings->save();

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

@@ -11,13 +11,13 @@ class ByIp extends Component
 {
     public $private_keys;
     public $limit_reached;
-    public int|null $private_key_id = null;
+    public ?int $private_key_id = null;
     public $new_private_key_name;
     public $new_private_key_description;
     public $new_private_key_value;
 
     public string $name;
-    public string|null $description = null;
+    public ?string $description = null;
     public string $ip;
     public string $user = 'root';
     public int $port = 22;
@@ -26,16 +26,16 @@ class ByIp extends Component
     protected $rules = [
         'name' => 'required|string',
         'description' => 'nullable|string',
-        'ip' => 'required',
+        'ip' => 'required|ip',
         'user' => 'required|string',
         'port' => 'required|integer',
     ];
     protected $validationAttributes = [
-        'name' => 'name',
-        'description' => 'description',
-        'ip' => 'ip',
-        'user' => 'user',
-        'port' => 'port',
+        'name' => 'Name',
+        'description' => 'Description',
+        'ip' => 'IP Address',
+        'user' => 'User',
+        'port' => 'Port',
     ];
 
     public function mount()

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

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Livewire\Server\Proxy;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class Logs extends Component
+{
+    public ?Server $server = null;
+    public $parameters = [];
+    public function mount()
+    {
+        $this->parameters = get_route_parameters();
+        try {
+            $this->server = Server::ownedByCurrentTeam(['name', 'proxy'])->whereUuid(request()->server_uuid)->first();
+            if (is_null($this->server)) {
+                return redirect()->route('server.all');
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.proxy.logs');
+    }
+}

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

@@ -9,6 +9,11 @@ class Show extends Component
 {
     public ?Server $server = null;
     public $parameters = [];
+    protected $listeners = ['proxyStatusUpdated'];
+    public function proxyStatusUpdated()
+    {
+        $this->server->refresh();
+    }
     public function mount()
     {
         $this->parameters = get_route_parameters();

app/Http/Livewire/Subscription/Show.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Livewire\Subscription;
+
+use App\Models\InstanceSettings;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public InstanceSettings $settings;
+    public bool $alreadySubscribed = false;
+    public function mount() {
+        if (!isCloud()) {
+            return redirect('/');
+        }
+        $this->settings = InstanceSettings::get();
+        $this->alreadySubscribed = currentTeam()->subscription()->exists();
+    }
+    public function stripeCustomerPortal() {
+        $session = getStripeCustomerPortalSession(currentTeam());
+        if (is_null($session)) {
+            return;
+        }
+        return redirect($session->url);
+    }
+    public function render()
+    {
+        return view('livewire.subscription.show')->layout('layouts.subscription');
+    }
+}

app/Http/Livewire/Upgrade.php

@@ -37,7 +37,7 @@ class Upgrade extends Component
                 return;
             }
             $this->showProgress = true;
-            resolve(UpdateCoolify::class)(true);
+            UpdateCoolify::run(true);
             $this->emit('success', "Upgrading to {$this->latestVersion} version...");
         } catch (\Throwable $e) {
             return handleError($e, $this);

app/Http/Middleware/DecideWhatToDoWithUser.php

@@ -12,6 +12,9 @@ class DecideWhatToDoWithUser
     public function handle(Request $request, Closure $next): Response
     {
         if (!auth()->user() || !isCloud() || isInstanceAdmin()) {
+            if (!isCloud() && showBoarding()  && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
+                return redirect('boarding');
+            }
             return $next($request);
         }
         if (!auth()->user()->hasVerifiedEmail()) {

app/Jobs/ApplicationDeploymentJob.php

@@ -184,41 +184,42 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
     }
 
-    private function deploy_docker_compose()
-    {
-        $dockercompose_base64 = base64_encode($this->application->dockercompose);
-        $this->execute_remote_command(
-            [
-                "echo 'Starting deployment of {$this->application->name}.'"
-            ],
-        );
-        $this->prepare_builder_image();
-        $this->execute_remote_command(
-            [
-                executeInDocker($this->deployment_uuid, "echo '$dockercompose_base64' | base64 -d > $this->workdir/docker-compose.yaml")
-            ],
-        );
-        $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
-        $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
-        $this->save_environment_variables();
-        $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
-        if ($containers->count() > 0) {
-            foreach ($containers as $container) {
-                $containerName = data_get($container, 'Names');
-                if ($containerName) {
-                    instant_remote_process(
-                        ["docker rm -f {$containerName}"],
-                        $this->application->destination->server
-                    );
-                }
-            }
-        }
+    // private function deploy_docker_compose()
+    // {
+    //     $dockercompose_base64 = base64_encode($this->application->dockercompose);
+    //     $this->execute_remote_command(
+    //         [
+    //             "echo 'Starting deployment of {$this->application->name}.'"
+    //         ],
+    //     );
+    //     $this->prepare_builder_image();
+    //     $this->execute_remote_command(
+    //         [
+    //             executeInDocker($this->deployment_uuid, "echo '$dockercompose_base64' | base64 -d > $this->workdir/docker-compose.yaml")
+    //         ],
+    //     );
+    //     $this->build_image_name = Str::lower("{$this->application->git_repository}:build");
+    //     $this->production_image_name = Str::lower("{$this->application->uuid}:latest");
+    //     $this->save_environment_variables();
+    //     $containers = getCurrentApplicationContainerStatus($this->application->destination->server, $this->application->id);
+    //     ray($containers);
+    //     if ($containers->count() > 0) {
+    //         foreach ($containers as $container) {
+    //             $containerName = data_get($container, 'Names');
+    //             if ($containerName) {
+    //                 instant_remote_process(
+    //                     ["docker rm -f {$containerName}"],
+    //                     $this->application->destination->server
+    //                 );
+    //             }
+    //         }
+    //     }
 
-        $this->execute_remote_command(
-            ["echo -n 'Starting services (could take a while)...'"],
-            [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
-        );
-    }
+    //     $this->execute_remote_command(
+    //         ["echo -n 'Starting services (could take a while)...'"],
+    //         [executeInDocker($this->deployment_uuid, "docker compose --project-directory {$this->workdir} up -d"), "hidden" => true],
+    //     );
+    // }
     private function save_environment_variables()
     {
         $envs = collect([]);
@@ -620,7 +621,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                     'container_name' => $this->container_name,
                     'restart' => RESTART_MODE,
                     'environment' => $environment_variables,
-                    'labels' => generateLabelsApplication($this->application, $this->preview),
+                    'labels' => generateLabelsApplication($this->application, $this->preview, $ports),
                     'expose' => $ports,
                     'networks' => [
                         $this->destination->network,

app/Jobs/ContainerStatusJob.php

@@ -29,7 +29,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
     public function __construct(public Server $server)
     {
-        $this->handle();
+
     }
 
     public function middleware(): array
@@ -44,7 +44,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            // ray("checking server status for {$this->server->name}");
+            ray("checking server status for {$this->server->id}");
             // ray()->clearAll();
             $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;
@@ -53,12 +53,15 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
             if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                 if ($this->server->unreachable_email_sent === false) {
                     ray('Server unreachable, sending notification...');
-                    // $this->server->team->notify(new Unreachable($this->server));
+                    $this->server->team->notify(new Unreachable($this->server));
                     $this->server->update(['unreachable_email_sent' => true]);
                 }
                 $this->server->settings()->update([
                     'is_reachable' => false,
                 ]);
+                $this->server->update([
+                    'unreachable_count' => 0,
+                ]);
                 return;
             }
             $result = $this->server->validateConnection();
@@ -82,7 +85,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
 
             if (data_get($this->server, 'unreachable_email_sent') === true) {
                 ray('Server is reachable again, sending notification...');
-                // $this->server->team->notify(new Revived($this->server));
+                $this->server->team->notify(new Revived($this->server));
                 $this->server->update(['unreachable_email_sent' => false]);
             }
             if (
@@ -111,7 +114,6 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 return data_get($value, 'Name') === '/coolify-proxy';
             })->first();
             if (!$foundProxyContainer) {
-                ray('Proxy not found, starting it...');
                 if ($this->server->isProxyShouldRun()) {
                     StartProxy::run($this->server, false);
                     $this->server->team->notify(new ContainerRestarted('coolify-proxy', $this->server));

app/Jobs/InstanceAutoUpdateJob.php

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

app/Models/S3Storage.php

@@ -46,7 +46,7 @@ class S3Storage extends BaseModel
             return;
         } catch (\Throwable $e) {
             $this->is_usable = false;
-            if ($this->unusable_email_sent === false) {
+            if ($this->unusable_email_sent === false && is_transactional_emails_active()) {
                 $mail = new MailMessage();
                 $mail->subject('Coolify: S3 Storage Connection Error');
                 $mail->view('emails.s3-connection-error', ['name' => $this->name, 'reason' => $e->getMessage(), 'url' => route('team.storages.show', ['storage_uuid' => $this->uuid])]);

app/Models/Server.php

@@ -93,8 +93,11 @@ class Server extends BaseModel
 
     public function proxyType()
     {
-        $type = $this->proxy->get('type');
-        if (is_null($type)) {
+        $proxyType = $this->proxy->get('type');
+        if ($proxyType === ProxyTypes::NONE->value) {
+            return $proxyType;
+        }
+        if (is_null($proxyType)) {
             $this->proxy->type = ProxyTypes::TRAEFIK_V2->value;
             $this->proxy->status = ProxyStatus::EXITED->value;
             $this->save();

app/Models/User.php

@@ -72,7 +72,7 @@ class User extends Authenticatable implements SendsEmail
         $mail->view('emails.email-verification', [
             'url' => $url,
         ]);
-        $mail->subject('Coolify Cloud: Verify your email.');
+        $mail->subject('Coolify: Verify your email.');
         send_user_an_email($mail, $this->email);
     }
     public function sendPasswordResetNotification($token): void
@@ -118,6 +118,9 @@ class User extends Authenticatable implements SendsEmail
     public function currentTeam()
     {
         return Cache::remember('team:' . auth()->user()->id, 3600, function () {
+            if (is_null(data_get(session('currentTeam'), 'id'))) {
+                return auth()->user()->teams[0];
+            }
             return Team::find(session('currentTeam')->id);
         });
     }

app/Notifications/Database/BackupFailed.php

@@ -3,8 +3,11 @@
 namespace App\Notifications\Database;
 
 use App\Models\ScheduledDatabaseBackup;
+use App\Notifications\Channels\DiscordChannel;
+use App\Notifications\Channels\TelegramChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Notifications\Channels\MailChannel;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 
@@ -24,7 +27,7 @@ class BackupFailed extends Notification implements ShouldQueue
 
     public function via(object $notifiable): array
     {
-        return setNotificationChannels($notifiable, 'database_backups');
+        return [DiscordChannel::class, TelegramChannel::class, MailChannel::class];
     }
 
     public function toMail(): MailMessage

app/View/Components/Server/Sidebar.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\View\Components\Server;
+
+use App\Models\Server;
+use Closure;
+use Illuminate\Contracts\View\View;
+use Illuminate\View\Component;
+
+class Sidebar extends Component
+{
+    /**
+     * Create a new component instance.
+     */
+    public function __construct(public Server $server, public $parameters)
+    {
+        //
+    }
+
+    /**
+     * Get the view / contents that represent the component.
+     */
+    public function render(): View|Closure|string
+    {
+        return view('components.server.sidebar');
+    }
+}

bootstrap/helpers/docker.php

@@ -147,7 +147,7 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica
     }
     return $labels;
 }
-function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled)
+function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled, $onlyPort = null)
 {
     $labels = collect([]);
     $labels->push('traefik.enable=true');
@@ -158,7 +158,9 @@ function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled)
         $path = $url->getPath();
         $schema = $url->getScheme();
         $port = $url->getPort();
-
+        if (is_null($port) && !is_null($onlyPort)) {
+            $port = $onlyPort;
+        }
         $http_label = "{$uuid}-http";
         $https_label = "{$uuid}-https";
 
@@ -203,9 +205,12 @@ function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled)
 
     return $labels;
 }
-function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null): array
+function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null, $ports): array
 {
-
+    $onlyPort = null;
+    if (count($ports) === 1) {
+        $onlyPort = $ports[0];
+    }
     $pull_request_id = data_get($preview, 'pull_request_id', 0);
     $container_name = generateApplicationContainerName($application, $pull_request_id);
     $appId = $application->id;
@@ -221,7 +226,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview
             $domains = Str::of(data_get($application, 'fqdn'))->explode(',');
         }
         // Add Traefik labels no matter which proxy is selected
-        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $application->settings->is_force_https_enabled));
+        $labels = $labels->merge(fqdnLabelsForTraefik($domains, $application->settings->is_force_https_enabled,$onlyPort));
     }
     return $labels->all();
 }

bootstrap/helpers/proxy.php

@@ -102,6 +102,8 @@ function generate_default_proxy_configuration(Server $server)
     ];
     if (isDev()) {
         $config['services']['traefik']['command'][] = "--log.level=debug";
+        $config['services']['traefik']['command'][] = "--accesslog.filepath=/traefik/access.log";
+        $config['services']['traefik']['command'][] = "--accesslog.bufferingsize=100";
     }
     $config = Yaml::dump($config, 4, 2);
     SaveConfiguration::run($server, $config);

bootstrap/helpers/subscriptions.php

@@ -110,7 +110,10 @@ function getStripeCustomerPortalSession(Team $team)
 {
     Stripe::setApiKey(config('subscription.stripe_api_key'));
     $return_url = route('team.index');
-    $stripe_customer_id = $team->subscription->stripe_customer_id;
+    $stripe_customer_id = data_get($team,'subscription.stripe_customer_id');
+    if (!$stripe_customer_id) {
+        return null;
+    }
     $session = \Stripe\BillingPortal\Session::create([
         'customer' => $stripe_customer_id,
         'return_url' => $return_url,

config/coolify.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'docs' => 'https://coolify.io/contact',
+    'docs' => 'https://coolify.io/docs/contact',
     'self_hosted' => env('SELF_HOSTED', true),
     'waitlist' => env('WAITLIST', false),
     'license_url' => 'https://licenses.coollabs.io',

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.72',
+    'release' => '4.0.0-beta.80',
     // 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.72';
+return '4.0.0-beta.80';

database/seeders/ServerSeeder.php

@@ -16,10 +16,6 @@ class ServerSeeder extends Seeder
             'ip' => "coolify-testing-host",
             'team_id' => 0,
             'private_key_id' => 0,
-            // 'proxy' => ServerMetadata::from([
-            //     'type' => ProxyTypes::TRAEFIK_V2->value,
-            //     'status' => ProxyStatus::EXITED->value
-            // ]),
         ]);
     }
 }

docker-compose.dev.yml

@@ -34,14 +34,16 @@ services:
       POSTGRES_DB: "${DB_DATABASE:-coolify}"
       POSTGRES_HOST_AUTH_METHOD: "trust"
     volumes:
-      - coolify-pg-data-dev:/var/lib/postgresql/data
+      - ./_data/coolify/_volumes/database/:/var/lib/postgresql/data
+      # - coolify-pg-data-dev:/var/lib/postgresql/data
   redis:
     ports:
       - "${FORWARD_REDIS_PORT:-6379}:6379"
     env_file:
       - .env
     volumes:
-      - coolify-redis-data-dev:/data
+      - ./_data/coolify/_volumes/redis/:/data
+      # - coolify-redis-data-dev:/data
   vite:
     image: node:19
     working_dir: /var/www/html
@@ -56,7 +58,8 @@ services:
     volumes:
       - /:/host
       - /var/run/docker.sock:/var/run/docker.sock
-      - coolify-data-dev:/data/coolify
+      - ./_data/coolify/:/data/coolify
+      # - coolify-data-dev:/data/coolify
   mailpit:
     image: "axllent/mailpit:latest"
     container_name: coolify-mail
@@ -76,7 +79,8 @@ services:
       MINIO_ACCESS_KEY: "${MINIO_ACCESS_KEY:-minioadmin}"
       MINIO_SECRET_KEY: "${MINIO_SECRET_KEY:-minioadmin}"
     volumes:
-      - coolify-minio-data-dev:/data
+      - ./_data/coolify/_volumes/minio/:/data
+      # - coolify-minio-data-dev:/data
     networks:
       - coolify
 

docker/testing-host/Dockerfile

@@ -27,4 +27,4 @@ RUN mkdir -p ~/.ssh
 RUN echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuGmoeGq/pojrsyP1pszcNVuZx9iFkCELtxrh31QJ68 coolify@coolify-instance" >> ~/.ssh/authorized_keys
 
 EXPOSE 22
-CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0"]
+CMD ["/usr/sbin/sshd", "-D", "-o", "ListenAddress=0.0.0.0", "-o", "Port=22"]

public/robots.txt

@@ -1,2 +1,2 @@
 User-agent: *
-Disallow:
+Disallow: /

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

@@ -2,7 +2,9 @@
     <livewire:server.proxy.modal :server="$server" />
     <div class="flex items-center gap-2">
         <h1>Server</h1>
-        <livewire:server.proxy.status :server="$server" />
+        @if ($server->proxyType() !== 'NONE')
+            <livewire:server.proxy.status :server="$server" />
+        @endif
     </div>
     <div class="subtitle ">{{ data_get($server, 'name') }}</div>
     <nav class="navbar-main">

resources/views/components/server/sidebar.blade.php

@@ -0,0 +1,20 @@
+<div>
+    @if ($server->isFunctional())
+        <div class="flex h-full pr-4">
+            <div class="flex flex-col gap-4 min-w-fit">
+                <a class="{{ request()->routeIs('server.proxy') ? 'text-white' : '' }}"
+                    href="{{ route('server.proxy', $parameters) }}">
+                    <button>Configuration</button>
+                </a>
+                @if (data_get($server, 'proxy.type') !== 'NONE')
+                    <a class="{{ request()->routeIs('server.proxy.logs') ? 'text-white' : '' }}"
+                        href="{{ route('server.proxy.logs', $parameters) }}">
+                        <button>Logs</button>
+                    </a>
+                @endif
+            </div>
+        </div>
+    @else
+        <div>Server is not validated. Validate first.</div>
+    @endif
+</div>

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

@@ -1,11 +1,14 @@
 <div class="pb-6">
-    <h1>Team</h1>
+    <div class="flex items-end gap-2">
+        <h1>Team</h1>
+        <a href="/team/new"><x-forms.button>+ New Team</x-forms.button></a>
+    </div>
     <nav class="flex pt-2 pb-10">
         <ol class="inline-flex items-center">
             <li>
                 <div class="flex items-center">
                     <span>Currently active team: <span
-                        class="text-warning">{{ session('currentTeam.name') }}</span></span>
+                            class="text-warning">{{ session('currentTeam.name') }}</span></span>
                 </div>
             </li>
         </ol>

resources/views/layouts/base.blade.php

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html data-theme="coollabs" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">

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

@@ -200,7 +200,7 @@
                                 label="Description" id="remoteServerDescription" />
                         </div>
                         <div class="flex gap-2">
-                            <x-forms.input required placeholder="Hostname or IP address" label="Hostname or IP Address"
+                            <x-forms.input required placeholder="127.0.0.1" label="IP Address"
                                 id="remoteServerHost" />
                             <x-forms.input required placeholder="Port number of your server. Default is 22."
                                 label="Port" id="remoteServerPort" />

resources/views/livewire/dashboard.blade.php

@@ -14,29 +14,12 @@
             <span>Your subscription has been activated! Welcome onboard!</span>
         </div>
     @endif
-    <div class="w-full rounded stats stats-vertical lg:stats-horizontal">
-        <div class="stat">
-            <div class="stat-title">Servers</div>
-            <div class="stat-value">{{ $servers->count() }} </div>
-        </div>
-
-        <div class="stat">
-            <div class="stat-title">Projects</div>
-            <div class="stat-value">{{ $projects->count() }}</div>
-        </div>
-
-        <div class="stat">
-            <div class="stat-title">Resources</div>
-            <div class="stat-value">{{ $resources }}</div>
-            <div class="stat-desc">Applications, databases, etc...</div>
-        </div>
-        <div class="stat">
-            <div class="stat-title">S3 Storages</div>
-            <div class="stat-value">{{ $s3s }}</div>
-        </div>
-    </div>
-    <h3 class="pb-4">Projects</h3>
-
+    @if ($projects->count() === 0 && $servers->count() === 0)
+        No resources found. Add your first server / private key <a class="text-white underline" href="{{route('server.create')}}">here</a>.
+    @endif
+    @if ($projects->count() > 0)
+        <h3 class="pb-4">Projects</h3>
+    @endif
     @if ($projects->count() === 1)
         <div class="grid grid-cols-1 gap-2">
         @else
@@ -44,7 +27,7 @@
     @endif
     @foreach ($projects as $project)
         <div class="gap-2 border border-transparent cursor-pointer box group" x-data
-            x-on:click="gotoProject('{{ $project->uuid }}')">
+            x-on:click="gotoProject('{{ $project->uuid }}','{{ data_get($project, 'environments.0.name', 'production') }}')">
             @if (data_get($project, 'environments.0.name'))
                 <a class="flex flex-col flex-1 mx-6 hover:no-underline"
                     href="{{ route('project.resources', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
@@ -60,6 +43,10 @@
                         {{ $project->description }}</div>
                 </a>
             @endif
+            <a class="mx-4 rounded group-hover:text-white hover:no-underline "
+                href="{{ route('project.resources.new', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => data_get($project, 'environments.0.name', 'production')]) }}">
+                <span class="font-bold hover:text-warning">+ New Resource</span>
+            </a>
             <a class="mx-4 rounded group-hover:text-white"
                 href="{{ route('project.edit', ['project_uuid' => data_get($project, 'uuid')]) }}">
                 <svg xmlns="http://www.w3.org/2000/svg" class="icon hover:text-warning" viewBox="0 0 24 24"
@@ -74,7 +61,9 @@
         </div>
     @endforeach
 </div>
-<h3 class="py-4">Servers</h3>
+@if ($projects->count() > 0)
+    <h3 class="pb-4">Servers</h3>
+@endif
 @if ($servers->count() === 1)
     <div class="grid grid-cols-1 gap-2">
     @else
@@ -108,11 +97,11 @@
     </a>
 @endforeach
 </div>
+
 <script>
-    function gotoProject(uuid) {
-        window.location.href = '/project/' + uuid;
+    function gotoProject(uuid, environment = 'production') {
+        window.location.href = '/project/' + uuid + '/' + environment;
     }
-   
 </script>
 {{-- <x-forms.button wire:click='getIptables'>Get IPTABLES</x-forms.button> --}}
 </div>

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

@@ -21,7 +21,7 @@
             @if (!$application->dockerfile)
                 <div class="flex flex-col gap-2">
                     <div class="flex gap-2">
-                        <x-forms.select id="application.build_pack" label="Build Pack" required>
+                        <x-forms.select wire:model="application.build_pack" label="Build Pack" required>
                             <option value="nixpacks">Nixpacks</option>
                             <option value="dockerfile">Dockerfile</option>
                             <option value="dockerimage">Docker Image</option>
@@ -73,8 +73,8 @@
                 </div>
             @else
                 <div class="flex flex-col gap-2 xl:flex-row">
-                    <x-forms.input id="application.docker_registry_image_name" required label="Docker Image" />
-                    <x-forms.input id="application.docker_registry_image_tag" required label="Docker Image Tag" />
+                    <x-forms.input id="application.docker_registry_image_name" label="Docker Image" />
+                    <x-forms.input id="application.docker_registry_image_tag" label="Docker Image Tag" />
                 </div>
             @endif
 

resources/views/livewire/project/new/public-git-repository.blade.php

@@ -1,13 +1,13 @@
 <div>
     <h1>Create a new Application</h1>
     <div class="pb-4">Deploy any public Git repositories.</div>
-    <form class="flex flex-col gap-2" wire:submit.prevent>
+    <form class="flex flex-col gap-2" wire:submit.prevent='load_branch'>
         <div class="flex flex-col gap-2">
             <div class="flex flex-col">
                 <div class="flex items-end gap-2">
-                    <x-forms.input wire:keydown.enter='load_branch' id="repository_url" label="Repository URL"
+                    <x-forms.input required  id="repository_url" label="Repository URL"
                         helper="{!! __('repository.url') !!}" />
-                    <x-forms.button wire:click.prevent="load_branch">
+                    <x-forms.button type="submit">
                         Check repository
                     </x-forms.button>
                 </div>
@@ -16,10 +16,9 @@
                         <div class="flex gap-2 py-2">
                             <div>Rate Limit</div>
                             <x-helper
-                                helper="Rate limit remaining: {{ $rate_limit_remaining }}<br>Rate limit reset at: {{ $rate_limit_reset }}" />
+                                helper="Rate limit remaining: {{ $rate_limit_remaining }}<br>Rate limit reset at: {{ $rate_limit_reset }} UTC"  />
                         </div>
                     @endif
-                    <h3 class="pt-8 pb-2">Details</h3>
                     <div class="flex flex-col gap-2 pb-6">
                         <div class="flex gap-2">
                             @if ($git_source === 'other')

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

@@ -1,5 +1,14 @@
 <div x-data x-init="$wire.loadThings">
-    <h1>New Resource</h1>
+    <div class="flex gap-2 ">
+        <h1>New Resource</h1>
+        <div class="w-96">
+            <x-forms.select wire:model="selectedEnvironment">
+                @foreach ($environments as $environment)
+                    <option value="{{ $environment->name }}">Environment: {{ $environment->name }}</option>
+                @endforeach
+            </x-forms.select>
+        </div>
+    </div>
     <div class="pb-4 ">Deploy resources, like Applications, Databases, Services...</div>
     <div class="flex flex-col gap-2 pt-10">
         @if ($current_step === 'type')
@@ -16,7 +25,7 @@
                             Public Repository
                         </div>
                         <div class="text-xs group-hover:text-white">
-                            You can deploy any kind of public repositories from the supported git servers.
+                            You can deploy any kind of public repositories from the supported git providers.
                         </div>
                     </div>
                 </div>

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

@@ -1,40 +1,24 @@
-<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.2000ms="checkStatus">
+<div x-data="{ raw: true, activeTab: window.location.hash ? window.location.hash.substring(1) : 'service-stack' }" wire:poll.15000ms="checkStatus">
     <livewire:project.service.navbar :service="$service" :parameters="$parameters" :query="$query" />
     <livewire:project.service.compose-modal :raw="$service->docker_compose_raw" :actual="$service->docker_compose" />
     <div class="flex h-full pt-6">
         <div class="flex flex-col items-start gap-4 min-w-fit">
             <a target="_blank" href="{{ $service->documentation() }}">Documentation <x-external-link /></a>
-            <a :class="activeTab === 'service-stack' && 'text-white'"
-                @click.prevent="activeTab = 'service-stack'; window.location.hash = 'service-stack'"
-                href="#">Service Stack</a>
-            <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages</a>
+            <a :class="activeTab === 'service-stack' && 'text-white'" @click.prevent="activeTab = 'service-stack';
+                window.location.hash = 'service-stack'" href="#">Service Stack</a>
+            <a :class="activeTab === 'storages' && 'text-white'" @click.prevent="activeTab = 'storages';
+                window.location.hash = 'storages'" href="#">Storages</a>
             <a :class="activeTab === 'environment-variables' && 'text-white'"
                 @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
                 href="#">Environment
                 Variables</a>
-            <a :class="activeTab === 'danger' && 'text-white'"
-                @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
+            <a :class="activeTab === 'danger' && 'text-white'" @click.prevent="activeTab = 'danger';
+                window.location.hash = 'danger'" href="#">Danger Zone
             </a>
         </div>
         <div class="w-full pl-8">
             <div x-cloak x-show="activeTab === 'service-stack'">
-                <form wire:submit.prevent='submit' class="flex flex-col gap-4 pb-2">
-                    <div class="flex gap-2">
-                        <div>
-                            <h2> Service Stack </h2>
-                            <div>Configuration</div>
-                        </div>
-                        <x-forms.button type="submit">Save</x-forms.button>
-                        <x-forms.button class="w-64" onclick="composeModal.showModal()">Edit Compose
-                            File</x-forms.button>
-                    </div>
-                    <div class="flex gap-2">
-                        <x-forms.input id="service.name" required label="Service Name"
-                            placeholder="My super wordpress site" />
-                        <x-forms.input id="service.description" label="Description" />
-                    </div>
-                </form>
+                <livewire:project.service.stack-form :service="$service" />
                 <div class="grid grid-cols-1 gap-2 pt-4 xl:grid-cols-3">
                     @foreach ($applications as $application)
                         <div @class([
@@ -65,8 +49,9 @@
                                 @endif
                                 <div class="text-xs">{{ $application->status }}</div>
                             </a>
-                            <a class="flex gap-2 p-1 mx-4 text-xs font-bold rounded hover:no-underline hover:text-warning"
-                                href="{{ route('project.service.logs', [...$parameters, 'service_name' => $application->name]) }}">Logs</a>
+                            <a class="flex gap-2 p-1 mx-4 font-bold rounded group-hover:text-white hover:no-underline"
+                                href="{{ route('project.service.logs', [...$parameters, 'service_name' => $application->name]) }}"><span
+                                    class="hover:text-warning">Logs</span></a>
                         </div>
                     @endforeach
                     @foreach ($databases as $database)
@@ -94,8 +79,9 @@
                                 @endif
                                 <div class="text-xs">{{ $database->status }}</div>
                             </a>
-                            <a class="flex gap-2 p-1 mx-4 text-xs font-bold rounded hover:no-underline hover:text-warning"
-                                href="{{ route('project.service.logs', [...$parameters, 'service_name' => $database->name]) }}">Logs</a>
+                            <a class="flex gap-2 p-1 mx-4 font-bold rounded hover:no-underline group-hover:text-white"
+                                href="{{ route('project.service.logs', [...$parameters, 'service_name' => $database->name]) }}"><span
+                                    class="hover:text-warning">Logs</span></a>
                         </div>
                     @endforeach
                 </div>
@@ -126,3 +112,4 @@
             </div>
         </div>
     </div>
+</div>

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

@@ -1,5 +1,5 @@
 <div>
-    <x-modal submitWireAction="serviceStatusUpdated" modalId="startService">
+    <x-modal submitWireAction="checkStatus" modalId="startService">
         <x-slot:modalBody>
             <livewire:activity-monitor header="Service Startup Logs" />
         </x-slot:modalBody>

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

@@ -1,4 +1,4 @@
-<div x-init="$wire.check_status">
+<div x-init="$wire.checkStatus">
     <livewire:project.service.modal />
     <h1>Configuration</h1>
     <x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />

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

@@ -0,0 +1,16 @@
+<form wire:submit.prevent='submit' class="flex flex-col gap-4 pb-2">
+    <div class="flex gap-2">
+        <div>
+            <h2>Service Stack</h2>
+            <div>Configuration</div>
+        </div>
+        <x-forms.button type="submit">Save</x-forms.button>
+        <x-forms.button class="w-64" onclick="composeModal.showModal()">Edit Compose
+            File</x-forms.button>
+    </div>
+    <div class="flex gap-2">
+        <x-forms.input id="service.name" required label="Service Name"
+            placeholder="My super wordpress site" />
+        <x-forms.input id="service.description" label="Description" />
+    </div>
+</form>

resources/views/livewire/server/form.blade.php

@@ -26,16 +26,23 @@
             Server is reachable and validated.
         @endif
         @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id !== 0)
-            <x-forms.button class="mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-100" wire:click.prevent='validateServer' isHighlighted>
+            <x-forms.button class="mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-100"
+                wire:click.prevent='validateServer' isHighlighted>
                 Validate Server & Install Docker Engine
             </x-forms.button>
         @endif
+        @if ((!$server->settings->is_reachable || !$server->settings->is_usable) && $server->id === 0)
+            <x-forms.button class="mt-8 mb-4 font-bold box-without-bg bg-coollabs hover:bg-coollabs-100"
+                wire:click.prevent='checkLocalhostConnection' isHighlighted>
+                Validate Server
+            </x-forms.button>
+        @endif
         <div class="flex flex-col gap-2 pt-4">
             <div class="flex flex-col w-full gap-2 lg:flex-row">
                 <x-forms.input id="server.name" label="Name" required />
                 <x-forms.input id="server.description" label="Description" />
                 <x-forms.input placeholder="https://example.com" id="wildcard_domain" label="Wildcard Domain"
-                    helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example</span>In case you set:<span class='text-helper'>https://example.com</span>your applications will get: <span class='text-helper'>https://randomId.example.com</span>" />
+                    helper="Wildcard domain for your applications. If you set this, you will get a random generated domain for your new applications.<br><span class='font-bold text-white'>Example:</span><br>In case you set:<span class='text-helper'>https://example.com</span> your applications will get:<br> <span class='text-helper'>https://randomId.example.com</span>" />
                 {{-- <x-forms.checkbox disabled type="checkbox" id="server.settings.is_part_of_swarm"
                     label="Is it part of a Swarm cluster?" /> --}}
             </div>
@@ -59,13 +66,13 @@
                 helper="Disk cleanup job will be executed if disk usage is more than this number." />
         @endif
     </form>
-    <h2 class="pt-4">Danger Zone</h2>
-    <div class="">Woah. I hope you know what are you doing.</div>
-    <h4 class="pt-4">Delete Server</h4>
-    <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming
-        back!
-    </div>
-    @if ($server->id !== 0 || isDev())
+    @if ($server->id !== 0)
+        <h2 class="pt-4">Danger Zone</h2>
+        <div class="">Woah. I hope you know what are you doing.</div>
+        <h4 class="pt-4">Delete Server</h4>
+        <div class="pb-4">This will remove this server from Coolify. Beware! There is no coming
+            back!
+        </div>
         <x-forms.button isError isModal modalId="deleteServer">
             Delete
         </x-forms.button>

resources/views/livewire/server/new/by-ip.blade.php

@@ -11,8 +11,8 @@
             </div>
             <div class="flex gap-2">
                 <x-forms.input id="ip" label="IP Address" required
-                    helper="Could be IP Address (127.0.0.1) or Domain Name (duckduckgo.com)." />
-                <x-forms.input id="user" label="User" required />
+                    helper="An IP Address (127.0.0.1). No domain names." />
+                <x-forms.input id="user" label  ="User" required />
                 <x-forms.input type="number" id="port" label="Port" required />
             </div>
             <x-forms.select label="Private Key" id="private_key_id">

resources/views/livewire/server/proxy.blade.php

@@ -1,75 +1,71 @@
 <div>
-    @if ($server->isFunctional())
-        @if (data_get($server, 'proxy.type'))
-            <div x-init="$wire.loadProxyConfiguration">
-                @if ($selectedProxy === 'TRAEFIK_V2')
-                    <form wire:submit.prevent='submit'>
-                        <div class="flex items-center gap-2">
-                            <h2>Proxy</h2>
-                            <x-forms.button type="submit">Save</x-forms.button>
-                            @if ($server->proxy->status === 'exited')
-                                <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
-                            @endif
+    @if (data_get($server, 'proxy.type'))
+        <div x-init="$wire.loadProxyConfiguration">
+            @if ($selectedProxy === 'TRAEFIK_V2')
+                <form wire:submit.prevent='submit'>
+                    <div class="flex items-center gap-2">
+                        <h2>Configuration</h2>
+                        <x-forms.button type="submit">Save</x-forms.button>
+                        @if ($server->proxy->status === 'exited')
+                            <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
+                        @endif
+                    </div>
+                    <div class="pt-3 pb-4 ">Traefik v2</div>
+                    @if (
+                        $server->proxy->last_applied_settings &&
+                            $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
+                        <div class="text-red-500 ">Configuration out of sync. Restart the proxy to apply the new
+                            configurations.
                         </div>
-                        <div class="pt-3 pb-4 ">Traefik v2</div>
-                        @if (
-                            $server->proxy->last_applied_settings &&
-                                $server->proxy->last_saved_settings !== $server->proxy->last_applied_settings)
-                            <div class="text-red-500 ">Configuration out of sync. Restart the proxy to apply the new
-                                configurations.
+                    @endif
+                    <x-forms.input placeholder="https://app.coolify.io" id="redirect_url" label="Default Redirect 404"
+                        helper="All urls that has no service available will be redirected to this domain." />
+                    <div wire:loading wire:target="loadProxyConfiguration" class="pt-4">
+                        <x-loading text="Loading proxy configuration..." />
+                    </div>
+                    <div wire:loading.remove wire:target="loadProxyConfiguration">
+                        @if ($proxy_settings)
+                            <div class="flex flex-col gap-2 pt-2">
+                                <x-forms.textarea label="Configuration file: traefik.conf" name="proxy_settings"
+                                    wire:model.defer="proxy_settings" rows="30" />
+                                <x-forms.button wire:click.prevent="reset_proxy_configuration">
+                                    Reset configuration to default
+                                </x-forms.button>
                             </div>
                         @endif
-                        <x-forms.input placeholder="https://app.coolify.io" id="redirect_url" label="Default Redirect 404"
-                            helper="All urls that has no service available will be redirected to this domain." />
-                        <div wire:loading wire:target="loadProxyConfiguration" class="pt-4">
-                            <x-loading text="Loading proxy configuration..." />
-                        </div>
-                        <div wire:loading.remove wire:target="loadProxyConfiguration">
-                            @if ($proxy_settings)
-                                <div class="flex flex-col gap-2 pt-2">
-                                    <x-forms.textarea label="Configuration file: traefik.conf" name="proxy_settings"
-                                        wire:model.defer="proxy_settings" rows="30" />
-                                    <x-forms.button wire:click.prevent="reset_proxy_configuration">
-                                        Reset configuration to default
-                                    </x-forms.button>
-                                </div>
-                            @endif
-                        </div>
-                    </form>
-                @elseif($selectedProxy === 'NONE')
-                    <div class="flex items-center gap-2">
-                        <h2>Proxy</h2>
-                        <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
-                    </div>
-                    <div class="pt-3 pb-4">None</div>
-                @else
-                    <div class="flex items-center gap-2">
-                        <h2>Proxy</h2>
-                        <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
-                    </div>
-                @endif
-            @else
-                <div>
-                    <h2>Proxy</h2>
-                    <div class="subtitle">Select a proxy you would like to use on this server.</div>
-                    <div class="grid gap-4">
-                        <x-forms.button class="box" wire:click="select_proxy('NONE')">
-                            Custom (None)
-                        </x-forms.button>
-                        <x-forms.button class="box" wire:click="select_proxy('TRAEFIK_V2')">
-                            Traefik
-                            v2
-                        </x-forms.button>
-                        <x-forms.button disabled class="box">
-                            Nginx
-                        </x-forms.button>
-                        <x-forms.button disabled class="box">
-                            Caddy
-                        </x-forms.button>
                     </div>
+                </form>
+            @elseif($selectedProxy === 'NONE')
+                <div class="flex items-center gap-2">
+                    <h2>Configuration</h2>
+                    <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
                 </div>
-        @endif
-    @else
-        <div>Server is not validated. Validate first.</div>
+                <div class="pt-3 pb-4">Custom (None) Proxy Selected</div>
+            @else
+                <div class="flex items-center gap-2">
+                    <h2>Configuration</h2>
+                    <x-forms.button wire:click.prevent="change_proxy">Switch Proxy</x-forms.button>
+                </div>
+            @endif
+        @else
+            <div>
+                <h2>Configuration</h2>
+                <div class="subtitle">Select a proxy you would like to use on this server.</div>
+                <div class="grid gap-4">
+                    <x-forms.button class="box" wire:click="select_proxy('NONE')">
+                        Custom (None)
+                    </x-forms.button>
+                    <x-forms.button class="box" wire:click="select_proxy('TRAEFIK_V2')">
+                        Traefik
+                        v2
+                    </x-forms.button>
+                    <x-forms.button disabled class="box">
+                        Nginx
+                    </x-forms.button>
+                    <x-forms.button disabled class="box">
+                        Caddy
+                    </x-forms.button>
+                </div>
+            </div>
     @endif
 </div>

resources/views/livewire/server/proxy/logs.blade.php

@@ -0,0 +1,9 @@
+<div>
+    <x-server.navbar :server="$server" :parameters="$parameters" />
+    <div class="flex gap-2">
+        <x-server.sidebar :server="$server" :parameters="$parameters" />
+        <div class="w-full">
+            <livewire:project.shared.get-logs :server="$server" container="coolify-proxy" />
+        </div>
+    </div>
+</div>

resources/views/livewire/server/proxy/show.blade.php

@@ -1,4 +1,9 @@
 <div>
     <x-server.navbar :server="$server" :parameters="$parameters" />
-    <livewire:server.proxy :server="$server" />
+    <div class="flex gap-2">
+        <x-server.sidebar :server="$server" :parameters="$parameters" />
+        <div class="w-full">
+            <livewire:server.proxy :server="$server" />
+        </div>
+    </div>
 </div>

resources/views/livewire/subscription/show.blade.php

@@ -0,0 +1,49 @@
+@if ($settings->is_resale_license_active)
+    @if (auth()->user()->isAdminFromSession())
+        <div class="flex justify-center mx-10">
+            <div x-data>
+                <div class="flex gap-2">
+                    <h1>Subscription</h1>
+                    <livewire:switch-team />
+                    @if (subscriptionProvider() === 'stripe' && $alreadySubscribed)
+                        <x-forms.button wire:click='stripeCustomerPortal'>Manage My Subscription</x-forms.button>
+                    @endif
+                </div>
+                <div class="flex items-center pb-8">
+                    <span>Currently active team: <span
+                            class="text-warning">{{ session('currentTeam.name') }}</span></span>
+                </div>
+                @if (request()->query->get('cancelled'))
+                    <div class="mb-6 rounded alert alert-error">
+                        <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
+                            viewBox="0 0 24 24">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                                d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                        </svg>
+                        <span>Something went wrong with your subscription. Please try again or contact
+                            support.</span>
+                    </div>
+                @endif
+
+                @if (config('subscription.provider') !== null)
+                    <livewire:subscription.pricing-plans />
+                @endif
+            </div>
+        </div>
+    @else
+        <div class="flex flex-col justify-center mx-10">
+            <div class="flex gap-2">
+                <h1>Subscription</h1>
+                <livewire:switch-team />
+            </div>
+            <div class="flex items-center pb-8">
+                <span>Currently active team: <span class="text-warning">{{ session('currentTeam.name') }}</span></span>
+            </div>
+            <div>You are not an admin or have been removed from this team. If this does not make sense, please <span
+                    class="text-white underline cursor-pointer" wire:click="help" onclick="help.showModal()">contact
+                    us</span>.</div>
+        </div>
+    @endif
+@else
+    <div class="px-10">Resale license is not active. Please contact your instance admin.</div>
+@endif

resources/views/subscription/index.blade.php

@@ -1,46 +0,0 @@
-<x-layout-subscription>
-    @if ($settings->is_resale_license_active)
-        @if (auth()->user()->isAdminFromSession())
-            <div class="flex justify-center mx-10">
-                <div x-data>
-                    <div class="flex gap-2">
-                        <h1>Subscription</h1>
-                        <livewire:switch-team />
-                    </div>
-                    <div class="flex items-center pb-8">
-                        <span>Currently active team: <span
-                                class="text-warning">{{ session('currentTeam.name') }}</span></span>
-                    </div>
-                    @if (request()->query->get('cancelled'))
-                        <div class="mb-6 rounded alert alert-error">
-                            <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 stroke-current shrink-0" fill="none"
-                                viewBox="0 0 24 24">
-                                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
-                                    d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
-                            </svg>
-                            <span>Something went wrong with your subscription. Please try again or contact
-                                support.</span>
-                        </div>
-                    @endif
-                    @if (config('subscription.provider') !== null)
-                        <livewire:subscription.pricing-plans />
-                    @endif
-                </div>
-            </div>
-        @else
-            <div class="flex flex-col justify-center mx-10">
-                <div class="flex gap-2">
-                    <h1>Subscription</h1>
-                    <livewire:switch-team />
-                </div>
-                <div class="flex items-center pb-8">
-                    <span>Currently active team: <span
-                            class="text-warning">{{ session('currentTeam.name') }}</span></span>
-                </div>
-                <div>You are not an admin or have been removed from this team. If this does not make sense, please <span class="text-white underline cursor-pointer" wire:click="help" onclick="help.showModal()">contact us</span>.</div>
-            </div>
-        @endif
-    @else
-        <div class="px-10" >Resale license is not active. Please contact your instance admin.</div>
-    @endif
-</x-layout-subscription>

resources/views/team/members.blade.php

@@ -25,7 +25,7 @@
             @else
                 <h3>Invite a new member</h3>
                 @if (isInstanceAdmin())
-                    <div class="pb-4 text-xs text-warning">You need to configure <a href="/settings/emails"
+                    <div class="pb-4 text-xs text-warning">You need to configure (as root team) <a href="/settings#smtp"
                             class="underline text-warning">Transactional
                             Emails</a>
                         before

routes/web.php

@@ -5,7 +5,6 @@ use App\Http\Controllers\Controller;
 use App\Http\Controllers\DatabaseController;
 use App\Http\Controllers\MagicController;
 use App\Http\Controllers\ProjectController;
-use App\Http\Controllers\ServerController;
 use App\Http\Livewire\Boarding\Index as BoardingIndex;
 use App\Http\Livewire\Project\Service\Index as ServiceIndex;
 use App\Http\Livewire\Project\Service\Show as ServiceShow;
@@ -17,7 +16,9 @@ use App\Http\Livewire\Server\Create;
 use App\Http\Livewire\Server\Destination\Show as DestinationShow;
 use App\Http\Livewire\Server\PrivateKey\Show as PrivateKeyShow;
 use App\Http\Livewire\Server\Proxy\Show as ProxyShow;
+use App\Http\Livewire\Server\Proxy\Logs as ProxyLogs;
 use App\Http\Livewire\Server\Show;
+use App\Http\Livewire\Subscription\Show as SubscriptionShow;
 use App\Http\Livewire\Waitlist\Index as WaitlistIndex;
 use App\Models\GithubApp;
 use App\Models\GitlabApp;
@@ -72,6 +73,7 @@ Route::get('/verify', function () {
 
 Route::get('/email/verify/{id}/{hash}', function (EmailVerificationRequest $request) {
     $request->fulfill();
+    send_internal_notification("User {$request->user()->name} verified their email address.");
     return redirect('/');
 })->middleware(['auth'])->name('verify.verify');
 
@@ -122,6 +124,7 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/server/new', Create::class)->name('server.create');
     Route::get('/server/{server_uuid}', Show::class)->name('server.show');
     Route::get('/server/{server_uuid}/proxy', ProxyShow::class)->name('server.proxy');
+    Route::get('/server/{server_uuid}/proxy/logs', ProxyLogs::class)->name('server.proxy.logs');
     Route::get('/server/{server_uuid}/private-key', PrivateKeyShow::class)->name('server.private-key');
     Route::get('/server/{server_uuid}/destinations', DestinationShow::class)->name('server.destinations');
 });
@@ -133,8 +136,7 @@ Route::middleware(['auth', 'verified'])->group(function () {
     Route::middleware(['throttle:force-password-reset'])->group(function () {
         Route::get('/force-password-reset', [Controller::class, 'force_passoword_reset'])->name('auth.force-password-reset');
     });
-    Route::get('/subscription', [Controller::class, 'subscription'])->name('subscription.index');
-    // Route::get('/help', Help::class)->name('help');
+    Route::get('/subscription', SubscriptionShow::class)->name('subscription.index');
     Route::get('/settings', [Controller::class, 'settings'])->name('settings.configuration');
     Route::get('/settings/license', [Controller::class, 'license'])->name('settings.license');
     Route::get('/profile', fn () => view('profile', ['request' => request()]))->name('profile');

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.72"
+            "version": "4.0.0-beta.80"
         }
     }
 }