ci(release): bump version

.env.example

@@ -1,7 +1,32 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=
-APP_URL=http://panel.test
-APP_INSTALLED=false
 APP_TIMEZONE=UTC
+APP_URL=http://panel.test
 APP_LOCALE=en
+
+LOG_CHANNEL=daily
+LOG_STACK=single
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=sqlite
+
+CACHE_STORE=file
+QUEUE_CONNECTION=database
+SESSION_DRIVER=file
+
+MAIL_MAILER=log
+MAIL_HOST=smtp.example.com
+MAIL_PORT=25
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=no-reply@example.com
+MAIL_FROM_NAME="Pelican Admin"
+# Set this to your domain to prevent it defaulting to 'localhost', causing mail servers such as Gmail to reject your mail
+# MAIL_EHLO_DOMAIN=panel.example.com
+
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null

.github/docker/entrypoint.sh

@@ -21,14 +21,10 @@ else
     echo -e "APP_KEY exists in environment, using that."
     echo -e "APP_KEY=$APP_KEY" > /pelican-data/.env
   fi
-
-  ## enable installer
-  echo -e "APP_INSTALLED=false" >> /pelican-data/.env
 fi
 
 mkdir /pelican-data/database
 ln -s /pelican-data/.env /var/www/html/
-chown -h www-data:www-data /var/www/html/.env
 ln -s /pelican-data/database/database.sqlite /var/www/html/database/
 
 if ! grep -q "APP_KEY=" .env || grep -q "APP_KEY=$" .env; then
@@ -42,9 +38,6 @@ fi
 echo -e "Migrating Database"
 php artisan migrate --force
 
-echo -e "Optimizing Filament"
-php artisan filament:optimize
-
 ## start cronjobs for the queue
 echo -e "Starting cron jobs."
 crond -L /var/log/crond -l 5
@@ -52,14 +45,14 @@ crond -L /var/log/crond -l 5
 export SUPERVISORD_CADDY=false
 
 ## disable caddy if SKIP_CADDY is set
-if [[ "${SKIP_CADDY:-}" == "true" ]]; then
-  echo "Starting PHP-FPM only"
-else
+if [[ -z $SKIP_CADDY ]]; then
   echo "Starting PHP-FPM and Caddy"
   export SUPERVISORD_CADDY=true
+else
+  echo "Starting PHP-FPM only"
 fi
 
-chown -R www-data:www-data /pelican-data/.env /pelican-data/database
+chown -R www-data:www-data . /pelican-data/.env /pelican-data/database
 
 echo "Starting Supervisord"
 exec "$@"

.github/docker/supervisord.conf

@@ -1,7 +1,5 @@
 [unix_http_server]
 file=/tmp/supervisor.sock                       ; path to your socket file
-username=dummy
-password=dummy
 
 [supervisord]
 logfile=/var/log/supervisord/supervisord.log    ; supervisord log file
@@ -20,8 +18,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
-username=dummy
-password=dummy
 
 [program:php-fpm]
 command=/usr/local/sbin/php-fpm -F
@@ -29,7 +25,7 @@ autostart=true
 autorestart=true
 
 [program:queue-worker]
-command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3
+command=/usr/local/bin/php /var/www/html/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
 user=www-data
 autostart=true
 autorestart=true
@@ -40,4 +36,4 @@ autostart=%(ENV_SUPERVISORD_CADDY)s
 autorestart=%(ENV_SUPERVISORD_CADDY)s
 priority=10
 stdout_events_enabled=true
-stderr_events_enabled=true
+stderr_events_enabled=true

.github/workflows/ci.yaml

@@ -3,8 +3,10 @@ name: Tests
 on:
   push:
     branches:
-      - main
+      - '**'
   pull_request:
+    branches:
+      - '**'
 
 jobs:
   mysql:
@@ -87,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.2, 8.3]
-        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
+        database: ["mariadb:10.3", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
         image: ${{ matrix.database }}

.github/workflows/docker-publish.yml

@@ -1,86 +0,0 @@
-name: Docker
-
-
-on:
-  push:
-    branches:
-      - main
-  release:
-    types:
-      - published
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push:
-    name: Build and Push
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    # Always run against a tag, even if the commit into the tag has [docker skip] within the commit message.
-    if: "!contains(github.ref, 'main') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-        
-      - name: Docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
-            type=ref,event=tag
-            type=ref,event=branch
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get Build Information
-        id: build_info
-        run: |
-          echo "version_tag=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
-          echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and Push (tag)
-        uses: docker/build-push-action@v5
-        if: "github.event_name == 'release' && github.event.action == 'published'"
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.build_info.outputs.version_tag }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-
-      - name: Build and Push (main)
-        uses: docker/build-push-action@v5
-        if: "github.event_name == 'push' && contains(github.ref, 'main')"
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=dev-${{ steps.build_info.outputs.short_sha }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

Caddyfile

@@ -1,5 +1,4 @@
 {
-    admin off
     email {$ADMIN_EMAIL}
 }
 

Dockerfile

@@ -7,9 +7,7 @@ WORKDIR /build
 
 COPY . ./
 
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile \
-    && yarn run build:production
+RUN yarn install --frozen-lockfile && yarn run build:production
 
 FROM php:8.3-fpm-alpine
 # FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
@@ -38,8 +36,8 @@ RUN touch .env
 RUN composer install --no-dev --optimize-autoloader
 
 # Set file permissions
-RUN chmod -R 755 storage bootstrap/cache \
-    && chown -R www-data:www-data ./
+RUN chmod -R 755 /var/www/html/storage \
+    && chmod -R 755 /var/www/html/bootstrap/cache
 
 # Add scheduler to cron
 RUN echo "* * * * * php /var/www/html/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data -
@@ -51,7 +49,8 @@ RUN cp .github/docker/supervisord.conf /etc/supervisord.conf && \
 HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
   CMD curl -f http://localhost/up || exit 1
 
-EXPOSE 80 443
+EXPOSE 80:2019
+EXPOSE 443
 
 VOLUME /pelican-data
 

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Egg;
-
-use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
-use Exception;
-use Illuminate\Console\Command;
-
-class CheckEggUpdatesCommand extends Command
-{
-    protected $signature = 'p:egg:check-updates';
-
-    public function handle(EggExporterService $exporterService): void
-    {
-        $eggs = Egg::all();
-        foreach ($eggs as $egg) {
-            try {
-                if (is_null($egg->update_url)) {
-                    $this->comment("{$egg->name}: Skipping (no update url set)");
-
-                    continue;
-                }
-
-                $currentJson = json_decode($exporterService->handle($egg->id));
-                unset($currentJson->exported_at);
-
-                $updatedJson = json_decode(file_get_contents($egg->update_url));
-                unset($updatedJson->exported_at);
-
-                if (md5(json_encode($currentJson)) === md5(json_encode($updatedJson))) {
-                    $this->info("{$egg->name}: Up-to-date");
-                    cache()->put("eggs.{$egg->uuid}.update", false, now()->addHour());
-                } else {
-                    $this->warn("{$egg->name}: Found update");
-                    cache()->put("eggs.{$egg->uuid}.update", true, now()->addHour());
-                }
-            } catch (Exception $exception) {
-                $this->error("{$egg->name}: Error ({$exception->getMessage()})");
-            }
-        }
-    }
-}

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -2,14 +2,20 @@
 
 namespace App\Console\Commands\Environment;
 
+use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Artisan;
 
 class AppSettingsCommand extends Command
 {
+    use EnvironmentWriterTrait;
+
     protected $description = 'Configure basic environment settings for the Panel.';
 
-    protected $signature = 'p:environment:setup';
+    protected $signature = 'p:environment:setup
+                            {--url= : The URL that this Panel is running on.}';
+
+    protected array $variables = [];
 
     public function handle(): void
     {
@@ -24,6 +30,21 @@ class AppSettingsCommand extends Command
             Artisan::call('key:generate');
         }
 
-        Artisan::call('filament:optimize');
+        $this->variables['APP_TIMEZONE'] = 'UTC';
+
+        $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
+            'Application URL',
+            config('app.url', 'https://example.com')
+        );
+
+        // Make sure session cookies are set as "secure" when using HTTPS
+        if (str_starts_with($this->variables['APP_URL'], 'https://')) {
+            $this->variables['SESSION_SECURE_COOKIE'] = 'true';
+        }
+
+        $this->comment('Writing variables to .env file');
+        $this->writeToEnvironment($this->variables);
+
+        $this->info("Setup complete. Vist {$this->variables['APP_URL']}/installer to complete the installation");
     }
 }

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -42,13 +42,6 @@ class DatabaseSettingsCommand extends Command
      */
     public function handle(): int
     {
-        $this->error('Changing the database driver will NOT move any database data!');
-        $this->error('Please make sure you made a database backup first!');
-        $this->error('After changing the driver you will have to manually move the old data to the new database.');
-        if (!$this->confirm('Do you want to continue?')) {
-            return 1;
-        }
-
         $selected = config('database.default', 'sqlite');
         $this->variables['DB_CONNECTION'] = $this->option('driver') ?? $this->choice(
             'Database Driver',

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -70,7 +70,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for SMTP driver.
      */
-    private function setupSmtpDriverVariables(): void
+    private function setupSmtpDriverVariables()
     {
         $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_host'),
@@ -101,7 +101,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for mailgun driver.
      */
-    private function setupMailgunDriverVariables(): void
+    private function setupMailgunDriverVariables()
     {
         $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mailgun_domain'),
@@ -122,7 +122,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for mandrill driver.
      */
-    private function setupMandrillDriverVariables(): void
+    private function setupMandrillDriverVariables()
     {
         $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mandrill_secret'),
@@ -133,7 +133,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle variables for postmark driver.
      */
-    private function setupPostmarkDriverVariables(): void
+    private function setupPostmarkDriverVariables()
     {
         $this->variables['MAIL_DRIVER'] = 'smtp';
         $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';

app/Console/Commands/InfoCommand.php

@@ -26,8 +26,8 @@ class InfoCommand extends Command
     {
         $this->output->title('Version Information');
         $this->table([], [
-            ['Panel Version', $this->versionService->currentPanelVersion()],
-            ['Latest Version', $this->versionService->latestPanelVersion()],
+            ['Panel Version', $this->versionService->versionData()['version']],
+            ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
         ], 'compact');
 

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
 use App\Services\Schedules\ProcessScheduleService;
+use Carbon\Carbon;
 
 class ProcessRunnableCommand extends Command
 {
@@ -23,7 +24,7 @@ class ProcessRunnableCommand extends Command
             ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
-            ->where('next_run_at', '<=', now('UTC')->toDateTimeString())
+            ->where('next_run_at', '<=', Carbon::now()->toDateTimeString())
             ->get();
 
         if ($schedules->count() < 1) {
@@ -50,7 +51,7 @@ class ProcessRunnableCommand extends Command
      * never throw an exception out, otherwise you'll end up killing the entire run group causing
      * any other schedules to not process correctly.
      */
-    protected function processSchedule(Schedule $schedule): void
+    protected function processSchedule(Schedule $schedule)
     {
         if ($schedule->tasks->isEmpty()) {
             return;

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -65,7 +65,6 @@ class BulkPowerActionCommand extends Command
 
         $bar = $this->output->createProgressBar($count);
         $powerRepository = $this->powerRepository;
-        // @phpstan-ignore-next-line
         $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
             $bar->clear();
 

app/Console/Commands/UpgradeCommand.php

@@ -178,7 +178,7 @@ class UpgradeCommand extends Command
         $this->info(__('commands.upgrade.success'));
     }
 
-    protected function withProgress(ProgressBar $bar, \Closure $callback): void
+    protected function withProgress(ProgressBar $bar, \Closure $callback)
     {
         $bar->clear();
         $callback();

app/Console/Kernel.php

@@ -2,17 +2,15 @@
 
 namespace App\Console;
 
-use App\Console\Commands\Egg\CheckEggUpdatesCommand;
-use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
-use App\Console\Commands\Maintenance\PruneImagesCommand;
-use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
-use App\Console\Commands\Schedule\ProcessRunnableCommand;
 use App\Jobs\NodeStatistics;
 use App\Models\ActivityLog;
-use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Console\Commands\Schedule\ProcessRunnableCommand;
+use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
+use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
+use App\Console\Commands\Maintenance\PruneImagesCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -37,7 +35,6 @@ class Kernel extends ConsoleKernel
 
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
         $schedule->command(PruneImagesCommand::class)->daily();
-        $schedule->command(CheckEggUpdatesCommand::class)->hourly();
 
         $schedule->job(new NodeStatistics())->everyFiveSeconds()->withoutOverlapping();
 
@@ -49,9 +46,5 @@ class Kernel extends ConsoleKernel
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
-
-        if (config('panel.webhook.prune_days')) {
-            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
-        }
     }
 }

app/Enums/EditorLanguages.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasLabel;
-
-enum EditorLanguages: string implements HasLabel
-{
-    case plaintext = 'plaintext';
-    case abap = 'abap';
-    case apex = 'apex';
-    case azcali = 'azcali';
-    case bat = 'bat';
-    case bicep = 'bicep';
-    case cameligo = 'cameligo';
-    case coljure = 'coljure';
-    case coffeescript = 'coffeescript';
-    case c = 'c';
-    case cpp = 'cpp';
-    case csharp = 'csharp';
-    case csp = 'csp';
-    case css = 'css';
-    case cypher = 'cypher';
-    case dart = 'dart';
-    case dockerfile = 'dockerfile';
-    case ecl = 'ecl';
-    case elixir = 'elixir';
-    case flow9 = 'flow9';
-    case fsharp = 'fsharp';
-    case go = 'go';
-    case graphql = 'graphql';
-    case handlebars = 'handlebars';
-    case hcl = 'hcl';
-    case html = 'html';
-    case ini = 'ini';
-    case java = 'java';
-    case javascript = 'javascript';
-    case julia = 'julia';
-    case kotlin = 'kotlin';
-    case less = 'less';
-    case lexon = 'lexon';
-    case lua = 'lua';
-    case liquid = 'liquid';
-    case m3 = 'm3';
-    case markdown = 'markdown';
-    case mdx = 'mdx';
-    case mips = 'mips';
-    case msdax = 'msdax';
-    case mysql = 'mysql';
-    case objectivec = 'objective-c';
-    case pascal = 'pascal';
-    case pascaligo = 'pascaligo';
-    case perl = 'perl';
-    case pgsql = 'pgsql';
-    case php = 'php';
-    case pla = 'pla';
-    case postiats = 'postiats';
-    case powerquery = 'powerquery';
-    case powershell = 'powershell';
-    case proto = 'proto';
-    case pug = 'pug';
-    case python = 'python';
-    case qsharp = 'qsharp';
-    case r = 'r';
-    case razor = 'razor';
-    case redis = 'redis';
-    case redshift = 'redshift';
-    case restructuredtext = 'restructuredtext';
-    case ruby = 'ruby';
-    case rust = 'rust';
-    case sb = 'sb';
-    case scala = 'scala';
-    case scheme = 'scheme';
-    case scss = 'scss';
-    case shell = 'shell';
-    case sol = 'sol';
-    case aes = 'aes';
-    case sparql = 'sparql';
-    case sql = 'sql';
-    case st = 'st';
-    case swift = 'swift';
-    case systemverilog = 'systemverilog';
-    case verilog = 'verilog';
-    case tcl = 'tcl';
-    case twig = 'twig';
-    case typescript = 'typescript';
-    case typespec = 'typespec';
-    case vb = 'vb';
-    case wgsl = 'wgsl';
-    case xml = 'xml';
-    case yaml = 'yaml';
-    case json = 'json';
-
-    public function getLabel(): ?string
-    {
-        return $this->name;
-    }
-}

app/Enums/RolePermissionModels.php

@@ -13,5 +13,4 @@ enum RolePermissionModels: string
     case Role = 'role';
     case Server = 'server';
     case User = 'user';
-    case Webhook = 'webhook';
 }

app/Events/ActivityLogged.php

@@ -8,7 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 
 class ActivityLogged extends Event
 {
-    public function __construct(public ActivityLog $model) {}
+    public function __construct(public ActivityLog $model)
+    {
+    }
 
     public function is(string $event): bool
     {

app/Events/Auth/DirectLogin.php

@@ -7,5 +7,7 @@ use App\Events\Event;
 
 class DirectLogin extends Event
 {
-    public function __construct(public User $user, public bool $remember) {}
+    public function __construct(public User $user, public bool $remember)
+    {
+    }
 }

app/Events/Auth/FailedCaptcha.php

@@ -12,5 +12,7 @@ class FailedCaptcha extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public string $ip, public ?string $message) {}
+    public function __construct(public string $ip, public string $domain)
+    {
+    }
 }

app/Events/Auth/FailedPasswordReset.php

@@ -12,5 +12,7 @@ class FailedPasswordReset extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public string $ip, public string $email) {}
+    public function __construct(public string $ip, public string $email)
+    {
+    }
 }

app/Events/Auth/ProvidedAuthenticationToken.php

@@ -7,5 +7,7 @@ use App\Events\Event;
 
 class ProvidedAuthenticationToken extends Event
 {
-    public function __construct(public User $user, public bool $recovery = false) {}
+    public function __construct(public User $user, public bool $recovery = false)
+    {
+    }
 }

app/Events/Event.php

@@ -2,4 +2,6 @@
 
 namespace App\Events;
 
-abstract class Event {}
+abstract class Event
+{
+}

app/Events/Server/Created.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Created extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Creating.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Creating extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Deleted.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Deleted extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Deleting.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Deleting extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Installed.php

@@ -13,5 +13,7 @@ class Installed extends Event
     /**
      * Create a new event instance.
      */
-    public function __construct(public Server $server) {}
+    public function __construct(public Server $server)
+    {
+    }
 }

app/Events/Server/Saved.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Saved extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Saving.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Saving extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Updated.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Updated extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Server/Updating.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Server;
+
+use App\Events\Event;
+use App\Models\Server;
+use Illuminate\Queue\SerializesModels;
+
+class Updating extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Server $server)
+    {
+    }
+}

app/Events/Subuser/Created.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Subuser;
+
+use App\Events\Event;
+use App\Models\Subuser;
+use Illuminate\Queue\SerializesModels;
+
+class Created extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Subuser $subuser)
+    {
+    }
+}

app/Events/Subuser/Creating.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Subuser;
+
+use App\Events\Event;
+use App\Models\Subuser;
+use Illuminate\Queue\SerializesModels;
+
+class Creating extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Subuser $subuser)
+    {
+    }
+}

app/Events/Subuser/Deleted.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Subuser;
+
+use App\Events\Event;
+use App\Models\Subuser;
+use Illuminate\Queue\SerializesModels;
+
+class Deleted extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Subuser $subuser)
+    {
+    }
+}

app/Events/Subuser/Deleting.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\Subuser;
+
+use App\Events\Event;
+use App\Models\Subuser;
+use Illuminate\Queue\SerializesModels;
+
+class Deleting extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public Subuser $subuser)
+    {
+    }
+}

app/Events/User/Created.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\User;
+
+use App\Models\User;
+use App\Events\Event;
+use Illuminate\Queue\SerializesModels;
+
+class Created extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public User $user)
+    {
+    }
+}

app/Events/User/Creating.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\User;
+
+use App\Models\User;
+use App\Events\Event;
+use Illuminate\Queue\SerializesModels;
+
+class Creating extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public User $user)
+    {
+    }
+}

app/Events/User/Deleted.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\User;
+
+use App\Models\User;
+use App\Events\Event;
+use Illuminate\Queue\SerializesModels;
+
+class Deleted extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public User $user)
+    {
+    }
+}

app/Events/User/Deleting.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Events\User;
+
+use App\Models\User;
+use App\Events\Event;
+use Illuminate\Queue\SerializesModels;
+
+class Deleting extends Event
+{
+    use SerializesModels;
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct(public User $user)
+    {
+    }
+}

app/Exceptions/AccountNotFoundException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions;
+
+class AccountNotFoundException extends \Exception
+{
+}

app/Exceptions/AutoDeploymentException.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions;
+
+class AutoDeploymentException extends \Exception
+{
+}

app/Exceptions/DisplayException.php

@@ -4,22 +4,18 @@ namespace App\Exceptions;
 
 use Exception;
 use Filament\Notifications\Notification;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Container\Container;
+use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class DisplayException extends PanelException implements HttpExceptionInterface
 {
     public const LEVEL_DEBUG = 'debug';
-
     public const LEVEL_INFO = 'info';
-
     public const LEVEL_WARNING = 'warning';
-
     public const LEVEL_ERROR = 'error';
 
     /**
@@ -50,7 +46,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      * and then redirecting them back to the page that they came from. If the
      * request originated from an API hit, return the error in JSONAPI spec format.
      */
-    public function render(Request $request): bool|RedirectResponse|JsonResponse
+    public function render(Request $request)
     {
         if ($request->is('livewire/update')) {
             Notification::make()
@@ -59,13 +55,15 @@ class DisplayException extends PanelException implements HttpExceptionInterface
                 ->danger()
                 ->send();
 
-            return false;
+            return;
         }
 
         if ($request->expectsJson()) {
             return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
         }
 
+        app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
+
         return redirect()->back()->withInput();
     }
 
@@ -75,10 +73,10 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      *
      * @throws \Throwable
      */
-    public function report(): void
+    public function report()
     {
         if (!$this->getPrevious() instanceof \Exception || !Handler::isReportable($this->getPrevious())) {
-            return;
+            return null;
         }
 
         try {
@@ -87,6 +85,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface
             throw $this->getPrevious();
         }
 
-        $logger->{$this->getErrorLevel()}($this->getPrevious());
+        return $logger->{$this->getErrorLevel()}($this->getPrevious());
     }
 }

app/Exceptions/Handler.php

@@ -114,7 +114,7 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
      *
      * @throws \Throwable
      */
@@ -140,7 +140,7 @@ class Handler extends ExceptionHandler
      * Transform a validation exception into a consistent format to be returned for
      * calls to the API.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
      */
     public function invalidJson($request, ValidationException $exception): JsonResponse
     {
@@ -236,7 +236,7 @@ class Handler extends ExceptionHandler
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param \Illuminate\Http\Request $request
      */
     protected function unauthenticated($request, AuthenticationException $exception): JsonResponse|RedirectResponse
     {
@@ -273,7 +273,6 @@ class Handler extends ExceptionHandler
      */
     public static function toArray(\Throwable $e): array
     {
-        // @phpstan-ignore-next-line
         return (new self(app()))->convertExceptionToArray($e);
     }
 }

app/Exceptions/Http/Base/InvalidPasswordProvidedException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Http\Base;
 
 use App\Exceptions\DisplayException;
 
-class InvalidPasswordProvidedException extends DisplayException {}
+class InvalidPasswordProvidedException extends DisplayException
+{
+}

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -7,6 +7,9 @@ use GuzzleHttp\Exception\GuzzleException;
 use App\Exceptions\DisplayException;
 use Illuminate\Support\Facades\Context;
 
+/**
+ * @method \GuzzleHttp\Exception\GuzzleException getPrevious()
+ */
 class DaemonConnectionException extends DisplayException
 {
     private int $statusCode = Response::HTTP_GATEWAY_TIMEOUT;

app/Exceptions/Http/HttpForbiddenException.php

@@ -10,7 +10,7 @@ class HttpForbiddenException extends HttpException
     /**
      * HttpForbiddenException constructor.
      */
-    public function __construct(?string $message = null, ?\Throwable $previous = null)
+    public function __construct(string $message = null, \Throwable $previous = null)
     {
         parent::__construct(Response::HTTP_FORBIDDEN, $message, $previous);
     }

app/Exceptions/Http/Server/FileTypeNotEditableException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Http\Server;
+
+use App\Exceptions\DisplayException;
+
+class FileTypeNotEditableException extends DisplayException
+{
+}

app/Exceptions/Http/Server/ServerStateConflictException.php

@@ -12,7 +12,7 @@ class ServerStateConflictException extends ConflictHttpException
      * Exception thrown when the server is in an unsupported state for API access or
      * certain operations within the codebase.
      */
-    public function __construct(Server $server, ?\Throwable $previous = null)
+    public function __construct(Server $server, \Throwable $previous = null)
     {
         $message = 'This server is currently in an unsupported state, please try again later.';
         if ($server->isSuspended()) {

app/Exceptions/Http/TwoFactorAuthRequiredException.php

@@ -11,7 +11,7 @@ class TwoFactorAuthRequiredException extends HttpException implements HttpExcept
     /**
      * TwoFactorAuthRequiredException constructor.
      */
-    public function __construct(?\Throwable $previous = null)
+    public function __construct(\Throwable $previous = null)
     {
         parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
     }

app/Exceptions/PanelException.php

@@ -2,4 +2,6 @@
 
 namespace App\Exceptions;
 
-class PanelException extends \Exception {}
+class PanelException extends \Exception
+{
+}

app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Repository\Daemon;
+
+use App\Exceptions\Repository\RepositoryException;
+
+class InvalidPowerSignalException extends RepositoryException
+{
+}

app/Exceptions/Repository/DuplicateDatabaseNameException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Repository;
 
 use App\Exceptions\DisplayException;
 
-class DuplicateDatabaseNameException extends DisplayException {}
+class DuplicateDatabaseNameException extends DisplayException
+{
+}

app/Exceptions/Repository/RepositoryException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Repository;
+
+use App\Exceptions\PanelException;
+
+class RepositoryException extends PanelException
+{
+}

app/Exceptions/Service/Allocation/AllocationDoesNotBelongToServerException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\PanelException;
+
+class AllocationDoesNotBelongToServerException extends PanelException
+{
+}

app/Exceptions/Service/Allocation/ServerUsingAllocationException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Allocation;
 
 use App\Exceptions\DisplayException;
 
-class ServerUsingAllocationException extends DisplayException {}
+class ServerUsingAllocationException extends DisplayException
+{
+}

app/Exceptions/Service/Deployment/NoViableAllocationException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Deployment;
 
 use App\Exceptions\DisplayException;
 
-class NoViableAllocationException extends DisplayException {}
+class NoViableAllocationException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/BadJsonFormatException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Egg;
+
+use App\Exceptions\DisplayException;
+
+class BadJsonFormatException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/HasChildrenException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Egg;
 
 use App\Exceptions\DisplayException;
 
-class HasChildrenException extends DisplayException {}
+class HasChildrenException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Egg;
+
+use App\Exceptions\DisplayException;
+
+class NoParentConfigurationFoundException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/Variable/BadValidationRuleException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Egg\Variable;
 
 use App\Exceptions\DisplayException;
 
-class BadValidationRuleException extends DisplayException {}
+class BadValidationRuleException extends DisplayException
+{
+}

app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Egg\Variable;
 
 use App\Exceptions\DisplayException;
 
-class ReservedVariableNameException extends DisplayException {}
+class ReservedVariableNameException extends DisplayException
+{
+}

app/Exceptions/Service/InvalidFileUploadException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service;
 
 use App\Exceptions\DisplayException;
 
-class InvalidFileUploadException extends DisplayException {}
+class InvalidFileUploadException extends DisplayException
+{
+}

app/Exceptions/Service/Node/ConfigurationNotPersistedException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Node;
 
 use App\Exceptions\DisplayException;
 
-class ConfigurationNotPersistedException extends DisplayException {}
+class ConfigurationNotPersistedException extends DisplayException
+{
+}

app/Exceptions/Service/Schedule/Task/TaskIntervalTooLongException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Schedule\Task;
+
+use App\Exceptions\DisplayException;
+
+class TaskIntervalTooLongException extends DisplayException
+{
+}

app/Exceptions/Service/Server/RequiredVariableMissingException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Server;
+
+use App\Exceptions\PanelException;
+
+class RequiredVariableMissingException extends PanelException
+{
+}

app/Exceptions/Service/ServiceLimitExceededException.php

@@ -10,7 +10,7 @@ class ServiceLimitExceededException extends DisplayException
      * Exception thrown when something goes over a defined limit, such as allocated
      * ports, tasks, databases, etc.
      */
-    public function __construct(string $message, ?\Throwable $previous = null)
+    public function __construct(string $message, \Throwable $previous = null)
     {
         parent::__construct($message, $previous, self::LEVEL_WARNING);
     }

app/Exceptions/Service/Subuser/ServerSubuserExistsException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Subuser;
 
 use App\Exceptions\DisplayException;
 
-class ServerSubuserExistsException extends DisplayException {}
+class ServerSubuserExistsException extends DisplayException
+{
+}

app/Exceptions/Service/Subuser/UserIsServerOwnerException.php

@@ -4,4 +4,6 @@ namespace App\Exceptions\Service\Subuser;
 
 use App\Exceptions\DisplayException;
 
-class UserIsServerOwnerException extends DisplayException {}
+class UserIsServerOwnerException extends DisplayException
+{
+}

app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php

@@ -7,7 +7,6 @@ use App\Exceptions\DisplayException;
 class TwoFactorAuthenticationTokenInvalid extends DisplayException
 {
     public string $title = 'Invalid 2FA Code';
-
     public string $icon = 'tabler-2fa';
 
     public function __construct()

app/Exceptions/Transformer/InvalidTransformerLevelException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Transformer;
+
+use App\Exceptions\PanelException;
+
+class InvalidTransformerLevelException extends PanelException
+{
+}

app/Extensions/Backups/BackupManager.php

@@ -27,12 +27,14 @@ class BackupManager
     /**
      * BackupManager constructor.
      */
-    public function __construct(protected Application $app) {}
+    public function __construct(protected Application $app)
+    {
+    }
 
     /**
      * Returns a backup adapter instance.
      */
-    public function adapter(?string $name = null): FilesystemAdapter
+    public function adapter(string $name = null): FilesystemAdapter
     {
         return $this->get($name ?: $this->getDefaultAdapter());
     }
@@ -143,7 +145,7 @@ class BackupManager
     /**
      * Unset the given adapter instances.
      *
-     * @param  string|string[]  $adapter
+     * @param string|string[] $adapter
      */
     public function forget(array|string $adapter): self
     {

app/Extensions/DynamicDatabaseConnection.php

@@ -7,9 +7,7 @@ use App\Models\DatabaseHost;
 class DynamicDatabaseConnection
 {
     public const DB_CHARSET = 'utf8';
-
     public const DB_COLLATION = 'utf8_unicode_ci';
-
     public const DB_DRIVER = 'mysql';
 
     /**

app/Extensions/Facades/Theme.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Extensions\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+class Theme extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return 'extensions.themes';
+    }
+}

app/Extensions/Themes/Theme.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Extensions\Themes;
+
+class Theme
+{
+    public function js($path): string
+    {
+        return sprintf('<script src="%s"></script>' . PHP_EOL, $this->getUrl($path));
+    }
+
+    public function css($path): string
+    {
+        return sprintf('<link media="all" type="text/css" rel="stylesheet" href="%s"/>' . PHP_EOL, $this->getUrl($path));
+    }
+
+    protected function getUrl($path): string
+    {
+        return '/themes/panel/' . ltrim($path, '/');
+    }
+}

app/Facades/LogBatch.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use App\Services\Activity\ActivityLogBatchService;
+
+class LogBatch extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return ActivityLogBatchService::class;
+    }
+}

app/Filament/Admin/Resources/WebhookResource.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources;
-
-use App\Filament\Admin\Resources\WebhookResource\Pages;
-use App\Models\WebhookConfiguration;
-use Filament\Resources\Resource;
-
-class WebhookResource extends Resource
-{
-    protected static ?string $model = WebhookConfiguration::class;
-
-    protected static ?string $navigationIcon = 'tabler-webhook';
-
-    protected static ?string $navigationGroup = 'Advanced';
-
-    protected static ?string $label = 'Webhooks';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListWebhookConfigurations::route('/'),
-            'create' => Pages\CreateWebhookConfiguration::route('/create'),
-            'edit' => Pages\EditWebhookConfiguration::route('/{record}/edit'),
-        ];
-    }
-}

app/Filament/Admin/Resources/WebhookResource/Pages/CreateWebhookConfiguration.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
-
-use App\Filament\Admin\Resources\WebhookResource;
-use App\Models\WebhookConfiguration;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Resources\Pages\CreateRecord;
-
-class CreateWebhookConfiguration extends CreateRecord
-{
-    protected static string $resource = WebhookResource::class;
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                TextInput::make('endpoint')
-                    ->activeUrl()
-                    ->required(),
-                TextInput::make('description')
-                    ->required(),
-                CheckboxList::make('events')
-                    ->lazy()
-                    ->options(fn () => WebhookConfiguration::filamentCheckboxList())
-                    ->searchable()
-                    ->bulkToggleable()
-                    ->columns(3)
-                    ->columnSpanFull()
-                    ->gridDirection('row')
-                    ->required(),
-            ]);
-    }
-}

app/Filament/Admin/Resources/WebhookResource/Pages/EditWebhookConfiguration.php

@@ -1,57 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
-
-use App\Models\WebhookConfiguration;
-use App\Filament\Admin\Resources\WebhookResource;
-use Filament\Actions;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Resources\Pages\EditRecord;
-
-class EditWebhookConfiguration extends EditRecord
-{
-    protected static string $resource = WebhookResource::class;
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                TextInput::make('endpoint')
-                    ->label('Endpoint')
-                    ->activeUrl()
-                    ->required(),
-                TextInput::make('description')
-                    ->label('Description')
-                    ->required(),
-                CheckboxList::make('events')
-                    ->label('Events')
-                    ->lazy()
-                    ->options(fn () => WebhookConfiguration::filamentCheckboxList())
-                    ->searchable()
-                    ->bulkToggleable()
-                    ->columns(3)
-                    ->columnSpanFull()
-                    ->gridDirection('row')
-                    ->required(),
-            ]);
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\DeleteAction::make()
-                ->label('Delete')
-                ->modalHeading('Are you sure you want to delete this?')
-                ->modalDescription('')
-                ->modalSubmitActionLabel('Delete'),
-            $this->getSaveFormAction()->formId('form'),
-        ];
-    }
-}

app/Filament/Admin/Resources/WebhookResource/Pages/ListWebhookConfigurations.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\WebhookResource\Pages;
-
-use App\Filament\Admin\Resources\WebhookResource;
-use App\Models\WebhookConfiguration;
-use Filament\Actions;
-use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Actions\DeleteAction;
-
-class ListWebhookConfigurations extends ListRecords
-{
-    protected static string $resource = WebhookResource::class;
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('description')
-                    ->label('Description'),
-                TextColumn::make('endpoint')
-                    ->label('Endpoint'),
-            ])
-            ->actions([
-                DeleteAction::make()
-                    ->label('Delete'),
-                EditAction::make()
-                    ->label('Edit'),
-            ])
-            ->emptyStateIcon('tabler-webhook')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('No Webhooks')
-            ->emptyStateActions([
-                CreateAction::make('create')
-                    ->label('Create Webhook')
-                    ->button(),
-            ]);
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Actions\CreateAction::make()
-                ->label('Create Webhook')
-                ->hidden(fn () => WebhookConfiguration::count() <= 0),
-        ];
-    }
-}

app/Filament/App/Resources/ServerResource.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Filament\App\Resources;
-
-use App\Filament\App\Resources\ServerResource\Pages;
-use App\Models\Server;
-use Filament\Resources\Resource;
-
-class ServerResource extends Resource
-{
-    protected static ?string $model = Server::class;
-
-    protected static ?string $slug = '/';
-
-    protected static bool $shouldRegisterNavigation = false;
-
-    public static function canAccess(): bool
-    {
-        return true;
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListServers::route('/'),
-        ];
-    }
-}

app/Filament/App/Resources/ServerResource/Pages/ListServers.php

@@ -1,124 +0,0 @@
-<?php
-
-namespace App\Filament\App\Resources\ServerResource\Pages;
-
-use App\Filament\App\Resources\ServerResource;
-use App\Filament\Server\Pages\Console;
-use App\Models\Server;
-use App\Tables\Columns\ServerEntryColumn;
-use Carbon\CarbonInterface;
-use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Columns\Layout\Stack;
-use Filament\Tables\Filters\SelectFilter;
-use Filament\Tables\Filters\TernaryFilter;
-use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Number;
-
-class ListServers extends ListRecords
-{
-    protected static string $resource = ServerResource::class;
-
-    public function table(Table $table): Table
-    {
-        $baseQuery = auth()->user()->can('viewList server') ? Server::query() : auth()->user()->accessibleServers();
-
-        return $table
-            ->paginated(false)
-            ->query(fn () => $baseQuery)
-            ->poll('15s')
-            ->columns([
-                Stack::make([
-                    ServerEntryColumn::make('server_entry')
-                        ->searchable(['name']),
-                ]),
-            ])
-            ->contentGrid([
-                'default' => 1,
-                'xl' => 2,
-            ])
-            ->recordUrl(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server))
-            ->emptyStateIcon('tabler-brand-docker')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('You don\'t have access to any servers!')
-            ->persistFiltersInSession()
-            ->filters([
-                TernaryFilter::make('only_my_servers')
-                    ->label('Owned by')
-                    ->placeholder('All servers')
-                    ->trueLabel('My Servers')
-                    ->falseLabel('Others\' Servers')
-                    ->default()
-                    ->queries(
-                        true: fn (Builder $query) => $query->where('owner_id', auth()->user()->id),
-                        false: fn (Builder $query) => $query->whereNot('owner_id', auth()->user()->id),
-                        blank: fn (Builder $query) => $query,
-                    ),
-                SelectFilter::make('egg')
-                    ->relationship('egg', 'name', fn (Builder $query) => $query->whereIn('id', $baseQuery->pluck('egg_id')))
-                    ->searchable()
-                    ->preload(),
-            ]);
-    }
-
-    // @phpstan-ignore-next-line
-    private function uptime(Server $server): string
-    {
-        $uptime = Arr::get($server->resources(), 'uptime', 0);
-
-        if ($uptime === 0) {
-            return 'Offline';
-        }
-
-        return now()->subMillis($uptime)->diffForHumans(syntax: CarbonInterface::DIFF_ABSOLUTE, short: true, parts: 2);
-    }
-
-    // @phpstan-ignore-next-line
-    private function cpu(Server $server): string
-    {
-        $cpu = Number::format(Arr::get($server->resources(), 'cpu_absolute', 0), maxPrecision: 2, locale: auth()->user()->language) . '%';
-        $max = Number::format($server->cpu, locale: auth()->user()->language) . '%';
-
-        return $cpu . ($server->cpu > 0 ? ' Of ' . $max : '');
-    }
-
-    // @phpstan-ignore-next-line
-    private function memory(Server $server): string
-    {
-        $latestMemoryUsed = Arr::get($server->resources(), 'memory_bytes', 0);
-        $totalMemory = Arr::get($server->resources(), 'memory_limit_bytes', 0);
-
-        $used = config('panel.use_binary_prefix')
-            ? Number::format($latestMemoryUsed / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-            : Number::format($latestMemoryUsed / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
-
-        if ($totalMemory === 0) {
-            $total = config('panel.use_binary_prefix')
-                ? Number::format($server->memory / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-                : Number::format($server->memory / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
-        } else {
-            $total = config('panel.use_binary_prefix')
-                ? Number::format($totalMemory / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-                : Number::format($totalMemory / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
-        }
-
-        return $used . ($server->memory > 0 ? ' Of ' . $total : '');
-    }
-
-    // @phpstan-ignore-next-line
-    private function disk(Server $server): string
-    {
-        $usedDisk = Arr::get($server->resources(), 'disk_bytes', 0);
-
-        $used = config('panel.use_binary_prefix')
-            ? Number::format($usedDisk / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-            : Number::format($usedDisk / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
-
-        $total = config('panel.use_binary_prefix')
-            ? Number::format($server->disk / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
-            : Number::format($server->disk / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
-
-        return $used . ($server->disk > 0 ? ' Of ' . $total : '');
-    }
-}

app/Filament/Pages/Auth/Login.php

@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Auth;
-
-use Coderflex\FilamentTurnstile\Forms\Components\Turnstile;
-use Filament\Forms\Components\Actions;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\TextInput;
-use Filament\Pages\Auth\Login as BaseLogin;
-use Illuminate\Support\Str;
-use Illuminate\Validation\ValidationException;
-
-class Login extends BaseLogin
-{
-    protected function getForms(): array
-    {
-        return [
-            'form' => $this->form(
-                $this->makeForm()
-                    ->schema([
-                        $this->getLoginFormComponent(),
-                        $this->getPasswordFormComponent(),
-                        $this->getRememberFormComponent(),
-                        $this->getOAuthFormComponent(),
-                        Turnstile::make('captcha')
-                            ->hidden(!config('turnstile.turnstile_enabled'))
-                            ->validationMessages([
-                                'required' => config('turnstile.error_messages.turnstile_check_message'),
-                            ]),
-                    ])
-                    ->statePath('data'),
-            ),
-        ];
-    }
-
-    protected function throwFailureValidationException(): never
-    {
-        $this->dispatch('reset-captcha');
-
-        throw ValidationException::withMessages([
-            'data.login' => __('filament-panels::pages/auth/login.messages.failed'),
-        ]);
-    }
-
-    protected function getLoginFormComponent(): Component
-    {
-        return TextInput::make('login')
-            ->label('Login')
-            ->required()
-            ->autocomplete()
-            ->autofocus()
-            ->extraInputAttributes(['tabindex' => 1]);
-    }
-
-    protected function getOAuthFormComponent(): Component
-    {
-        $actions = [];
-
-        foreach (config('auth.oauth') as $name => $data) {
-            if (!$data['enabled']) {
-                continue;
-            }
-
-            $actions[] = Action::make("oauth_$name")
-                ->label(Str::title($name))
-                ->icon($data['icon'])
-                ->color($data['color'])
-                ->url(route('auth.oauth.redirect', ['driver' => $name], false));
-        }
-
-        return Actions::make($actions);
-    }
-
-    protected function getCredentialsFromFormData(array $data): array
-    {
-        $loginType = filter_var($data['login'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
-
-        return [
-            $loginType => mb_strtolower($data['login']),
-            'password' => $data['password'],
-        ];
-    }
-}

app/Filament/Pages/Dashboard.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Pages;
+namespace App\Filament\Pages;
 
-use App\Filament\Admin\Resources\NodeResource\Pages\CreateNode;
-use App\Filament\Admin\Resources\NodeResource\Pages\ListNodes;
+use App\Filament\Resources\NodeResource\Pages\ListNodes;
 use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
@@ -29,20 +28,16 @@ class Dashboard extends Page
 
     public string $activeTab = 'nodes';
 
-    private SoftwareVersionService $softwareVersionService;
-
-    public function mount(SoftwareVersionService $softwareVersionService): void
-    {
-        $this->softwareVersionService = $softwareVersionService;
-    }
-
     public function getViewData(): array
     {
+        /** @var SoftwareVersionService $softwareVersionService */
+        $softwareVersionService = app(SoftwareVersionService::class);
+
         return [
             'inDevelopment' => config('app.version') === 'canary',
-            'version' => $this->softwareVersionService->currentPanelVersion(),
-            'latestVersion' => $this->softwareVersionService->latestPanelVersion(),
-            'isLatest' => $this->softwareVersionService->isLatestPanel(),
+            'version' => $softwareVersionService->versionData()['version'],
+            'latestVersion' => $softwareVersionService->getPanel(),
+            'isLatest' => $softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
             'nodesCount' => Node::query()->count(),
@@ -66,13 +61,13 @@ class Dashboard extends Page
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
                     ->icon('tabler-server-2')
-                    ->url(CreateNode::getUrl()),
+                    ->url(route('filament.admin.resources.nodes.create')),
             ],
             'supportActions' => [
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url('https://pelican.dev/donate', true)
+                    ->url($softwareVersionService->getDonations(), true)
                     ->color('success'),
             ],
             'helpActions' => [

app/Filament/Pages/Installer/PanelInstaller.php

@@ -0,0 +1,160 @@
+<?php
+
+namespace App\Filament\Pages\Installer;
+
+use App\Filament\Pages\Installer\Steps\AdminUserStep;
+use App\Filament\Pages\Installer\Steps\DatabaseStep;
+use App\Filament\Pages\Installer\Steps\EnvironmentStep;
+use App\Filament\Pages\Installer\Steps\RedisStep;
+use App\Filament\Pages\Installer\Steps\RequirementsStep;
+use App\Models\User;
+use App\Services\Users\UserCreationService;
+use App\Traits\CheckMigrationsTrait;
+use App\Traits\EnvironmentWriterTrait;
+use Exception;
+use Filament\Forms\Components\Wizard;
+use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Notifications\Notification;
+use Filament\Pages\Concerns\HasUnsavedDataChangesAlert;
+use Filament\Pages\SimplePage;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\HtmlString;
+
+/**
+ * @property Form $form
+ */
+class PanelInstaller extends SimplePage implements HasForms
+{
+    use CheckMigrationsTrait;
+    use EnvironmentWriterTrait;
+    use HasUnsavedDataChangesAlert;
+    use InteractsWithForms;
+
+    public $data = [];
+
+    protected static string $view = 'filament.pages.installer';
+
+    public function getMaxWidth(): MaxWidth|string
+    {
+        return MaxWidth::SevenExtraLarge;
+    }
+
+    public static function show(): bool
+    {
+        if (User::count() <= 0) {
+            return true;
+        }
+
+        if (config('panel.client_features.installer.enabled')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function mount()
+    {
+        abort_unless(self::show(), 404);
+
+        $this->form->fill();
+    }
+
+    public function dehydrate(): void
+    {
+        Artisan::call('config:clear');
+        Artisan::call('cache:clear');
+    }
+
+    protected function getFormSchema(): array
+    {
+        return [
+            Wizard::make([
+                RequirementsStep::make(),
+                EnvironmentStep::make(),
+                DatabaseStep::make(),
+                RedisStep::make()
+                    ->hidden(fn (Get $get) => $get('env.SESSION_DRIVER') != 'redis' && $get('env.QUEUE_CONNECTION') != 'redis' && $get('env.CACHE_STORE') != 'redis'),
+                AdminUserStep::make(),
+            ])
+                ->persistStepInQueryString()
+                ->submitAction(new HtmlString(Blade::render(<<<'BLADE'
+                    <x-filament::button
+                        type="submit"
+                        size="sm"
+                        wire:loading.attr="disabled"
+                    >
+                        Finish
+                        <span wire:loading><x-filament::loading-indicator class="h-4 w-4" /></span>
+                    </x-filament::button>
+                BLADE))),
+        ];
+    }
+
+    protected function getFormStatePath(): ?string
+    {
+        return 'data';
+    }
+
+    protected function hasUnsavedDataChangesAlert(): bool
+    {
+        return true;
+    }
+
+    public function submit()
+    {
+        try {
+            $inputs = $this->form->getState();
+
+            // Write variables to .env file
+            $variables = array_get($inputs, 'env');
+            $this->writeToEnvironment($variables);
+
+            // Clear config cache
+            Artisan::call('config:clear');
+
+            // Run migrations
+            Artisan::call('migrate', [
+                '--force' => true,
+                '--seed' => true,
+                '--database' => $variables['DB_CONNECTION'],
+            ]);
+
+            if (!$this->hasCompletedMigrations()) {
+                throw new Exception('Migrations didn\'t run successfully. Double check your database configuration.');
+            }
+
+            // Create first admin user
+            $userData = array_get($inputs, 'user');
+            $userData['root_admin'] = true;
+            $user = app(UserCreationService::class)->handle($userData);
+
+            // Install setup complete
+            $this->writeToEnvironment(['APP_INSTALLER' => 'false']);
+
+            $this->rememberData();
+
+            Notification::make()
+                ->title('Successfully Installed')
+                ->success()
+                ->send();
+
+            auth()->loginUsingId($user->id);
+
+            return redirect('/admin');
+        } catch (Exception $exception) {
+            report($exception);
+
+            Notification::make()
+                ->title('Installation Failed')
+                ->body($exception->getMessage())
+                ->danger()
+                ->persistent()
+                ->send();
+        }
+    }
+}

app/Filament/Pages/Installer/Steps/AdminUserStep.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Wizard\Step;
+
+class AdminUserStep
+{
+    public static function make(): Step
+    {
+        return Step::make('user')
+            ->label('Admin User')
+            ->schema([
+                TextInput::make('user.email')
+                    ->label('Admin E-Mail')
+                    ->required()
+                    ->email()
+                    ->placeholder('admin@example.com'),
+                TextInput::make('user.username')
+                    ->label('Admin Username')
+                    ->required()
+                    ->placeholder('admin'),
+                TextInput::make('user.password')
+                    ->label('Admin Password')
+                    ->required()
+                    ->password()
+                    ->revealable(),
+            ]);
+    }
+}

app/Filament/Pages/Installer/Steps/DatabaseStep.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+use Filament\Notifications\Notification;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Support\Facades\DB;
+use PDOException;
+
+class DatabaseStep
+{
+    public static function make(): Step
+    {
+        return Step::make('database')
+            ->label('Database')
+            ->columns()
+            ->schema([
+                TextInput::make('env.DB_DATABASE')
+                    ->label(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite' ? 'Database Path' : 'Database Name')
+                    ->columnSpanFull()
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite' ? 'The path of your .sqlite file relative to the database folder.' : 'The name of the panel database.')
+                    ->required()
+                    ->default(fn (Get $get) => env('DB_DATABASE', $get('env.DB_CONNECTION') === 'sqlite' ? 'database.sqlite' : 'panel')),
+                TextInput::make('env.DB_HOST')
+                    ->label('Database Host')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The host of your database. Make sure it is reachable.')
+                    ->required()
+                    ->default(env('DB_HOST', '127.0.0.1'))
+                    ->hidden(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite'),
+                TextInput::make('env.DB_PORT')
+                    ->label('Database Port')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The port of your database.')
+                    ->required()
+                    ->numeric()
+                    ->minValue(1)
+                    ->maxValue(65535)
+                    ->default(env('DB_PORT', 3306))
+                    ->hidden(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite'),
+                TextInput::make('env.DB_USERNAME')
+                    ->label('Database Username')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The name of your database user.')
+                    ->required()
+                    ->default(env('DB_USERNAME', 'pelican'))
+                    ->hidden(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite'),
+                TextInput::make('env.DB_PASSWORD')
+                    ->label('Database Password')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The password of your database user. Can be empty.')
+                    ->password()
+                    ->revealable()
+                    ->default(env('DB_PASSWORD'))
+                    ->hidden(fn (Get $get) => $get('env.DB_CONNECTION') === 'sqlite'),
+            ])
+            ->afterValidation(function (Get $get) {
+                $driver = $get('env.DB_CONNECTION');
+                if ($driver !== 'sqlite') {
+                    try {
+                        config()->set('database.connections._panel_install_test', [
+                            'driver' => $driver,
+                            'host' => $get('env.DB_HOST'),
+                            'port' => $get('env.DB_PORT'),
+                            'database' => $get('env.DB_DATABASE'),
+                            'username' => $get('env.DB_USERNAME'),
+                            'password' => $get('env.DB_PASSWORD'),
+                            'charset' => 'utf8mb4',
+                            'collation' => 'utf8mb4_unicode_ci',
+                            'strict' => true,
+                        ]);
+
+                        DB::connection('_panel_install_test')->getPdo();
+                    } catch (PDOException $exception) {
+                        Notification::make()
+                            ->title('Database connection failed')
+                            ->body($exception->getMessage())
+                            ->danger()
+                            ->send();
+
+                        DB::disconnect('_panel_install_test');
+
+                        throw new Halt('Database connection failed');
+                    }
+                }
+            });
+    }
+}

app/Filament/Pages/Installer/Steps/EnvironmentStep.php

@@ -0,0 +1,94 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Set;
+
+class EnvironmentStep
+{
+    public const CACHE_DRIVERS = [
+        'file' => 'Filesystem',
+        'redis' => 'Redis',
+    ];
+
+    public const SESSION_DRIVERS = [
+        'file' => 'Filesystem',
+        'redis' => 'Redis',
+        'database' => 'Database',
+        'cookie' => 'Cookie',
+    ];
+
+    public const QUEUE_DRIVERS = [
+        'sync' => 'Sync',
+        'database' => 'Database',
+        'redis' => 'Redis',
+    ];
+
+    public const DATABASE_DRIVERS = [
+        'sqlite' => 'SQLite',
+        'mariadb' => 'MariaDB',
+        'mysql' => 'MySQL',
+    ];
+
+    public static function make(): Step
+    {
+        return Step::make('environment')
+            ->label('Environment')
+            ->columns()
+            ->schema([
+                TextInput::make('env.APP_NAME')
+                    ->label('App Name')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('This will be the Name of your Panel.')
+                    ->required()
+                    ->default(config('app.name')),
+                TextInput::make('env.APP_URL')
+                    ->label('App URL')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('This will be the URL you access your Panel from.')
+                    ->required()
+                    ->default(config('app.url'))
+                    ->live()
+                    ->afterStateUpdated(fn ($state, Set $set) => $set('env.SESSION_SECURE_COOKIE', str_starts_with($state, 'https://'))),
+                Toggle::make('env.SESSION_SECURE_COOKIE')
+                    ->hidden()
+                    ->default(env('SESSION_SECURE_COOKIE')),
+                ToggleButtons::make('env.CACHE_STORE')
+                    ->label('Cache Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for caching. We recommend "Filesystem".')
+                    ->required()
+                    ->inline()
+                    ->options(self::CACHE_DRIVERS)
+                    ->default(config('cache.default', 'file')),
+                ToggleButtons::make('env.SESSION_DRIVER')
+                    ->label('Session Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for storing sessions. We recommend "Filesystem" or "Database".')
+                    ->required()
+                    ->inline()
+                    ->options(self::SESSION_DRIVERS)
+                    ->default(config('session.driver', 'file')),
+                ToggleButtons::make('env.QUEUE_CONNECTION')
+                    ->label('Queue Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for handling queues. We recommend "Sync" or "Database".')
+                    ->required()
+                    ->inline()
+                    ->options(self::QUEUE_DRIVERS)
+                    ->default(config('queue.default', 'database')),
+                ToggleButtons::make('env.DB_CONNECTION')
+                    ->label('Database Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for the panel database. We recommend "SQLite".')
+                    ->required()
+                    ->inline()
+                    ->options(self::DATABASE_DRIVERS)
+                    ->default(config('database.default', 'sqlite')),
+            ]);
+    }
+}

app/Filament/Pages/Installer/Steps/RedisStep.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use Exception;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+use Filament\Notifications\Notification;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Support\Facades\Redis;
+
+class RedisStep
+{
+    public static function make(): Step
+    {
+        return Step::make('redis')
+            ->label('Redis')
+            ->columns()
+            ->schema([
+                TextInput::make('env.REDIS_HOST')
+                    ->label('Redis Host')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The host of your redis server. Make sure it is reachable.')
+                    ->required()
+                    ->default(config('database.redis.default.host')),
+                TextInput::make('env.REDIS_PORT')
+                    ->label('Redis Port')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The port of your redis server.')
+                    ->required()
+                    ->default(config('database.redis.default.port')),
+                TextInput::make('env.REDIS_USERNAME')
+                    ->label('Redis Username')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The name of your redis user. Can be empty')
+                    ->default(config('database.redis.default.username')),
+                TextInput::make('env.REDIS_PASSWORD')
+                    ->label('Redis Password')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The password for your redis user. Can be empty.')
+                    ->password()
+                    ->revealable()
+                    ->default(config('database.redis.default.password')),
+            ])
+            ->afterValidation(function (Get $get) {
+                try {
+                    config()->set('database.redis._panel_install_test', [
+                        'host' => $get('env.REDIS_HOST'),
+                        'username' => $get('env.REDIS_USERNAME'),
+                        'password' => $get('env.REDIS_PASSWORD'),
+                        'port' => $get('env.REDIS_PORT'),
+                    ]);
+
+                    Redis::connection('_panel_install_test')->command('ping');
+                } catch (Exception $exception) {
+                    Notification::make()
+                        ->title('Redis connection failed')
+                        ->body($exception->getMessage())
+                        ->danger()
+                        ->send();
+
+                    throw new Halt('Redis connection failed');
+                }
+            });
+    }
+}

app/Filament/Pages/Installer/Steps/RequirementsStep.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Livewire\Installer\Steps;
+namespace App\Filament\Pages\Installer\Steps;
 
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
@@ -10,20 +10,18 @@ use Filament\Support\Exceptions\Halt;
 
 class RequirementsStep
 {
-    public const MIN_PHP_VERSION = '8.2';
-
     public static function make(): Step
     {
-        $correctPhpVersion = version_compare(PHP_VERSION, self::MIN_PHP_VERSION) >= 0;
+        $correctPhpVersion = version_compare(PHP_VERSION, '8.2.0') >= 0;
 
         $fields = [
             Section::make('PHP Version')
-                ->description(self::MIN_PHP_VERSION . ' or newer')
+                ->description('8.2 or newer')
                 ->icon($correctPhpVersion ? 'tabler-check' : 'tabler-x')
                 ->iconColor($correctPhpVersion ? 'success' : 'danger')
                 ->schema([
                     Placeholder::make('')
-                        ->content('Your PHP Version is ' . PHP_VERSION . '.'),
+                        ->content('Your PHP Version ' . ($correctPhpVersion ? 'is' : 'needs to be') .' 8.2 or newer.'),
                 ]),
         ];
 
@@ -82,7 +80,7 @@ class RequirementsStep
                         ->danger()
                         ->send();
 
-                    throw new Halt('Some requirements are missing');
+                    throw new Halt();
                 }
             });
     }

app/Filament/Pages/Settings.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Pages;
+namespace App\Filament\Pages;
 
 use App\Models\Backup;
 use App\Notifications\MailTested;
@@ -8,9 +8,7 @@ use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Actions\Action as FormAction;
-use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\TagsInput;
@@ -23,14 +21,11 @@ use Filament\Forms\Form;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Notifications\Notification;
+use Filament\Pages\Concerns\HasUnsavedDataChangesAlert;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
-use Filament\Support\Enums\MaxWidth;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Notification as MailNotification;
-use Illuminate\Support\HtmlString;
 
 /**
  * @property Form $form
@@ -38,11 +33,11 @@ use Illuminate\Support\HtmlString;
 class Settings extends Page implements HasForms
 {
     use EnvironmentWriterTrait;
+    use HasUnsavedDataChangesAlert;
     use InteractsWithForms;
     use InteractsWithHeaderActions;
 
     protected static ?string $navigationIcon = 'tabler-settings';
-
     protected static ?string $navigationGroup = 'Advanced';
 
     protected static string $view = 'filament.pages.settings';
@@ -71,11 +66,10 @@ class Settings extends Page implements HasForms
                         ->label('General')
                         ->icon('tabler-home')
                         ->schema($this->generalSettings()),
-                    Tab::make('captcha')
-                        ->label('Captcha')
+                    Tab::make('recaptcha')
+                        ->label('reCAPTCHA')
                         ->icon('tabler-shield')
-                        ->schema($this->captchaSettings())
-                        ->columns(3),
+                        ->schema($this->recaptchaSettings()),
                     Tab::make('mail')
                         ->label('Mail')
                         ->icon('tabler-mail')
@@ -98,6 +92,7 @@ class Settings extends Page implements HasForms
             TextInput::make('APP_NAME')
                 ->label('App Name')
                 ->required()
+                ->alphaNum()
                 ->default(env('APP_NAME', 'Pelican')),
             TextInput::make('APP_FAVICON')
                 ->label('App Favicon')
@@ -151,7 +146,7 @@ class Settings extends Page implements HasForms
                 ->separator()
                 ->splitKeys(['Tab', ' '])
                 ->placeholder('New IP or IP Range')
-                ->default(env('TRUSTED_PROXIES', implode(',', config('trustedproxy.proxies'))))
+                ->default(env('TRUSTED_PROXIES', config('trustedproxy.proxies')))
                 ->hintActions([
                     FormAction::make('clear')
                         ->label('Clear')
@@ -164,76 +159,56 @@ class Settings extends Page implements HasForms
                         ->label('Set to Cloudflare IPs')
                         ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(function (Client $client, Set $set) {
-                            $ips = collect();
-                            try {
-                                $response = $client->request(
-                                    'GET',
-                                    'https://api.cloudflare.com/client/v4/ips',
-                                    config('panel.guzzle')
-                                );
-                                if ($response->getStatusCode() === 200) {
-                                    $result = json_decode($response->getBody(), true)['result'];
-                                    foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
-                                        $ips->push(...data_get($result, $value));
-                                    }
-                                    $ips->unique();
-                                }
-                            } catch (GuzzleException $e) {
-                            }
-
-                            $set('TRUSTED_PROXIES', $ips->values()->all());
-                        }),
+                        ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [
+                            '173.245.48.0/20',
+                            '103.21.244.0/22',
+                            '103.22.200.0/22',
+                            '103.31.4.0/22',
+                            '141.101.64.0/18',
+                            '108.162.192.0/18',
+                            '190.93.240.0/20',
+                            '188.114.96.0/20',
+                            '197.234.240.0/22',
+                            '198.41.128.0/17',
+                            '162.158.0.0/15',
+                            '104.16.0.0/13',
+                            '104.24.0.0/14',
+                            '172.64.0.0/13',
+                            '131.0.72.0/22',
+                        ])),
                 ]),
-            Select::make('FILAMENT_WIDTH')
-                ->label('Display Width')
-                ->native(false)
-                ->options(MaxWidth::class)
-                ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
         ];
     }
 
-    private function captchaSettings(): array
+    private function recaptchaSettings(): array
     {
         return [
-            Toggle::make('TURNSTILE_ENABLED')
-                ->label('Enable Turnstile Captcha?')
+            Toggle::make('RECAPTCHA_ENABLED')
+                ->label('Enable reCAPTCHA?')
                 ->inline(false)
-                ->columnSpan(1)
                 ->onIcon('tabler-check')
                 ->offIcon('tabler-x')
                 ->onColor('success')
                 ->offColor('danger')
                 ->live()
                 ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_ENABLED', (bool) $state))
-                ->default(env('TURNSTILE_ENABLED', config('turnstile.turnstile_enabled'))),
-            Placeholder::make('info')
-                ->columnSpan(2)
-                ->content(new HtmlString('<p>You can generate the keys on your <u><a href="https://developers.cloudflare.com/turnstile/get-started/#get-a-sitekey-and-secret-key" target="_blank">Cloudflare Dashboard</a></u>. A Cloudflare account is required.</p>')),
-            TextInput::make('TURNSTILE_SITE_KEY')
-                ->label('Site Key')
+                ->afterStateUpdated(fn ($state, Set $set) => $set('RECAPTCHA_ENABLED', (bool) $state))
+                ->default(env('RECAPTCHA_ENABLED', config('recaptcha.enabled'))),
+            TextInput::make('RECAPTCHA_DOMAIN')
+                ->label('Domain')
                 ->required()
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->default(env('TURNSTILE_SITE_KEY', config('turnstile.turnstile_site_key')))
-                ->placeholder('1x00000000000000000000AA'),
-            TextInput::make('TURNSTILE_SECRET_KEY')
+                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
+                ->default(env('RECAPTCHA_DOMAIN', config('recaptcha.domain'))),
+            TextInput::make('RECAPTCHA_WEBSITE_KEY')
+                ->label('Website Key')
+                ->required()
+                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
+                ->default(env('RECAPTCHA_WEBSITE_KEY', config('recaptcha.website_key'))),
+            TextInput::make('RECAPTCHA_SECRET_KEY')
                 ->label('Secret Key')
                 ->required()
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->default(env('TURNSTILE_SECRET_KEY', config('turnstile.secret_key')))
-                ->placeholder('1x0000000000000000000000000000000AA'),
-            Toggle::make('TURNSTILE_VERIFY_DOMAIN')
-                ->label('Verify domain?')
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_VERIFY_DOMAIN', (bool) $state))
-                ->default(env('TURNSTILE_VERIFY_DOMAIN', config('turnstile.turnstile_verify_domain'))),
+                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
+                ->default(env('RECAPTCHA_SECRET_KEY', config('recaptcha.secret_key'))),
         ];
     }
 
@@ -547,39 +522,6 @@ class Settings extends Page implements HasForms
                         ->suffix('Requests Per Minute')
                         ->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
                 ]),
-            Section::make('Server')
-                ->description('Settings for Servers.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    Toggle::make('PANEL_EDITABLE_SERVER_DESCRIPTIONS')
-                        ->label('Allow Users to edit Server Descriptions?')
-                        ->onIcon('tabler-check')
-                        ->offIcon('tabler-x')
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->columnSpanFull()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
-                        ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
-                ]),
-            Section::make('Webhook')
-                ->description('Configure how often old webhook logs should be pruned.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    TextInput::make('APP_WEBHOOK_PRUNE_DAYS')
-                        ->label('Prune age')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->maxValue(365)
-                        ->suffix('Days')
-                        ->default(env('APP_WEBHOOK_PRUNE_DAYS', config('panel.webhook.prune_days'))),
-                ]),
         ];
     }
 
@@ -588,6 +530,11 @@ class Settings extends Page implements HasForms
         return 'data';
     }
 
+    protected function hasUnsavedDataChangesAlert(): bool
+    {
+        return true;
+    }
+
     public function save(): void
     {
         try {
@@ -601,6 +548,8 @@ class Settings extends Page implements HasForms
             Artisan::call('config:clear');
             Artisan::call('queue:restart');
 
+            $this->rememberData();
+
             $this->redirect($this->getUrl());
 
             Notification::make()

app/Filament/Resources/ApiKeyResource.php

@@ -1,32 +1,35 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Resources;
 
-use App\Filament\Admin\Resources\ApiKeyResource\Pages;
+use App\Filament\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Model;
 
 class ApiKeyResource extends Resource
 {
     protected static ?string $model = ApiKey::class;
-
     protected static ?string $label = 'API Key';
-
     protected static ?string $navigationIcon = 'tabler-key';
-
     protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
     {
-        return static::getModel()::where('key_type', ApiKey::TYPE_APPLICATION)->count() ?: null;
+        return static::getModel()::where('key_type', '2')->count() ?: null;
     }
 
-    public static function canEdit(Model $record): bool
+    public static function canEdit($record): bool
     {
         return false;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
@@ -11,7 +11,6 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Database\Eloquent\Model;
 
 class CreateApiKey extends CreateRecord
 {
@@ -42,7 +41,7 @@ class CreateApiKey extends CreateRecord
                         'md' => 2,
                     ])
                     ->schema(
-                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -88,20 +87,4 @@ class CreateApiKey extends CreateRecord
                     ->columnSpanFull(),
             ]);
     }
-
-    protected function handleRecordCreation(array $data): Model
-    {
-        $permissions = [];
-
-        foreach (ApiKey::getPermissionList() as $permission) {
-            if (isset($data['permissions_' . $permission])) {
-                $permissions[$permission] = intval($data['permissions_' . $permission]);
-                unset($data['permissions_' . $permission]);
-            }
-        }
-
-        $data['permissions'] = $permissions;
-
-        return parent::handleRecordCreation($data);
-    }
 }

app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
+namespace App\Filament\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use App\Tables\Columns\DateTimeColumn;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
@@ -36,13 +34,15 @@ class ListApiKeys extends ListRecords
                     ->hidden()
                     ->searchable(),
 
-                DateTimeColumn::make('last_used_at')
+                TextColumn::make('last_used_at')
                     ->label('Last Used')
                     ->placeholder('Not Used')
+                    ->dateTime()
                     ->sortable(),
 
-                DateTimeColumn::make('created_at')
+                TextColumn::make('created_at')
                     ->label('Created')
+                    ->dateTime()
                     ->sortable(),
 
                 TextColumn::make('user.username')
@@ -51,23 +51,13 @@ class ListApiKeys extends ListRecords
             ])
             ->actions([
                 DeleteAction::make(),
-            ])
-            ->emptyStateIcon('tabler-key')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('No API Keys')
-            ->emptyStateActions([
-                CreateAction::make('create')
-                    ->label('Create API Key')
-                    ->button(),
             ]);
     }
 
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make()
-                ->label('Create API Key')
-                ->hidden(fn () => ApiKey::where('key_type', ApiKey::TYPE_APPLICATION)->count() <= 0),
+            Actions\CreateAction::make(),
         ];
     }
 }

app/Filament/Resources/DatabaseHostResource.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Filament\Admin\Resources;
+namespace App\Filament\Resources;
 
-use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+use App\Filament\Resources\DatabaseHostResource\Pages;
 use App\Models\DatabaseHost;
 use Filament\Resources\Resource;
 
@@ -10,10 +10,9 @@ class DatabaseHostResource extends Resource
 {
     protected static ?string $model = DatabaseHost::class;
 
-    protected static ?string $label = 'Database Host';
+    protected static ?string $label = 'Databases';
 
     protected static ?string $navigationIcon = 'tabler-database';
-
     protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
@@ -21,6 +20,13 @@ class DatabaseHostResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php

@@ -1,24 +1,21 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
+use App\Filament\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
-use Filament\Forms;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
+use Filament\Forms\Components\Section;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
-use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Model;
 use PDOException;
 
 class CreateDatabaseHost extends CreateRecord
 {
-    private HostCreationService $service;
-
     protected static string $resource = DatabaseHostResource::class;
 
     protected ?string $heading = 'Database Hosts';
@@ -27,11 +24,6 @@ class CreateDatabaseHost extends CreateRecord
 
     protected ?string $subheading = '(database servers that can have individual databases)';
 
-    public function boot(HostCreationService $service): void
-    {
-        $this->service = $service;
-    }
-
     public function form(Form $form): Form
     {
         return $form
@@ -78,13 +70,12 @@ class CreateDatabaseHost extends CreateRecord
                             ->revealable()
                             ->maxLength(255)
                             ->required(),
-                        Select::make('node_ids')
-                            ->multiple()
+                        Select::make('node_id')
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Nodes')
-                            ->relationship('nodes', 'name'),
+                            ->label('Linked Node')
+                            ->relationship('node', 'name'),
                     ]),
             ]);
     }
@@ -103,18 +94,21 @@ class CreateDatabaseHost extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        try {
-            return $this->service->handle($data);
-        } catch (PDOException $exception) {
+        return resolve(HostCreationService::class)->handle($data);
+    }
+
+    public function exception($e, $stopPropagation): void
+    {
+        if ($e instanceof PDOException) {
             Notification::make()
                 ->title('Error connecting to database host')
-                ->body($exception->getMessage())
+                ->body($e->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')
                 ->danger()
                 ->send();
 
-            throw new Halt();
+            $stopPropagation();
         }
     }
 }

app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php

@@ -1,20 +1,19 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
-use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
+use App\Filament\Resources\DatabaseHostResource;
+use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
 use Filament\Actions;
-use Filament\Forms;
-use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
+use Filament\Resources\Pages\EditRecord;
+use Filament\Forms;
+use Filament\Forms\Components\Section;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
-use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Model;
 use PDOException;
 
@@ -22,13 +21,6 @@ class EditDatabaseHost extends EditRecord
 {
     protected static string $resource = DatabaseHostResource::class;
 
-    private HostUpdateService $hostUpdateService;
-
-    public function boot(HostUpdateService $hostUpdateService): void
-    {
-        $this->hostUpdateService = $hostUpdateService;
-    }
-
     public function form(Form $form): Form
     {
         return $form
@@ -73,13 +65,12 @@ class EditDatabaseHost extends EditRecord
                             ->password()
                             ->revealable()
                             ->maxLength(255),
-                        Select::make('nodes')
-                            ->multiple()
+                        Select::make('node_id')
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Nodes')
-                            ->relationship('nodes', 'name'),
+                            ->label('Linked Node')
+                            ->relationship('node', 'name'),
                     ]),
             ]);
     }
@@ -101,33 +92,28 @@ class EditDatabaseHost extends EditRecord
 
     public function getRelationManagers(): array
     {
-        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
-            return [
-                DatabasesRelationManager::class,
-            ];
-        }
-
-        return [];
+        return [
+            DatabasesRelationManager::class,
+        ];
     }
 
-    protected function handleRecordUpdate(Model $record, array $data): Model
+    protected function handleRecordUpdate($record, array $data): Model
     {
-        if (!$record instanceof DatabaseHost) {
-            return $record;
-        }
+        return resolve(HostUpdateService::class)->handle($record->id, $data);
+    }
 
-        try {
-            return $this->hostUpdateService->handle($record, $data);
-        } catch (PDOException $exception) {
+    public function exception($e, $stopPropagation): void
+    {
+        if ($e instanceof PDOException) {
             Notification::make()
                 ->title('Error connecting to database host')
-                ->body($exception->getMessage())
+                ->body($e->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')
                 ->danger()
                 ->send();
 
-            throw new Halt();
+            $stopPropagation();
         }
     }
 }

app/Filament/Resources/DatabaseHostResource/Pages/ListDatabaseHosts.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
+namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHostResource;
-use App\Models\DatabaseHost;
+use App\Filament\Resources\DatabaseHostResource;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\TextColumn;
@@ -32,17 +30,13 @@ class ListDatabaseHosts extends ListRecords
                     ->sortable(),
                 TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('databases_count')
-                    ->counts('databases')
-                    ->icon('tabler-database')
-                    ->label('Databases'),
-                TextColumn::make('nodes.name')
-                    ->icon('tabler-server-2')
-                    ->badge()
-                    ->placeholder('No Nodes')
+                TextColumn::make('max_databases')
+                    ->numeric()
+                    ->sortable(),
+                TextColumn::make('node.name')
+                    ->numeric()
                     ->sortable(),
             ])
-            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
             ->actions([
                 EditAction::make(),
             ])
@@ -51,23 +45,13 @@ class ListDatabaseHosts extends ListRecords
                     DeleteBulkAction::make()
                         ->authorize(fn () => auth()->user()->can('delete databasehost')),
                 ]),
-            ])
-            ->emptyStateIcon('tabler-database')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('No Database Hosts')
-            ->emptyStateActions([
-                CreateAction::make('create')
-                    ->label('Create Database Host')
-                    ->button(),
             ]);
     }
 
     protected function getHeaderActions(): array
     {
         return [
-            Actions\CreateAction::make('create')
-                ->label('Create Database Host')
-                ->hidden(fn () => DatabaseHost::count() <= 0),
+            Actions\CreateAction::make('create')->label('New Database Host'),
         ];
     }
 }

app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php

@@ -1,15 +1,13 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
+namespace App\Filament\Resources\DatabaseHostResource\RelationManagers;
 
 use App\Models\Database;
 use App\Services\Databases\DatabasePasswordService;
-use App\Tables\Columns\DateTimeColumn;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Actions\DeleteAction;
 use Filament\Tables\Actions\ViewAction;
@@ -24,62 +22,45 @@ class DatabasesRelationManager extends RelationManager
     {
         return $form
             ->schema([
-                TextInput::make('database')
-                    ->columnSpanFull(),
+                TextInput::make('database')->columnSpanFull(),
                 TextInput::make('username'),
                 TextInput::make('password')
-                    ->password()
-                    ->revealable()
                     ->hintAction(
                         Action::make('rotate')
                             ->icon('tabler-refresh')
                             ->requiresConfirmation()
                             ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
-                            ->authorize(fn (Database $database) => auth()->user()->can('update database', $database))
                     )
                     ->formatStateUsing(fn (Database $database) => $database->password),
-                TextInput::make('remote')
-                    ->label('Connections From')
-                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
-                TextInput::make('max_connections')
-                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                TextInput::make('remote')->label('Connections From'),
+                TextInput::make('max_connections'),
                 TextInput::make('JDBC')
                     ->label('JDBC Connection String')
                     ->columnSpanFull()
-                    ->password()
-                    ->revealable()
                     ->formatStateUsing(fn (Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
             ]);
     }
-
     public function table(Table $table): Table
     {
         return $table
             ->recordTitleAttribute('servers')
             ->columns([
-                TextColumn::make('database')
-                    ->icon('tabler-database'),
-                TextColumn::make('username')
-                    ->icon('tabler-user'),
-                TextColumn::make('remote')
-                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
+                TextColumn::make('database')->icon('tabler-database'),
+                TextColumn::make('username')->icon('tabler-user'),
+                TextColumn::make('remote'),
                 TextColumn::make('server.name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
-                TextColumn::make('max_connections')
-                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
-                DateTimeColumn::make('created_at'),
+                TextColumn::make('max_connections'),
+                TextColumn::make('created_at')->dateTime(),
             ])
             ->actions([
-                DeleteAction::make()
-                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database)),
-                ViewAction::make()
-                    ->color('primary')
-                    ->hidden(fn () => !auth()->user()->can('viewList database')),
+                DeleteAction::make(),
+                ViewAction::make()->color('primary'),
             ]);
     }
 
-    protected function rotatePassword(DatabasePasswordService $service, Database $database, Set $set, Get $get): void
+    protected function rotatePassword(DatabasePasswordService $service, Database $database, $set, $get): void
     {
         $newPassword = $service->handle($database);
         $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database');