fix consecutive deployment issue (#62)

* fix consecutive deployment issue

* fix styles

.env.example

@@ -2,7 +2,7 @@ APP_NAME=Vito
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://localhost:2080
+APP_URL=http://vito.test
 
 LOG_CHANNEL=stack
 LOG_LEVEL=debug
@@ -15,14 +15,12 @@ DB_USERNAME=root
 DB_PASSWORD=
 
 BROADCAST_DRIVER=null
-CACHE_DRIVER=redis
+CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
-QUEUE_CONNECTION=sync
+QUEUE_CONNECTION=default
 SESSION_DRIVER=database
 SESSION_LIFETIME=120
 
-MEMCACHED_HOST=127.0.0.1
-
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
@@ -36,31 +34,5 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME="${APP_NAME}"
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
-FORWARD_REDIS_PORT=2060
-FORWARD_DB_PORT=2070
-APP_PORT=2080
-HMR_PORT=2090
-
-SENTRY_LARAVEL_DSN=
-
-APP_SERVICE=vito
-
-GITHUB_CLIENT_ID=
-GITHUB_CLIENT_SECRET=
-
-ABLY_KEY=
-ABLY_PUBLIC_KEY=
+SSH_PUBLIC_KEY_NAME=ssh-public.key
+SSH_PRIVATE_KEY_NAME=ssh-private.pem

.env.prod

@@ -14,7 +14,7 @@ DB_DATABASE=
 DB_USERNAME=
 DB_PASSWORD=
 
-BROADCAST_DRIVER=pusher
+BROADCAST_DRIVER=null
 CACHE_DRIVER=file
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=default
@@ -34,31 +34,5 @@ MAIL_ENCRYPTION=null
 MAIL_FROM_ADDRESS=null
 MAIL_FROM_NAME="${APP_NAME}"
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=app-id
-PUSHER_APP_KEY=app-key
-PUSHER_APP_SECRET=app-secret
-PUSHER_HOST=soketi
-PUSHER_PORT=6001
-PUSHER_SCHEME=http
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
 SSH_PUBLIC_KEY_NAME=ssh-public.key
 SSH_PRIVATE_KEY_NAME=ssh-private.pem
-
-GITHUB_CLIENT_ID=
-GITHUB_CLIENT_SECRET=
-
-ABLY_KEY=
-ABLY_PUBLIC_KEY=

.env.sail

@@ -0,0 +1,45 @@
+APP_NAME=Vito
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://vito.test
+
+LOG_CHANNEL=stack
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=vito
+DB_USERNAME=sail
+DB_PASSWORD=password
+
+BROADCAST_DRIVER=null
+CACHE_DRIVER=redis
+FILESYSTEM_DRIVER=local
+QUEUE_CONNECTION=default
+SESSION_DRIVER=database
+SESSION_LIFETIME=120
+
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailhog
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+SSH_PUBLIC_KEY_NAME=ssh-public.key
+SSH_PRIVATE_KEY_NAME=ssh-private.pem
+
+APP_SERVICE=vito
+
+FORWARD_REDIS_PORT=2060
+FORWARD_DB_PORT=2070
+APP_PORT=2080
+HMR_PORT=2090

.env.testing

@@ -14,7 +14,7 @@ DB_DATABASE=vito_test
 DB_USERNAME=root
 DB_PASSWORD=
 
-BROADCAST_DRIVER=pusher
+BROADCAST_DRIVER=null
 CACHE_DRIVER=array
 FILESYSTEM_DRIVER=local
 QUEUE_CONNECTION=database
@@ -23,19 +23,5 @@ SESSION_LIFETIME=120
 
 MAIL_MAILER=array
 
-PUSHER_APP_ID=app-id
-PUSHER_APP_KEY=app-key
-PUSHER_APP_SECRET=app-secret
-PUSHER_HOST=soketi
-PUSHER_PORT=6001
-PUSHER_SCHEME=http
-PUSHER_APP_CLUSTER=mt1
-
-VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-VITE_PUSHER_HOST="${PUSHER_HOST}"
-VITE_PUSHER_PORT="${PUSHER_PORT}"
-VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
-VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
-
 SSH_PUBLIC_KEY_NAME=ssh-public.key
 SSH_PRIVATE_KEY_NAME=ssh-private.pem

.github/workflows/code-style.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   code-style:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: true

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     services:
       mysql:

app/Actions/SourceControl/ConnectSourceControl.php

@@ -3,6 +3,7 @@
 namespace App\Actions\SourceControl;
 
 use App\Models\SourceControl;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Illuminate\Validation\ValidationException;
@@ -16,6 +17,7 @@ public function connect(array $input): void
             'provider' => $input['provider'],
             'profile' => $input['name'],
             'access_token' => $input['token'],
+            'url' => Arr::has($input, 'url') ? $input['url'] : null,
         ]);
 
         if (! $sourceControl->provider()->connect()) {
@@ -44,6 +46,11 @@ private function validate(array $input): void
             'token' => [
                 'required',
             ],
+            'url' => [
+                'nullable',
+                'url:http,https',
+                'ends_with:/',
+            ],
         ];
         Validator::make($input, $rules)->validate();
     }

app/Actions/StorageProvider/CreateStorageProvider.php

@@ -21,13 +21,15 @@ public function create(User $user, array $input): void
             'user_id' => $user->id,
             'provider' => $input['provider'],
             'profile' => $input['name'],
-            'credentials' => [
-                'token' => $input['token'],
-            ],
         ]);
+
+        $this->validateProvider($input, $storageProvider->provider()->validationRules());
+
+        $storageProvider->credentials = $storageProvider->provider()->credentialData($input);
+
         if (! $storageProvider->provider()->connect()) {
             throw ValidationException::withMessages([
-                'token' => __("Couldn't connect to the provider"),
+                'provider' => __("Couldn't connect to the provider"),
             ]);
         }
         $storageProvider->save();
@@ -44,9 +46,11 @@ private function validate(User $user, array $input): void
                 'required',
                 Rule::unique('storage_providers', 'profile')->where('user_id', $user->id),
             ],
-            'token' => [
-                'required',
-            ],
         ])->validate();
     }
+
+    private function validateProvider(array $input, array $rules): void
+    {
+        Validator::make($input, $rules)->validate();
+    }
 }

app/Contracts/StorageProvider.php

@@ -6,6 +6,10 @@
 
 interface StorageProvider
 {
+    public function validationRules(): array;
+
+    public function credentialData(array $input): array;
+
     public function connect(): bool;
 
     public function upload(Server $server, string $src, string $dest): array;

app/Enums/StorageProvider.php

@@ -6,7 +6,7 @@
 
 final class StorageProvider extends Enum
 {
-    const GOOGLE = 'google';
-
     const DROPBOX = 'dropbox';
+
+    const FTP = 'ftp';
 }

app/Http/Livewire/StorageProviders/ConnectProvider.php

@@ -14,6 +14,20 @@ class ConnectProvider extends Component
 
     public string $token;
 
+    public string $host;
+
+    public string $port;
+
+    public string $path = '/';
+
+    public string $username;
+
+    public string $password;
+
+    public int $ssl = 1;
+
+    public int $passive = 0;
+
     public function connect(): void
     {
         app(CreateStorageProvider::class)->create(auth()->user(), $this->all());

app/Jobs/Job.php

@@ -3,13 +3,12 @@
 namespace App\Jobs;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-abstract class Job implements ShouldQueue, ShouldBeUnique
+abstract class Job implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 }

app/Jobs/Site/Deploy.php

@@ -4,7 +4,6 @@
 
 use App\Enums\DeploymentStatus;
 use App\Events\Broadcast;
-use App\Helpers\SSH;
 use App\Jobs\Job;
 use App\Models\Deployment;
 use App\SSHCommands\System\RunScriptCommand;
@@ -18,13 +17,11 @@ class Deploy extends Job
 
     protected string $script;
 
-    protected SSH $ssh;
-
-    public function __construct(Deployment $deployment, string $path, string $script)
+    public function __construct(Deployment $deployment, string $path)
     {
+        $this->script = $deployment->deploymentScript->content;
         $this->deployment = $deployment;
         $this->path = $path;
-        $this->script = $script;
     }
 
     /**
@@ -32,28 +29,31 @@ public function __construct(Deployment $deployment, string $path, string $script
      */
     public function handle(): void
     {
-        $this->ssh = $this->deployment->site->server->ssh();
-        $this->ssh->exec(
+        $ssh = $this->deployment->site->server->ssh();
+        try {
+            $ssh->exec(
                 new RunScriptCommand($this->path, $this->script),
                 'deploy',
                 $this->deployment->site_id
             );
             $this->deployment->status = DeploymentStatus::FINISHED;
-        $this->deployment->log_id = $this->ssh->log->id;
+            $this->deployment->log_id = $ssh->log->id;
             $this->deployment->save();
             event(
                 new Broadcast('deploy-site-finished', [
                     'deployment' => $this->deployment,
                 ])
             );
+        } catch (Throwable) {
+            $this->deployment->log_id = $ssh->log->id;
+            $this->deployment->save();
+            $this->failed();
+        }
     }
 
     public function failed(): void
     {
         $this->deployment->status = DeploymentStatus::FAILED;
-        if ($this->ssh->log) {
-            $this->deployment->log_id = $this->ssh->log->id;
-        }
         $this->deployment->save();
         event(
             new Broadcast('deploy-site-failed', [

app/Listeners/BroadcastListener.php

@@ -13,7 +13,7 @@ public function __construct()
 
     public function handle(Broadcast $event): void
     {
-        Cache::set('broadcast', [
+        Cache::put('broadcast', [
             'type' => $event->type,
             'data' => $event->data,
         ], now()->addMinutes(5));

app/Models/BackupFile.php

@@ -76,7 +76,7 @@ public function getPathAttribute(): string
 
     public function getStoragePathAttribute(): string
     {
-        return '/'.$this->backup->database->name.'/'.$this->name.'.zip';
+        return '/'.$this->name.'.zip';
     }
 
     public function restore(Database $database): void

app/Models/Site.php

@@ -266,13 +266,7 @@ public function deploy(): Deployment
         }
         $deployment->save();
 
-        dispatch(
-            new Deploy(
-                $deployment,
-                $this->path,
-                $this->deployment_script_text
-            )
-        )->onConnection('ssh');
+        dispatch(new Deploy($deployment, $this->path))->onConnection('ssh');
 
         return $deployment;
     }

app/SSHCommands/Storage/DownloadFromFTPCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\SSHCommands\Storage;
+
+use App\SSHCommands\Command;
+use Illuminate\Support\Facades\File;
+
+class DownloadFromFTPCommand extends Command
+{
+    public function __construct(
+        protected string $src,
+        protected string $dest,
+        protected string $host,
+        protected string $port,
+        protected string $username,
+        protected string $password,
+        protected bool $ssl,
+        protected bool $passive,
+    ) {
+    }
+
+    public function file(): string
+    {
+        return File::get(resource_path('commands/storage/download-from-ftp.sh'));
+    }
+
+    public function content(): string
+    {
+        return str($this->file())
+            ->replace('__src__', $this->src)
+            ->replace('__dest__', $this->dest)
+            ->replace('__host__', $this->host)
+            ->replace('__port__', $this->port)
+            ->replace('__username__', $this->username)
+            ->replace('__password__', $this->password)
+            ->replace('__ssl__', $this->ssl ? 's' : '')
+            ->replace('__passive__', $this->passive ? '--ftp-pasv' : '')
+            ->toString();
+    }
+}

app/SSHCommands/Storage/UploadToFTPCommand.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\SSHCommands\Storage;
+
+use App\SSHCommands\Command;
+use Illuminate\Support\Facades\File;
+
+class UploadToFTPCommand extends Command
+{
+    public function __construct(
+        protected string $src,
+        protected string $dest,
+        protected string $host,
+        protected string $port,
+        protected string $username,
+        protected string $password,
+        protected bool $ssl,
+        protected bool $passive,
+    ) {
+    }
+
+    public function file(): string
+    {
+        return File::get(resource_path('commands/storage/upload-to-ftp.sh'));
+    }
+
+    public function content(): string
+    {
+        return str($this->file())
+            ->replace('__src__', $this->src)
+            ->replace('__dest__', $this->dest)
+            ->replace('__host__', $this->host)
+            ->replace('__port__', $this->port)
+            ->replace('__username__', $this->username)
+            ->replace('__password__', $this->password)
+            ->replace('__ssl__', $this->ssl ? 's' : '')
+            ->replace('__passive__', $this->passive ? '--ftp-pasv' : '')
+            ->toString();
+    }
+}

app/ServerTypes/Regular.php

@@ -2,6 +2,7 @@
 
 namespace App\ServerTypes;
 
+use App\Enums\ServerStatus;
 use App\Events\Broadcast;
 use App\Jobs\Installation\Initialize;
 use App\Jobs\Installation\InstallCertbot;
@@ -79,7 +80,7 @@ public function install(): void
 
         $jobs[] = function () {
             $this->server->update([
-                'status' => 'ready',
+                'status' => ServerStatus::READY,
                 'progress' => 100,
             ]);
             event(

app/SourceControlProviders/Gitlab.php

@@ -10,12 +10,14 @@
 
 class Gitlab extends AbstractSourceControlProvider
 {
-    protected string $apiUrl = 'https://gitlab.com/api/v4';
+    protected string $defaultApiHost = 'https://gitlab.com/';
+
+    protected string $apiVersion = 'api/v4';
 
     public function connect(): bool
     {
         $res = Http::withToken($this->sourceControl->access_token)
-            ->get($this->apiUrl.'/projects');
+            ->get($this->getApiUrl().'/projects');
 
         return $res->successful();
     }
@@ -27,7 +29,7 @@ public function getRepo(string $repo = null): mixed
     {
         $repository = $repo ? urlencode($repo) : null;
         $res = Http::withToken($this->sourceControl->access_token)
-            ->get($this->apiUrl.'/projects/'.$repository.'/repository/commits');
+            ->get($this->getApiUrl().'/projects/'.$repository.'/repository/commits');
 
         $this->handleResponseErrors($res, $repo);
 
@@ -36,7 +38,9 @@ public function getRepo(string $repo = null): mixed
 
     public function fullRepoUrl(string $repo, string $key): string
     {
-        return sprintf('git@gitlab.com-%s:%s.git', $key, $repo);
+        $host = parse_url($this->getApiUrl())['host'];
+
+        return sprintf('git@%s-%s:%s.git', $host, $key, $repo);
     }
 
     /**
@@ -46,7 +50,7 @@ public function deployHook(string $repo, array $events, string $secret): array
     {
         $repository = urlencode($repo);
         $response = Http::withToken($this->sourceControl->access_token)->post(
-            $this->apiUrl.'/projects/'.$repository.'/hooks',
+            $this->getApiUrl().'/projects/'.$repository.'/hooks',
             [
                 'description' => 'deploy',
                 'url' => url('/git-hooks?secret='.$secret),
@@ -81,7 +85,7 @@ public function destroyHook(string $repo, string $hookId): void
     {
         $repository = urlencode($repo);
         $response = Http::withToken($this->sourceControl->access_token)->delete(
-            $this->apiUrl.'/projects/'.$repository.'/hooks/'.$hookId
+            $this->getApiUrl().'/projects/'.$repository.'/hooks/'.$hookId
         );
 
         if ($response->status() != 204) {
@@ -96,7 +100,7 @@ public function getLastCommit(string $repo, string $branch): ?array
     {
         $repository = urlencode($repo);
         $res = Http::withToken($this->sourceControl->access_token)
-            ->get($this->apiUrl.'/projects/'.$repository.'/repository/commits?ref_name='.$branch);
+            ->get($this->getApiUrl().'/projects/'.$repository.'/repository/commits?ref_name='.$branch);
 
         $this->handleResponseErrors($res, $repo);
 
@@ -123,7 +127,7 @@ public function deployKey(string $title, string $repo, string $key): void
     {
         $repository = urlencode($repo);
         $response = Http::withToken($this->sourceControl->access_token)->post(
-            $this->apiUrl.'/projects/'.$repository.'/deploy_keys',
+            $this->getApiUrl().'/projects/'.$repository.'/deploy_keys',
             [
                 'title' => $title,
                 'key' => $key,
@@ -135,4 +139,13 @@ public function deployKey(string $title, string $repo, string $key): void
             throw new FailedToDeployGitKey(json_decode($response->body())->message);
         }
     }
+
+    public function getApiUrl(): string
+    {
+        $host = $this->sourceControl->url === null
+            ? $this->defaultApiHost
+            : $this->sourceControl->url;
+
+        return $host.$this->apiVersion;
+    }
 }

app/StorageProviders/Dropbox.php

@@ -13,6 +13,20 @@ class Dropbox extends AbstractStorageProvider
 {
     protected string $apiUrl = 'https://api.dropboxapi.com/2';
 
+    public function validationRules(): array
+    {
+        return [
+            'token' => 'required',
+        ];
+    }
+
+    public function credentialData(array $input): array
+    {
+        return [
+            'token' => $input['token'],
+        ];
+    }
+
     public function connect(): bool
     {
         $res = Http::withToken($this->storageProvider->credentials['token'])

app/StorageProviders/FTP.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace App\StorageProviders;
+
+use App\Models\Server;
+use App\SSHCommands\Storage\DownloadFromFTPCommand;
+use App\SSHCommands\Storage\UploadToFTPCommand;
+use FTP\Connection;
+use Throwable;
+
+class FTP extends AbstractStorageProvider
+{
+    public function validationRules(): array
+    {
+        return [
+            'host' => 'required',
+            'port' => 'required|numeric',
+            'path' => 'required',
+            'username' => 'required',
+            'password' => 'required',
+            'ssl' => 'required',
+            'passive' => 'required',
+        ];
+    }
+
+    public function credentialData(array $input): array
+    {
+        return [
+            'host' => $input['host'],
+            'port' => $input['port'],
+            'path' => $input['path'],
+            'username' => $input['username'],
+            'password' => $input['password'],
+            'ssl' => (bool) $input['ssl'],
+            'passive' => (bool) $input['passive'],
+        ];
+    }
+
+    public function connect(): bool
+    {
+        $connection = $this->connection();
+
+        $isConnected = $connection && $this->login($connection);
+
+        if ($isConnected) {
+            ftp_close($connection);
+        }
+
+        return $isConnected;
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function upload(Server $server, string $src, string $dest): array
+    {
+        $server->ssh()->exec(
+            new UploadToFTPCommand(
+                $src,
+                $this->storageProvider->credentials['path'].'/'.$dest,
+                $this->storageProvider->credentials['host'],
+                $this->storageProvider->credentials['port'],
+                $this->storageProvider->credentials['username'],
+                $this->storageProvider->credentials['password'],
+                $this->storageProvider->credentials['ssl'],
+                $this->storageProvider->credentials['passive'],
+            ),
+            'upload-to-ftp'
+        );
+
+        return [
+            'size' => null,
+        ];
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function download(Server $server, string $src, string $dest): void
+    {
+        $server->ssh()->exec(
+            new DownloadFromFTPCommand(
+                $this->storageProvider->credentials['path'].'/'.$src,
+                $dest,
+                $this->storageProvider->credentials['host'],
+                $this->storageProvider->credentials['port'],
+                $this->storageProvider->credentials['username'],
+                $this->storageProvider->credentials['password'],
+                $this->storageProvider->credentials['ssl'],
+                $this->storageProvider->credentials['passive'],
+            ),
+            'download-from-ftp'
+        );
+    }
+
+    public function delete(array $paths): void
+    {
+        $connection = $this->connection();
+
+        if ($connection && $this->login($connection)) {
+            if ($this->storageProvider->credentials['passive']) {
+                ftp_pasv($connection, true);
+            }
+
+            foreach ($paths as $path) {
+                ftp_delete($connection, $this->storageProvider->credentials['path'].'/'.$path);
+            }
+        }
+
+        ftp_close($connection);
+    }
+
+    private function connection(): bool|Connection
+    {
+        $credentials = $this->storageProvider->credentials;
+        if ($credentials['ssl']) {
+            return ftp_ssl_connect($credentials['host'], $credentials['port'], 5);
+        }
+
+        return ftp_connect($credentials['host'], $credentials['port'], 5);
+    }
+
+    private function login(Connection $connection): bool
+    {
+        $credentials = $this->storageProvider->credentials;
+
+        return ftp_login($connection, $credentials['username'], $credentials['password']);
+    }
+}

composer.json

@@ -16,7 +16,7 @@
         "laravel/tinker": "^2.8",
         "livewire/livewire": "^2.12",
         "phpseclib/phpseclib": "~3.0",
-        "pusher/pusher-php-server": "^7.2"
+        "ext-ftp": "*"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0f725da8271d545b318e319f7b616053",
+    "content-hash": "53be6925a69aeafb21d079b82e51c1c4",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -3198,92 +3198,6 @@
             },
             "time": "2020-10-15T08:29:30+00:00"
         },
-        {
-            "name": "paragonie/sodium_compat",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933",
-                "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
-            },
-            "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "autoload.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "ISC"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com"
-                },
-                {
-                    "name": "Frank Denis",
-                    "email": "jedisct1@pureftpd.org"
-                }
-            ],
-            "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-            "keywords": [
-                "Authentication",
-                "BLAKE2b",
-                "ChaCha20",
-                "ChaCha20-Poly1305",
-                "Chapoly",
-                "Curve25519",
-                "Ed25519",
-                "EdDSA",
-                "Edwards-curve Digital Signature Algorithm",
-                "Elliptic Curve Diffie-Hellman",
-                "Poly1305",
-                "Pure-PHP cryptography",
-                "RFC 7748",
-                "RFC 8032",
-                "Salpoly",
-                "Salsa20",
-                "X25519",
-                "XChaCha20-Poly1305",
-                "XSalsa20-Poly1305",
-                "Xchacha20",
-                "Xsalsa20",
-                "aead",
-                "cryptography",
-                "ecdh",
-                "elliptic curve",
-                "elliptic curve cryptography",
-                "encryption",
-                "libsodium",
-                "php",
-                "public-key cryptography",
-                "secret-key cryptography",
-                "side-channel resistant"
-            ],
-            "support": {
-                "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.19.0"
-            },
-            "time": "2022-09-26T03:40:35+00:00"
-        },
         {
             "name": "phpoption/phpoption",
             "version": "1.9.1",
@@ -3961,67 +3875,6 @@
             },
             "time": "2023-04-07T21:57:09+00:00"
         },
-        {
-            "name": "pusher/pusher-php-server",
-            "version": "7.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pusher/pusher-http-php.git",
-                "reference": "4ace4873873b06c25cecb2dd6d9fdcbf2f20b640"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pusher/pusher-http-php/zipball/4ace4873873b06c25cecb2dd6d9fdcbf2f20b640",
-                "reference": "4ace4873873b06c25cecb2dd6d9fdcbf2f20b640",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "guzzlehttp/guzzle": "^7.2",
-                "paragonie/sodium_compat": "^1.6",
-                "php": "^7.3|^8.0",
-                "psr/log": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "overtrue/phplint": "^2.3",
-                "phpunit/phpunit": "^9.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Pusher\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Library for interacting with the Pusher REST API",
-            "keywords": [
-                "events",
-                "messaging",
-                "php-pusher-server",
-                "publish",
-                "push",
-                "pusher",
-                "real time",
-                "real-time",
-                "realtime",
-                "rest",
-                "trigger"
-            ],
-            "support": {
-                "issues": "https://github.com/pusher/pusher-http-php/issues",
-                "source": "https://github.com/pusher/pusher-http-php/tree/7.2.2"
-            },
-            "time": "2022-12-20T19:52:36+00:00"
-        },
         {
             "name": "ralouphie/getallheaders",
             "version": "3.0.3",
@@ -9227,7 +9080,8 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1"
+        "php": "^8.1",
+        "ext-ftp": "*"
     },
     "platform-dev": [],
     "plugin-api-version": "2.3.0"

config/core.php

@@ -30,14 +30,15 @@
 use App\SourceControlProviders\Github;
 use App\SourceControlProviders\Gitlab;
 use App\StorageProviders\Dropbox;
+use App\StorageProviders\FTP;
 
 return [
     /*
      * SSH
      */
     'ssh_user' => env('SSH_USER', 'vito'),
-    'ssh_public_key_name' => env('SSH_PUBLIC_KEY_NAME'),
-    'ssh_private_key_name' => env('SSH_PRIVATE_KEY_NAME'),
+    'ssh_public_key_name' => env('SSH_PUBLIC_KEY_NAME', 'ssh-public.key'),
+    'ssh_private_key_name' => env('SSH_PRIVATE_KEY_NAME', 'ssh-private.pem'),
     'logs_disk' => env('SERVER_LOGS_DISK', 'server-logs-local'),
     'key_pairs_disk' => env('KEY_PAIRS_DISK', 'key-pairs-local'),
 
@@ -355,8 +356,10 @@
      */
     'storage_providers' => [
         'dropbox',
+        'ftp',
     ],
     'storage_providers_class' => [
         'dropbox' => Dropbox::class,
+        'ftp' => FTP::class,
     ],
 ];

config/queue.php

@@ -13,7 +13,7 @@
     |
     */
 
-    'default' => env('QUEUE_CONNECTION', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'default'),
 
     /*
     |--------------------------------------------------------------------------

config/serverproviders.php

@@ -139,85 +139,125 @@
             ],
         ],
         'images' => [
-            'us-east-1' => [
-                'ubuntu_18' => 'ami-0279c3b3186e54acd',
-                'ubuntu_20' => 'ami-083654bd07b5da81d',
-            ],
-            'us-east-2' => [
-                'ubuntu_18' => 'ami-020db2c14939a8efb',
-                'ubuntu_20' => 'ami-0629230e074c580f2',
-            ],
-            'us-west-1' => [
-                'ubuntu_18' => 'ami-083f68207d3376798',
-                'ubuntu_20' => 'ami-053ac55bdcfe96e85',
-            ],
-            'us-west-2' => [
-                'ubuntu_18' => 'ami-09889d8d54f9e0a0e',
-                'ubuntu_20' => 'ami-036d46416a34a611c',
+            'af-south-1' => [
+                'ubuntu_20' => 'ami-03684d4c2541e5333',
+                'ubuntu_22' => 'ami-05759acc7d8973892',
             ],
             'ap-east-1' => [
-                'ubuntu_18' => 'ami-032c0a4bd39a5772c',
-                'ubuntu_20' => 'ami-0a9c1cc3697104990',
-            ],
-            'ap-south-1' => [
-                'ubuntu_18' => 'ami-00782a7608c7fc226',
-                'ubuntu_20' => 'ami-0567e0d2b4b2169ae',
+                'ubuntu_20' => 'ami-0b19a97bf326b4931',
+                'ubuntu_22' => 'ami-03490b1b7425e5fe3',
             ],
             'ap-northeast-1' => [
-                'ubuntu_18' => 'ami-085e9421f80dbe728',
-                'ubuntu_20' => 'ami-036d0684fc96830ca',
+                'ubuntu_20' => 'ami-0e25df74d27e028e6',
+                'ubuntu_22' => 'ami-09a81b370b76de6a2',
             ],
             'ap-northeast-2' => [
-                'ubuntu_18' => 'ami-0252a84eb1d66c2a0',
-                'ubuntu_20' => 'ami-0f8b8babb98cc66d0',
+                'ubuntu_20' => 'ami-003a709e1e4ce3729',
+                'ubuntu_22' => 'ami-086cae3329a3f7d75',
+            ],
+            'ap-northeast-3' => [
+                'ubuntu_20' => 'ami-06c1367bd83de7d47',
+                'ubuntu_22' => 'ami-0690c54203f5f67da',
+            ],
+            'ap-south-1' => [
+                'ubuntu_20' => 'ami-0b88997c830e88c76',
+                'ubuntu_22' => 'ami-0287a05f0ef0e9d9a',
+            ],
+            'ap-south-2' => [
+                'ubuntu_20' => 'ami-049e2ae605332dba6',
+                'ubuntu_22' => 'ami-06fe902e167e67d33',
             ],
             'ap-southeast-1' => [
-                'ubuntu_18' => 'ami-0907c2c44ea451f84',
-                'ubuntu_20' => 'ami-0fed77069cd5a6d6c',
+                'ubuntu_20' => 'ami-0a6461ddb52e9db63',
+                'ubuntu_22' => 'ami-078c1149d8ad719a7',
             ],
             'ap-southeast-2' => [
-                'ubuntu_18' => 'ami-00abf0511a7f4cee5',
-                'ubuntu_20' => 'ami-0bf8b986de7e3c7ce',
+                'ubuntu_20' => 'ami-0a9fb81cc3289919c',
+                'ubuntu_22' => 'ami-0df4b2961410d4cff',
+            ],
+            'ap-southeast-3' => [
+                'ubuntu_20' => 'ami-05ee5bed682a3fff0',
+                'ubuntu_22' => 'ami-0fb6d1fdeeea10488',
+            ],
+            'ap-southeast-4' => [
+                'ubuntu_20' => 'ami-02f9759882b112414',
+                'ubuntu_22' => 'ami-043a030d3eeabec75',
             ],
             'ca-central-1' => [
-                'ubuntu_18' => 'ami-0e471deaa43652c4a',
-                'ubuntu_20' => 'ami-0bb84e7329f4fa1f7',
+                'ubuntu_20' => 'ami-0daaea212e620de87',
+                'ubuntu_22' => 'ami-06873c81b882339ac',
+            ],
+            'cn-north-1' => [
+                'ubuntu_20' => 'ami-0c8bcac1fe3389a72',
+                'ubuntu_22' => 'ami-0728a1a4cc9e07753',
+            ],
+            'cn-northwest-1' => [
+                'ubuntu_20' => 'ami-0415bfb3ea62e17c0',
+                'ubuntu_22' => 'ami-05529cf859783e600',
             ],
             'eu-central-1' => [
-                'ubuntu_18' => 'ami-00d5e377dd7fad751',
-                'ubuntu_20' => 'ami-0a49b025fffbbdac6',
+                'ubuntu_20' => 'ami-0b369586722023326',
+                'ubuntu_22' => 'ami-06dd92ecc74fdfb36',
             ],
-            'eu-west-1' => [
-                'ubuntu_18' => 'ami-095b735dce49535b5',
-                'ubuntu_20' => 'ami-08edbb0e85d6a0a07',
-            ],
-            'eu-west-2' => [
-                'ubuntu_18' => 'ami-008485ca60c91a0f3',
-                'ubuntu_20' => 'ami-0fdf70ed5c34c5f52',
-            ],
-            'eu-west-3' => [
-                'ubuntu_18' => 'ami-0df7d9cc2767d16cd',
-                'ubuntu_20' => 'ami-06d79c60d7454e2af',
-            ],
-            'eu-south-1' => [
-                'ubuntu_18' => 'ami-09f165dd6bd167be5',
-                'ubuntu_20' => 'ami-0f8ce9c417115413d',
+            'eu-central-2' => [
+                'ubuntu_20' => 'ami-070c78d5ed65f11c8',
+                'ubuntu_22' => 'ami-07cf963e6321c9e6a',
             ],
             'eu-north-1' => [
-                'ubuntu_18' => 'ami-038904f9024f34a0c',
-                'ubuntu_20' => 'ami-0bd9c26722573e69b',
+                'ubuntu_20' => 'ami-0c5863072fc83557e',
+                'ubuntu_22' => 'ami-0fe8bec493a81c7da',
+            ],
+            'eu-south-1' => [
+                'ubuntu_20' => 'ami-0966ff128f1497260',
+                'ubuntu_22' => 'ami-0b03947fd0ce0eed2',
+            ],
+            'eu-south-2' => [
+                'ubuntu_20' => 'ami-087296a5b46cb95ce',
+                'ubuntu_22' => 'ami-03486abd2962c176f',
+            ],
+            'eu-west-1' => [
+                'ubuntu_20' => 'ami-0e3e7f215a53e2a86',
+                'ubuntu_22' => 'ami-0694d931cee176e7d',
+            ],
+            'eu-west-2' => [
+                'ubuntu_20' => 'ami-0b22eee5ba6bb6772',
+                'ubuntu_22' => 'ami-0505148b3591e4c07',
+            ],
+            'eu-west-3' => [
+                'ubuntu_20' => 'ami-0f14fa1f9c69f4111',
+                'ubuntu_22' => 'ami-00983e8a26e4c9bd9',
+            ],
+            'il-central-1' => [
+                'ubuntu_20' => 'ami-0703881563bf5fab7',
+                'ubuntu_22' => 'ami-03869c813f5a2e20c',
+            ],
+            'me-central-1' => [
+                'ubuntu_20' => 'ami-04a5bde3b044c7c21',
+                'ubuntu_22' => 'ami-02168d82d5c12118f',
             ],
             'me-south-1' => [
-                'ubuntu_18' => 'ami-0ef669c57b73af73b',
-                'ubuntu_20' => 'ami-0b4946d7420c44be4',
+                'ubuntu_20' => 'ami-0165b692f5714e330',
+                'ubuntu_22' => 'ami-0f8d2a6080634ee69',
             ],
             'sa-east-1' => [
-                'ubuntu_18' => 'ami-0ed2b3edeb28afa59',
-                'ubuntu_20' => 'ami-0e66f5495b4efdd0f',
+                'ubuntu_20' => 'ami-095ca107fb46b81e6',
+                'ubuntu_22' => 'ami-0b6c2d49148000cd5',
             ],
-            'af-south-1' => [
-                'ubuntu_18' => 'ami-0191bb2cf509687ee',
-                'ubuntu_20' => 'ami-0ff86122fd4ad7208',
+            'us-east-1' => [
+                'ubuntu_20' => 'ami-0fe0238291c8e3f07',
+                'ubuntu_22' => 'ami-0fc5d935ebf8bc3bc',
+            ],
+            'us-east-2' => [
+                'ubuntu_20' => 'ami-0b6968e5c7117349a',
+                'ubuntu_22' => 'ami-0e83be366243f524a',
+            ],
+            'us-west-1' => [
+                'ubuntu_20' => 'ami-092efbcc9a2d2be8a',
+                'ubuntu_22' => 'ami-0cbd40f694b804622',
+            ],
+            'us-west-2' => [
+                'ubuntu_20' => 'ami-0a55cdf919d10eac9',
+                'ubuntu_22' => 'ami-0efcece6bed30fd98',
             ],
         ],
     ],

database/factories/SourceControlFactory.php

@@ -17,4 +17,40 @@ public function definition(): array
             'access_token' => Str::random(10),
         ];
     }
+
+    public function gitlab(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'provider' => \App\Enums\SourceControl::GITLAB,
+            ];
+        });
+    }
+
+    public function github(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'provider' => \App\Enums\SourceControl::GITHUB,
+            ];
+        });
+    }
+
+    public function bitbucket(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'provider' => \App\Enums\SourceControl::BITBUCKET,
+            ];
+        });
+    }
+
+    public function custom(): Factory
+    {
+        return $this->state(function (array $attributes) {
+            return [
+                'provider' => \App\Enums\SourceControl::CUSTOM,
+            ];
+        });
+    }
 }

docker-compose.yml

@@ -1,6 +1,6 @@
 version: '3'
 services:
-    app:
+    vito:
         build:
             context: ./docker/8.1
             dockerfile: Dockerfile

public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "resources/css/app.css": {
-    "file": "assets/app-bdf134de.css",
+    "file": "assets/app-99c9ce18.css",
     "isEntry": true,
     "src": "resources/css/app.css"
   },

resources/commands/storage/download-from-ftp.sh

@@ -0,0 +1 @@
+curl __passive__ -u "__username__:__password__" ftp__ssl__://__host__:__port__/__src__ -o "__dest__"

resources/commands/storage/upload-to-ftp.sh

@@ -0,0 +1 @@
+curl __passive__ -T "__src__" -u "__username__:__password__" ftp__ssl__://__host__:__port__/__dest__

resources/commands/system/run-script.sh

@@ -2,6 +2,4 @@ if ! cd __path__; then
     echo 'VITO_SSH_ERROR' && exit 1
 fi
 
-if ! __script__; then
-    echo 'VITO_SSH_ERROR' && exit 1
-fi
+__script__

resources/views/auth/login.blade.php

@@ -4,37 +4,49 @@
 
     <form method="POST" action="{{ route('login') }}">
         @csrf
-
+        <div x-data="{ isPasswordVisible: false }">
             <!-- Email Address -->
             <div>
                 <x-input-label for="email" :value="__('Email')" />
-            <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')" required autofocus autocomplete="username" />
+                <x-text-input id="email" class="block mt-1 w-full" type="email" name="email" :value="old('email')"
+                    required autofocus autocomplete="username" />
                 <x-input-error :messages="$errors->get('email')" class="mt-2" />
             </div>
 
             <!-- Password -->
             <div class="mt-4">
                 <x-input-label for="password" :value="__('Password')" />
-
                 <x-text-input id="password" class="block mt-1 w-full"
-                            type="password"
-                            name="password"
-                            required autocomplete="current-password" />
-
+                    x-bind:type="isPasswordVisible ? 'text' : 'password'" name="password" required
+                    autocomplete="current-password" />
                 <x-input-error :messages="$errors->get('password')" class="mt-2" />
             </div>
 
+            <div class="flex items-center justify-between">
                 <!-- Remember Me -->
-        <div class="block mt-4">
+                <div class="block mt-4 ">
                     <label for="remember_me" class="inline-flex items-center">
-                <input id="remember_me" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="remember">
+                        <input id="remember_me" type="checkbox"
+                            class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800"
+                            name="remember">
                         <span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Remember me') }}</span>
                     </label>
                 </div>
 
+                <!-- Show Password -->
+                <div class="block mt-4">
+                    <label for="show_password" class="inline-flex items-center float-right">
+                        <input id="show_password" type="checkbox" x-model="isPasswordVisible"
+                            class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800">
+                        <span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Show password') }}</span>
+                    </label>
+                </div>
+            </div>
+
             <div class="flex items-center justify-end mt-4">
                 @if (Route::has('password.request'))
-                <a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800" href="{{ route('password.request') }}">
+                    <a class="underline text-sm text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-100 rounded-md focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 dark:focus:ring-offset-gray-800"
+                        href="{{ route('password.request') }}">
                         {{ __('Forgot your password?') }}
                     </a>
                 @endif
@@ -43,5 +55,6 @@
                     {{ __('Log in') }}
                 </x-primary-button>
             </div>
+        </div>
     </form>
 </x-guest-layout>

resources/views/components/input-help.blade.php

@@ -0,0 +1 @@
+<p {{ $attributes->merge(['class' => 'mt-2 text-sm text-gray-500 dark:text-gray-300']) }}>{{ $slot }}</p>

resources/views/layouts/app.blade.php

@@ -1,13 +1,14 @@
 @props(['server'])
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
     <title>
-        @if(isset($pageTitle))
+        @if (isset($pageTitle))
             {{ $pageTitle }} -
         @endif
         {{ config('app.name', 'Laravel') }}
@@ -29,9 +30,12 @@
 
     @include('layouts.partials.favicon')
 </head>
-<body class="font-sans antialiased bg-gray-100 dark:bg-gray-900 dark:text-gray-300 min-h-screen min-w-max" x-data="" x-cloak>
+
+<body class="font-sans antialiased bg-gray-100 dark:bg-gray-900 dark:text-gray-300 min-h-screen min-w-max"
+    x-data="" x-cloak>
     <div class="flex min-h-screen">
-        <div class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 dark:bg-gray-800/50 p-3 dark:border-r-2 dark:border-gray-800">
+        <div
+            class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 dark:bg-gray-800/50 p-3 dark:border-r-2 dark:border-gray-800">
             <div class="h-16 block">
                 <div class="flex items-center justify-start text-3xl font-extrabold text-white">
                     Vito
@@ -39,78 +43,101 @@
             </div>
 
             <div class="mb-5 space-y-2">
-                @include('layouts.partials.server-select', ['server' => isset($server) ? $server : null ])
+                @include('layouts.partials.server-select', ['server' => isset($server) ? $server : null])
 
-                @if(isset($server))
+                @if (isset($server))
                     <x-sidebar-link :href="route('servers.show', ['server' => $server])" :active="request()->routeIs('servers.show')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-6 h-6">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
                         </svg>
                         <span class="ml-2 text-gray-50">{{ __('Overview') }}</span>
                     </x-sidebar-link>
-                    @if($server->isReady())
-                        @if($server->webserver())
+                    @if ($server->isReady())
+                        @if ($server->webserver())
                             <x-sidebar-link :href="route('servers.sites', ['server' => $server])" :active="request()->routeIs('servers.sites') || request()->is('servers/*/sites/*')">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418" />
                                 </svg>
                                 <span class="ml-2 text-gray-50">{{ __('Sites') }}</span>
                             </x-sidebar-link>
                         @endif
-                        @if($server->database())
-                            <x-sidebar-link :href="route('servers.databases', ['server' => $server])" :active="request()->routeIs('servers.databases') || request()->routeIs('servers.databases.backups')">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
+                        @if ($server->database())
+                            <x-sidebar-link :href="route('servers.databases', ['server' => $server])" :active="request()->routeIs('servers.databases') ||
+                                request()->routeIs('servers.databases.backups')">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
                                 </svg>
                                 <span class="ml-2 text-gray-50">{{ __('Databases') }}</span>
                             </x-sidebar-link>
                         @endif
-                        @if($server->php())
+                        @if ($server->php())
                             <x-sidebar-link :href="route('servers.php', ['server' => $server])" :active="request()->routeIs('servers.php')">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M17.25 6.75L22.5 12l-5.25 5.25m-10.5 0L1.5 12l5.25-5.25m7.5-3l-4.5 16.5" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M17.25 6.75L22.5 12l-5.25 5.25m-10.5 0L1.5 12l5.25-5.25m7.5-3l-4.5 16.5" />
                                 </svg>
                                 <span class="ml-2 text-gray-50">{{ __('PHP') }}</span>
                             </x-sidebar-link>
                         @endif
-                        @if($server->firewall())
+                        @if ($server->firewall())
                             <x-sidebar-link :href="route('servers.firewall', ['server' => $server])" :active="request()->routeIs('servers.firewall')">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.21 0 003 2.48z" />
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.21 0 003 2.48z" />
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
                                 </svg>
                                 <span class="ml-2 text-gray-50">{{ __('Firewall') }}</span>
                             </x-sidebar-link>
                         @endif
                         <x-sidebar-link :href="route('servers.cronjobs', ['server' => $server])" :active="request()->routeIs('servers.cronjobs')">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z" />
                             </svg>
                             <span class="ml-2 text-gray-50">{{ __('Cronjobs') }}</span>
                         </x-sidebar-link>
                         <x-sidebar-link :href="route('servers.ssh-keys', ['server' => $server])" :active="request()->routeIs('servers.ssh-keys')">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z" />
                             </svg>
                             <span class="ml-2 text-gray-50">{{ __('SSH Keys') }}</span>
                         </x-sidebar-link>
                         <x-sidebar-link :href="route('servers.services', ['server' => $server])" :active="request()->routeIs('servers.services')">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                             </svg>
                             <span class="ml-2 text-gray-50">{{ __('Services') }}</span>
                         </x-sidebar-link>
                     @endif
                     <x-sidebar-link :href="route('servers.settings', ['server' => $server])" :active="request()->routeIs('servers.settings')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />
                         </svg>
                         <span class="ml-2 text-gray-50">{{ __('Settings') }}</span>
                     </x-sidebar-link>
                     <x-sidebar-link :href="route('servers.logs', ['server' => $server])" :active="request()->routeIs('servers.logs')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M6.429 9.75L2.25 12l4.179 2.25m0-4.5l5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0l4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0l-5.571 3-5.571-3" />
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M6.429 9.75L2.25 12l4.179 2.25m0-4.5l5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0l4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0l-5.571 3-5.571-3" />
                         </svg>
                         <span class="ml-2 text-gray-50">{{ __('Logs') }}</span>
                     </x-sidebar-link>
@@ -118,8 +145,9 @@
             </div>
         </div>
 
-        @if(isset($sidebar))
-            <div class="min-h-screen w-64 flex-none border-r border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
+        @if (isset($sidebar))
+            <div
+                class="min-h-screen w-64 flex-none border-r border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
                 {{ $sidebar }}
             </div>
         @endif
@@ -128,29 +156,73 @@
             <nav class="h-16 border-b border-gray-200 dark:border-gray-800 bg-white dark:bg-gray-900">
                 <!-- Primary Navigation Menu -->
                 <div class="mx-auto max-w-full px-4 sm:px-6 lg:px-8">
-                    <div class="flex h-16 justify-between">
+                    <div class="flex h-16 justify-end">
                         <div class="flex items-center justify-center">
                             {{-- Search --}}
                         </div>
+                        {{-- Dark Mode Toggle Button section  --}}
+                        <div class="flex items-center" x-data="{
+                            isDarkMode: localStorage.theme,
+                            toggleTheme() {
+                                localStorage.theme = this.isDarkMode == 'dark' ? 'light' : 'dark';
 
+                                if (localStorage.theme === 'dark') {
+                                    document.documentElement.classList.add('dark')
+                                } else {
+                                    document.documentElement.classList.remove('dark')
+                                }
+
+                                this.isDarkMode = localStorage.theme
+                            }
+                        }" x-on:click="toggleTheme()">
+                            <div class="flex items-center">
+                                <div class="flex items-center justify-end">
+                                    <button id="theme-toggle" type="button" class="text-sm p-2"
+                                        :class="isDarkMode == 'dark' ? 'text-gray-300 border-gray-300' :
+                                            'text-gray-800 border-gray-800'">
+                                        <svg x-show="isDarkMode!='dark'" id="theme-toggle-dark-icon" class="w-5 h-5"
+                                            fill="currentColor" viewBox="0 0 20 20"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <path
+                                                d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z">
+                                            </path>
+                                        </svg>
+                                        <svg x-show="isDarkMode=='dark'" id="theme-toggle-light-icon" class="w-5 h-5"
+                                            fill="currentColor" viewBox="0 0 20 20"
+                                            xmlns="http://www.w3.org/2000/svg">
+                                            <path
+                                                d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
+                                                fillRule="evenodd" clipRule="evenodd"></path>
+                                        </svg>
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                        {{-- End of Dark Mode Toggle Button section  --}}
                         <div class="ml-6 flex items-center">
                             <div class="relative ml-5">
                                 <x-dropdown align="right" width="48">
                                     <x-slot name="trigger">
                                         <div class="flex cursor-pointer items-center justify-between">
                                             {{ auth()->user()->name }}
-                                            <svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                                                <path fill-rule="evenodd" d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z" clip-rule="evenodd" />
+                                            <svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
+                                                viewBox="0 0 20 20" fill="currentColor">
+                                                <path fill-rule="evenodd"
+                                                    d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
+                                                    clip-rule="evenodd" />
                                             </svg>
                                         </div>
                                     </x-slot>
 
                                     <x-slot name="content">
                                         <x-dropdown-link :href="route('profile')">Profile</x-dropdown-link>
+                                        <div class="border-t border-gray-100 dark:border-gray-700"></div>
+
                                         <div class="border-t border-gray-100 dark:border-gray-700"></div>
                                         <form method="POST" action="{{ route('logout') }}">
                                             @csrf
-                                            <x-dropdown-link :href="route('logout')" onclick="event.preventDefault(); this.closest('form').submit();">
+                                            <x-dropdown-link :href="route('logout')"
+                                                onclick="event.preventDefault(); this.closest('form').submit();">
                                                 {{ __('Log Out') }}
                                             </x-dropdown-link>
                                         </form>
@@ -163,7 +235,7 @@
             </nav>
 
             <!-- Page Heading -->
-            @if(isset($header))
+            @if (isset($header))
                 <header class="border-b border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
                     <div class="mx-auto flex h-20 w-full max-w-full items-center justify-between px-8">
                         {{ $header }}
@@ -171,7 +243,7 @@
                 </header>
             @endif
 
-            @if(isset($header2))
+            @if (isset($header2))
                 <header class="border-b border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
                     <div class="mx-auto max-w-full py-6 px-8">
                         {{ $header2 }}
@@ -191,9 +263,20 @@
     <script>
         document.addEventListener('livewire:load', () => {
             Livewire.onPageExpired((response, message) => {
-                ({href: window.location.href} = window.location);
+                ({
+                    href: window.location.href
+                } = window.location);
             })
         })
+
+        // On page load or when changing themes, best to add inline in `head` to avoid FOUC
+        if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia(
+                '(prefers-color-scheme: dark)').matches)) {
+            document.documentElement.classList.add('dark')
+        } else {
+            document.documentElement.classList.remove('dark')
+        }
     </script>
 </body>
+
 </html>

resources/views/layouts/guest.blade.php

@@ -29,4 +29,5 @@
             </div>
         </div>
     </body>
+
 </html>

resources/views/livewire/databases/database-backup-files.blade.php

@@ -18,7 +18,7 @@
             <tr>
                 <x-th>{{ __("Name") }}</x-th>
                 <x-th>{{ __("Created") }}</x-th>
-                <x-th>{{ __("Size") }}</x-th>
+                {{--<x-th>{{ __("Size") }}</x-th>--}}
                 <x-th>{{ __("Status") }}</x-th>
                 <x-th>{{ __("Restored") }}</x-th>
                 <x-th>{{ __("Restored To") }}</x-th>
@@ -30,7 +30,7 @@
                     <x-td>
                         <x-datetime :value="$file->created_at" />
                     </x-td>
-                    <x-td>{{ $file->size }}</x-td>
+                    {{--<x-td>{{ $file->size }}</x-td>--}}
                     <x-td>
                         <div class="inline-flex">
                             @include('livewire.databases.partials.backup-file-status', ['status' => $file->status])

resources/views/livewire/source-controls/connect.blade.php

@@ -32,6 +32,17 @@
                 @enderror
             </div>
 
+            @if($provider === App\Enums\SourceControl::GITLAB)
+                <div class="mt-6">
+                    <x-input-label for="url" value="Url (optional)" />
+                    <x-text-input wire:model.defer="url" id="url" name="url" type="text" class="mt-1 w-full" placeholder="e.g. https://gitlab.example.com/" />
+                    <x-input-help>If you run a self-managed gitlab enter the url here, leave empty to use gitlab.com</x-input-help>
+                    @error('url')
+                    <x-input-error class="mt-2" :messages="$message" />
+                    @enderror
+                </div>
+            @endif
+
             <div class="mt-6">
                 <x-input-label for="token" value="API Key" />
                 <x-text-input wire:model.defer="token" id="token" name="token" type="text" class="mt-1 w-full" />

resources/views/livewire/storage-providers/connect-provider.blade.php

@@ -32,6 +32,7 @@
                 @enderror
             </div>
 
+            @if($provider == \App\Enums\StorageProvider::DROPBOX)
                 <div class="mt-6">
                     <x-input-label for="token" value="API Key" />
                     <x-text-input wire:model.defer="token" id="token" name="token" type="text" class="mt-1 w-full" />
@@ -39,6 +40,71 @@
                     <x-input-error class="mt-2" :messages="$message" />
                     @enderror
                 </div>
+            @endif
+
+            @if($provider == \App\Enums\StorageProvider::FTP)
+                <div class="grid grid-cols-2 gap-2">
+                    <div class="mt-6">
+                        <x-input-label for="host" value="Host" />
+                        <x-text-input wire:model.defer="host" id="host" name="host" type="text" class="mt-1 w-full" />
+                        @error('host')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                    <div class="mt-6">
+                        <x-input-label for="port" value="Port" />
+                        <x-text-input wire:model.defer="port" id="port" name="port" type="text" class="mt-1 w-full" />
+                        @error('port')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                </div>
+                <div class="mt-6">
+                    <x-input-label for="path" value="Path" />
+                    <x-text-input wire:model.defer="path" id="path" name="path" type="text" class="mt-1 w-full" />
+                    @error('path')
+                    <x-input-error class="mt-2" :messages="$message" />
+                    @enderror
+                </div>
+                <div class="grid grid-cols-2 gap-2">
+                    <div class="mt-6">
+                        <x-input-label for="username" value="Username" />
+                        <x-text-input wire:model.defer="username" id="username" name="username" type="text" class="mt-1 w-full" />
+                        @error('username')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                    <div class="mt-6">
+                        <x-input-label for="password" value="Password" />
+                        <x-text-input wire:model.defer="password" id="password" name="password" type="text" class="mt-1 w-full" />
+                        @error('password')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                </div>
+                <div class="grid grid-cols-2 gap-2">
+                    <div class="mt-6">
+                        <x-input-label for="ssl" :value="__('SSL')" />
+                        <x-select-input wire:model="ssl" id="ssl" name="ssl" class="mt-1 w-full">
+                            <option value="1" @if($ssl) selected @endif>{{ __("Yes") }}</option>
+                            <option value="0" @if(!$ssl) selected @endif>{{ __("No") }}</option>
+                        </x-select-input>
+                        @error('ssl')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                    <div class="mt-6">
+                        <x-input-label for="passive" :value="__('Passive')" />
+                        <x-select-input wire:model="passive" id="passive" name="passive" class="mt-1 w-full">
+                            <option value="1" @if($passive) selected @endif>{{ __("Yes") }}</option>
+                            <option value="0" @if(!$passive) selected @endif>{{ __("No") }}</option>
+                        </x-select-input>
+                        @error('passive')
+                        <x-input-error class="mt-2" :messages="$message" />
+                        @enderror
+                    </div>
+                </div>
+            @endif
 
             <div class="mt-6 flex justify-end">
                 <x-secondary-button type="button" x-on:click="$dispatch('close')">

resources/views/livewire/storage-providers/providers-list.blade.php

@@ -11,12 +11,18 @@
             @foreach($providers as $provider)
                 <x-item-card>
                     <div class="flex-none">
+                        @if($provider->provider == \App\Enums\StorageProvider::FTP)
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-10 h-10 text-gray-600 dark:text-gray-200">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 00-3.375-3.375h-1.5A1.125 1.125 0 0113.5 7.125v-1.5a3.375 3.375 0 00-3.375-3.375H8.25m2.25 0H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 00-9-9z" />
+                            </svg>
+                        @else
                             <img src="{{ asset('static/images/' . $provider->provider . '.svg') }}" class="h-10 w-10" alt="">
+                        @endif
                     </div>
                     <div class="ml-3 flex flex-grow flex-col items-start justify-center">
                         <span class="mb-1">{{ $provider->profile }}</span>
                         <span class="text-sm text-gray-400">
-                            <x-datetime :value="$provider->created_at"/>
+                            <x-datetime :value="$provider->created_at" />
                         </span>
                     </div>
                     <div class="flex items-center">

tailwind.config.js

@@ -3,6 +3,7 @@ const colors = require("tailwindcss/colors");
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
+    darkMode: 'class',
     content: [
         './vendor/laravel/framework/src/Illuminate/Pagination/resources/views/*.blade.php',
         './storage/framework/views/*.php',

tests/Feature/Http/SourceControlsTest.php

@@ -17,21 +17,28 @@ class SourceControlsTest extends TestCase
     /**
      * @dataProvider data
      */
-    public function test_connect_provider(string $provider): void
+    public function test_connect_provider(string $provider, ?string $customUrl): void
     {
         $this->actingAs($this->user);
 
         Http::fake();
 
-        Livewire::test(Connect::class)
+        $livewire = Livewire::test(Connect::class)
             ->set('token', 'token')
             ->set('name', 'profile')
-            ->set('provider', $provider)
+            ->set('provider', $provider);
+
+        if ($customUrl !== null) {
+            $livewire->set('url', $customUrl);
+        }
+
+        $livewire
             ->call('connect')
             ->assertSuccessful();
 
         $this->assertDatabaseHas('source_controls', [
             'provider' => $provider,
+            'url' => $customUrl,
         ]);
     }
 
@@ -61,9 +68,10 @@ public function test_delete_provider(string $provider): void
     public static function data(): array
     {
         return [
-            ['github'],
-            ['gitlab'],
-            ['bitbucket'],
+            ['github', null],
+            ['gitlab', null],
+            ['gitlab', 'https://git.example.com/'],
+            ['bitbucket', null],
         ];
     }
 }

tests/Feature/SSHCommands/Storage/DownloadFromFTPCommandTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Feature\SSHCommands\Storage;
+
+use App\SSHCommands\Storage\DownloadFromFTPCommand;
+use Tests\TestCase;
+
+class DownloadFromFTPCommandTest extends TestCase
+{
+    public function test_generate_command()
+    {
+        $command = new DownloadFromFTPCommand(
+            'src',
+            'dest',
+            '1.1.1.1',
+            '21',
+            'username',
+            'password',
+            false,
+            true,
+        );
+
+        $expected = <<<'EOD'
+        curl --ftp-pasv -u "username:password" ftp://1.1.1.1:21/src -o "dest"
+        EOD;
+
+        $this->assertStringContainsString($expected, $command->content());
+    }
+}

tests/Feature/SSHCommands/Storage/UploadToFTPCommandTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Tests\Feature\SSHCommands\Storage;
+
+use App\SSHCommands\Storage\UploadToFTPCommand;
+use Tests\TestCase;
+
+class UploadToFTPCommandTest extends TestCase
+{
+    public function test_generate_command()
+    {
+        $command = new UploadToFTPCommand(
+            'src',
+            'dest',
+            '1.1.1.1',
+            '21',
+            'username',
+            'password',
+            true,
+            true
+        );
+
+        $expected = <<<'EOD'
+        curl --ftp-pasv -T "src" -u "username:password" ftps://1.1.1.1:21/dest
+        EOD;
+
+        $this->assertStringContainsString($expected, $command->content());
+    }
+}

tests/Feature/SSHCommands/System/RunScriptCommandTest.php

@@ -16,9 +16,7 @@ public function test_generate_command()
             echo 'VITO_SSH_ERROR' && exit 1
         fi
 
-        if ! script; then
-            echo 'VITO_SSH_ERROR' && exit 1
-        fi
+        script
         EOD;
 
         $this->assertStringContainsString($expected, $command->content());

tests/Unit/SourceControlProviders/GitlabTest.php

@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\SourceControlProviders;
+
+use App\Models\SourceControl;
+use App\SourceControlProviders\Gitlab;
+use Tests\TestCase;
+
+class GitlabTest extends TestCase
+{
+    public function test_default_gitlab_url(): void
+    {
+        $sourceControlModel = SourceControl::factory()
+            ->gitlab()
+            ->create();
+
+        $gitlab = new Gitlab($sourceControlModel);
+
+        $this->assertSame('https://gitlab.com/api/v4', $gitlab->getApiUrl());
+    }
+
+    public function test_default_gitlab_repo_url(): void
+    {
+        $repo = 'test/repo';
+        $key = 'TEST_KEY';
+
+        $sourceControlModel = SourceControl::factory()
+            ->gitlab()
+            ->create();
+
+        $gitlab = new Gitlab($sourceControlModel);
+
+        $this->assertSame('git@gitlab.com-TEST_KEY:test/repo.git', $gitlab->fullRepoUrl($repo, $key));
+    }
+
+    /**
+     * @dataProvider customUrlData
+     */
+    public function test_custom_url(string $url, string $expected): void
+    {
+        $sourceControlModel = SourceControl::factory()
+            ->gitlab()
+            ->create(['url' => $url]);
+
+        $gitlab = new Gitlab($sourceControlModel);
+
+        $this->assertSame($expected, $gitlab->getApiUrl());
+    }
+
+    /**
+     * @dataProvider customRepoUrlData
+     */
+    public function test_custom_full_repository_url(string $url, string $expected): void
+    {
+        $repo = 'test/repo';
+        $key = 'TEST_KEY';
+
+        $sourceControlModel = SourceControl::factory()
+            ->gitlab()
+            ->create(['url' => $url]);
+
+        $gitlab = new Gitlab($sourceControlModel);
+
+        $this->assertSame($expected, $gitlab->fullRepoUrl($repo, $key));
+    }
+
+    public static function customRepoUrlData(): array
+    {
+        return [
+            ['https://git.example.com/', 'git@git.example.com-TEST_KEY:test/repo.git'],
+            ['https://git.test.example.com/', 'git@git.test.example.com-TEST_KEY:test/repo.git'],
+            ['https://git.example.co.uk/', 'git@git.example.co.uk-TEST_KEY:test/repo.git'],
+        ];
+    }
+
+    public static function customUrlData(): array
+    {
+        return [
+            ['https://git.example.com/', 'https://git.example.com/api/v4'],
+            ['https://git.test.example.com/', 'https://git.test.example.com/api/v4'],
+            ['https://git.example.co.uk/', 'https://git.example.co.uk/api/v4'],
+        ];
+    }
+}