cleanup before release (#391)

app/Actions/Server/CreateServer.php

@@ -5,6 +5,7 @@
 use App\Enums\FirewallRuleStatus;
 use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
+use App\Enums\ServerType;
 use App\Facades\Notifier;
 use App\Models\Project;
 use App\Models\Server;
@@ -33,7 +34,7 @@ public function create(User $creator, Project $project, array $input): Server
             'ip' => $input['ip'] ?? '',
             'port' => $input['port'] ?? 22,
             'os' => $input['os'],
-            'type' => $input['type'],
+            'type' => ServerType::REGULAR,
             'provider' => $input['provider'],
             'authentication' => [
                 'user' => config('core.ssh_user'),
@@ -124,10 +125,6 @@ public static function rules(Project $project, array $input): array
                 'required',
                 Rule::in(config('core.operating_systems')),
             ],
-            'type' => [
-                'required',
-                Rule::in(config('core.server_types')),
-            ],
             'server_provider' => [
                 Rule::when(function () use ($input) {
                     return isset($input['provider']) && $input['provider'] != ServerProvider::CUSTOM;

app/Enums/ServerType.php

@@ -2,6 +2,9 @@
 
 namespace App\Enums;
 
+/**
+ * @deprecated server types will be dropped
+ */
 final class ServerType
 {
     const REGULAR = 'regular';

app/Helpers/HtmxResponse.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Helpers;
-
-use Illuminate\Http\Response;
-
-class HtmxResponse extends Response
-{
-    public function redirect(string $redirect): self
-    {
-        $this->header('HX-Redirect', $redirect);
-
-        return $this;
-    }
-
-    public function back(): self
-    {
-        return $this->redirect(back()->getTargetUrl());
-    }
-
-    public function refresh(): self
-    {
-        $this->header('HX-Refresh', true);
-
-        return $this;
-    }
-
-    public function location(string $location): self
-    {
-        $this->header('HX-Location', $location);
-
-        return $this;
-    }
-}

app/Http/Controllers/API/HealthController.php

@@ -18,7 +18,7 @@ public function __invoke()
     {
         return response()->json([
             'success' => true,
-            'version' => vito_version(),
+            'version' => config('app.version'),
         ]);
     }
 }

app/Http/Controllers/API/ServerController.php

@@ -8,7 +8,6 @@
 use App\Enums\Database;
 use App\Enums\PHP;
 use App\Enums\ServerProvider;
-use App\Enums\ServerType;
 use App\Enums\Webserver;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\ServerResource;
@@ -52,7 +51,6 @@ public function index(Project $project): ResourceCollection
     #[BodyParam(name: 'port', description: 'SSH Port if the provider is custom')]
     #[BodyParam(name: 'name', description: 'The name of the server.', required: true)]
     #[BodyParam(name: 'os', description: 'The os of the server', required: true)]
-    #[BodyParam(name: 'type', description: 'Server type', required: true, enum: [ServerType::REGULAR, ServerType::DATABASE])]
     #[BodyParam(name: 'webserver', description: 'Web server', required: true, enum: [Webserver::NONE, Webserver::NGINX])]
     #[BodyParam(name: 'database', description: 'Database', required: true, enum: [Database::NONE, Database::MYSQL57, Database::MYSQL80, Database::MARIADB103, Database::MARIADB104, Database::MARIADB103, Database::POSTGRESQL12, Database::POSTGRESQL13, Database::POSTGRESQL14, Database::POSTGRESQL15, Database::POSTGRESQL16], )]
     #[BodyParam(name: 'php', description: 'PHP version', required: true, enum: [PHP::V70, PHP::V71, PHP::V72, PHP::V73, PHP::V74, PHP::V80, PHP::V81, PHP::V82, PHP::V83])]

app/ServerTypes/Regular.php

@@ -11,7 +11,8 @@ public function createRules(array $input): array
         return [
             'webserver' => [
                 'required',
-                'in:'.implode(',', config('core.webservers')),
+                Rule::in(config('core.webservers')),
+
             ],
             'php' => [
                 'required',
@@ -19,7 +20,7 @@ public function createRules(array $input): array
             ],
             'database' => [
                 'required',
-                'in:'.implode(',', config('core.databases')),
+                Rule::in(config('core.databases')),
             ],
         ];
     }

app/Support/helpers.php

@@ -1,7 +1,6 @@
 <?php
 
 use App\Exceptions\SSHError;
-use App\Helpers\HtmxResponse;
 use Filament\Notifications\Actions\Action;
 use Filament\Notifications\Notification;
 use Illuminate\Http\Request;
@@ -32,14 +31,15 @@ function date_with_timezone($date, $timezone): string
     return $dt->format('Y-m-d H:i:s');
 }
 
-function htmx(): HtmxResponse
+function show_vito_version(): string
 {
-    return new HtmxResponse;
+    $version = config('app.version');
-}
 
-function vito_version(): string
+    if (str($version)->contains('-beta')) {
-{
+        return str($version)->before('-beta')->toString();
-    return config('app.version');
+    }
+
+    return $version;
 }
 
 function convert_time_format($string): string

app/Web/Pages/Scripts/Index.php

@@ -45,7 +45,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/other/scripts.html')
+                ->url('https://vitodeploy.com/scripts')
                 ->openUrlInNewTab(),
             Action::make('create')
                 ->label('Create a Script')

app/Web/Pages/Servers/CronJobs/Index.php

@@ -38,7 +38,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/servers/cronjobs.html')
+                ->url('https://vitodeploy.com/servers/cronjobs')
                 ->openUrlInNewTab(),
             Action::make('create')
                 ->authorize(fn () => auth()->user()?->can('create', [CronJob::class, $this->server]))
@@ -48,7 +48,7 @@ protected function getHeaderActions(): array
                     TextInput::make('command')
                         ->rules(fn (callable $get) => CreateCronJob::rules($get())['command'])
                         ->helperText(fn () => view('components.link', [
-                            'href' => 'https://vitodeploy.com/servers/cronjobs.html',
+                            'href' => 'https://vitodeploy.com/servers/cronjobs',
                             'external' => true,
                             'text' => 'How the command should look like?',
                         ])),

app/Web/Pages/Servers/Firewall/Index.php

@@ -38,7 +38,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/servers/firewall.html')
+                ->url('https://vitodeploy.com/servers/firewall')
                 ->openUrlInNewTab(),
             Action::make('create')
                 ->authorize(fn () => auth()->user()?->can('create', [FirewallRule::class, $this->server]))

app/Web/Pages/Servers/Index.php

@@ -3,14 +3,17 @@
 namespace App\Web\Pages\Servers;
 
 use App\Actions\Server\CreateServer as CreateServerAction;
+use App\Enums\Database;
+use App\Enums\PHP;
 use App\Enums\ServerProvider;
-use App\Enums\ServerType;
+use App\Enums\Webserver;
 use App\Models\Server;
 use App\Web\Components\Page;
 use App\Web\Fields\AlertField;
 use App\Web\Fields\ProviderField;
 use App\Web\Pages\Settings\ServerProviders\Actions\Create;
 use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -57,7 +60,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/servers/create-server.html')
+                ->url('https://vitodeploy.com')
                 ->openUrlInNewTab(),
             \Filament\Actions\Action::make('create')
                 ->label('Create a Server')
@@ -162,9 +165,20 @@ protected function getHeaderActions(): array
                         ->helperText('Run this command on your server as root user')
                         ->disabled()
                         ->visible(fn ($get) => $get('provider') === ServerProvider::CUSTOM),
-                    TextInput::make('name')
+                    Grid::make()
-                        ->label('Name')
+                        ->schema([
-                        ->rules(fn ($get) => CreateServerAction::rules($project, $get())['name']),
+                            TextInput::make('name')
+                                ->label('Name')
+                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['name']),
+                            Select::make('os')
+                                ->label('OS')
+                                ->native(false)
+                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['os'])
+                                ->options(
+                                    collect(config('core.operating_systems'))
+                                        ->mapWithKeys(fn ($value) => [$value => $value])
+                                ),
+                        ]),
                     Grid::make()
                         ->schema([
                             TextInput::make('ip')
@@ -175,57 +189,46 @@ protected function getHeaderActions(): array
                                 ->rules(fn ($get) => CreateServerAction::rules($project, $get())['port']),
                         ])
                         ->visible(fn ($get) => $get('provider') === ServerProvider::CUSTOM),
-                    Grid::make()
+                    Fieldset::make('Services')
+                        ->columns(1)
                         ->schema([
-                            Select::make('os')
+                            AlertField::make('alert')
-                                ->label('OS')
+                                ->info()
-                                ->native(false)
+                                ->message('You can install/uninstall services later'),
-                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['os'])
+                            Grid::make(3)
-                                ->options(
+                                ->schema([
-                                    collect(config('core.operating_systems'))
+                                    Select::make('webserver')
-                                        ->mapWithKeys(fn ($value) => [$value => $value])
+                                        ->label('Webserver')
-                                ),
+                                        ->native(false)
-                            Select::make('type')
+                                        ->selectablePlaceholder(false)
-                                ->label('Server Type')
+                                        ->rules(fn ($get) => CreateServerAction::rules($project, $get())['webserver'] ?? [])
-                                ->native(false)
+                                        ->default(Webserver::NONE)
-                                ->selectablePlaceholder(false)
+                                        ->options(
-                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['type'])
+                                            collect(config('core.webservers'))->mapWithKeys(fn ($value) => [$value => $value])
-                                ->options(
+                                        ),
-                                    collect(config('core.server_types'))
+                                    Select::make('database')
-                                        ->mapWithKeys(fn ($value) => [$value => $value])
+                                        ->label('Database')
-                                )
+                                        ->native(false)
-                                ->default(ServerType::REGULAR),
+                                        ->selectablePlaceholder(false)
-                        ]),
+                                        ->rules(fn ($get) => CreateServerAction::rules($project, $get())['database'] ?? [])
-                    Grid::make(3)
+                                        ->default(Database::NONE)
-                        ->schema([
+                                        ->options(
-                            Select::make('webserver')
+                                            collect(config('core.databases_name'))
-                                ->label('Webserver')
+                                                ->mapWithKeys(fn ($value, $key) => [
-                                ->native(false)
+                                                    $key => $value.' '.config('core.databases_version')[$key],
-                                ->selectablePlaceholder(false)
+                                                ])
-                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['webserver'] ?? [])
+                                        ),
-                                ->options(
+                                    Select::make('php')
-                                    collect(config('core.webservers'))->mapWithKeys(fn ($value) => [$value => $value])
+                                        ->label('PHP')
-                                ),
+                                        ->native(false)
-                            Select::make('database')
+                                        ->selectablePlaceholder(false)
-                                ->label('Database')
+                                        ->rules(fn ($get) => CreateServerAction::rules($project, $get())['php'] ?? [])
-                                ->native(false)
+                                        ->default(PHP::NONE)
-                                ->selectablePlaceholder(false)
+                                        ->options(
-                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['database'] ?? [])
+                                            collect(config('core.php_versions'))
-                                ->options(
+                                                ->mapWithKeys(fn ($value) => [$value => $value])
-                                    collect(config('core.databases_name'))
+                                        ),
-                                        ->mapWithKeys(fn ($value, $key) => [
+                                ]),
-                                            $key => $value.' '.config('core.databases_version')[$key],
-                                        ])
-                                ),
-                            Select::make('php')
-                                ->label('PHP')
-                                ->native(false)
-                                ->selectablePlaceholder(false)
-                                ->rules(fn ($get) => CreateServerAction::rules($project, $get())['php'] ?? [])
-                                ->options(
-                                    collect(config('core.php_versions'))
-                                        ->mapWithKeys(fn ($value) => [$value => $value])
-                                ),
                         ]),
                 ])
                 ->modalSubmitActionLabel('Create')

app/Web/Pages/Servers/Sites/Index.php

@@ -45,7 +45,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/sites/create-site.html')
+                ->url('https://vitodeploy.com/sites/site-types')
                 ->openUrlInNewTab(),
             Action::make('create')
                 ->label('Create a Site')

app/Web/Pages/Servers/Sites/Pages/Queues/Index.php

@@ -38,7 +38,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/sites/queues.html')
+                ->url('https://vitodeploy.com/sites/queues')
                 ->openUrlInNewTab(),
             CreateAction::make('create')
                 ->icon('heroicon-o-plus')

app/Web/Pages/Servers/Sites/Pages/SSL/Index.php

@@ -39,7 +39,7 @@ protected function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/sites/ssl.html')
+                ->url('https://vitodeploy.com/sites/ssl')
                 ->openUrlInNewTab(),
             CreateAction::make('create')
                 ->label('New Certificate')

app/Web/Pages/Servers/Sites/View.php

@@ -82,7 +82,7 @@ public function getHeaderActions(): array
                 ->label('Read the Docs')
                 ->icon('heroicon-o-document-text')
                 ->color('gray')
-                ->url('https://vitodeploy.com/sites/application.html')
+                ->url('https://vitodeploy.com/sites/application')
                 ->openUrlInNewTab(),
         ];
         $actionsGroup = [];

package-lock.json

@@ -11,10 +11,6 @@
                 "apexcharts": "^3.44.2",
                 "autoprefixer": "^10.4.20",
                 "brace": "^0.11.1",
-                "flowbite": "^2.3.0",
-                "flowbite-datepicker": "^1.2.6",
-                "htmx.org": "^1.9.10",
-                "laravel-echo": "^1.15.0",
                 "laravel-vite-plugin": "^0.7.2",
                 "postcss": "^8.4.45",
                 "postcss-nesting": "^13.0.0",
@@ -23,7 +19,6 @@
                 "prettier-plugin-sh": "^0.14.0",
                 "prettier-plugin-tailwindcss": "^0.5.11",
                 "tailwindcss": "^3.4.10",
-                "tippy.js": "^6.3.7",
                 "vite": "^4.5.5"
             }
         },
@@ -501,62 +496,6 @@
                 "node": ">=14"
             }
         },
-        "node_modules/@popperjs/core": {
-            "version": "2.11.8",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-            "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-            "dev": true,
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/popperjs"
-            }
-        },
-        "node_modules/@rollup/plugin-node-resolve": {
-            "version": "15.3.0",
-            "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.3.0.tgz",
-            "integrity": "sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==",
-            "dev": true,
-            "dependencies": {
-                "@rollup/pluginutils": "^5.0.1",
-                "@types/resolve": "1.20.2",
-                "deepmerge": "^4.2.2",
-                "is-module": "^1.0.0",
-                "resolve": "^1.22.1"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^2.78.0||^3.0.0||^4.0.0"
-            },
-            "peerDependenciesMeta": {
-                "rollup": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@rollup/pluginutils": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz",
-            "integrity": "sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==",
-            "dev": true,
-            "dependencies": {
-                "@types/estree": "^1.0.0",
-                "estree-walker": "^2.0.2",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
-            },
-            "peerDependenciesMeta": {
-                "rollup": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/@tailwindcss/forms": {
             "version": "0.5.9",
             "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.9.tgz",
@@ -584,18 +523,6 @@
                 "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
             }
         },
-        "node_modules/@types/estree": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-            "dev": true
-        },
-        "node_modules/@types/resolve": {
-            "version": "1.20.2",
-            "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
-            "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-            "dev": true
-        },
         "node_modules/@vue/reactivity": {
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.1.5.tgz",
@@ -618,9 +545,9 @@
             "dev": true
         },
         "node_modules/alpinejs": {
-            "version": "3.14.1",
+            "version": "3.14.7",
-            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.1.tgz",
+            "resolved": "https://registry.npmjs.org/alpinejs/-/alpinejs-3.14.7.tgz",
-            "integrity": "sha512-ICar8UsnRZAYvv/fCNfNeKMXNoXGUfwHrjx7LqXd08zIP95G2d9bAOuaL97re+1mgt/HojqHsfdOLo/A5LuWgQ==",
+            "integrity": "sha512-ScnbydNBcWVnCiVupD3wWUvoMPm8244xkvDNMxVCspgmap9m4QuJ7pjc+77UtByU+1+Ejg0wzYkP4mQaOMcvng==",
             "dev": true,
             "dependencies": {
                 "@vue/reactivity": "~3.1.1"
@@ -670,9 +597,9 @@
             }
         },
         "node_modules/apexcharts": {
-            "version": "3.54.0",
+            "version": "3.54.1",
-            "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.54.0.tgz",
+            "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.54.1.tgz",
-            "integrity": "sha512-ZgI/seScffjLpwNRX/gAhIkAhpCNWiTNsdICv7qxnF0xisI23XSsaENUKIcMlyP1rbe8ECgvybDnp7plZld89A==",
+            "integrity": "sha512-E4et0h/J1U3r3EwS/WlqJCQIbepKbp6wGUmaAwJOMjHUP4Ci0gxanLa7FR3okx6p9coi4st6J853/Cb1NP0vpA==",
             "dev": true,
             "dependencies": {
                 "@yr/monotone-cubic-spline": "^1.0.3",
@@ -773,9 +700,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.0",
+            "version": "4.24.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
             "dev": true,
             "funding": [
                 {
@@ -792,10 +719,10 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001663",
+                "caniuse-lite": "^1.0.30001669",
-                "electron-to-chromium": "^1.5.28",
+                "electron-to-chromium": "^1.5.41",
                 "node-releases": "^2.0.18",
-                "update-browserslist-db": "^1.1.0"
+                "update-browserslist-db": "^1.1.1"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -814,9 +741,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001667",
+            "version": "1.0.30001687",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz",
-            "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==",
+            "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==",
             "dev": true,
             "funding": [
                 {
@@ -897,9 +824,9 @@
             }
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.5",
+            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
             "dev": true,
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -922,15 +849,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/deepmerge": {
-            "version": "4.3.1",
-            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/didyoumean": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -950,9 +868,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.33",
+            "version": "1.5.72",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.33.tgz",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz",
-            "integrity": "sha512-+cYTcFB1QqD4j4LegwLfpCNxifb6dDFUAwk6RsLusCwIaZI6or2f+q8rs5tTB2YC53HhOlIbEaqHMAAC8IOIwA==",
+            "integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1007,12 +925,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/estree-walker": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
-            "dev": true
-        },
         "node_modules/fast-glob": {
             "version": "3.3.2",
             "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -1062,27 +974,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/flowbite": {
-            "version": "2.5.2",
-            "resolved": "https://registry.npmjs.org/flowbite/-/flowbite-2.5.2.tgz",
-            "integrity": "sha512-kwFD3n8/YW4EG8GlY3Od9IoKND97kitO+/ejISHSqpn3vw2i5K/+ZI8Jm2V+KC4fGdnfi0XZ+TzYqQb4Q1LshA==",
-            "dev": true,
-            "dependencies": {
-                "@popperjs/core": "^2.9.3",
-                "flowbite-datepicker": "^1.3.0",
-                "mini-svg-data-uri": "^1.4.3"
-            }
-        },
-        "node_modules/flowbite-datepicker": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/flowbite-datepicker/-/flowbite-datepicker-1.3.0.tgz",
-            "integrity": "sha512-CLVqzuoE2vkUvWYK/lJ6GzT0be5dlTbH3uuhVwyB67+PjqJWABm2wv68xhBf5BqjpBxvTSQ3mrmLHpPJ2tvrSQ==",
-            "dev": true,
-            "dependencies": {
-                "@rollup/plugin-node-resolve": "^15.2.3",
-                "flowbite": "^2.0.0"
-            }
-        },
         "node_modules/foreground-child": {
             "version": "3.3.0",
             "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
@@ -1179,12 +1070,6 @@
                 "node": ">= 0.4"
             }
         },
-        "node_modules/htmx.org": {
-            "version": "1.9.12",
-            "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.12.tgz",
-            "integrity": "sha512-VZAohXyF7xPGS52IM8d1T1283y+X4D+Owf3qY1NZ9RuBypyu9l8cGsxUMAG5fEAb/DhT7rDoJ9Hpu5/HxFD3cw==",
-            "dev": true
-        },
         "node_modules/is-binary-path": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
@@ -1242,12 +1127,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/is-module": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-            "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
-            "dev": true
-        },
         "node_modules/is-number": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -1287,15 +1166,6 @@
                 "jiti": "bin/jiti.js"
             }
         },
-        "node_modules/laravel-echo": {
-            "version": "1.16.1",
-            "resolved": "https://registry.npmjs.org/laravel-echo/-/laravel-echo-1.16.1.tgz",
-            "integrity": "sha512-++Ylb6M3ariC9Rk5WE5gZjj6wcEV5kvLF8b+geJ5/rRIfdoOA+eG6b9qJPrarMD9rY28Apx+l3eelIrCc2skVg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/laravel-vite-plugin": {
             "version": "0.7.8",
             "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-0.7.8.tgz",
@@ -1313,12 +1183,15 @@
             }
         },
         "node_modules/lilconfig": {
-            "version": "2.1.0",
+            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
             "dev": true,
             "engines": {
-                "node": ">=10"
+                "node": ">=14"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/antonk52"
             }
         },
         "node_modules/lines-and-columns": {
@@ -1424,9 +1297,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "3.3.7",
+            "version": "3.3.8",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
             "dev": true,
             "funding": [
                 {
@@ -1442,9 +1315,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.18",
+            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
             "dev": true
         },
         "node_modules/normalize-path": {
@@ -1521,9 +1394,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.1.0",
+            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
             "dev": true
         },
         "node_modules/picomatch": {
@@ -1557,9 +1430,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.47",
+            "version": "8.4.49",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
             "dev": true,
             "funding": [
                 {
@@ -1577,7 +1450,7 @@
             ],
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.1.0",
+                "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
             "engines": {
@@ -1655,18 +1528,6 @@
                 }
             }
         },
-        "node_modules/postcss-load-config/node_modules/lilconfig": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
-            "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
-            "dev": true,
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/antonk52"
-            }
-        },
         "node_modules/postcss-nested": {
             "version": "6.2.0",
             "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -1706,9 +1567,9 @@
             }
         },
         "node_modules/postcss-nesting": {
-            "version": "13.0.0",
+            "version": "13.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.1.tgz",
-            "integrity": "sha512-TCGQOizyqvEkdeTPM+t6NYwJ3EJszYE/8t8ILxw/YoeUvz2rz7aM8XTAmBWh9/DJjfaaabL88fWrsVHSPF2zgA==",
+            "integrity": "sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==",
             "dev": true,
             "funding": [
                 {
@@ -1721,9 +1582,9 @@
                 }
             ],
             "dependencies": {
-                "@csstools/selector-resolve-nested": "^2.0.0",
+                "@csstools/selector-resolve-nested": "^3.0.0",
-                "@csstools/selector-specificity": "^4.0.0",
+                "@csstools/selector-specificity": "^5.0.0",
-                "postcss-selector-parser": "^6.1.0"
+                "postcss-selector-parser": "^7.0.0"
             },
             "engines": {
                 "node": ">=18"
@@ -1733,9 +1594,9 @@
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-            "version": "2.0.0",
+            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-2.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz",
-            "integrity": "sha512-oklSrRvOxNeeOW1yARd4WNCs/D09cQjunGZUgSq6vM8GpzFswN+8rBZyJA29YFZhOTQ6GFzxgLDNtVbt9wPZMA==",
+            "integrity": "sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==",
             "dev": true,
             "funding": [
                 {
@@ -1751,13 +1612,13 @@
                 "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.1.0"
+                "postcss-selector-parser": "^7.0.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
-            "version": "4.0.0",
+            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
-            "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
+            "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
             "dev": true,
             "funding": [
                 {
@@ -1773,13 +1634,13 @@
                 "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.1.0"
+                "postcss-selector-parser": "^7.0.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
+            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
             "dev": true,
             "dependencies": {
                 "cssesc": "^3.0.0",
@@ -1809,9 +1670,9 @@
             "dev": true
         },
         "node_modules/prettier": {
-            "version": "3.3.3",
+            "version": "3.4.2",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-            "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+            "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
             "dev": true,
             "bin": {
                 "prettier": "bin/prettier.cjs"
@@ -2314,33 +2175,33 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.13",
+            "version": "3.4.16",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.16.tgz",
-            "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
+            "integrity": "sha512-TI4Cyx7gDiZ6r44ewaJmt0o6BrMCT5aK5e0rmJ/G9Xq3w7CX/5VXl/zIPEJZFUK5VEqwByyhqNPycPlvcK4ZNw==",
             "dev": true,
             "dependencies": {
                 "@alloc/quick-lru": "^5.2.0",
                 "arg": "^5.0.2",
-                "chokidar": "^3.5.3",
+                "chokidar": "^3.6.0",
                 "didyoumean": "^1.2.2",
                 "dlv": "^1.1.3",
-                "fast-glob": "^3.3.0",
+                "fast-glob": "^3.3.2",
                 "glob-parent": "^6.0.2",
                 "is-glob": "^4.0.3",
-                "jiti": "^1.21.0",
+                "jiti": "^1.21.6",
-                "lilconfig": "^2.1.0",
+                "lilconfig": "^3.1.3",
-                "micromatch": "^4.0.5",
+                "micromatch": "^4.0.8",
                 "normalize-path": "^3.0.0",
                 "object-hash": "^3.0.0",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.1.1",
-                "postcss": "^8.4.23",
+                "postcss": "^8.4.47",
                 "postcss-import": "^15.1.0",
                 "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.1",
+                "postcss-load-config": "^4.0.2",
-                "postcss-nested": "^6.0.1",
+                "postcss-nested": "^6.2.0",
-                "postcss-selector-parser": "^6.0.11",
+                "postcss-selector-parser": "^6.1.2",
-                "resolve": "^1.22.2",
+                "resolve": "^1.22.8",
-                "sucrase": "^3.32.0"
+                "sucrase": "^3.35.0"
             },
             "bin": {
                 "tailwind": "lib/cli.js",
@@ -2384,15 +2245,6 @@
                 "node": ">=0.8"
             }
         },
-        "node_modules/tippy.js": {
-            "version": "6.3.7",
-            "resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",
-            "integrity": "sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ==",
-            "dev": true,
-            "dependencies": {
-                "@popperjs/core": "^2.9.0"
-            }
-        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -2625,9 +2477,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.5.1",
+            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
-            "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+            "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
             "dev": true,
             "bin": {
                 "yaml": "bin.mjs"

package.json

@@ -13,10 +13,6 @@
         "apexcharts": "^3.44.2",
         "autoprefixer": "^10.4.20",
         "brace": "^0.11.1",
-        "flowbite": "^2.3.0",
-        "flowbite-datepicker": "^1.2.6",
-        "htmx.org": "^1.9.10",
-        "laravel-echo": "^1.15.0",
         "laravel-vite-plugin": "^0.7.2",
         "postcss": "^8.4.45",
         "postcss-nesting": "^13.0.0",
@@ -25,7 +21,6 @@
         "prettier-plugin-sh": "^0.14.0",
         "prettier-plugin-tailwindcss": "^0.5.11",
         "tailwindcss": "^3.4.10",
-        "tippy.js": "^6.3.7",
         "vite": "^4.5.5"
     }
 }

public/build/manifest.json

@@ -1,6 +1,6 @@
 {
   "resources/css/filament/app/theme.css": {
-    "file": "assets/theme-7ed65d36.css",
+    "file": "assets/theme-d1a47f2d.css",
     "isEntry": true,
     "src": "resources/css/filament/app/theme.css"
   },

resources/views/components/app-version.blade.php

@@ -1,5 +1,5 @@
-<div class="p-6 text-sm">
+<div class="p-6 text-xs">
     <a href="https://github.com/vitodeploy/vito/releases/tag/{{ config("app.version") }}" target="_blank">
-        V{{ config("app.version") }}
+        V{{ show_vito_version() }}
     </a>
 </div>

tests/Feature/API/ServerTest.php

@@ -43,10 +43,7 @@ public function test_get_server(): void
             ]);
     }
 
-    /**
+    public function test_create_server(): void
-     * @dataProvider createData
-     */
-    public function test_create_server(string $type): void
     {
         Sanctum::actingAs($this->user, ['read', 'write']);
 
@@ -55,7 +52,6 @@ public function test_create_server(string $type): void
         $this->json('POST', route('api.projects.servers.create', [
             'project' => $this->user->current_project_id,
         ]), [
-            'type' => $type,
             'provider' => ServerProvider::CUSTOM,
             'name' => 'test',
             'ip' => '1.1.1.1',
@@ -68,7 +64,7 @@ public function test_create_server(string $type): void
             ->assertSuccessful()
             ->assertJsonFragment([
                 'name' => 'test',
-                'type' => $type,
+                'type' => ServerType::REGULAR,
             ]);
     }
 
@@ -110,12 +106,4 @@ public function test_upgrade_server(): void
         ]))
             ->assertNoContent();
     }
-
-    public static function createData(): array
-    {
-        return [
-            [ServerType::REGULAR],
-            [ServerType::DATABASE],
-        ];
-    }
 }

tests/Feature/ServerTest.php

@@ -6,11 +6,9 @@
 use App\Enums\OperatingSystem;
 use App\Enums\ServerProvider;
 use App\Enums\ServerStatus;
-use App\Enums\ServerType;
 use App\Enums\ServiceStatus;
 use App\Enums\Webserver;
 use App\Facades\SSH;
-use App\Models\Server;
 use App\NotificationChannels\Email\NotificationMail;
 use App\Web\Pages\Servers\Index;
 use App\Web\Pages\Servers\Settings;
@@ -36,7 +34,6 @@ public function test_create_regular_server(): void
 
         Livewire::test(Index::class)
             ->callAction('create', [
-                'type' => ServerType::REGULAR,
                 'provider' => ServerProvider::CUSTOM,
                 'name' => 'test',
                 'ip' => '1.1.1.1',
@@ -86,64 +83,6 @@ public function test_create_regular_server(): void
         ]);
     }
 
-    public function test_create_database_server(): void
-    {
-        $this->actingAs($this->user);
-
-        SSH::fake('Active: active'); // fake output for service installations
-
-        Livewire::test(Index::class)
-            ->callAction('create', [
-                'type' => ServerType::DATABASE,
-                'provider' => ServerProvider::CUSTOM,
-                'name' => 'test',
-                'ip' => '2.2.2.2',
-                'port' => '22',
-                'os' => OperatingSystem::UBUNTU22,
-                'database' => Database::MYSQL80,
-            ])
-            ->assertSuccessful();
-
-        $server = Server::query()->where('ip', '2.2.2.2')->first();
-
-        $this->assertDatabaseHas('servers', [
-            'name' => 'test',
-            'ip' => '2.2.2.2',
-            'status' => ServerStatus::READY,
-        ]);
-
-        $this->assertDatabaseMissing('services', [
-            'server_id' => $server->id,
-            'type' => 'php',
-            'version' => '8.2',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseMissing('services', [
-            'server_id' => $server->id,
-            'type' => 'webserver',
-            'name' => 'nginx',
-            'version' => 'latest',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => $server->id,
-            'type' => 'database',
-            'name' => 'mysql',
-            'version' => '8.0',
-            'status' => ServiceStatus::READY,
-        ]);
-
-        $this->assertDatabaseHas('services', [
-            'server_id' => $server->id,
-            'type' => 'firewall',
-            'name' => 'ufw',
-            'version' => 'latest',
-            'status' => ServiceStatus::READY,
-        ]);
-    }
-
     public function test_delete_server(): void
     {
         $this->actingAs($this->user);

tests/TestCase.php

@@ -28,7 +28,7 @@ abstract class TestCase extends BaseTestCase
 
     public const EXPECT_FAILURE = false;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -55,7 +55,7 @@ public function setUp(): void
         $this->setupKeys();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();