Merge pull request #1711 from coollabsio/next

Refactor server validation and installation logic

app/Actions/Proxy/StartProxy.php

@@ -27,7 +27,7 @@ class StartProxy
             $server->save();
             if ($server->isSwarm()) {
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path && cd $proxy_path",
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Starting coolify-proxy.'",
                     "cd $proxy_path && docker stack deploy -c docker-compose.yml coolify-proxy",
@@ -35,7 +35,7 @@ class StartProxy
                 ]);
             } else {
                 $commands = $commands->merge([
-                    "mkdir -p $proxy_path && cd $proxy_path",
+                    "mkdir -p $proxy_path/dynamic && cd $proxy_path",
                     "echo 'Creating required Docker Compose file.'",
                     "echo 'Pulling docker image.'",
                     'docker compose pull',

app/Actions/Server/InstallDocker.php

@@ -43,6 +43,7 @@ class InstallDocker
                 "echo 'Restarting Docker Engine...'",
                 "ls -l /tmp"
             ]);
+            return remote_process($command, $server);
         } else {
             if ($supported_os_type->contains('debian')) {
                 $command = $command->merge([
@@ -89,7 +90,6 @@ class InstallDocker
                     "echo 'Done!'",
                 ]);
             }
-
             return remote_process($command, $server);
         }
     }

app/Actions/Service/DeleteService.php

@@ -45,6 +45,7 @@ class DeleteService
             foreach ($service->databases()->get() as $database) {
                 $database->forceDelete();
             }
+            $service->tags()->detach();
         }
     }
 }

app/Console/Commands/SyncBunny.php

@@ -48,7 +48,7 @@ class SyncBunny extends Command
 
         $versions = "versions.json";
 
-        PendingRequest::macro('storage', function ($fileName) use($that) {
+        PendingRequest::macro('storage', function ($fileName) use ($that) {
             $headers = [
                 'AccessKey' => env('BUNNY_STORAGE_API_KEY'),
                 'Accept' => 'application/json',
@@ -76,23 +76,26 @@ class SyncBunny extends Command
             }
             if ($only_template) {
                 $this->info('About to sync service-templates.json to BunnyCDN.');
-            }
+                $confirmed = confirm("Are you sure you want to sync?");
-            if ($only_version) {
+                if (!$confirmed) {
-                $this->info('About to sync versions.json to BunnyCDN.');
+                    return;
-            }
+                }
-            $confirmed = confirm('Are you sure you want to sync?');
-            if (!$confirmed) {
-                return;
-            }
-            if ($only_template) {
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/templates/$service_template")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$service_template"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$service_template"),
                 ]);
                 $this->info('Service template uploaded & purged...');
                 return;
-            }
+            } else if ($only_version) {
-            if ($only_version) {
+                $this->info('About to sync versions.json to BunnyCDN.');
+                $file = file_get_contents("$parent_dir/$versions");
+                $json = json_decode($file, true);
+                $actual_version = data_get($json, 'coolify.v4.version');
+
+                $confirmed = confirm("Are you sure you want to sync to {$actual_version}?");
+                if (!$confirmed) {
+                    return;
+                }
                 Http::pool(fn (Pool $pool) => [
                     $pool->storage(fileName: "$parent_dir/$versions")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$versions"),
                     $pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
@@ -101,6 +104,7 @@ class SyncBunny extends Command
                 return;
             }
 
+
             Http::pool(fn (Pool $pool) => [
                 $pool->storage(fileName: "$parent_dir/$compose_file")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file"),
                 $pool->storage(fileName: "$parent_dir/$compose_file_prod")->put("/$bunny_cdn_storage_name/$bunny_cdn_path/$compose_file_prod"),

app/Http/Controllers/Api/Deploy.php

@@ -0,0 +1,159 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Actions\Database\StartMariadb;
+use App\Actions\Database\StartMongodb;
+use App\Actions\Database\StartMysql;
+use App\Actions\Database\StartPostgresql;
+use App\Actions\Database\StartRedis;
+use App\Actions\Service\StartService;
+use App\Http\Controllers\Controller;
+use App\Models\Tag;
+use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Visus\Cuid2\Cuid2;
+
+class Deploy extends Controller
+{
+    public function deploy(Request $request)
+    {
+        $token = auth()->user()->currentAccessToken();
+        $teamId = data_get($token, 'team_id');
+        $uuids = $request->query->get('uuid');
+        $tags = $request->query->get('tag');
+        $force = $request->query->get('force') ?? false;
+
+        if ($uuids && $tags) {
+            return response()->json(['error' => 'You can only use uuid or tag, not both.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        if (is_null($teamId)) {
+            return response()->json(['error' => 'Invalid token.', 'docs' => 'https://coolify.io/docs/api/authentication'], 400);
+        }
+        if ($tags) {
+            return $this->by_tags($tags, $teamId, $force);
+        } else if ($uuids) {
+            return $this->by_uuids($uuids, $teamId, $force);
+        }
+        return response()->json(['error' => 'You must provide uuid or tag.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+    }
+    private function by_uuids(string $uuid, int $teamId, bool $force = false)
+    {
+        $uuids = explode(',', $uuid);
+        $uuids = collect(array_filter($uuids));
+
+        if (count($uuids) === 0) {
+            return response()->json(['error' => 'No UUIDs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($uuids as $uuid) {
+            $resource = getResourceByUuid($uuid, $teamId);
+            if ($resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function by_tags(string $tags, int $team_id, bool $force = false)
+    {
+        $tags = explode(',', $tags);
+        $tags = collect(array_filter($tags));
+
+        if (count($tags) === 0) {
+            return response()->json(['error' => 'No TAGs provided.', 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 400);
+        }
+        $message = collect([]);
+        foreach ($tags as $tag) {
+            $found_tag = Tag::where(['name' => $tag, 'team_id' => $team_id])->first();
+            if (!$found_tag) {
+                $message->push("Tag {$tag} not found.");
+                continue;
+            }
+            $applications = $found_tag->applications();
+            $services = $found_tag->services();
+            if ($applications->count() === 0 && $services->count() === 0) {
+                $message->push("No resources found for tag {$tag}.");
+                continue;
+            }
+            foreach ($applications as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+            foreach ($services as $resource) {
+                $return_message = $this->deploy_resource($resource, $force);
+                $message = $message->merge($return_message);
+            }
+        }
+        if ($message->count() > 0) {
+            return response()->json(['message' => $message->toArray()], 200);
+        }
+
+        return response()->json(['error' => "No resources found.", 'docs' => 'https://coolify.io/docs/api/deploy-webhook'], 404);
+    }
+    public function deploy_resource($resource, bool $force = false): Collection
+    {
+        $message = collect([]);
+        $type = $resource->getMorphClass();
+        if ($type === 'App\Models\Application') {
+            queue_application_deployment(
+                application: $resource,
+                deployment_uuid: new Cuid2(7),
+                force_rebuild: $force,
+            );
+            $message->push("Application {$resource->name} deployment queued.");
+        } else if ($type === 'App\Models\StandalonePostgresql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartPostgresql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneRedis') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartRedis::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMongodb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMongodb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMysql') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMysql::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\StandaloneMariadb') {
+            if (str($resource->status)->startsWith('running')) {
+                $message->push("Database {$resource->name} already running.");
+            }
+            StartMariadb::run($resource);
+            $resource->update([
+                'started_at' => now(),
+            ]);
+            $message->push("Database {$resource->name} started.");
+        } else if ($type === 'App\Models\Service') {
+            StartService::run($resource);
+            $message->push("Service {$resource->name} started. It could take a while, be patient.");
+        }
+        return $message;
+    }
+}

app/Jobs/ApplicationDeploymentJob.php

@@ -122,7 +122,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         if ($source) {
             $this->source = $source->getMorphClass()::where('id', $this->application->source->id)->first();
         }
-        $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
+        $this->server = Server::find($this->application_deployment_queue->server_id);
+        $this->destination = $this->server->destinations()->where('id', $this->application_deployment_queue->destination_id)->first();
         $this->server = $this->mainServer = $this->destination->server;
         $this->serverUser = $this->server->user;
         $this->basedir = $this->application->generateBaseDir($this->deployment_uuid);
@@ -166,10 +167,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
     public function handle(): void
     {
-        $this->application_deployment_queue->update([
-            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
-        ]);
-
         // Generate custom host<->ip mapping
         $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
         if (!is_null($allContainers)) {
@@ -488,7 +485,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         } else {
             $this->application_deployment_queue->addLogEntry("Starting pull request (#{$this->pull_request_id}) deployment of {$this->customRepository}:{$this->application->git_branch}.");
         }
-        ray('asddf');
         $this->prepare_builder_image();
         $this->check_git_if_build_needed();
         $this->clone_repository();
@@ -566,12 +562,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->generate_build_env_variables();
         $this->add_build_env_variables_to_dockerfile();
         $this->build_image();
-        // if ($this->application->additional_destinations) {
-        //     $this->push_to_docker_registry();
-        //     $this->deploy_to_additional_destinations();
-        // } else {
         $this->rolling_update();
-        // }
     }
     private function deploy_nixpacks_buildpack()
     {
@@ -796,7 +787,18 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     }
     private function deploy_to_additional_destinations()
     {
+        if (str($this->application->additional_destinations)->isEmpty()) {
+            return;
+        }
         $destination_ids = collect(str($this->application->additional_destinations)->explode(','));
+        if ($this->server->isSwarm()) {
+            $this->application_deployment_queue->addLogEntry("Additional destinations are not supported in swarm mode.");
+            return;
+        }
+        if ($destination_ids->contains($this->destination->id)) {
+            ray('Same destination found in additional destinations. Skipping.');
+            return;
+        }
         foreach ($destination_ids as $destination_id) {
             $destination = StandaloneDocker::find($destination_id);
             $server = $destination->server;
@@ -804,11 +806,21 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 $this->application_deployment_queue->addLogEntry("Skipping deployment to {$server->name}. Not in the same team?!");
                 continue;
             }
-            $this->server = $server;
+            // ray('Deploying to additional destination: ', $server->name);
-            $this->application_deployment_queue->addLogEntry("Deploying to {$this->server->name}.");
+            $deployment_uuid = new Cuid2();
-            $this->prepare_builder_image();
+            queue_application_deployment(
-            $this->generate_image_names();
+                deployment_uuid: $deployment_uuid,
-            $this->rolling_update();
+                application: $this->application,
+                server: $server,
+                destination: $destination,
+                no_questions_asked: true,
+            );
+            $this->application_deployment_queue->addLogEntry("Deploying to additional server: {$server->name}. Click here to see the deployment status: " . route('project.application.deployment.show', [
+                'project_uuid' => data_get($this->application, 'environment.project.uuid'),
+                'application_uuid' => data_get($this->application, 'uuid'),
+                'deployment_uuid' => $deployment_uuid,
+                'environment_name' => data_get($this->application, 'environment.name'),
+            ]));
         }
     }
     private function set_base_dir()
@@ -1512,11 +1524,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                 'status' => $status,
             ]);
         }
-        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
-            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
-        }
         if ($status === ApplicationDeploymentStatus::FAILED->value) {
             $this->application->environment->project->team?->notify(new DeploymentFailed($this->application, $this->deployment_uuid, $this->preview));
+            return;
+        }
+        if ($status === ApplicationDeploymentStatus::FINISHED->value) {
+            // $this->deploy_to_additional_destinations();
+            $this->application->environment->project->team?->notify(new DeploymentSuccess($this->application, $this->deployment_uuid, $this->preview));
         }
     }
 

app/Jobs/ScheduledTaskJob.php

@@ -39,7 +39,7 @@ class ScheduledTaskJob implements ShouldQueue
         } else if ($application = $task->application()->first()) {
             $this->resource = $application;
         } else {
-            throw new \Exception('ScheduledTaskJob failed: No resource found.');
+            throw new \RuntimeException('ScheduledTaskJob failed: No resource found.');
         }
         $this->team = Team::find($task->team_id);
     }

app/Livewire/ActivityMonitor.php

@@ -15,7 +15,7 @@ class ActivityMonitor extends Component
     public $isPollingActive = false;
 
     protected $activity;
-    protected $listeners = ['newMonitorActivity'];
+    protected $listeners = ['activityMonitor' => 'newMonitorActivity'];
 
     public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
     {

app/Livewire/Boarding/Index.php

@@ -12,6 +12,7 @@ use Livewire\Component;
 
 class Index extends Component
 {
+    protected $listeners = ['serverInstalled' => 'validateServer'];
     public string $currentState = 'welcome';
 
     public ?string $selectedServerType = null;
@@ -93,7 +94,11 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->serverPublicKey = $this->createdServer->privateKey->publicKey();
             return $this->validateServer('localhost');
         } elseif ($this->selectedServerType === 'remote') {
-            $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            if (isDev()) {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->get();
+            } else {
+                $this->privateKeys = PrivateKey::ownedByCurrentTeam(['name'])->where('id', '!=', 0)->get();
+            }
             if ($this->privateKeys->count() > 0) {
                 $this->selectedExistingPrivateKey = $this->privateKeys->first()->id;
             }
@@ -190,6 +195,10 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
         $this->createdServer->addInitialNetwork();
         $this->validateServer();
     }
+    public function installServer()
+    {
+        $this->dispatch('validateServer', true);
+    }
     public function validateServer()
     {
         try {
@@ -228,7 +237,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA==
             $this->dockerInstallationStarted = true;
             $activity = InstallDocker::run($this->createdServer);
             $this->dispatch('installDocker');
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             $this->dockerInstallationStarted = false;
             return handleError(error: $e, livewire: $this);

app/Livewire/NewActivityMonitor.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Models\User;
+use Livewire\Component;
+use Spatie\Activitylog\Models\Activity;
+
+class NewActivityMonitor extends Component
+{
+    public ?string $header = null;
+    public $activityId;
+    public $eventToDispatch = 'activityFinished';
+    public $isPollingActive = false;
+
+    protected $activity;
+    protected $listeners = ['newActivityMonitor' => 'newMonitorActivity'];
+
+    public function newMonitorActivity($activityId, $eventToDispatch = 'activityFinished')
+    {
+        $this->activityId = $activityId;
+        $this->eventToDispatch = $eventToDispatch;
+
+        $this->hydrateActivity();
+
+        $this->isPollingActive = true;
+    }
+
+    public function hydrateActivity()
+    {
+        $this->activity = Activity::find($this->activityId);
+    }
+
+    public function polling()
+    {
+        $this->hydrateActivity();
+        // $this->setStatus(ProcessStatus::IN_PROGRESS);
+        $exit_code = data_get($this->activity, 'properties.exitCode');
+        if ($exit_code !== null) {
+            // if ($exit_code === 0) {
+            //     // $this->setStatus(ProcessStatus::FINISHED);
+            // } else {
+            //     // $this->setStatus(ProcessStatus::ERROR);
+            // }
+            $this->isPollingActive = false;
+            if ($this->eventToDispatch !== null) {
+                if (str($this->eventToDispatch)->startsWith('App\\Events\\')) {
+                    $causer_id = data_get($this->activity, 'causer_id');
+                    $user = User::find($causer_id);
+                    if ($user) {
+                        foreach ($user->teams as $team) {
+                            $teamId = $team->id;
+                            $this->eventToDispatch::dispatch($teamId);
+                        }
+                    }
+                    return;
+                }
+                $this->dispatch($this->eventToDispatch);
+                ray('Dispatched event: ' . $this->eventToDispatch);
+            }
+        }
+    }
+}

app/Livewire/Project/Application/DeploymentNavbar.php

@@ -7,8 +7,6 @@ use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
 use Illuminate\Support\Carbon;
-use Illuminate\Support\Facades\Process;
-use Illuminate\Support\Str;
 use Livewire\Component;
 
 class DeploymentNavbar extends Component
@@ -37,7 +35,15 @@ class DeploymentNavbar extends Component
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
         $this->dispatch('refreshQueue');
     }
-
+    public function force_start()
+    {
+        try {
+            force_start_deployment($this->application_deployment_queue);
+        } catch (\Throwable $e) {
+            ray($e);
+            return handleError($e, $this);
+        }
+    }
     public function cancel()
     {
         try {
@@ -67,7 +73,6 @@ class DeploymentNavbar extends Component
                 'current_process_id' => null,
                 'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
             ]);
-            // queue_next_deployment($this->application);
         }
     }
 }

app/Livewire/Project/Application/Heading.php

@@ -46,26 +46,6 @@ class Heading extends Component
         $this->deploy(force_rebuild: true);
     }
 
-    public function deployNew()
-    {
-        if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {
-            $this->dispatch('error', 'Please load a Compose file first.');
-            return;
-        }
-        $this->setDeploymentUuid();
-        queue_application_deployment(
-            application: $this->application,
-            deployment_uuid: $this->deploymentUuid,
-            force_rebuild: false,
-            is_new_deployment: true,
-        );
-        return redirect()->route('project.application.deployment.show', [
-            'project_uuid' => $this->parameters['project_uuid'],
-            'application_uuid' => $this->parameters['application_uuid'],
-            'deployment_uuid' => $this->deploymentUuid,
-            'environment_name' => $this->parameters['environment_name'],
-        ]);
-    }
     public function deploy(bool $force_rebuild = false)
     {
         if ($this->application->build_pack === 'dockercompose' && is_null($this->application->docker_compose_raw)) {

app/Livewire/Project/CloneMe.php

@@ -22,12 +22,12 @@ class CloneMe extends Component
     public ?int $selectedDestination = null;
     public ?Server $server = null;
     public $resources = [];
-    public string $newProjectName = '';
+    public string $newName = '';
 
     protected $messages = [
         'selectedServer' => 'Please select a server.',
         'selectedDestination' => 'Please select a server & destination.',
-        'newProjectName' => 'Please enter a name for the new project.',
+        'newName' => 'Please enter a name for the new project or environment.',
     ];
     public function mount($project_uuid)
     {
@@ -36,7 +36,7 @@ class CloneMe extends Component
         $this->environment = $this->project->environments->where('name', $this->environment_name)->first();
         $this->project_id = $this->project->id;
         $this->servers = currentTeam()->servers;
-        $this->newProjectName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
+        $this->newName = str($this->project->name . '-clone-' . (string)new Cuid2(7))->slug();
     }
 
     public function render()
@@ -46,34 +46,50 @@ class CloneMe extends Component
 
     public function selectServer($server_id, $destination_id)
     {
+        if ($server_id == $this->selectedServer && $destination_id == $this->selectedDestination) {
+            $this->selectedServer = null;
+            $this->selectedDestination = null;
+            $this->server = null;
+            return;
+        }
         $this->selectedServer = $server_id;
         $this->selectedDestination = $destination_id;
         $this->server = $this->servers->where('id', $server_id)->first();
     }
 
-    public function clone()
+    public function clone(string $type)
     {
         try {
             $this->validate([
                 'selectedDestination' => 'required',
-                'newProjectName' => 'required',
+                'newName' => 'required',
             ]);
-            $foundProject = Project::where('name', $this->newProjectName)->first();
+            if ($type === 'project') {
-            if ($foundProject) {
+                $foundProject = Project::where('name', $this->newName)->first();
-                throw new \Exception('Project with the same name already exists.');
+                if ($foundProject) {
-            }
+                    throw new \Exception('Project with the same name already exists.');
-            $newProject = Project::create([
+                }
-                'name' => $this->newProjectName,
+                $project = Project::create([
-                'team_id' => currentTeam()->id,
+                    'name' => $this->newName,
-                'description' => $this->project->description . ' (clone)',
+                    'team_id' => currentTeam()->id,
-            ]);
+                    'description' => $this->project->description . ' (clone)',
-            if ($this->environment->name !== 'production') {
+                ]);
-                $newProject->environments()->create([
+                if ($this->environment->name !== 'production') {
-                    'name' => $this->environment->name,
+                    $project->environments()->create([
+                        'name' => $this->environment->name,
+                    ]);
+                }
+                $environment = $project->environments->where('name', $this->environment->name)->first();
+            } else {
+                $foundEnv = $this->project->environments()->where('name', $this->newName)->first();
+                if ($foundEnv) {
+                    throw new \Exception('Environment with the same name already exists.');
+                }
+                $project = $this->project;
+                $environment = $this->project->environments()->create([
+                    'name' => $this->newName,
                 ]);
             }
-            $newEnvironment = $newProject->environments->where('name', $this->environment->name)->first();
-            // Clone Applications
             $applications = $this->environment->applications;
             $databases = $this->environment->databases();
             $services = $this->environment->services;
@@ -83,7 +99,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'fqdn' => generateFqdn($this->server, $uuid),
                     'status' => 'exited',
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     // This is not correct, but we need to set it to something
                     'destination_id' => $this->selectedDestination,
                 ]);
@@ -110,7 +126,7 @@ class CloneMe extends Component
                     'uuid' => $uuid,
                     'status' => 'exited',
                     'started_at' => null,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newDatabase->save();
@@ -136,7 +152,7 @@ class CloneMe extends Component
                 $uuid = (string)new Cuid2(7);
                 $newService = $service->replicate()->fill([
                     'uuid' => $uuid,
-                    'environment_id' => $newEnvironment->id,
+                    'environment_id' => $environment->id,
                     'destination_id' => $this->selectedDestination,
                 ]);
                 $newService->save();
@@ -153,8 +169,8 @@ class CloneMe extends Component
                 $newService->parse();
             }
             return redirect()->route('project.resource.index', [
-                'project_uuid' => $newProject->uuid,
+                'project_uuid' => $project->uuid,
-                'environment_name' => $newEnvironment->name,
+                'environment_name' => $environment->name,
             ]);
         } catch (\Exception $e) {
             return handleError($e, $this);

app/Livewire/Project/Database/Heading.php

@@ -58,19 +58,19 @@ class Heading extends Component
     {
         if ($this->database->type() === 'standalone-postgresql') {
             $activity = StartPostgresql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-redis') {
             $activity = StartRedis::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mongodb') {
             $activity = StartMongodb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mysql') {
             $activity = StartMysql::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } else if ($this->database->type() === 'standalone-mariadb') {
             $activity = StartMariadb::run($this->database);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         }
     }
 }

app/Livewire/Project/Database/Import.php

@@ -129,7 +129,7 @@ class Import extends Component
 
             if (!empty($this->importCommands)) {
                 $activity = remote_process($this->importCommands, $this->server, ignore_errors: true);
-                $this->dispatch('newMonitorActivity', $activity->id);
+                $this->dispatch('activityMonitor', $activity->id);
             }
         } catch (\Throwable $e) {
             $this->validated = false;

app/Livewire/Project/DeleteEnvironment.php

@@ -9,6 +9,7 @@ class DeleteEnvironment extends Component
 {
     public array $parameters;
     public int $environment_id;
+    public bool $disabled = false;
 
     public function mount()
     {

app/Livewire/Project/DeleteProject.php

@@ -9,6 +9,7 @@ class DeleteProject extends Component
 {
     public array $parameters;
     public int $project_id;
+    public bool $disabled = false;
 
     public function mount()
     {

app/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -9,6 +9,7 @@ use App\Models\PrivateKey;
 use App\Models\Project;
 use App\Models\StandaloneDocker;
 use App\Models\SwarmDocker;
+use Illuminate\Support\Collection;
 use Livewire\Component;
 use Spatie\Url\Url;
 use Illuminate\Support\Str;
@@ -18,7 +19,7 @@ class GithubPrivateRepositoryDeployKey extends Component
     public $current_step = 'private_keys';
     public $parameters;
     public $query;
-    public $private_keys;
+    public $private_keys =[];
     public int $private_key_id;
 
     public int $port = 3000;
@@ -33,6 +34,11 @@ class GithubPrivateRepositoryDeployKey extends Component
     public $build_pack = 'nixpacks';
     public bool $show_is_static = true;
 
+    private object $repository_url_parsed;
+    private GithubApp|GitlabApp|string $git_source = 'other';
+    private ?string $git_host = null;
+    private string $git_repository;
+
     protected $rules = [
         'repository_url' => 'required',
         'branch' => 'required|string',
@@ -49,10 +55,7 @@ class GithubPrivateRepositoryDeployKey extends Component
         'publish_directory' => 'Publish directory',
         'build_pack' => 'Build pack',
     ];
-    private object $repository_url_parsed;
+
-    private GithubApp|GitlabApp|string $git_source = 'other';
-    private ?string $git_host = null;
-    private string $git_repository;
 
     public function mount()
     {

app/Livewire/Project/Resource/Index.php

@@ -29,7 +29,7 @@ class Index extends Component
         }
         $this->project = $project;
         $this->environment = $environment;
-        $this->applications = $environment->applications->sortBy('name');
+        $this->applications = $environment->applications->load(['tags']);
         $this->applications = $this->applications->map(function ($application) {
             if (data_get($application, 'environment.project.uuid')) {
                 $application->hrefLink = route('project.application.configuration', [
@@ -40,8 +40,9 @@ class Index extends Component
             }
             return $application;
         });
-        $this->postgresqls = $environment->postgresqls->sortBy('name');
+        ray($this->applications);
-        $this->postgresqls =  $this->postgresqls->map(function ($postgresql) {
+        $this->postgresqls = $environment->postgresqls->load(['tags'])->sortBy('name');
+        $this->postgresqls = $this->postgresqls->map(function ($postgresql) {
             if (data_get($postgresql, 'environment.project.uuid')) {
                 $postgresql->hrefLink = route('project.database.configuration', [
                     'project_uuid' => data_get($postgresql, 'environment.project.uuid'),
@@ -51,7 +52,7 @@ class Index extends Component
             }
             return $postgresql;
         });
-        $this->redis = $environment->redis->sortBy('name');
+        $this->redis = $environment->redis->load(['tags'])->sortBy('name');
         $this->redis = $this->redis->map(function ($redis) {
             if (data_get($redis, 'environment.project.uuid')) {
                 $redis->hrefLink = route('project.database.configuration', [
@@ -62,7 +63,7 @@ class Index extends Component
             }
             return $redis;
         });
-        $this->mongodbs = $environment->mongodbs->sortBy('name');
+        $this->mongodbs = $environment->mongodbs->load(['tags'])->sortBy('name');
         $this->mongodbs = $this->mongodbs->map(function ($mongodb) {
             if (data_get($mongodb, 'environment.project.uuid')) {
                 $mongodb->hrefLink = route('project.database.configuration', [
@@ -73,7 +74,7 @@ class Index extends Component
             }
             return $mongodb;
         });
-        $this->mysqls = $environment->mysqls->sortBy('name');
+        $this->mysqls = $environment->mysqls->load(['tags'])->sortBy('name');
         $this->mysqls = $this->mysqls->map(function ($mysql) {
             if (data_get($mysql, 'environment.project.uuid')) {
                 $mysql->hrefLink = route('project.database.configuration', [
@@ -84,7 +85,7 @@ class Index extends Component
             }
             return $mysql;
         });
-        $this->mariadbs = $environment->mariadbs->sortBy('name');
+        $this->mariadbs = $environment->mariadbs->load(['tags'])->sortBy('name');
         $this->mariadbs = $this->mariadbs->map(function ($mariadb) {
             if (data_get($mariadb, 'environment.project.uuid')) {
                 $mariadb->hrefLink = route('project.database.configuration', [
@@ -95,7 +96,7 @@ class Index extends Component
             }
             return $mariadb;
         });
-        $this->services = $environment->services->sortBy('name');
+        $this->services = $environment->services->load(['tags'])->sortBy('name');
         $this->services = $this->services->map(function ($service) {
             if (data_get($service, 'environment.project.uuid')) {
                 $service->hrefLink = route('project.service.configuration', [

app/Livewire/Project/Service/Configuration.php

@@ -8,7 +8,7 @@ use Livewire\Component;
 
 class Configuration extends Component
 {
-    public Service $service;
+    public ?Service $service = null;
     public $applications;
     public $databases;
     public array $parameters;

app/Livewire/Project/Service/Navbar.php

@@ -57,7 +57,7 @@ class Navbar extends Component
         }
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
     public function stop(bool $forceCleanup = false)
     {
@@ -82,6 +82,6 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->parse();
         $activity = StartService::run($this->service);
-        $this->dispatch('newMonitorActivity', $activity->id);
+        $this->dispatch('activityMonitor', $activity->id);
     }
 }

app/Livewire/Project/Service/ServiceApplicationView.php

@@ -5,7 +5,7 @@ namespace App\Livewire\Project\Service;
 use App\Models\ServiceApplication;
 use Livewire\Component;
 
-class Application extends Component
+class ServiceApplicationView extends Component
 {
     public ServiceApplication $application;
     public $parameters;
@@ -20,7 +20,7 @@ class Application extends Component
     ];
     public function render()
     {
-        return view('livewire.project.service.application');
+        return view('livewire.project.service.service-application-view');
     }
     public function instantSave()
     {

app/Livewire/Project/Shared/Danger.php

@@ -17,8 +17,8 @@ class Danger extends Component
     {
         $this->modalId = new Cuid2(7);
         $parameters = get_route_parameters();
-        $this->projectUuid = $parameters['project_uuid'];
+        $this->projectUuid = data_get($parameters, 'project_uuid');
-        $this->environmentName = $parameters['environment_name'];
+        $this->environmentName = data_get($parameters, 'environment_name');
     }
 
     public function delete()

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

@@ -32,6 +32,13 @@ class Add extends Component
     public function submit()
     {
         $this->validate();
+        if (str($this->value)->startsWith('{{') && str($this->value)->endsWith('}}')) {
+            $type = str($this->value)->after("{{")->before(".")->value;
+            if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                return;
+            }
+        }
         $this->dispatch('saveKey', [
             'key' => $this->key,
             'value' => $this->value,

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

@@ -71,12 +71,26 @@ class All extends Component
                     continue;
                 }
                 $found->value = $variable;
+                if (str($found->value)->startsWith('{{') && str($found->value)->endsWith('}}')) {
+                    $type = str($found->value)->after("{{")->before(".")->value;
+                    if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                        $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                        return;
+                    }
+                }
                 $found->save();
                 continue;
             } else {
                 $environment = new EnvironmentVariable();
                 $environment->key = $key;
                 $environment->value = $variable;
+                if (str($environment->value)->startsWith('{{') && str($environment->value)->endsWith('}}')) {
+                    $type = str($environment->value)->after("{{")->before(".")->value;
+                    if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                        $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                        return;
+                    }
+                }
                 $environment->is_build_time = false;
                 $environment->is_preview = $isPreview ? true : false;
                 switch ($this->resource->type()) {

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

@@ -50,7 +50,8 @@ class Show extends Component
             $this->isLocked = true;
         }
     }
-    public function serialize() {
+    public function serialize()
+    {
         data_forget($this->env, 'real_value');
         if ($this->env->getMorphClass() === 'App\Models\SharedEnvironmentVariable') {
             data_forget($this->env, 'is_build_time');
@@ -80,11 +81,18 @@ class Show extends Component
             } else {
                 $this->validate();
             }
+            if (str($this->env->value)->startsWith('{{') && str($this->env->value)->endsWith('}}')) {
+                $type = str($this->env->value)->after("{{")->before(".")->value;
+                if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                    $this->dispatch('error', 'Invalid  shared variable type.', "Valid types are: team, project, environment.");
+                    return;
+                }
+            }
             $this->serialize();
             $this->env->save();
             $this->dispatch('success', 'Environment variable updated successfully.');
             $this->dispatch('refreshEnvs');
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             return handleError($e);
         }
     }

app/Livewire/Project/Shared/ExecuteContainerCommand.php

@@ -115,7 +115,7 @@ class ExecuteContainerCommand extends Component
                 $exec = "docker exec {$this->container} {$cmd}";
             }
             $activity = remote_process([$exec], $this->server, ignore_errors: true);
-            $this->dispatch('newMonitorActivity', $activity->id);
+            $this->dispatch('activityMonitor', $activity->id);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Project/Shared/ResourceOperations.php

@@ -20,8 +20,8 @@ class ResourceOperations extends Component
     public function mount()
     {
         $parameters = get_route_parameters();
-        $this->projectUuid = $parameters['project_uuid'];
+        $this->projectUuid = data_get($parameters, 'project_uuid');
-        $this->environmentName = $parameters['environment_name'];
+        $this->environmentName = data_get($parameters, 'environment_name');
         $this->projects = Project::ownedByCurrentTeam()->get();
         $this->servers = currentTeam()->servers;
     }

app/Livewire/Project/Shared/Tags.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Livewire\Project\Shared;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Tags extends Component
+{
+    public $resource = null;
+    public ?string $new_tag = null;
+    public $tags = [];
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+    protected $rules = [
+        'resource.tags.*.name' => 'required|string|min:2',
+        'new_tag' => 'required|string|min:2'
+    ];
+    protected $validationAttributes = [
+        'new_tag' => 'tag'
+    ];
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get();
+    }
+    public function addTag(string $id, string $name)
+    {
+        try {
+            if ($this->resource->tags()->where('id', $id)->exists()) {
+                $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$name</span> already added.");
+                return;
+            }
+            $this->resource->tags()->syncWithoutDetaching($id);
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function deleteTag(string $id)
+    {
+        try {
+            $this->resource->tags()->detach($id);
+
+            $found_more_tags = Tag::where(['id' => $id, 'team_id' => currentTeam()->id])->first();
+            if ($found_more_tags->applications()->count() == 0 && $found_more_tags->services()->count() == 0){
+                $found_more_tags->delete();
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function refresh()
+    {
+        $this->resource->load(['tags']);
+        $this->tags = Tag::ownedByCurrentTeam()->get();
+        $this->new_tag = null;
+    }
+    public function submit()
+    {
+        try {
+            $this->validate([
+                'new_tag' => 'required|string|min:2'
+            ]);
+            $tags = str($this->new_tag)->trim()->explode(' ');
+            foreach ($tags as $tag) {
+                if ($this->resource->tags()->where('name', $tag)->exists()) {
+                    $this->dispatch('error', 'Duplicate tags.', "Tag <span class='text-warning'>$tag</span> already added.");
+                    continue;
+                }
+                $found = Tag::where(['name' => $tag, 'team_id' => currentTeam()->id])->first();
+                if (!$found) {
+                    $found = Tag::create([
+                        'name' => $tag,
+                        'team_id' => currentTeam()->id
+                    ]);
+                }
+                $this->resource->tags()->syncWithoutDetaching($found->id);
+            }
+            $this->refresh();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function render()
+    {
+        return view('livewire.project.shared.tags');
+    }
+}

app/Livewire/RunCommand.php

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

app/Livewire/Server/Form.php

@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Server;
 
-use App\Actions\Server\InstallDocker;
 use App\Models\Server;
 use Livewire\Component;
 
@@ -14,7 +13,8 @@ class Form extends Component
     public ?string $wildcard_domain = null;
     public int $cleanup_after_percentage;
     public bool $dockerInstallationStarted = false;
-    protected $listeners = ['serverRefresh'];
+
+    protected $listeners = ['serverInstalled'];
 
     protected $rules = [
         'server.name' => 'required',
@@ -49,9 +49,10 @@ class Form extends Component
         $this->wildcard_domain = $this->server->settings->wildcard_domain;
         $this->cleanup_after_percentage = $this->server->settings->cleanup_after_percentage;
     }
-    public function serverRefresh($install = true)
+    public function serverInstalled()
     {
-        $this->validateServer($install);
+        $this->server->refresh();
+        $this->server->settings->refresh();
     }
     public function instantSave()
     {
@@ -64,13 +65,6 @@ class Form extends Component
             return handleError($e, $this);
         }
     }
-    public function installDocker()
-    {
-        $this->dispatch('installDocker');
-        $this->dockerInstallationStarted = true;
-        $activity = InstallDocker::run($this->server);
-        $this->dispatch('newMonitorActivity', $activity->id);
-    }
     public function checkLocalhostConnection()
     {
         $uptime = $this->server->validateConnection();
@@ -80,48 +74,13 @@ class Form extends Component
             $this->server->settings->is_usable = true;
             $this->server->settings->save();
         } else {
-            $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
+            $this->dispatch('error', 'Server is not reachable.', 'Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
             return;
         }
     }
     public function validateServer($install = true)
     {
-        try {
+        $this->dispatch('validateServer', $install);
-            $uptime = $this->server->validateConnection();
-            if (!$uptime) {
-                $install &&  $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.');
-                return;
-            }
-            $supported_os_type = $this->server->validateOS();
-            if (!$supported_os_type) {
-                $install && $this->dispatch('error', 'Server OS type is not supported for automated installation. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.');
-                return;
-            }
-            $dockerInstalled = $this->server->validateDockerEngine();
-            if ($dockerInstalled) {
-                $install && $this->dispatch('success', 'Docker Engine is installed.<br> Checking version.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            $dockerVersion = $this->server->validateDockerEngineVersion();
-            if ($dockerVersion) {
-                $install && $this->dispatch('success', 'Docker Engine version is 22+.');
-            } else {
-                $install && $this->installDocker();
-                return;
-            }
-            if ($this->server->isSwarm()) {
-                $swarmInstalled = $this->server->validateDockerSwarm();
-                if ($swarmInstalled) {
-                    $install && $this->dispatch('success', 'Docker Swarm is initiated.');
-                }
-            }
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        } finally {
-            $this->dispatch('proxyStatusUpdated');
-        }
     }
 
     public function submit()

app/Livewire/Server/Proxy/Deploy.php

@@ -71,7 +71,7 @@ class Deploy extends Component
     {
         try {
             $activity = StartProxy::run($this->server);
-            $this->dispatch('newMonitorActivity', $activity->id, ProxyStatusChanged::class);
+            $this->dispatch('activityMonitor', $activity->id, ProxyStatusChanged::class);
         } catch (\Throwable $e) {
             return handleError($e, $this);
         }

app/Livewire/Server/Proxy/Status.php

@@ -12,10 +12,8 @@ class Status extends Component
     public Server $server;
     public bool $polling = false;
     public int $numberOfPolls = 0;
-
     protected $listeners = ['proxyStatusUpdated', 'startProxyPolling'];
-    public function mount() {
+
-    }
     public function startProxyPolling()
     {
         $this->checkProxy();

app/Livewire/Server/Show.php

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

app/Livewire/Server/ShowPrivateKey.php

@@ -39,7 +39,7 @@ class ShowPrivateKey extends Component
             if ($uptime) {
                 $this->dispatch('success', 'Server is reachable.');
             } else {
-                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/configuration#openssh-server">documentation</a> for further help.');
+                $this->dispatch('error', 'Server is not reachable.<br>Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh#openssh">documentation</a> for further help.');
                 return;
             }
         } catch (\Throwable $e) {

app/Livewire/Server/ValidateAndInstall.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Livewire\Server;
+
+use App\Models\Server;
+use Livewire\Component;
+
+class ValidateAndInstall extends Component
+{
+    public Server $server;
+    public int $number_of_tries = 0;
+    public int $max_tries = 1;
+    public bool $install = true;
+    public $uptime = null;
+    public $supported_os_type = null;
+    public $docker_installed = null;
+    public $docker_version = null;
+    public $error = null;
+
+    protected $listeners = ['validateServer' => 'init', 'validateDockerEngine', 'validateServerNow' => 'validateServer'];
+
+    public function init(bool $install = true)
+    {
+        $this->install = $install;
+        $this->uptime = null;
+        $this->supported_os_type = null;
+        $this->docker_installed = null;
+        $this->docker_version = null;
+        $this->error = null;
+        $this->number_of_tries = 0;
+        $this->dispatch('validateServerNow');
+    }
+
+    public function validateServer()
+    {
+        try {
+            $this->validateConnection();
+            $this->validateOS();
+            $this->validateDockerEngine();
+
+            if ($this->server->isSwarm()) {
+                $swarmInstalled = $this->server->validateDockerSwarm();
+                if ($swarmInstalled) {
+                    $this->dispatch('success', 'Docker Swarm is initiated.');
+                }
+            }
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function validateConnection()
+    {
+        $this->uptime = $this->server->validateConnection();
+        if (!$this->uptime) {
+            $this->error = 'Server is not reachable. Please validate your configuration and connection.<br><br>Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.';
+            return;
+        }
+    }
+    public function validateOS()
+    {
+        $this->supported_os_type = $this->server->validateOS();
+        if (!$this->supported_os_type) {
+            $this->error = 'Server OS type is not supported. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+            return;
+        }
+    }
+    public function validateDockerEngine()
+    {
+        $this->docker_installed = $this->server->validateDockerEngine();
+        if (!$this->docker_installed) {
+            if ($this->install) {
+                ray($this->number_of_tries, $this->max_tries);
+                if ($this->number_of_tries == $this->max_tries) {
+                    $this->error = 'Docker Engine could not be installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+                    return;
+                } else {
+                    $activity = $this->server->installDocker();
+                    $this->number_of_tries++;
+                    $this->dispatch('newActivityMonitor', $activity->id, 'validateDockerEngine');
+                    return;
+                }
+            } else {
+                $this->error = 'Docker Engine is not installed. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+                return;
+            }
+        } else {
+            $this->validateDockerVersion();
+        }
+    }
+    public function validateDockerVersion()
+    {
+        $this->docker_version = $this->server->validateDockerEngineVersion();
+        if ($this->docker_version) {
+            $this->dispatch('serverInstalled');
+            $this->dispatch('success', 'Server validated successfully.');
+        } else {
+            $this->error = 'Docker Engine version is not 22+. Please install Docker manually before continuing: <a target="_blank" class="underline" href="https://docs.docker.com/engine/install/#server">documentation</a>.';
+            return;
+        }
+    }
+    public function render()
+    {
+        return view('livewire.server.validate-and-install');
+    }
+}

app/Livewire/Tags/Index.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Models\Tag;
+use Livewire\Component;
+
+class Index extends Component
+{
+    public $tags = [];
+    public function mount() {
+        $this->tags = Tag::where('team_id', currentTeam()->id)->get()->unique('name')->sortBy('name');
+    }
+    public function render()
+    {
+        return view('livewire.tags.index');
+    }
+}

app/Livewire/Tags/Show.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Livewire\Tags;
+
+use App\Http\Controllers\Api\Deploy;
+use App\Models\ApplicationDeploymentQueue;
+use App\Models\Tag;
+use Livewire\Component;
+
+class Show extends Component
+{
+    public $tags;
+    public Tag $tag;
+    public $applications;
+    public $services;
+    public $webhook = null;
+    public $deployments_per_tag_per_server = [];
+
+    public function mount()
+    {
+        $this->tags = Tag::ownedByCurrentTeam()->get()->unique('name')->sortBy('name');
+        $tag = $this->tags->where('name', request()->tag_name)->first();
+        if (!$tag) {
+            return redirect()->route('tags.index');
+        }
+        $this->webhook = generatTagDeployWebhook($tag->name);
+        $this->applications = $tag->applications()->get();
+        $this->services = $tag->services()->get();
+        $this->tag = $tag;
+        $this->get_deployments();
+    }
+    public function get_deployments()
+    {
+        try {
+            $resource_ids = $this->applications->pluck('id');
+            $this->deployments_per_tag_per_server = ApplicationDeploymentQueue::whereIn("status", ["in_progress", "queued"])->whereIn('application_id', $resource_ids)->get([
+                "id",
+                "application_id",
+                "application_name",
+                "deployment_url",
+                "pull_request_id",
+                "server_name",
+                "server_id",
+                "status"
+            ])->sortBy('id')->groupBy('server_name')->toArray();
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+    public function redeploy_all()
+    {
+        try {
+            $this->applications->each(function ($resource) {
+                $deploy = new Deploy();
+                $deploy->deploy_resource($resource);
+            });
+            $this->services->each(function ($resource) {
+                $deploy = new Deploy();
+                $deploy->deploy_resource($resource);
+            });
+            $this->dispatch('success', 'Mass deployment started.');
+        } catch (\Exception $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function render()
+    {
+        return view('livewire.tags.show');
+    }
+}

app/Livewire/Team/Invitations.php

@@ -12,7 +12,11 @@ class Invitations extends Component
 
     public function deleteInvitation(int $invitation_id)
     {
-        TeamInvitation::find($invitation_id)->delete();
+        $initiation_found = TeamInvitation::find($invitation_id);
+        if (!$initiation_found) {
+            return $this->dispatch('error', 'Invitation not found.');
+        }
+        $initiation_found->delete();
         $this->refreshInvitations();
         $this->dispatch('success', 'Invitation revoked.');
     }

app/Livewire/Team/Storage/Create.php

@@ -67,7 +67,8 @@ class Create extends Component
             $this->storage->save();
             return redirect()->route('team.storage.show', $this->storage->uuid);
         } catch (\Throwable $e) {
-            return handleError($e, $this);
+            $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
+            // return handleError($e, $this);
         }
     }
 }

app/Livewire/Team/Storage/Form.php

@@ -33,9 +33,9 @@ class Form extends Component
     {
         try {
             $this->storage->testConnection(shouldSave: true);
-            return $this->dispatch('success', 'Connection is working. Tested with "ListObjectsV2" action.');
+            return $this->dispatch('success', 'Connection is working.', 'Tested with "ListObjectsV2" action.');
         } catch (\Throwable $e) {
-            return handleError($e, $this);
+            $this->dispatch('error', 'Failed to create storage.', $e->getMessage());
         }
     }
 

app/Models/Application.php

@@ -49,6 +49,7 @@ class Application extends BaseModel
             $application->persistentStorages()->delete();
             $application->environment_variables()->delete();
             $application->environment_variables_preview()->delete();
+            $application->tags()->detach();
         });
     }
 
@@ -211,6 +212,13 @@ class Application extends BaseModel
                 : explode(',', $this->ports_exposes)
         );
     }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
+    public function project() {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/EnvironmentVariable.php

@@ -91,7 +91,7 @@ class EnvironmentVariable extends Model
     }
     private function get_real_environment_variables(?string $environment_variable = null, $resource = null): string|null
     {
-        if (!$environment_variable) {
+        if (!$environment_variable || !$resource) {
             return null;
         }
         $environment_variable = trim($environment_variable);
@@ -100,6 +100,9 @@ class EnvironmentVariable extends Model
             $variable = Str::after($environment_variable, "{$type}.");
             $variable = Str::before($variable, '}}');
             $variable = Str::of($variable)->trim()->value;
+            if (!collect(SHARED_VARIABLE_TYPES)->contains($type)) {
+                return $variable;
+            }
             if ($type === 'environment') {
                 $id = $resource->environment->id;
             } else if ($type === 'project') {

app/Models/Project.php

@@ -64,10 +64,13 @@ class Project extends BaseModel
     }
     public function mysqls()
     {
-        return $this->hasMany(StandaloneMysql::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMysql::class, Environment::class);
     }
     public function mariadbs()
     {
-        return $this->hasMany(StandaloneMariadb::class, Environment::class);
+        return $this->hasManyThrough(StandaloneMariadb::class, Environment::class);
+    }
+    public function resource_count() {
+        return $this->applications()->count() + $this->postgresqls()->count() + $this->redis()->count() + $this->mongodbs()->count() + $this->mysqls()->count() + $this->mariadbs()->count();
     }
 }

app/Models/Server.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Actions\Server\InstallDocker;
 use App\Enums\ProxyStatus;
 use App\Enums\ProxyTypes;
 use App\Notifications\Server\Revived;
@@ -411,6 +412,11 @@ class Server extends BaseModel
 
         return true;
     }
+    public function installDocker()
+    {
+        $activity = InstallDocker::run($this);
+        return $activity;
+    }
     public function validateDockerEngine($throwError = false)
     {
         $dockerBinary = instant_remote_process(["command -v docker"], $this, false);

app/Models/Service.php

@@ -16,10 +16,18 @@ class Service extends BaseModel
     {
         return 'service';
     }
+    public function project()
+    {
+        return data_get($this, 'environment.project');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');
     }
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function extraFields()
     {
         $fields = collect([]);

app/Models/StandaloneMariadb.php

@@ -40,8 +40,14 @@ class StandaloneMariadb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandaloneMongodb.php

@@ -43,8 +43,14 @@ class StandaloneMongodb extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandaloneMysql.php

@@ -40,8 +40,14 @@ class StandaloneMysql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/StandalonePostgresql.php

@@ -40,8 +40,14 @@ class StandalonePostgresql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function link()
     {
         if (data_get($this, 'environment.project.uuid')) {

app/Models/StandaloneRedis.php

@@ -35,8 +35,14 @@ class StandaloneRedis extends BaseModel
             }
             $database->persistentStorages()->delete();
             $database->environment_variables()->delete();
+            $database->tags()->detach();
         });
     }
+
+    public function tags()
+    {
+        return $this->morphToMany(Tag::class, 'taggable');
+    }
     public function team()
     {
         return data_get($this, 'environment.project.team');

app/Models/Tag.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Casts\Attribute;
+
+class Tag extends BaseModel
+{
+    protected $guarded = [];
+
+
+    public function name(): Attribute
+    {
+        return Attribute::make(
+            get: fn ($value) => strtolower($value),
+            set: fn ($value) => strtolower($value)
+        );
+    }
+    static public function ownedByCurrentTeam()
+    {
+        return Tag::whereTeamId(currentTeam()->id)->orderBy('name');
+    }
+    public function applications()
+    {
+        return $this->morphedByMany(Application::class, 'taggable');
+    }
+    public function services()
+    {
+        return $this->morphedByMany(Service::class, 'taggable');
+    }
+}

bootstrap/helpers/applications.php

@@ -1,23 +1,35 @@
 <?php
 
+use App\Enums\ApplicationDeploymentStatus;
 use App\Jobs\ApplicationDeploymentJob;
 use App\Models\Application;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Server;
+use App\Models\StandaloneDocker;
 use Spatie\Url\Url;
 
-function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null)
+function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null)
 {
     $application_id = $application->id;
     $deployment_link = Url::fromString($application->link() . "/deployment/{$deployment_uuid}");
     $deployment_url = $deployment_link->getPath();
     $server_id = $application->destination->server->id;
     $server_name = $application->destination->server->name;
+    $destination_id = $application->destination->id;
+
+    if ($server) {
+        $server_id = $server->id;
+        $server_name = $server->name;
+    }
+    if ($destination) {
+        $destination_id = $destination->id;
+    }
     $deployment = ApplicationDeploymentQueue::create([
         'application_id' => $application_id,
         'application_name' => $application->name,
         'server_id' => $server_id,
         'server_name' => $server_name,
+        'destination_id' => $destination_id,
         'deployment_uuid' => $deployment_uuid,
         'deployment_url' => $deployment_url,
         'pull_request_id' => $pull_request_id,
@@ -28,18 +40,39 @@ function queue_application_deployment(Application $application, string $deployme
         'git_type' => $git_type
     ]);
 
-    if (next_queuable($server_id, $application_id)) {
+    if ($no_questions_asked) {
+        $deployment->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
+        dispatch(new ApplicationDeploymentJob(
+            application_deployment_queue_id: $deployment->id,
+        ));
+    } else if (next_queuable($server_id, $application_id)) {
+        $deployment->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $deployment->id,
         ));
     }
 }
-
+function force_start_deployment(ApplicationDeploymentQueue $deployment)
+{
+    $deployment->update([
+        'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+    ]);
+    dispatch(new ApplicationDeploymentJob(
+        application_deployment_queue_id: $deployment->id,
+    ));
+}
 function queue_next_deployment(Application $application)
 {
     $server_id = $application->destination->server_id;
     $next_found = ApplicationDeploymentQueue::where('server_id', $server_id)->where('status', 'queued')->get()->sortBy('created_at')->first();
     if ($next_found) {
+        $next_found->update([
+            'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
+        ]);
         dispatch(new ApplicationDeploymentJob(
             application_deployment_queue_id: $next_found->id,
         ));

bootstrap/helpers/constants.php

@@ -34,3 +34,5 @@ const SUPPORTED_OS = [
     'centos fedora rhel ol rocky',
     'sles opensuse-leap opensuse-tumbleweed'
 ];
+
+const SHARED_VARIABLE_TYPES = ['team', 'project', 'environment'];

bootstrap/helpers/github.php

@@ -29,7 +29,7 @@ function generate_github_installation_token(GithubApp $source)
         'Accept' => 'application/vnd.github.machine-man-preview+json'
     ])->post("{$source->api_url}/app/installations/{$source->installation_id}/access_tokens");
     if ($token->failed()) {
-        throw new \Exception("Failed to get access token for " . $source->name . " with error: " . $token->json()['message']);
+        throw new RuntimeException("Failed to get access token for " . $source->name . " with error: " . $token->json()['message']);
     }
     return $token->json()['token'];
 }

bootstrap/helpers/shared.php

@@ -110,9 +110,9 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
     }
     if ($error instanceof UniqueConstraintViolationException) {
         if (isset($livewire)) {
-            return $livewire->dispatch('error', "A resource with the same name already exists.");
+            return $livewire->dispatch('error', "Duplicate entry found.", "Please use a different name.");
         }
-        return "A resource with the same name already exists.";
+        return "Duplicate entry found. Please use a different name.";
     }
 
     if ($error instanceof Throwable) {
@@ -481,7 +481,14 @@ function queryResourcesByUuid(string $uuid)
     if ($mariadb) return $mariadb;
     return $resource;
 }
-
+function generatTagDeployWebhook($tag_name)
+{
+    $baseUrl = base_url();
+    $api = Url::fromString($baseUrl) . '/api/v1';
+    $endpoint = "/deploy?tag=$tag_name";
+    $url = $api . $endpoint;
+    return $url;
+}
 function generateDeployWebhook($resource)
 {
     $baseUrl = base_url();
@@ -937,7 +944,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                                 'service_id' => $resource->id,
                             ])->first();
                             ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
-                            if ($command->value() === 'FQDN' || $command->value() === 'URL') {
+                            if ($command?->value() === 'FQDN' || $command?->value() === 'URL') {
                                 if (Str::lower($forService) === $serviceName) {
                                     $fqdn = generateFqdn($resource->server, $containerName);
                                 } else {
@@ -1357,7 +1364,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             'application_id' => $resource->id,
                         ])->first();
                         ['command' => $command, 'forService' => $forService, 'generatedValue' => $generatedValue, 'port' => $port] = parseEnvVariable($value);
-                        if ($command->value() === 'FQDN' || $command->value() === 'URL') {
+                        if ($command?->value() === 'FQDN' || $command?->value() === 'URL') {
                             if (Str::lower($forService) === $serviceName) {
                                 $fqdn = generateFqdn($server, $containerName);
                             } else {
@@ -1670,15 +1677,21 @@ function ip_match($ip, $cidrs, &$match = null)
 function check_fqdn_usage(ServiceApplication|Application $own_resource)
 {
     $domains = collect($own_resource->fqdns)->map(function ($domain) {
-        return Url::fromString($domain)->getHost();
+        if (str($domain)->endsWith('/')) {
+            $domain = str($domain)->beforeLast('/');
+        }
+        return str($domain)->replace('http://', '')->replace('https://', '');
     });
     $apps = Application::all();
     foreach ($apps as $app) {
         $list_of_domains = collect(explode(',', $app->fqdn))->filter(fn ($fqdn) => $fqdn !== '');
         foreach ($list_of_domains as $domain) {
-            $naked_domain = Url::fromString($domain)->getHost();
+            if (str($domain)->endsWith('/')) {
+                $domain = str($domain)->beforeLast('/');
+            }
+            $naked_domain = str($domain)->replace('http://', '')->replace('https://', '')->value();
             if ($domains->contains($naked_domain)) {
-                if ($app->uuid !== $own_resource->uuid ) {
+                if ($app->uuid !== $own_resource->uuid) {
                     throw new \RuntimeException("Domain $naked_domain is already in use by another resource.");
                 }
             }
@@ -1688,7 +1701,10 @@ function check_fqdn_usage(ServiceApplication|Application $own_resource)
     foreach ($apps as $app) {
         $list_of_domains = collect(explode(',', $app->fqdn))->filter(fn ($fqdn) => $fqdn !== '');
         foreach ($list_of_domains as $domain) {
-            $naked_domain = Url::fromString($domain)->getHost();
+            if (str($domain)->endsWith('/')) {
+                $domain = str($domain)->beforeLast('/');
+            }
+            $naked_domain = str($domain)->replace('http://', '')->replace('https://', '')->value();
             if ($domains->contains($naked_domain)) {
                 if ($app->uuid !== $own_resource->uuid) {
                     throw new \RuntimeException("Domain $naked_domain is already in use by another resource.");

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

config/toaster.php

@@ -1,48 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-return [
-
-    /**
-     * Add an additional second for every 100th word of the toast messages.
-     *
-     * Supported: true | false
-     */
-    'accessibility' => true,
-
-    /**
-     * The vertical alignment of the toast container.
-     *
-     * Supported: "bottom", "middle" or "top"
-     */
-    'alignment' => 'top',
-
-    /**
-     * Allow users to close toast messages prematurely.
-     *
-     * Supported: true | false
-     */
-    'closeable' => true,
-
-    /**
-     * The on-screen duration of each toast.
-     *
-     * Minimum: 3000 (in milliseconds)
-     */
-    'duration' => 5000,
-
-    /**
-     * The horizontal position of each toast.
-     *
-     * Supported: "center", "left" or "right"
-     */
-    'position' => 'center',
-
-    /**
-     * Whether messages passed as translation keys should be translated automatically.
-     *
-     * Supported: true | false
-     */
-    'translate' => true,
-];

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.203';
+return '4.0.0-beta.207';

database/migrations/2024_02_01_111228_create_tags_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('tags', function (Blueprint $table) {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->string('name')->unique();
+            $table->foreignId('team_id')->nullable()->constrained()->onDelete('cascade');
+            $table->timestamps();
+        });
+        Schema::create('taggables', function (Blueprint $table) {
+            $table->unsignedBigInteger('tag_id');
+            $table->unsignedBigInteger('taggable_id');
+            $table->string('taggable_type');
+            $table->foreign('tag_id')->references('id')->on('tags')->onDelete('cascade');
+            $table->unique(['tag_id', 'taggable_id', 'taggable_type'], 'taggable_unique'); // Composite unique index
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('taggables');
+        Schema::dropIfExists('tags');
+    }
+};

database/migrations/2024_02_05_105215_add_destination_to_app_deployments.php

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

resources/css/app.css

@@ -14,6 +14,10 @@ button[isError] {
     @apply bg-red-600 hover:bg-red-700;
 }
 
+button[isHighlighted] {
+    @apply bg-coollabs hover:bg-coollabs-100;
+}
+
 .scrollbar {
     @apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-2;
 }
@@ -72,11 +76,11 @@ a {
 }
 
 .box {
-    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] bg-coolgray-100 hover:bg-coollabs-100 hover:text-white hover:no-underline min-w-[24rem];
+    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] bg-coolgray-100 hover:bg-coollabs-100 hover:text-white hover:no-underline;
 }
 
 .box-without-bg {
-    @apply flex p-2 transition-colors min-h-full hover:text-white hover:no-underline min-h-[4rem];
+    @apply flex p-2 transition-colors hover:text-white hover:no-underline min-h-[4rem];
 }
 
 .description {

resources/views/components/navbar.blade.php

@@ -4,7 +4,7 @@
                 class="transition rounded w-11 h-11" src="{{ asset('coolify-transparent.png') }}"></a>
         <ul class="flex flex-col h-full gap-4 menu flex-nowrap">
             <li title="Dashboard">
-                <a  class="hover:bg-transparent" href="/">
+                <a class="hover:bg-transparent" href="/">
                     <svg xmlns="http://www.w3.org/2000/svg" class="{{ request()->is('/') ? 'text-warning icon' : 'icon' }}"
                         fill="none" viewBox="0 0 24 24" stroke="currentColor">
                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
@@ -13,7 +13,7 @@
                 </a>
             </li>
             <li title="Servers">
-                <a  class="hover:bg-transparent" href="/servers">
+                <a class="hover:bg-transparent" href="/servers">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('server/*') || request()->is('servers') ? 'text-warning icon' : 'icon' }}"
                         viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -28,7 +28,7 @@
                 </a>
             </li>
             <li title="Projects">
-                <a  class="hover:bg-transparent" href="/projects">
+                <a class="hover:bg-transparent" href="/projects">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('project/*') || request()->is('projects') ? 'text-warning icon' : 'icon' }}"
                         viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -41,7 +41,7 @@
                 </a>
             </li>
             <li title="Command Center">
-                <a  class="hover:bg-transparent" href="/command-center">
+                <a class="hover:bg-transparent" href="/command-center">
                     <svg xmlns="http://www.w3.org/2000/svg"
                         class="{{ request()->is('command-center') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
                         stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -53,7 +53,7 @@
                 </a>
             </li>
             <li title="Source">
-                <a  class="hover:bg-transparent" href="{{ route('source.all') }}">
+                <a class="hover:bg-transparent" href="{{ route('source.all') }}">
                     <svg class="icon" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
                         <path fill="currentColor"
                             d="m6.793 1.207l.353.354l-.353-.354ZM1.207 6.793l-.353-.354l.353.354Zm0 1.414l.354-.353l-.354.353Zm5.586 5.586l-.354.353l.354-.353Zm1.414 0l-.353-.354l.353.354Zm5.586-5.586l.353.354l-.353-.354Zm0-1.414l-.354.353l.354-.353ZM8.207 1.207l.354-.353l-.354.353ZM6.44.854L.854 6.439l.707.707l5.585-5.585L6.44.854ZM.854 8.56l5.585 5.585l.707-.707l-5.585-5.585l-.707.707Zm7.707 5.585l5.585-5.585l-.707-.707l-5.585 5.585l.707.707Zm5.585-7.707L8.561.854l-.707.707l5.585 5.585l.707-.707Zm0 2.122a1.5 1.5 0 0 0 0-2.122l-.707.707a.5.5 0 0 1 0 .708l.707.707ZM6.44 14.146a1.5 1.5 0 0 0 2.122 0l-.707-.707a.5.5 0 0 1-.708 0l-.707.707ZM.854 6.44a1.5 1.5 0 0 0 0 2.122l.707-.707a.5.5 0 0 1 0-.708L.854 6.44Zm6.292-4.878a.5.5 0 0 1 .708 0L8.56.854a1.5 1.5 0 0 0-2.122 0l.707.707Zm-2 1.293l1 1l.708-.708l-1-1l-.708.708ZM7.5 5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 6V5Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 4.5H8ZM7.5 4a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 3v1Zm0-1A1.5 1.5 0 0 0 6 4.5h1a.5.5 0 0 1 .5-.5V3Zm.646 2.854l1.5 1.5l.707-.708l-1.5-1.5l-.707.708ZM10.5 8a.5.5 0 0 1-.5-.5H9A1.5 1.5 0 0 0 10.5 9V8Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 12 7.5h-1Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 10.5 6v1Zm0-1A1.5 1.5 0 0 0 9 7.5h1a.5.5 0 0 1 .5-.5V6ZM7 5.5v4h1v-4H7Zm.5 5.5a.5.5 0 0 1-.5-.5H6A1.5 1.5 0 0 0 7.5 12v-1Zm.5-.5a.5.5 0 0 1-.5.5v1A1.5 1.5 0 0 0 9 10.5H8Zm-.5-.5a.5.5 0 0 1 .5.5h1A1.5 1.5 0 0 0 7.5 9v1Zm0-1A1.5 1.5 0 0 0 6 10.5h1a.5.5 0 0 1 .5-.5V9Z" />
@@ -61,7 +61,7 @@
                 </a>
             </li>
             <li title="Security">
-                <a  class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
+                <a class="hover:bg-transparent" href="{{ route('security.private-key.index') }}">
                     <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                         <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
                             stroke-width="2"
@@ -70,7 +70,7 @@
                 </a>
             </li>
             <li title="Teams">
-                <a  class="hover:bg-transparent" href="{{ route('team.index') }}">
+                <a class="hover:bg-transparent" href="{{ route('team.index') }}">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" viewBox="0 0 24 24" stroke-width="1.5"
                         stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
                         <path stroke="none" d="M0 0h24v24H0z" fill="none" />
@@ -83,6 +83,18 @@
                     </svg>
                 </a>
             </li>
+            <li title="Tags">
+                <a class="hover:bg-transparent" href="{{ route('tags.index') }}">
+                    <svg class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+                        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
+                            stroke-width="2">
+                            <path
+                                d="M3 8v4.172a2 2 0 0 0 .586 1.414l5.71 5.71a2.41 2.41 0 0 0 3.408 0l3.592-3.592a2.41 2.41 0 0 0 0-3.408l-5.71-5.71A2 2 0 0 0 9.172 6H5a2 2 0 0 0-2 2" />
+                            <path d="m18 19l1.592-1.592a4.82 4.82 0 0 0 0-6.816L15 6m-8 4h-.01" />
+                        </g>
+                    </svg>
+                </a>
+            </li>
 
             <div class="flex-1"></div>
             @if (isInstanceAdmin() && !isCloud())
@@ -103,7 +115,7 @@
                 </a>
             </li>
             <li title="Profile">
-                <a  class="hover:bg-transparent" href="/profile">
+                <a class="hover:bg-transparent" href="/profile">
                     <svg xmlns="http://www.w3.org/2000/svg" class="icon" 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" />
@@ -116,7 +128,7 @@
 
             @if (isInstanceAdmin())
                 <li title="Settings" class="mt-auto">
-                    <a  class="hover:bg-transparent" href="/settings">
+                    <a class="hover:bg-transparent" href="/settings">
                         <svg xmlns="http://www.w3.org/2000/svg"
                             class="{{ request()->is('settings*') ? 'text-warning icon' : 'icon' }}" viewBox="0 0 24 24"
                             stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"

resources/views/components/new-modal.blade.php

@@ -0,0 +1,69 @@
+@props([
+    'title' => 'Are you sure?',
+    'buttonTitle' => 'Open Modal',
+    'isErrorButton' => false,
+    'disabled' => false,
+    'action' => 'delete',
+    'content' => null,
+])
+<div x-data="{ modalOpen: false }" @keydown.escape.window="modalOpen = false" :class="{ 'z-40': modalOpen }"
+    class="relative w-auto h-auto">
+    @if ($content)
+        <div @click="modalOpen=true">
+            {{ $content }}
+        </div>
+    @else
+        @if ($disabled)
+            <x-forms.button isError disabled>{{ $buttonTitle }}</x-forms.button>
+        @elseif ($isErrorButton)
+            <x-forms.button isError @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @else
+            <x-forms.button @click="modalOpen=true">{{ $buttonTitle }}</x-forms.button>
+        @endif
+    @endif
+    <template x-teleport="body">
+        <div x-show="modalOpen" class="fixed top-0 left-0 z-[99] flex items-center justify-center w-screen h-screen"
+            x-cloak>
+            <div x-show="modalOpen" x-transition:enter="ease-out duration-100" x-transition:enter-start="opacity-0"
+                x-transition:enter-end="opacity-100" x-transition:leave="ease-in duration-100"
+                x-transition:leave-start="opacity-100" x-transition:leave-end="opacity-0" @click="modalOpen=false"
+                class="absolute inset-0 w-full h-full bg-black bg-opacity-20 backdrop-blur-sm"></div>
+            <div x-show="modalOpen" x-trap.inert.noscroll="modalOpen" x-transition:enter="ease-out duration-100"
+                x-transition:enter-start="opacity-0 -translate-y-2 sm:scale-95"
+                x-transition:enter-end="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave="ease-in duration-100"
+                x-transition:leave-start="opacity-100 translate-y-0 sm:scale-100"
+                x-transition:leave-end="opacity-0 -translate-y-2 sm:scale-95"
+                class="relative w-full py-6 border rounded shadow-lg bg-coolgray-100 px-7 border-coolgray-300 sm:max-w-lg">
+                <div class="flex items-center justify-between pb-3">
+                    <h3 class="text-2xl font-bold">{{ $title }}</h3>
+                    {{-- <button @click="modalOpen=false"
+                        class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5 text-white rounded-full hover:bg-coolgray-300">
+                        <svg class="w-5 h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                        </svg>
+                    </button> --}}
+                </div>
+                <div class="relative w-auto pb-8">
+                    {{ $slot }}
+                </div>
+                <div class="flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2">
+                    <x-forms.button @click="modalOpen=false" class="w-24 bg-coolgray-200 hover:bg-coolgray-300"
+                        type="button">Cancel
+                    </x-forms.button>
+                    <div class="flex-1"></div>
+                    @if ($isErrorButton)
+                        <x-forms.button @click="modalOpen=false" class="w-24" isError type="button"
+                            wire:click.prevent="{{ $action }}">Continue
+                        </x-forms.button>
+                    @else
+                        <x-forms.button @click="modalOpen=false" class="w-24" isHighlighted type="button"
+                            wire:click.prevent="{{ $action }}">Continue
+                        </x-forms.button>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </template>
+</div>

resources/views/components/pricing-plans.blade.php

@@ -258,7 +258,8 @@
                 <div class="flex items-start gap-4 text-xl tracking-tight">Need official support for
                     your self-hosted instance?
                     <x-forms.button>
-                        <a class="font-bold text-white hover:no-underline" href="{{ config('coolify.contact') }}">Contact
+                        <a class="font-bold text-white hover:no-underline"
+                            href="{{ config('coolify.contact') }}">Contact
                             Us</a>
                     </x-forms.button>
                 </div>

resources/views/components/slide-over.blade.php

@@ -1,31 +1,37 @@
+@props(['closeWithX' => 'false', 'fullScreen' => 'false'])
 <div x-data="{
     slideOverOpen: false
 }" class="relative w-auto h-auto">
     {{ $slot }}
     <template x-teleport="body">
-        <div x-show="slideOverOpen" @keydown.window.escape="slideOverOpen=false" class="relative z-[99]">
+        <div x-show="slideOverOpen" @if (!$closeWithX) @keydown.window.escape="slideOverOpen=false" @endif
-            <div x-show="slideOverOpen" @click="slideOverOpen = false" class="fixed inset-0 bg-black bg-opacity-60"></div>
+            class="relative z-[99]">
+            <div x-show="slideOverOpen" @if (!$closeWithX) @click="slideOverOpen = false" @endif
+                class="fixed inset-0 bg-black bg-opacity-60"></div>
             <div class="fixed inset-0 overflow-hidden">
                 <div class="absolute inset-0 overflow-hidden">
                     <div class="fixed inset-y-0 right-0 flex max-w-full pl-10">
-                        <div x-show="slideOverOpen" @click.away="slideOverOpen = false"
+                        <div x-show="slideOverOpen"
+                            @if (!$closeWithX) @click.away="slideOverOpen = false" @endif
                             x-transition:enter="transform transition ease-in-out duration-100 sm:duration-300"
                             x-transition:enter-start="translate-x-full" x-transition:enter-end="translate-x-0"
                             x-transition:leave="transform transition ease-in-out duration-100 sm:duration-300"
                             x-transition:leave-start="translate-x-0" x-transition:leave-end="translate-x-full"
-                            class="w-screen max-w-md">
+                            @class([
+                                'max-w-md w-screen' => !$fullScreen,
+                                'max-w-7xl w-screen' => $fullScreen,
+                            ])>
                             <div
                                 class="flex flex-col h-full py-6 overflow-hidden border-l shadow-lg bg-base-100 border-neutral-800">
-                                <div class="px-4 pb-10 sm:px-5">
+                                <div class="px-4 pb-4 sm:px-5">
                                     <div class="flex items-start justify-between pb-1">
-                                        <h2 class="text-2xl leading-6" id="slide-over-title">
+                                        <h2 class="text-3xl leading-6" id="slide-over-title">
                                             {{ $title }}</h2>
                                         <div class="flex items-center h-auto ml-3">
                                             <button class="icon" @click="slideOverOpen=false"
                                                 class="absolute top-0 right-0 z-30 flex items-center justify-center px-3 py-2 mt-4 mr-2 space-x-1 text-xs font-normal border-none rounded">
                                                 <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none"
-                                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                                                    viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                                                    >
                                                     <path stroke-linecap="round" stroke-linejoin="round"
                                                         d="M6 18L18 6M6 6l12 12"></path>
                                                 </svg>

resources/views/components/toast.blade.php

@@ -22,20 +22,7 @@
     if (typeof options.html != 'undefined') html = options.html;
 
     window.dispatchEvent(new CustomEvent('toast-show', { detail: { type: type, message: message, description: description, position: position, html: html } }));
-}
+}" class="relative space-y-5">
-
-window.customToastHTML = `
-        <div class='relative flex items-start justify-center p-4'>
-            <div class='flex flex-col'>
-                <p class='text-sm font-medium text-gray-800'>New Friend Request</p>
-                <p class='mt-1 text-xs leading-none text-gray-800'>Friend request from John Doe.</p>
-                <div class='flex mt-3'>
-                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 text-xs font-semibold text-white bg-indigo-600 rounded shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600'>Accept</button>
-                    <button type='button' @click='burnToast(toast.id)' class='inline-flex items-center px-2 py-1 ml-3 text-xs font-semibold text-gray-900 bg-white rounded shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50'>Decline</button>
-                </div>
-            </div>
-        </div>
-    `" class="relative space-y-5">
     <template x-teleport="body">
         <ul x-data="{
             toasts: [],
@@ -369,10 +356,10 @@ window.customToastHTML = `
                     }, 5);
                 }, 4000);"
                     @mouseover="toastHovered=true" @mouseout="toastHovered=false"
-                    class="absolute w-full duration-200 ease-out select-none sm:max-w-xs"
+                    class="absolute w-full duration-100 ease-out sm:max-w-xs"
                     :class="{ 'toast-no-description': !toast.description }">
                     <span
-                        class="relative flex flex-col items-start shadow-[0_5px_15px_-3px_rgb(0_0_0_/_0.08)] w-full transition-all duration-200 ease-out bg-coolgray-200 border border-coolgray-100 sm:rounded-md sm:max-w-xs group"
+                        class="relative flex flex-col items-start shadow-[0_5px_15px_-3px_rgb(0_0_0_/_0.08)] w-full transition-all duration-100 ease-out bg-coolgray-100 border border-coolgray-200 rounded sm:max-w-xs group"
                         :class="{ 'p-4': !toast.html, 'p-0': toast.html }">
                         <template x-if="!toast.html">
                             <div class="relative">
@@ -403,12 +390,12 @@ window.customToastHTML = `
                                             d="M2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12ZM11.9996 7C12.5519 7 12.9996 7.44772 12.9996 8V12C12.9996 12.5523 12.5519 13 11.9996 13C11.4474 13 10.9996 12.5523 10.9996 12V8C10.9996 7.44772 11.4474 7 11.9996 7ZM12.001 14.99C11.4488 14.9892 11.0004 15.4363 10.9997 15.9886L10.9996 15.9986C10.9989 16.5509 11.446 16.9992 11.9982 17C12.5505 17.0008 12.9989 16.5537 12.9996 16.0014L12.9996 15.9914C13.0004 15.4391 12.5533 14.9908 12.001 14.99Z"
                                             fill="currentColor"></path>
                                     </svg>
-                                    <p class="font-bold leading-2 text-neutral-200"
+                                    <p class="leading-2 text-neutral-200"
                                         x-html="toast.message">
                                     </p>
                                 </div>
                                 <p x-show="toast.description" :class="{ 'pl-5': toast.type!='default' }"
-                                    class="mt-1.5 text-xs leading-2 opacity-90" x-html="toast.description"></p>
+                                    class="mt-1.5 text-xs leading-2 opacity-90 whitespace-pre-wrap" x-html="toast.description"></p>
                             </div>
                         </template>
                         <template x-if="toast.html">

resources/views/layouts/base.blade.php

@@ -170,6 +170,7 @@
                     }
                 })
                 window.Livewire.on('installDocker', () => {
+                    console.log('Installing Docker...');
                     installDocker.showModal();
                 })
             });

resources/views/layouts/boarding.blade.php

@@ -1,15 +1,5 @@
 @extends('layouts.base')
 @section('body')
-    <x-modal noSubmit modalId="installDocker">
-        <x-slot:modalBody>
-            <livewire:activity-monitor header="Docker Installation Logs" />
-        </x-slot:modalBody>
-        <x-slot:modalSubmit>
-            <x-forms.button onclick="installDocker.close()" type="submit">
-                Close
-            </x-forms.button>
-        </x-slot:modalSubmit>
-    </x-modal>
     @if (isSubscriptionActive() || isDev())
         <div title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
             <button class="flex items-center justify-center gap-2" wire:click="help" onclick="help.showModal()">

resources/views/layouts/subscription.blade.php

@@ -12,7 +12,7 @@
         <x-navbar-subscription />
     @endif
 
-    <main class="main max-w-screen-2xl">
+    <main class="mx-auto main max-w-screen-2xl">
         {{ $slot }}
     </main>
 @endsection

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

@@ -5,7 +5,8 @@
             <h1 class="text-5xl font-bold">Welcome to Coolify</h1>
             <p class="py-6 text-xl text-center">Let me help you to set the basics.</p>
             <div class="flex justify-center ">
-                <x-forms.button class="justify-center box" wire:click="$set('currentState','explanation')">Get Started
+                <x-forms.button class="justify-center w-64 box" wire:click="$set('currentState','explanation')">Get
+                    Started
                 </x-forms.button>
             </div>
         @endif
@@ -31,7 +32,7 @@
                         Telegram, Email, etc.) when something goes wrong, or an action needed from your side.</p>
                 </x-slot:explanation>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="explanation">Next
+                    <x-forms.button class="justify-center w-64 box" wire:click="explanation">Next
                     </x-forms.button>
                 </x-slot:actions>
             </x-boarding-step>
@@ -43,11 +44,11 @@
                     or on a <x-highlighted text="Remote Server" />?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:target="setServerType('localhost')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setServerType('localhost')"
                         wire:click="setServerType('localhost')">Localhost
                     </x-forms.button>
 
-                    <x-forms.button class="justify-center box" wire:target="setServerType('remote')"
+                    <x-forms.button class="justify-center w-64 box " wire:target="setServerType('remote')"
                         wire:click="setServerType('remote')">Remote Server
                     </x-forms.button>
                     @if (!$serverReachable)
@@ -57,9 +58,10 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <br />
-                        Check this <a target="_blank" class="underline" href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
+                        Check this <a target="_blank" class="underline"
+                            href="https://coolify.io/docs/server/openssh">documentation</a> for further help.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="box" wire:target="setServerType('localhost')"
+                        <x-forms.button class="w-64 box" wire:target="setServerType('localhost')"
                             wire:click="setServerType('localhost')">Check again
                         </x-forms.button>
                     @endif
@@ -83,10 +85,10 @@
                     Do you have your own SSH Private Key?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:target="setPrivateKey('own')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setPrivateKey('own')"
                         wire:click="setPrivateKey('own')">Yes
                     </x-forms.button>
-                    <x-forms.button class="justify-center box" wire:target="setPrivateKey('create')"
+                    <x-forms.button class="justify-center w-64 box" wire:target="setPrivateKey('create')"
                         wire:click="setPrivateKey('create')">No (create one for me)
                     </x-forms.button>
                     @if (count($privateKeys) > 0)
@@ -119,7 +121,7 @@
                     There are already servers available for your Team. Do you want to use one of them?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="createNewServer">No (create one for me)
+                    <x-forms.button class="justify-center w-64 box" wire:click="createNewServer">No (create one for me)
                     </x-forms.button>
                     <div>
                         <form wire:submit='selectExistingServer' class="flex flex-col w-full gap-4 lg:w-96">
@@ -139,7 +141,7 @@
                         'root' or skip the boarding process and add a new private key manually to Coolify and to the
                         server.
                         <x-forms.input readonly id="serverPublicKey"></x-forms.input>
-                        <x-forms.button class="box" wire:target="validateServer" wire:click="validateServer">Check
+                        <x-forms.button class="w-64 box" wire:target="validateServer" wire:click="validateServer">Check
                             again
                         </x-forms.button>
                     @endif
@@ -231,12 +233,16 @@
                     Could not find Docker Engine on your server. Do you want me to install it for you?
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="installDocker">
+                    <x-slide-over closeWithX fullScreen>
-                        Let's do it!</x-forms.button>
+                        <x-slot:title>Configuring Server</x-slot:title>
-                    @if ($dockerInstallationStarted)
+                        <x-slot:content>
-                        <x-forms.button class="justify-center box" wire:click="dockerInstalledOrSkipped">
+                            <livewire:server.validate-and-install :server="$this->createdServer" />
-                            Validate Server & Continue</x-forms.button>
+                        </x-slot:content>
-                    @endif
+                        <x-forms.button @click="slideOverOpen=true" class="font-bold box w-96"
+                            wire:click.prevent='installServer' isHighlighted>
+                            Let's do it!
+                        </x-forms.button>
+                    </x-slide-over>
                 </x-slot:actions>
                 <x-slot:explanation>
                     <p>This will install the latest Docker Engine on your server, configure a few things to be able
@@ -246,7 +252,6 @@
                             documentation</a>.</p>
                 </x-slot:explanation>
             </x-boarding-step>
-
         @endif
     </div>
     <div>
@@ -289,7 +294,7 @@
                     @endif
                 </x-slot:question>
                 <x-slot:actions>
-                    <x-forms.button class="justify-center box" wire:click="createNewProject">Let's create a new
+                    <x-forms.button class="justify-center w-64 box" wire:click="createNewProject">Let's create a new
                         one!</x-forms.button>
                     <div>
                         @if (count($projects) > 0)
@@ -322,7 +327,7 @@
                     I will redirect you to the new resource page, where you can create your first resource.
                 </x-slot:question>
                 <x-slot:actions>
-                    <div class="items-center justify-center box" wire:click="showNewResource">Let's do
+                    <div class="items-center justify-center w-64 box" wire:click="showNewResource">Let's do
                         it!</div>
                 </x-slot:actions>
                 <x-slot:explanation>

resources/views/livewire/dashboard.blade.php

@@ -102,41 +102,40 @@
 </div>
 
 <div class="flex items-center gap-2">
-    <h3 class="py-4">Deployments </h3>
+    <h3 class="py-4">Deployments</h3>
     @if (count($deployments_per_server) > 0)
         <x-loading />
     @endif
 </div>
-{{-- <div wire:poll.4000ms="get_deployments" class="grid grid-cols-1 gap-2 lg:grid-cols-3"> --}}
+<div wire:poll.1000ms="get_deployments" class="grid grid-cols-1">
-<div class="grid grid-cols-1">
     @forelse ($deployments_per_server as $server_name => $deployments)
-    <h4 class="py-4">{{ $server_name }}</h4>
+        <h4 class="py-4">{{ $server_name }}</h4>
-    <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
+        <div class="grid grid-cols-1 gap-2 lg:grid-cols-3">
-        @foreach ($deployments as $deployment)
+            @foreach ($deployments as $deployment)
-            <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
+                <a href="{{ data_get($deployment, 'deployment_url') }}" @class([
-                'gap-2 cursor-pointer box group border-l-2 border-dotted',
+                    'gap-2 cursor-pointer box group border-l-2 border-dotted',
-                'border-white' => data_get($deployment, 'status') === 'queued',
+                    'border-coolgray-500' => data_get($deployment, 'status') === 'queued',
-                'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
+                    'border-yellow-500' => data_get($deployment, 'status') === 'in_progress',
-            ])>
+                ])>
-                <div class="flex flex-col mx-6">
+                    <div class="flex flex-col mx-6">
-                    <div class="font-bold text-white">
+                        <div class="font-bold text-white">
-                        {{ data_get($deployment, 'application_name') }}
+                            {{ data_get($deployment, 'application_name') }}
-                    </div>
+                        </div>
-                    @if (data_get($deployment, 'pull_request_id') !== 0)
+                        @if (data_get($deployment, 'pull_request_id') !== 0)
-                        <div class="description">
+                            <div class="description">
-                            PR #{{ data_get($deployment, 'pull_request_id') }}
+                                PR #{{ data_get($deployment, 'pull_request_id') }}
+                            </div>
+                        @endif
+                        <div class="description">
+                            {{ str(data_get($deployment, 'status'))->headline() }}
                         </div>
-                    @endif
-                    <div class="description">
-                        {{ str(data_get($deployment, 'status'))->headline() }}
                     </div>
-                </div>
+                    <div class="flex-1"></div>
-                <div class="flex-1"></div>
+                </a>
-            </a>
+            @endforeach
-        @endforeach
         </div>
     @empty
-        <div>No queued / in progress deployments</div>
+        <div>No deployments running.</div>
     @endforelse
 </div>
 <script>

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

@@ -1,9 +1,4 @@
 <div>
-    <x-modal yesOrNo modalId="deleteDestination" modalTitle="Delete Destination">
-        <x-slot:modalBody>
-            <p>This destination will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
     <form class="flex flex-col">
         <div class="flex items-center gap-2">
             <h1>Destination</h1>
@@ -11,9 +6,9 @@
                 Save
             </x-forms.button>
             @if ($destination->network !== 'coolify')
-                <x-forms.button isError isModal modalId="deleteDestination">
+                <x-new-modal isErrorButton buttonTitle="Delete Destination">
-                    Delete
+                    This destination will be deleted. It is not reversible. <br>Please think again.
-                </x-forms.button>
+                </x-new-modal>
             @endif
         </div>
 

resources/views/livewire/destination/new/docker.blade.php

@@ -14,7 +14,7 @@
         </x-forms.select>
         {{-- <x-forms.checkbox type="checkbox" id="is_swarm" label="Is it a Swarm network?" /> --}}
         <x-forms.button type="submit">
-            Save Destination
+            Continue
         </x-forms.button>
     </form>
 </div>

resources/views/livewire/new-activity-monitor.blade.php

@@ -0,0 +1,18 @@
+@php use App\Actions\CoolifyTask\RunRemoteProcess; @endphp
+<div>
+    @if ($this->activity)
+        @if (isset($header))
+            <div class="flex gap-2 pb-2">
+                {{ $header }}
+                @if ($isPollingActive)
+                    <x-loading />
+                @endif
+            </div>
+        @endif
+        <div
+            class="scrollbar flex flex-col-reverse w-full overflow-y-auto border border-solid rounded border-coolgray-300 max-h-[32rem] p-4 pt-6 text-xs text-white">
+
+            <pre class="font-mono whitespace-pre-wrap" @if ($isPollingActive) wire:poll.1000ms="polling" @endif>{{ RunRemoteProcess::decodeOutput($this->activity) }}</pre>
+        </div>
+    @endif
+</div>

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

@@ -63,6 +63,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger'; window.location.hash = 'danger'" href="#">Danger Zone
             </a>
@@ -112,6 +115,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$application" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$application" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$application" />
             </div>

resources/views/livewire/project/application/deployment-navbar.blade.php

@@ -5,8 +5,12 @@
     @else
         <x-forms.button wire:click.prevent="show_debug">Show Debug Logs</x-forms.button>
     @endif
+    @if (data_get($application_deployment_queue, 'status') === 'queued')
+        <x-forms.button wire:click.prevent="force_start">Force Start</x-forms.button>
+    @endif
     @if (data_get($application_deployment_queue, 'status') === 'in_progress' ||
             data_get($application_deployment_queue, 'status') === 'queued')
-        <x-forms.button isError wire:click.prevent="cancel">Cancel Deployment</x-forms.button>
+        <x-forms.button isError wire:click.prevent="cancel">Cancel</x-forms.button>
     @endif
+
 </div>

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

@@ -112,9 +112,7 @@
                                 helper="If set, it will tag the built image with this tag too. <br><br>Example: If you set it to 'latest', it will push the image with the commit sha tag + with the latest tag."
                                 label="Docker Image Tag" />
                         @endif
-
                     @endif
-
                 </div>
             @endif
 

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

@@ -106,18 +106,6 @@
                     </svg>
                     Deploy
                 </button>
-                {{-- @if (isDev())
-                    <button wire:click='deployNew'
-                        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 (new)
-                    </button>
-                @endif --}}
             @endif
         @endif
     </div>

resources/views/livewire/project/clone-me.blade.php

@@ -1,18 +1,17 @@
-<form wire:submit='clone'>
+<form>
     <div class="flex flex-col">
         <h1>Clone</h1>
-        <div class="subtitle ">Quickly clone all resources to a new project</div>
+        <div class="subtitle ">Quickly clone all resources to a new project or environment</div>
-    </div>
-    <div class="flex items-end gap-2">
-        <x-forms.input required id="newProjectName" label="New Project Name" />
-        <x-forms.button type="submit">Clone</x-forms.button>
     </div>
+    <x-forms.input required id="newName" label="New Name" />
+    <x-forms.button isHighlighted wire:click="clone('project')" class="mt-4">Clone to a new Project</x-forms.button>
+    <x-forms.button isHighlighted wire:click="clone('environment')" class="mt-4">Clone to a new Environment</x-forms.button>
     <h3 class="pt-4 pb-2">Servers</h3>
+    <div>Choose the server and network to clone the resources to.</div>
     <div class="flex flex-col gap-4">
         @foreach ($servers->sortBy('id') as $server)
-            <div class="p-4 border border-coolgray-500">
+            <div class="p-4">
-                <h3>{{ $server->name }}</h3>
+                <h4>{{ $server->name }}</h4>
-                <h5>{{ $server->description }}</h5>
                 <div class="pt-4 pb-2">Docker Networks</div>
                 <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
                     @foreach ($server->destinations() as $destination)
@@ -28,9 +27,10 @@
     </div>
 
     <h3 class="pt-4 pb-2">Resources</h3>
-    <div class="grid grid-cols-1 gap-2 p-4 border border-coolgray-500">
+    <div>These will be cloned to the new project</div>
+    <div class="grid grid-cols-1 gap-2 pt-4 opacity-95 lg:grid-cols-2 xl:grid-cols-3">
         @foreach ($environment->applications->sortBy('name') as $application)
-            <div>
+            <div class="cursor-default box-without-bg bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold text-white">{{ $application->name }}</div>
                     <div class="description">{{ $application->description }}</div>
@@ -38,7 +38,7 @@
             </div>
         @endforeach
         @foreach ($environment->databases()->sortBy('name') as $database)
-            <div>
+            <div class="cursor-default box-without-bg bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold text-white">{{ $database->name }}</div>
                     <div class="description">{{ $database->description }}</div>
@@ -46,7 +46,7 @@
             </div>
         @endforeach
         @foreach ($environment->services->sortBy('name') as $service)
-            <div>
+            <div class="cursor-default box-without-bg bg-coolgray-100 group">
                 <div class="flex flex-col">
                     <div class="font-bold text-white">{{ $service->name }}</div>
                     <div class="description">{{ $service->description }}</div>

resources/views/livewire/project/database/configuration.blade.php

@@ -48,6 +48,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -89,6 +92,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$database" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$database" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$database" />
             </div>

resources/views/livewire/project/delete-environment.blade.php

@@ -1,8 +1,3 @@
-<div>
+<x-new-modal isErrorButton buttonTitle="Delete Environment" disabled="{{ $disabled }}">
-    <x-modal yesOrNo modalId="deleteEnvironment" modalTitle="Delete Environment">
+    This environment will be deleted. It is not reversible. <br>Please think again.
-        <x-slot:modalBody>
+</x-new-modal>
-            <p>This environment will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
-    <x-forms.button isError isModal modalId="deleteEnvironment"> Delete Environment</x-forms.button>
-</div>

resources/views/livewire/project/delete-project.blade.php

@@ -1,10 +1,3 @@
-<div>
+<x-new-modal isErrorButton buttonTitle="Delete Project" disabled="{{ $disabled }}">
-    <x-modal yesOrNo modalId="deleteProject" modalTitle="Delete Project">
+    This project will be deleted. It is not reversible. <br>Please think again.
-        <x-slot:modalBody>
+</x-new-modal>
-            <p>This project will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
-    <x-forms.button isError isModal modalId="deleteProject">
-        Delete Project
-    </x-forms.button>
-</div>

resources/views/livewire/project/edit.blade.php

@@ -5,6 +5,7 @@
         <div class="flex items-end gap-2">
             <h2>General</h2>
             <x-forms.button type="submit">Save</x-forms.button>
+            <livewire:project.delete-project :disabled="$project->resource_count() > 0" :project_id="$project->id" />
         </div>
         <div class="flex gap-2">
             <x-forms.input label="Name" id="project.name" />
@@ -23,7 +24,8 @@
                 Add</button>
         </x-slide-over>
     </div>
-    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span class="text-warning">@{{project.VARIABLENAME}}</span><x-helper
+    <div class="flex items-center gap-2 pb-4">You can use these variables anywhere with <span
+            class="text-warning">@{{ project.VARIABLENAME }}</span><x-helper
             helper="More info <a class='text-white underline' href='https://coolify.io/docs/environment-variables#shared-variables' target='_blank'>here</a>."></x-helper>
     </div>
     <div class="flex flex-col gap-2">

resources/views/livewire/project/environment-edit.blade.php

@@ -3,6 +3,7 @@
         <div class="flex items-end gap-2">
             <h1>Environment: {{ data_get($environment, 'name') }}</h1>
             <x-forms.button type="submit">Save</x-forms.button>
+            <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
         </div>
         <nav class="flex pt-2 pb-10">
             <ol class="flex items-center">

resources/views/livewire/project/new/github-private-repository-deploy-key.blade.php

@@ -8,7 +8,7 @@
                 <li class="step">Select a Repository, Branch & Save</li>
             </ul>
             <div class="flex flex-col justify-center gap-2 text-left xl:flex-row">
-                @foreach ($private_keys as $key)
+                @forelse ($private_keys as $key)
                     @if ($private_key_id == $key->id)
                         <div class="gap-2 py-4 cursor-pointer group hover:bg-coollabs bg-coolgray-200"
                             wire:click.defer="setPrivateKey('{{ $key->id }}')" wire:key="{{ $key->id }}">
@@ -32,7 +32,16 @@
                             </div>
                         </div>
                     @endif
-                @endforeach
+                @empty
+                    <div class="flex flex-col items-center justify-center gap-2">
+                        <div class="text-neutral-500">
+                            No private keys found.
+                        </div>
+                        <a href="{{ route('security.private-key.index') }}">
+                            <x-forms.button>Create a new private key</x-forms.button>
+                        </a>
+                    </div>
+                @endforelse
             </div>
         @endif
         @if ($current_step === 'repository')

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

@@ -7,7 +7,6 @@
                     href="{{ route('project.clone-me', ['project_uuid' => data_get($project, 'uuid'), 'environment_name' => request()->route('environment_name')]) }}">
                     Clone
                 </a>
-                <livewire:project.delete-environment :environment_id="$environment->id" />
             @else
                 <a href="{{ route('project.resource.create', ['project_uuid' => request()->route('project_uuid'), 'environment_name' => request()->route('environment_name')]) }}  "
                     class="font-normal text-white normal-case border-none rounded hover:no-underline btn btn-primary btn-sm no-animation">+
@@ -17,6 +16,7 @@
                     Clone
                 </a>
             @endif
+            <livewire:project.delete-environment :disabled="!$environment->isEmpty()" :environment_id="$environment->id" />
         </div>
         <nav class="flex pt-2 pb-10">
             <ol class="flex items-center">
@@ -46,126 +46,197 @@
     @else
         <div x-data="searchComponent()">
             <x-forms.input placeholder="Search for name, fqdn..." class="w-full" x-model="search" />
-            <div class="grid gap-2 pt-4 lg:grid-cols-2">
+            <div class="grid grid-cols-1 gap-4 pt-4 lg:grid-cols-2 xl:grid-cols-3">
                 <template x-for="item in filteredApplications" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="pb-2 font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="pb-2 font-bold text-white" x-text="item.name"></div>
-                            <div class="description" x-text="item.fqdn"></div>
+                                <div class="description" x-text="item.description"></div>
+                                <div class="description" x-text="item.fqdn"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredPostgresqls" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredRedis" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredMongodbs" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredMysqls" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredMariadbs" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('restarting')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('restarting')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
                 <template x-for="item in filteredServices" :key="item.id">
-                    <a class="relative box group" :href="item.hrefLink">
+                    <span class="relative">
-                        <div class="flex flex-col mx-6">
+                        <a class="h-24 box group" :href="item.hrefLink">
-                            <div class="font-bold text-white" x-text="item.name"></div>
+                            <div class="flex flex-col mx-6">
-                            <div class="description" x-text="item.description"></div>
+                                <div class="font-bold text-white" x-text="item.name"></div>
+                                <div class="description" x-text="item.description"></div>
+                            </div>
+                            <template x-if="item.status.startsWith('running')">
+                                <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('exited')">
+                                <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                            <template x-if="item.status.startsWith('degraded')">
+                                <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
+                            </template>
+                        </a>
+                        <div class="flex gap-1 pt-1 group-hover:text-white group min-h-6">
+                            <template x-for="tag in item.tags">
+                                <div class="px-2 py-1 cursor-pointer description bg-coolgray-100 hover:bg-coolgray-300"
+                                    @click.prevent="gotoTag(tag.name)" x-text="tag.name"></div>
+                            </template>
+                            <div class="flex items-center px-2 text-xs cursor-pointer text-neutral-500/20 group-hover:text-white hover:bg-coolgray-300"
+                                @click.prevent="goto(item)">Add tag</div>
                         </div>
-                        <template x-if="item.status.startsWith('running')">
+                    </span>
-                            <div class="absolute bg-success -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('exited')">
-                            <div class="absolute bg-error -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                        <template x-if="item.status.startsWith('degraded')">
-                            <div class="absolute bg-warning -top-1 -left-1 badge badge-xs"></div>
-                        </template>
-                    </a>
                 </template>
             </div>
         </div>
@@ -174,6 +245,10 @@
 </div>
 
 <script>
+    function sortFn(a, b) {
+        return a.name.localeCompare(b.name)
+    }
+
     function searchComponent() {
         return {
             search: '',
@@ -184,76 +259,90 @@
             mysqls: @js($mysqls),
             mariadbs: @js($mariadbs),
             services: @js($services),
+            gotoTag(tag) {
+                window.location.href = '/tags/' + tag;
+            },
+            goto(item) {
+                const hrefLink = item.hrefLink;
+                window.location.href = `${hrefLink}#tags`;
+            },
             get filteredApplications() {
                 if (this.search === '') {
-                    return this.applications;
+                    return Object.values(this.applications).sort(sortFn);
                 }
                 this.applications = Object.values(this.applications);
                 return this.applications.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
                         item.fqdn?.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredPostgresqls() {
                 if (this.search === '') {
-                    return this.postgresqls;
+                    return Object.values(this.postgresqls).sort(sortFn);
                 }
                 this.postgresqls = Object.values(this.postgresqls);
                 return this.postgresqls.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredRedis() {
                 if (this.search === '') {
-                    return this.redis;
+                    return Object.values(this.redis).sort(sortFn);
                 }
                 this.redis = Object.values(this.redis);
                 return this.redis.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMongodbs() {
                 if (this.search === '') {
-                    return this.mongodbs;
+                    return Object.values(this.mongodbs).sort(sortFn);
                 }
                 this.mongodbs = Object.values(this.mongodbs);
                 return this.mongodbs.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMysqls() {
                 if (this.search === '') {
-                    return this.mysqls;
+                    return Object.values(this.mysqls).sort(sortFn);
                 }
                 this.mysqls = Object.values(this.mysqls);
                 return this.mysqls.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredMariadbs() {
                 if (this.search === '') {
-                    return this.mariadbs;
+                    return Object.values(this.mariadbs).sort(sortFn);
                 }
                 this.mariadbs = Object.values(this.mariadbs);
                 return this.mariadbs.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
             get filteredServices() {
                 if (this.search === '') {
-                    return this.services;
+                    return Object.values(this.services).sort(sortFn);
                 }
                 this.services = Object.values(this.services);
                 return this.services.filter(item => {
                     return item.name.toLowerCase().includes(this.search.toLowerCase()) ||
-                        item.description?.toLowerCase().includes(this.search.toLowerCase());
+                        item.description?.toLowerCase().includes(this.search.toLowerCase()) ||
-                });
+                        item.tags?.some(tag => tag.name.toLowerCase().includes(this.search.toLowerCase()));
+                }).sort(sortFn);
             },
 
         };

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

@@ -30,6 +30,9 @@
                 @click.prevent="activeTab = 'resource-operations'; window.location.hash = 'resource-operations'"
                 href="#">Resource Operations
             </a>
+            <a :class="activeTab === 'tags' && 'text-white'"
+                @click.prevent="activeTab = 'tags'; window.location.hash = 'tags'" href="#">Tags
+            </a>
             <a :class="activeTab === 'danger' && 'text-white'"
                 @click.prevent="activeTab = 'danger';
                 window.location.hash = 'danger'"
@@ -164,6 +167,9 @@
             <div x-cloak x-show="activeTab === 'resource-operations'">
                 <livewire:project.shared.resource-operations :resource="$service" />
             </div>
+            <div x-cloak x-show="activeTab === 'tags'">
+                <livewire:project.shared.tags :resource="$service" />
+            </div>
             <div x-cloak x-show="activeTab === 'danger'">
                 <livewire:project.shared.danger :resource="$service" />
             </div>

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

@@ -28,7 +28,7 @@
         <div class="w-full pl-8">
             @isset($serviceApplication)
                 <div x-cloak x-show="activeTab === 'general'" class="h-full">
-                    <livewire:project.service.application :application="$serviceApplication" />
+                    <livewire:project.service.service-application-view :application="$serviceApplication" />
                 </div>
                 <div x-cloak x-show="activeTab === 'storages'">
                     <div class="flex items-center gap-2">

resources/views/livewire/project/shared/danger.blade.php

@@ -1,16 +1,11 @@
 <div>
-    <x-modal yesOrNo modalId="{{ $modalId }}" modalTitle="Delete Resource">
-        <x-slot:modalBody>
-            <p>This resource will be deleted. It is not reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
     <h2>Danger Zone</h2>
     <div class="">Woah. I hope you know what are you doing.</div>
     <h4 class="pt-4">Delete Resource</h4>
     <div class="pb-4">This will stop your containers, delete all related data, etc. Beware! There is no coming
         back!
     </div>
-    <x-forms.button isError isModal modalId="{{ $modalId }}">
+    <x-new-modal isErrorButton buttonTitle="Delete">
-        Delete
+        This resource will be deleted. It is not reversible. <br>Please think again.
-    </x-forms.button>
+    </x-new-modal>
 </div>

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -1,10 +1,4 @@
 <div>
-    <x-modal yesOrNo modalId="{{ $modalId }}" modalTitle="Delete Environment Variable">
-        <x-slot:modalBody>
-            <p>Are you sure you want to delete this environment variable <span
-                    class="font-bold text-warning">({{ $env->key }})</span>?</p>
-        </x-slot:modalBody>
-    </x-modal>
     <form wire:submit='submit'
         class="flex flex-col gap-2 p-4 m-2 border lg:items-center border-coolgray-300 lg:m-0 lg:p-0 lg:border-0 lg:flex-row">
         @if ($isLocked)
@@ -38,9 +32,10 @@
         @endif
         <div class="flex gap-2">
             @if ($isLocked)
-                <x-forms.button isError isModal modalId="{{ $modalId }}">
+                <x-new-modal isErrorButton buttonTitle="Delete">
-                    Delete
+                    You will delete environment variable <span
-                </x-forms.button>
+                        class="font-bold text-warning">{{ $env->key }}</span>.
+                </x-new-modal>
             @else
                 @if ($isDisabled)
                     <x-forms.button disabled type="submit">
@@ -49,9 +44,10 @@
                     <x-forms.button wire:click='lock'>
                         Lock
                     </x-forms.button>
-                    <x-forms.button disabled isError isModal modalId="{{ $modalId }}">
+                    <x-new-modal isErrorButton buttonTitle="Delete">
-                        Delete
+                        You will delete environment variable <span
-                    </x-forms.button>
+                            class="font-bold text-warning">{{ $env->key }}</span>.
+                    </x-new-modal>
                 @else
                     <x-forms.button type="submit">
                         Update
@@ -59,9 +55,10 @@
                     <x-forms.button wire:click='lock'>
                         Lock
                     </x-forms.button>
-                    <x-forms.button isError isModal modalId="{{ $modalId }}">
+                    <x-new-modal isErrorButton buttonTitle="Delete">
-                        Delete
+                        You will delete environment variable <span
-                    </x-forms.button>
+                            class="font-bold text-warning">{{ $env->key }}</span>.
+                    </x-new-modal>
                 @endif
             @endif
         </div>

resources/views/livewire/project/shared/get-logs.blade.php

@@ -13,7 +13,7 @@
         <x-forms.input label="Only Show Number of Lines" placeholder="1000" required id="numberOfLines"></x-forms.input>
         <x-forms.button type="submit">Refresh</x-forms.button>
     </form>
-    <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'container w-full py-4 mx-auto'">
+    <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'w-full py-4 mx-auto'">
         <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-solid rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg
@@ -33,8 +33,8 @@
                         stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
                 </svg></button>
 
-            <button title="Fullscreen" x-show="!fullscreen" class="absolute top-2 right-8"
+            <button title="Fullscreen" x-show="!fullscreen" class="absolute top-2 right-2"
-                x-on:click="makeFullscreen"><svg class="fixed icon" viewBox="0 0 24 24"
+                x-on:click="makeFullscreen"><svg class=" icon" viewBox="0 0 24 24"
                     xmlns="http://www.w3.org/2000/svg">
                     <g fill="none">
                         <path

resources/views/livewire/project/shared/resource-operations.blade.php

@@ -11,10 +11,15 @@
                 <div>
                     <div class="grid grid-cols-1 gap-2 pb-4 lg:grid-cols-4">
                         @foreach ($server->destinations() as $destination)
-                            <div class="flex flex-col gap-2 box" wire:click="cloneTo('{{ data_get($destination, 'id') }}')">
+                            <x-new-modal action="cloneTo({{ data_get($destination, 'id') }})">
-                                <div class="font-bold text-white">{{ $server->name }}</div>
+                                <x:slot name="content">
-                                <div>{{ $destination->name }}</div>
+                                    <div class="flex flex-col gap-2 box">
-                            </div>
+                                        <div class="font-bold text-white">{{ $server->name }}</div>
+                                        <div>{{ $destination->name }}</div>
+                                    </div>
+                                </x:slot>
+                                <div>You are about to clone this resource.</div>
+                            </x-new-modal>
                         @endforeach
                     </div>
                 </div>
@@ -32,10 +37,15 @@
             @forelse ($projects as $project)
                 <div class="flex flex-row flex-wrap gap-2">
                     @foreach ($project->environments as $environment)
-                        <div class="flex flex-col gap-2 box" wire:click="moveTo('{{ data_get($environment, 'id') }}')">
+                    <x-new-modal action="moveTo({{ data_get($environment, 'id') }})">
-                            <div class="font-bold text-white">{{ $project->name }}</div>
+                        <x:slot name="content">
-                            <div><span class="text-warning">{{ $environment->name }}</span> environment</div>
+                            <div class="flex flex-col gap-2 box">
-                        </div>
+                                <div class="font-bold text-white">{{ $project->name }}</div>
+                                <div><span class="text-warning">{{ $environment->name }}</span> environment</div>
+                            </div>
+                        </x:slot>
+                        <div>You are about to move this resource.</div>
+                    </x-new-modal>
                     @endforeach
                 </div>
             @empty

resources/views/livewire/project/shared/scheduled-task/show.blade.php

@@ -1,11 +1,4 @@
 <div>
-    <x-modal yesOrNo modalId="{{ $modalId }}" modalTitle="Delete Scheduled Task">
-        <x-slot:modalBody>
-            <p>Are you sure you want to delete this scheduled task <span
-                    class="font-bold text-warning">({{ $task->name }})</span>?</p>
-        </x-slot:modalBody>
-    </x-modal>
-
     <h1>Scheduled Task</h1>
     @if ($type === 'application')
         <livewire:project.application.heading :application="$resource" />
@@ -20,11 +13,9 @@
                 <x-forms.button type="submit">
                     Save
                 </x-forms.button>
-
+                <x-new-modal isErrorButton buttonTitle="Delete Scheduled Task">
-                <x-forms.button isError isModal modalId="{{ $modalId }}">
+                    You will delete scheduled task <span class="font-bold text-warning">{{ $task->name }}</span>.
-                    Delete
+                </x-new-modal>
-                </x-forms.button>
-
             </div>
         </div>
         <div class="flex w-full gap-2">

resources/views/livewire/project/shared/storages/show.blade.php

@@ -1,12 +1,4 @@
 <div>
-    <x-modal yesOrNo modalId="{{ $modalId }}" modalTitle="Delete Storage">
-        <x-slot:modalBody>
-            <p>This storage will be deleted <span class="font-bold text-warning">({{ $storage->name }})</span>. It is
-                not
-                reversible. <br>Please think again.</p>
-        </x-slot:modalBody>
-    </x-modal>
-
     <form wire:submit='submit' class="flex flex-col gap-2 xl:items-end xl:flex-row">
         @if ($isReadOnly)
             @if ($isFirst)
@@ -32,9 +24,12 @@
                 <x-forms.button type="submit">
                     Update
                 </x-forms.button>
-                <x-forms.button isError isModal modalId="{{ $modalId }}">
+                <x-new-modal isErrorButton buttonTitle="Delete">
-                    Delete
+                    This storage will be deleted <span class="font-bold text-warning">{{ $storage->name }}</span>. It
-                </x-forms.button>
+                    is
+                    not
+                    reversible. <br>Please think again.
+                </x-new-modal>
             </div>
         @endif
     </form>

resources/views/livewire/project/shared/tags.blade.php

@@ -0,0 +1,35 @@
+<div>
+    <h2>Tags</h2>
+    <div class="flex gap-2 pt-4">
+        @forelse ($this->resource->tags as $tagId => $tag)
+            <div class="px-2 py-1 text-center text-white select-none w-fit bg-coolgray-100 hover:bg-coolgray-200">
+                {{ $tag->name }}
+                <svg wire:click="deleteTag('{{ $tag->id }}')"
+                    xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                    class="inline-block w-3 h-3 rounded cursor-pointer stroke-current hover:bg-red-500">
+                    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
+                </svg>
+            </div>
+        @empty
+            <div>No tags yet</div>
+        @endforelse
+    </div>
+    <form wire:submit='submit' class="flex items-end gap-2 pt-4">
+        <div class="w-64">
+            <x-forms.input label="Create new or assign existing tags"
+                helper="You add more at once with space seperated list: web api something<br><br>If the tag does not exists, it will be created."
+                wire:model="new_tag" />
+        </div>
+        <x-forms.button type="submit">Add</x-forms.button>
+    </form>
+    @if ($tags->count() > 0)
+        <h3 class="pt-4">Already defined tags</h3>
+        <div>Click to quickly add one.</div>
+        <div class="flex gap-2 pt-4">
+            @foreach ($tags as $tag)
+                <x-forms.button wire:click="addTag('{{ $tag->id }}','{{ $tag->name }}')">
+                    {{ $tag->name }}</x-forms.button>
+            @endforeach
+        </div>
+    @endif
+</div>

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

@@ -3,9 +3,7 @@
         <h1>Environments</h1>
         <x-forms.button class="btn" onclick="newEnvironment.showModal()">+ Add</x-forms.button>
         <livewire:project.add-environment :project="$project" />
-        @if ($project->applications->count() === 0)
+        <livewire:project.delete-project :disabled="$project->resource_count() > 0" :project_id="$project->id" />
-            <livewire:project.delete-project :project_id="$project->id" />
-        @endif
     </div>
     <div class="text-xs truncate subtitle lg:text-sm">{{ $project->name }}</div>
     <div class="grid gap-2 lg:grid-cols-2">

resources/views/livewire/security/private-key/show.blade.php

@@ -1,21 +1,16 @@
 <div>
     <x-security.navbar />
     <div x-data="{ showPrivateKey: false }">
-        <x-modal yesOrNo modalId="deletePrivateKey" modalTitle="Delete Private Key">
-            <x-slot:modalBody>
-                <p>This private key will be deleted. It is not reversible. <br>Please think again.</p>
-            </x-slot:modalBody>
-        </x-modal>
         <form class="flex flex-col gap-2" wire:submit='changePrivateKey'>
             <div class="flex items-end gap-2">
                 <h2>Private Key</h2>
                 <x-forms.button type="submit">
                     Save
                 </x-forms.button>
-                @if ($private_key->id > 0)
+                @if (data_get($private_key, 'id') > 0)
-                    <x-forms.button isError isModal modalId="deletePrivateKey">
+                    <x-new-modal isErrorButton buttonTitle="Delete">
-                        Delete
+                        This private key will be deleted. It is not reversible. <br>Please think again.
-                    </x-forms.button>
+                    </x-new-modal>
                 @endif
             </div>
             <x-forms.input id="private_key.name" label="Name" required />
@@ -36,7 +31,7 @@
                         Hide
                     </div>
                 </div>
-                @if ($private_key->is_git_related)
+                @if (data_get($private_key, 'is_git_related'))
                     <div class="w-48">
                         <x-forms.checkbox id="private_key.is_git_related" disabled label="Is used by a Git App?" />
                     </div>

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

@@ -1,9 +1,4 @@
 <div>
-    <x-modal yesOrNo modalId="deleteServer" modalTitle="Delete Server">
-        <x-slot:modalBody>
-            <p>This server will be deleted. It is not reversible. <br>Please think again..</p>
-        </x-slot:modalBody>
-    </x-modal>
     @if ($server->id !== 0)
         <h2 class="pt-4">Danger Zone</h2>
         <div class="">Woah. I hope you know what are you doing.</div>
@@ -12,13 +7,13 @@
             back!
         </div>
         @if ($server->definedResources()->count() > 0)
-            <x-forms.button disabled isError isModal modalId="deleteServer">
+            <x-new-modal disabled isErrorButton buttonTitle="Delete">
-                Delete
+                This server will be deleted. It is not reversible. <br>Please think again.
-            </x-forms.button>
+            </x-new-modal>
         @else
-            <x-forms.button isError isModal modalId="deleteServer">
+            <x-new-modal isErrorButton buttonTitle="Delete">
-                Delete
+                This server will be deleted. It is not reversible. <br>Please think again.
-            </x-forms.button>
+            </x-new-modal>
         @endif
         <div class="flex flex-col">
             @forelse ($server->definedResources() as $resource)
@@ -26,7 +21,7 @@
                     <h3 class="pt-4">Resources</h3>
                 @endif
                 @if ($resource->link())
-                    <a  class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
+                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
                         <div class="w-64">{{ str($resource->type())->headline() }}</div>
                         <div>{{ $resource->name }}</div>
                     </a>
@@ -46,7 +41,7 @@
                     <h3 class="pt-4">Resources</h3>
                 @endif
                 @if ($resource->link())
-                    <a  class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
+                    <a class="flex gap-2 p-1 hover:bg-coolgray-100 hover:no-underline" href="{{ $resource->link() }}">
                         <div class="w-64">{{ str($resource->type())->headline() }}</div>
                         <div>{{ $resource->name }}</div>
                     </a>