ci(release): bump version

.dockerignore

@@ -1,10 +0,0 @@
-.git
-node_modules
-vendor
-database/database.sqlite
-storage/debugbar/*.json
-storage/logs/*.log
-storage/framework/cache/data/*
-storage/framework/sessions/*
-storage/framework/testing
-storage/framework/views/*.php

.env.example

@@ -1,7 +1,37 @@
 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
+APP_ENVIRONMENT_ONLY=true
+
+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
+
+# Set this to true, and set start & end ports to auto create allocations.
+PANEL_CLIENT_ALLOCATIONS_ENABLED=false
+PANEL_CLIENT_ALLOCATIONS_RANGE_START=
+PANEL_CLIENT_ALLOCATIONS_RANGE_END=

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -33,6 +33,7 @@ body:
   attributes:
     label: Panel Version
     description: Version number of your Panel (latest is not a version)
+    placeholder: 1.4.0
   validations:
     required: true
 
@@ -41,6 +42,7 @@ body:
   attributes:
     label: Wings Version
     description: Version number of your Wings (latest is not a version)
+    placeholder: 1.4.2
   validations:
     required: true
 
@@ -66,7 +68,7 @@ body:
       Run the following command to collect logs on your system.
 
       Wings: `sudo wings diagnostics`
-      Panel: `tail -n 150 /var/www/pelican/storage/logs/laravel-$(date +%F).log | curl -X POST -F 'c=@-' paste.pelistuff.com`
+      Panel: `tail -n 150 /var/www/pelican/storage/logs/laravel-$(date +%F).log | nc pelipaste.com 99`
     placeholder: "https://pelipaste.com/a1h6z"
     render: bash
   validations:

.github/docker/entrypoint.sh

@@ -1,65 +1,81 @@
 #!/bin/ash -e
+cd /app
 
-#mkdir -p /var/log/supervisord/ /var/log/php8/ \
+mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php8/ \
+  && chmod 777 /var/log/panel/logs/ \
+  && ln -s /app/storage/logs/ /var/log/panel/
 
 ## check for .env file and generate app keys if missing
-if [ -f /pelican-data/.env ]; then
+if [ -f /app/var/.env ]; then
   echo "external vars exist."
-  rm -rf /var/www/html/.env
+  rm -rf /app/.env
+  ln -s /app/var/.env /app/
 else
   echo "external vars don't exist."
-  rm -rf /var/www/html/.env
-  touch /pelican-data/.env
+  rm -rf /app/.env
+  touch /app/var/.env
 
   ## manually generate a key because key generate --force fails
   if [ -z $APP_KEY ]; then
      echo -e "Generating key."
      APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
      echo -e "Generated app key: $APP_KEY"
-     echo -e "APP_KEY=$APP_KEY" > /pelican-data/.env
+     echo -e "APP_KEY=$APP_KEY" > /app/var/.env
   else
     echo -e "APP_KEY exists in environment, using that."
-    echo -e "APP_KEY=$APP_KEY" > /pelican-data/.env
+    echo -e "APP_KEY=$APP_KEY" > /app/var/.env
   fi
 
-  ## enable installer
-  echo -e "APP_INSTALLED=false" >> /pelican-data/.env
+  ln -s /app/var/.env /app/
 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
-  echo "Generating APP_KEY..."
-  php artisan key:generate --force
+echo "Checking if https is required."
+if [ -f /etc/nginx/http.d/panel.conf ]; then
+  echo "Using nginx config already in place."
+  if [ $LE_EMAIL ]; then
+    echo "Checking for cert update"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  else
+    echo "No letsencrypt email is set"
+  fi
 else
-  echo "APP_KEY is already set."
+  echo "Checking if letsencrypt email is set."
+  if [ -z $LE_EMAIL ]; then
+    echo "No letsencrypt email is set using http config."
+    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
+  else
+    echo "writing ssl config"
+    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
+    echo "updating ssl config for domain"
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
+    echo "generating certs"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  fi
+  echo "Removing the default nginx config"
+  rm -rf /etc/nginx/http.d/default.conf
 fi
 
+if [[ -z $DB_PORT ]]; then
+  echo -e "DB_PORT not specified, defaulting to 3306"
+  DB_PORT=3306
+fi
+
+## check for DB up before starting the panel
+echo "Checking database status."
+until nc -z -v -w30 $DB_HOST $DB_PORT
+do
+  echo "Waiting for database connection..."
+  # wait for 1 seconds before check again
+  sleep 1
+done
+
 ## make sure the db is set up
-echo -e "Migrating Database"
-php artisan migrate --force
-
-echo -e "Optimizing Filament"
-php artisan filament:optimize
+echo -e "Migrating and Seeding D.B"
+php artisan migrate --seed --force
 
 ## start cronjobs for the queue
 echo -e "Starting cron jobs."
 crond -L /var/log/crond -l 5
 
-export SUPERVISORD_CADDY=false
-
-## disable caddy if SKIP_CADDY is set
-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
-
-echo "Starting Supervisord"
+echo -e "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,15 +25,15 @@ autostart=true
 autorestart=true
 
 [program:queue-worker]
-command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3
-user=www-data
+command=/usr/local/bin/php /app/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
+user=nginx
 autostart=true
 autorestart=true
 
-[program:caddy]
-command=caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
-autostart=%(ENV_SUPERVISORD_CADDY)s
-autorestart=%(ENV_SUPERVISORD_CADDY)s
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
+autostart=true
+autorestart=true
 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:
@@ -30,6 +32,7 @@ jobs:
       APP_KEY: ThisIsARandomStringForTests12345
       APP_TIMEZONE: UTC
       APP_URL: http://localhost/
+      APP_ENVIRONMENT_ONLY: "true"
       CACHE_DRIVER: array
       MAIL_MAILER: array
       SESSION_DRIVER: array
@@ -38,8 +41,6 @@ jobs:
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: root
-      GUZZLE_TIMEOUT: 60
-      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -103,6 +104,7 @@ jobs:
       APP_KEY: ThisIsARandomStringForTests12345
       APP_TIMEZONE: UTC
       APP_URL: http://localhost/
+      APP_ENVIRONMENT_ONLY: "true"
       CACHE_DRIVER: array
       MAIL_MAILER: array
       SESSION_DRIVER: array
@@ -111,8 +113,6 @@ jobs:
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: root
-      GUZZLE_TIMEOUT: 60
-      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -166,14 +166,13 @@ jobs:
       APP_KEY: ThisIsARandomStringForTests12345
       APP_TIMEZONE: UTC
       APP_URL: http://localhost/
+      APP_ENVIRONMENT_ONLY: "true"
       CACHE_DRIVER: array
       MAIL_MAILER: array
       SESSION_DRIVER: array
       QUEUE_CONNECTION: sync
       DB_CONNECTION: sqlite
       DB_DATABASE: testing.sqlite
-      GUZZLE_TIMEOUT: 60
-      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4

.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,12 +0,0 @@
-{
-    admin off
-    email {$ADMIN_EMAIL}
-}
-
-{$APP_URL} {
-    root * /var/www/html/public
-    encode gzip
-
-    php_fastcgi 127.0.0.1:9000
-    file_server
-}

Dockerfile

@@ -1,59 +1,41 @@
-# Pelican Production Dockerfile
-
-FROM node:20-alpine AS yarn
-#FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
-
-WORKDIR /build
-
+# Stage 0:
+# Build the assets that are needed for the frontend. This build stage is then discarded
+# since we won't need NodeJS anymore in the future. This Docker image ships a final production
+# level distribution
+FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine
+WORKDIR /app
 COPY . ./
-
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile \
+RUN yarn install --frozen-lockfile \
     && yarn run build:production
 
-FROM php:8.3-fpm-alpine
-# FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
+# Stage 1:
+# Build the actual container with all of the needed PHP dependencies that will run the application.
+FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
+WORKDIR /app
+COPY . ./
+COPY --from=0 /app/public/assets ./public/assets
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev icu-dev certbot certbot-nginx \
+    && docker-php-ext-configure zip \
+    && docker-php-ext-install bcmath gd intl pdo_mysql zip \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && cp .env.example .env \
+    && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \
+    && chmod 777 -R bootstrap storage \
+    && composer install --no-dev --optimize-autoloader \
+    && rm -rf .env bootstrap/cache/*.php \
+    && mkdir -p /app/storage/logs/ \
+    && chown -R nginx:nginx .
 
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
+RUN rm /usr/local/etc/php-fpm.conf \
+    && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+    && echo "0 23 * * * certbot renew --nginx --quiet" >> /var/spool/cron/crontabs/root \
+    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
+    && mkdir -p /var/run/php /var/run/nginx
 
-WORKDIR /var/www/html
-
-# Install dependencies
-RUN apk update && apk add --no-cache \
-    libpng-dev libjpeg-turbo-dev freetype-dev libzip-dev icu-dev \
-    zip unzip curl \
-    caddy ca-certificates supervisor \
-    && docker-php-ext-install bcmath gd intl zip opcache pcntl posix pdo_mysql
-
-# Copy the Caddyfile to the container
-COPY Caddyfile /etc/caddy/Caddyfile
-
-# Copy the application code to the container
-COPY . .
-
-COPY --from=yarn /build/public/assets ./public/assets
-
-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 ./
-
-# Add scheduler to cron
-RUN echo "* * * * * php /var/www/html/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data -
-
-## supervisord config and log dir
-RUN cp .github/docker/supervisord.conf /etc/supervisord.conf && \
-    mkdir /var/log/supervisord/
-
-HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost/up || exit 1
+COPY .github/docker/default.conf /etc/nginx/http.d/default.conf
+COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf
+COPY .github/docker/supervisord.conf /etc/supervisord.conf
 
 EXPOSE 80 443
-
-VOLUME /pelican-data
-
 ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

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

@@ -3,27 +3,162 @@
 namespace App\Console\Commands\Environment;
 
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+use App\Traits\Commands\EnvironmentWriterTrait;
 use Illuminate\Support\Facades\Artisan;
 
 class AppSettingsCommand extends Command
 {
+    use EnvironmentWriterTrait;
+
+    public const CACHE_DRIVERS = [
+        'file' => 'Filesystem (recommended)',
+        'redis' => 'Redis',
+    ];
+
+    public const SESSION_DRIVERS = [
+        'file' => 'Filesystem (recommended)',
+        'redis' => 'Redis',
+        'database' => 'Database',
+        'cookie' => 'Cookie',
+    ];
+
+    public const QUEUE_DRIVERS = [
+        'database' => 'Database (recommended)',
+        'redis' => 'Redis',
+        'sync' => 'Synchronous',
+    ];
+
     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.}
+                            {--cache= : The cache driver backend to use.}
+                            {--session= : The session driver backend to use.}
+                            {--queue= : The queue driver backend to use.}
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}
+                            {--settings-ui= : Enable or disable the settings UI.}';
 
-    public function handle(): void
+    protected array $variables = [];
+
+    /**
+     * AppSettingsCommand constructor.
+     */
+    public function __construct(private Kernel $console)
     {
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     *
+     * @throws \App\Exceptions\PanelException
+     */
+    public function handle(): int
+    {
+        $this->variables['APP_TIMEZONE'] = 'UTC';
+
+        $this->output->comment(__('commands.appsettings.comment.url'));
+        $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
+            'Application URL',
+            config('app.url', 'https://example.com')
+        );
+
+        $selected = config('cache.default', 'file');
+        $this->variables['CACHE_STORE'] = $this->option('cache') ?? $this->choice(
+            'Cache Driver',
+            self::CACHE_DRIVERS,
+            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
+        );
+
+        $selected = config('session.driver', 'file');
+        $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
+            'Session Driver',
+            self::SESSION_DRIVERS,
+            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
+        );
+
+        $selected = config('queue.default', 'database');
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
+            'Queue Driver',
+            self::QUEUE_DRIVERS,
+            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
+        );
+
+        if (!is_null($this->option('settings-ui'))) {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true';
+        } else {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(__('commands.appsettings.comment.settings_ui'), true) ? 'false' : 'true';
+        }
+
+        // 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';
+        }
+
+        $redisUsed = count(collect($this->variables)->filter(function ($item) {
+            return $item === 'redis';
+        })) !== 0;
+
+        if ($redisUsed) {
+            $this->requestRedisSettings();
+        }
+
         $path = base_path('.env');
         if (!file_exists($path)) {
-            $this->comment('Copying example .env file');
             copy($path . '.example', $path);
         }
 
+        $this->writeToEnvironment($this->variables);
+
         if (!config('app.key')) {
-            $this->comment('Generating app key');
             Artisan::call('key:generate');
         }
 
-        Artisan::call('filament:optimize');
+        if ($this->variables['QUEUE_CONNECTION'] !== 'sync') {
+            $this->call('p:environment:queue-service', [
+                '--use-redis' => $redisUsed,
+            ]);
+        }
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+
+    /**
+     * Request redis connection details and verify them.
+     */
+    private function requestRedisSettings(): void
+    {
+        $this->output->note(__('commands.appsettings.redis.note'));
+        $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
+            'Redis Host',
+            config('database.redis.default.host')
+        );
+
+        $askForRedisPassword = true;
+        if (!empty(config('database.redis.default.password'))) {
+            $this->variables['REDIS_PASSWORD'] = config('database.redis.default.password');
+            $askForRedisPassword = $this->confirm('It seems a password is already defined for Redis, would you like to change it?');
+        }
+
+        if ($askForRedisPassword) {
+            $this->output->comment(__('commands.appsettings.redis.comment'));
+            $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
+                'Redis Password'
+            );
+        }
+
+        if (empty($this->variables['REDIS_PASSWORD'])) {
+            $this->variables['REDIS_PASSWORD'] = 'null';
+        }
+
+        $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
+            'Redis Port',
+            config('database.redis.default.port')
+        );
     }
 }

app/Console/Commands/Environment/CacheSettingsCommand.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class CacheSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem (default)',
-        'database' => 'Database',
-        'redis' => 'Redis',
-    ];
-
-    protected $description = 'Configure cache settings for the Panel.';
-
-    protected $signature = 'p:environment:cache
-                            {--driver= : The cache driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    protected array $variables = [];
-
-    /**
-     * CacheSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('cache.default', 'file');
-        $this->variables['CACHE_STORE'] = $this->option('driver') ?? $this->choice(
-            'Cache Driver',
-            self::CACHE_DRIVERS,
-            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['CACHE_STORE'] === 'redis') {
-            $this->requestRedisSettings();
-
-            if (config('queue.default') !== 'sync') {
-                $this->call('p:environment:queue-service', [
-                    '--overwrite' => true,
-                ]);
-            }
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands\Environment;
 
-use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
+use App\Traits\Commands\EnvironmentWriterTrait;
 
 class DatabaseSettingsCommand extends Command
 {
@@ -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

@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands\Environment;
 
-use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
+use App\Traits\Commands\EnvironmentWriterTrait;
 
 class EmailSettingsCommand extends Command
 {
@@ -61,8 +61,6 @@ class EmailSettingsCommand extends Command
 
         $this->writeToEnvironment($this->variables);
 
-        $this->call('queue:restart');
-
         $this->line('Updating stored environment configuration file.');
         $this->line('');
     }
@@ -70,7 +68,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 +99,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 +120,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 +131,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/Environment/QueueSettingsCommand.php

@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class QueueSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database (default)',
-        'redis' => 'Redis',
-        'sync' => 'Synchronous',
-    ];
-
-    protected $description = 'Configure queue settings for the Panel.';
-
-    protected $signature = 'p:environment:queue
-                            {--driver= : The queue driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    protected array $variables = [];
-
-    /**
-     * QueueSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('queue.default', 'database');
-        $this->variables['QUEUE_CONNECTION'] = $this->option('driver') ?? $this->choice(
-            'Queue Driver',
-            self::QUEUE_DRIVERS,
-            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['QUEUE_CONNECTION'] === 'redis') {
-            $this->requestRedisSettings();
-
-            $this->call('p:environment:queue-service', [
-                '--overwrite' => true,
-            ]);
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -14,6 +14,7 @@ class QueueWorkerServiceCommand extends Command
         {--service-name= : Name of the queue worker service.}
         {--user= : The user that PHP runs under.}
         {--group= : The group that PHP runs under.}
+        {--use-redis : Whether redis is used.}
         {--overwrite : Force overwrite if the service file already exists.}';
 
     public function handle(): void
@@ -31,8 +32,7 @@ class QueueWorkerServiceCommand extends Command
         $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
         $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
 
-        $redisUsed = config('queue.default') === 'redis' || config('session.driver') === 'redis' || config('cache.default') === 'redis';
-        $afterRedis = $redisUsed ? '
+        $afterRedis = $this->option('use-redis') ? '
 After=redis-server.service' : '';
 
         $basePath = base_path();

app/Console/Commands/Environment/RedisSetupCommand.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class RedisSetupCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    protected $description = 'Configure the Panel to use Redis as cache, queue and session driver.';
-
-    protected $signature = 'p:redis:setup
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    protected array $variables = [];
-
-    /**
-     * RedisSetupCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $this->variables['CACHE_STORE'] = 'redis';
-        $this->variables['QUEUE_CONNECTION'] = 'redis';
-        $this->variables['SESSION_DRIVERS'] = 'redis';
-
-        $this->requestRedisSettings();
-
-        $this->call('p:environment:queue-service', [
-            '--overwrite' => true,
-        ]);
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}

app/Console/Commands/Environment/SessionSettingsCommand.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class SessionSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem (default)',
-        'redis' => 'Redis',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-    ];
-
-    protected $description = 'Configure session settings for the Panel.';
-
-    protected $signature = 'p:environment:session
-                            {--driver= : The session driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    protected array $variables = [];
-
-    /**
-     * SessionSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('session.driver', 'file');
-        $this->variables['SESSION_DRIVER'] = $this->option('driver') ?? $this->choice(
-            'Session Driver',
-            self::SESSION_DRIVERS,
-            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['SESSION_DRIVER'] === 'redis') {
-            $this->requestRedisSettings();
-
-            if (config('queue.default') !== 'sync') {
-                $this->call('p:environment:queue-service', [
-                    '--overwrite' => true,
-                ]);
-            }
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}

app/Console/Commands/Maintenance/PruneImagesCommand.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Maintenance;
-
-use App\Models\Node;
-use Exception;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
-
-class PruneImagesCommand extends Command
-{
-    protected $signature = 'p:maintenance:prune-images {node?}';
-
-    protected $description = 'Clean up all dangling docker images to clear up disk space.';
-
-    public function handle(): void
-    {
-        $node = $this->argument('node');
-
-        if (empty($node)) {
-            $nodes = Node::all();
-            /** @var Node $node */
-            foreach ($nodes as $node) {
-                $this->cleanupImages($node);
-            }
-        } else {
-            $this->cleanupImages((int) $node);
-        }
-    }
-
-    private function cleanupImages(int|Node $node): void
-    {
-        if (!$node instanceof Node) {
-            $node = Node::query()->findOrFail($node);
-        }
-
-        try {
-            $response = Http::daemon($node)
-                ->connectTimeout(5)
-                ->timeout(30)
-                ->delete('/api/system/docker/image/prune')
-                ->json() ?? [];
-
-            if (empty($response) || $response['ImagesDeleted'] === null) {
-                $this->warn("Node {$node->id}: No images to clean up.");
-
-                return;
-            }
-
-            $count = count($response['ImagesDeleted']);
-
-            $useBinaryPrefix = config('panel.use_binary_prefix');
-            $space = round($useBinaryPrefix ? $response['SpaceReclaimed'] / 1024 / 1024 : $response['SpaceReclaimed'] / 1000 / 1000, 2) . ($useBinaryPrefix ? ' MiB' : ' MB');
-
-            $this->info("Node {$node->id}: Cleaned up {$count} dangling docker images. ({$space})");
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-        }
-    }
-}

app/Console/Commands/Overrides/SeedCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Overrides;
 
-use App\Traits\Commands\RequiresDatabaseMigrations;
+use App\Console\RequiresDatabaseMigrations;
 use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;
 
 class SeedCommand extends BaseSeedCommand

app/Console/Commands/Overrides/UpCommand.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands\Overrides;
 
-use App\Traits\Commands\RequiresDatabaseMigrations;
+use App\Console\RequiresDatabaseMigrations;
 use Illuminate\Foundation\Console\UpCommand as BaseUpCommand;
 
 class UpCommand extends BaseUpCommand

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/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/Commands/User/DeleteUserCommand.php

@@ -15,7 +15,7 @@ class DeleteUserCommand extends Command
     public function handle(): int
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
-        Assert::notEmpty($search, 'Search term should not be empty.');
+        Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
 
         $results = User::query()
             ->where('id', 'LIKE', "$search%")
@@ -42,8 +42,6 @@ class DeleteUserCommand extends Command
             if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                 return $this->handle();
             }
-
-            $deleteUser = User::query()->findOrFail($deleteUser);
         } else {
             if (count($results) > 1) {
                 $this->error(trans('command/messages.user.multiple_found'));
@@ -55,7 +53,8 @@ class DeleteUserCommand extends Command
         }
 
         if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
-            $deleteUser->delete();
+            $user = User::query()->findOrFail($deleteUser);
+            $user->delete();
 
             $this->info(trans('command/messages.user.deleted'));
         }

app/Console/Commands/User/MakeUserCommand.php

@@ -52,7 +52,7 @@ class MakeUserCommand extends Command
             ['UUID', $user->uuid],
             ['Email', $user->email],
             ['Username', $user->username],
-            ['Admin', $user->isRootAdmin() ? 'Yes' : 'No'],
+            ['Admin', $user->root_admin ? 'Yes' : 'No'],
         ]);
 
         return 0;

app/Console/Kernel.php

@@ -2,16 +2,13 @@
 
 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 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;
 
 class Kernel extends ConsoleKernel
 {
@@ -33,12 +30,7 @@ class Kernel extends ConsoleKernel
 
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
-
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
-        $schedule->command(PruneImagesCommand::class)->daily();
-        $schedule->command(CheckEggUpdatesCommand::class)->hourly();
-
-        $schedule->job(new NodeStatistics())->everyFiveSeconds()->withoutOverlapping();
 
         if (config('backups.prune_age')) {
             // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.

app/Console/RequiresDatabaseMigrations.php

@@ -1,16 +1,32 @@
 <?php
 
-namespace App\Traits\Commands;
-
-use App\Traits\CheckMigrationsTrait;
-use Illuminate\Console\Command;
+namespace App\Console;
 
 /**
- * @mixin Command
+ * @mixin \Illuminate\Console\Command
  */
 trait RequiresDatabaseMigrations
 {
-    use CheckMigrationsTrait;
+    /**
+     * Checks if the migrations have finished running by comparing the last migration file.
+     */
+    protected function hasCompletedMigrations(): bool
+    {
+        /** @var \Illuminate\Database\Migrations\Migrator $migrator */
+        $migrator = $this->getLaravel()->make('migrator');
+
+        $files = $migrator->getMigrationFiles(database_path('migrations'));
+
+        if (!$migrator->repositoryExists()) {
+            return false;
+        }
+
+        if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
+            return false;
+        }
+
+        return true;
+    }
 
     /**
      * Throw a massive error into the console to hopefully catch the users attention and get

app/Enums/ContainerStatus.php

@@ -6,14 +6,12 @@ enum ContainerStatus: string
 {
     // Docker Based
     case Created = 'created';
-    case Starting = 'starting';
     case Running = 'running';
     case Restarting = 'restarting';
     case Exited = 'exited';
     case Paused = 'paused';
     case Dead = 'dead';
     case Removing = 'removing';
-    case Stopping = 'stopping';
     case Offline = 'offline';
 
     // HTTP Based
@@ -22,17 +20,15 @@ enum ContainerStatus: string
     public function icon(): string
     {
         return match ($this) {
-
             self::Created => 'tabler-heart-plus',
-            self::Starting => 'tabler-heart-up',
             self::Running => 'tabler-heartbeat',
             self::Restarting => 'tabler-heart-bolt',
             self::Exited => 'tabler-heart-exclamation',
             self::Paused => 'tabler-heart-pause',
-            self::Dead, self::Offline => 'tabler-heart-x',
+            self::Dead => 'tabler-heart-x',
             self::Removing => 'tabler-heart-down',
-            self::Missing => 'tabler-heart-search',
-            self::Stopping => 'tabler-heart-minus',
+            self::Missing => 'tabler-heart-question',
+            self::Offline => 'tabler-heart-bolt',
         };
     }
 
@@ -40,7 +36,6 @@ enum ContainerStatus: string
     {
         return match ($this) {
             self::Created => 'primary',
-            self::Starting => 'warning',
             self::Running => 'success',
             self::Restarting => 'info',
             self::Exited => 'danger',
@@ -48,7 +43,6 @@ enum ContainerStatus: string
             self::Dead => 'danger',
             self::Removing => 'warning',
             self::Missing => 'danger',
-            self::Stopping => 'warning',
             self::Offline => 'gray',
         };
     }

app/Enums/RolePermissionModels.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum RolePermissionModels: string
-{
-    case ApiKey = 'apiKey';
-    case DatabaseHost = 'databaseHost';
-    case Database = 'database';
-    case Egg = 'egg';
-    case Mount = 'mount';
-    case Node = 'node';
-    case Role = 'role';
-    case Server = 'server';
-    case User = 'user';
-}

app/Enums/RolePermissionPrefixes.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum RolePermissionPrefixes: string
-{
-    case ViewAny = 'viewList';
-    case View = 'view';
-    case Create = 'create';
-    case Update = 'update';
-    case Delete = 'delete';
-}

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/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/DisplayException.php

@@ -4,8 +4,6 @@ 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;
@@ -16,11 +14,8 @@ 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';
 
     /**
@@ -51,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()
@@ -60,14 +55,13 @@ class DisplayException extends PanelException implements HttpExceptionInterface
                 ->danger()
                 ->send();
 
-            return false;
+            return;
         }
 
         if ($request->expectsJson()) {
             return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
         }
 
-        // @phpstan-ignore-next-line
         app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
 
         return redirect()->back()->withInput();
@@ -79,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 {
@@ -91,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/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/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/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/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/Extensions/Backups/BackupManager.php

@@ -34,7 +34,7 @@ class BackupManager
     /**
      * 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());
     }
@@ -145,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/Themes/Theme.php

@@ -4,17 +4,17 @@ namespace App\Extensions\Themes;
 
 class Theme
 {
-    public function js(string $path): string
+    public function js($path): string
     {
         return sprintf('<script src="%s"></script>' . PHP_EOL, $this->getUrl($path));
     }
 
-    public function css(string $path): string
+    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(string $path): string
+    protected function getUrl($path): string
     {
         return '/themes/panel/' . ltrim($path, '/');
     }

app/Filament/Clusters/Settings.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Filament\Clusters;
+
+use Filament\Clusters\Cluster;
+
+class Settings extends Cluster
+{
+    protected static ?string $navigationIcon = 'tabler-settings';
+}

app/Filament/Pages/Dashboard.php

@@ -28,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->versionData()['version'],
-            'latestVersion' => $this->softwareVersionService->getPanel(),
-            '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(),
@@ -71,7 +67,7 @@ class Dashboard extends Page
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url($this->softwareVersionService->getDonations(), true)
+                    ->url($softwareVersionService->getDonations(), true)
                     ->color('success'),
             ],
             'helpActions' => [

app/Filament/Pages/Installer/PanelInstaller.php

@@ -1,183 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer;
-
-use App\Filament\Pages\Dashboard;
-use App\Filament\Pages\Installer\Steps\AdminUserStep;
-use App\Filament\Pages\Installer\Steps\CompletedStep;
-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\Actions\Action;
-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\SimplePage;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Routing\Redirector;
-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 InteractsWithForms;
-
-    public array $data = [];
-
-    protected static string $view = 'filament.pages.installer';
-
-    private User $user;
-
-    public function getMaxWidth(): MaxWidth|string
-    {
-        return MaxWidth::SevenExtraLarge;
-    }
-
-    public static function isInstalled(): bool
-    {
-        // This defaults to true so existing panels count as "installed"
-        return env('APP_INSTALLED', true);
-    }
-
-    public function mount(): void
-    {
-        abort_if(self::isInstalled(), 404);
-
-        $this->form->fill();
-    }
-
-    protected function getFormSchema(): array
-    {
-        return [
-            Wizard::make([
-                RequirementsStep::make(),
-                EnvironmentStep::make($this),
-                DatabaseStep::make($this),
-                RedisStep::make($this)
-                    ->hidden(fn (Get $get) => $get('env_general.SESSION_DRIVER') != 'redis' && $get('env_general.QUEUE_CONNECTION') != 'redis' && $get('env_general.CACHE_STORE') != 'redis'),
-                AdminUserStep::make($this),
-                CompletedStep::make(),
-            ])
-                ->persistStepInQueryString()
-                ->nextAction(fn (Action $action) => $action->keyBindings('enter'))
-                ->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';
-    }
-
-    public function submit(): Redirector|RedirectResponse
-    {
-        // Disable installer
-        $this->writeToEnvironment(['APP_INSTALLED' => 'true']);
-
-        // Login user
-        $this->user ??= User::all()->filter(fn ($user) => $user->isRootAdmin())->first();
-        auth()->guard()->login($this->user, true);
-
-        // Redirect to admin panel
-        return redirect(Dashboard::getUrl());
-    }
-
-    public function writeToEnv(string $key): void
-    {
-        try {
-            $variables = array_get($this->data, $key);
-            $this->writeToEnvironment($variables);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->title('Could not write to .env file')
-                ->body($exception->getMessage())
-                ->danger()
-                ->persistent()
-                ->send();
-
-            throw new Halt('Error while writing .env file');
-        }
-
-        Artisan::call('config:clear');
-    }
-
-    public function runMigrations(string $driver): void
-    {
-        try {
-            Artisan::call('migrate', [
-                '--force' => true,
-                '--seed' => true,
-                '--database' => $driver,
-            ]);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->title('Migrations failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->persistent()
-                ->send();
-
-            throw new Halt('Error while running migrations');
-        }
-
-        if (!$this->hasCompletedMigrations()) {
-            Notification::make()
-                ->title('Migrations failed')
-                ->danger()
-                ->persistent()
-                ->send();
-
-            throw new Halt('Migrations failed');
-        }
-    }
-
-    public function createAdminUser(UserCreationService $userCreationService): void
-    {
-        try {
-            $userData = array_get($this->data, 'user');
-            $userData['root_admin'] = true;
-            $this->user = $userCreationService->handle($userData);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->title('Could not create admin user')
-                ->body($exception->getMessage())
-                ->danger()
-                ->persistent()
-                ->send();
-
-            throw new Halt('Error while creating admin user');
-        }
-    }
-}

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

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use App\Services\Users\UserCreationService;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-
-class AdminUserStep
-{
-    public static function make(PanelInstaller $installer): 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(),
-            ])
-            ->afterValidation(fn (UserCreationService $service) => $installer->createAdminUser($service));
-    }
-}

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

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Support\HtmlString;
-use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
-
-class CompletedStep
-{
-    public static function make(): Step
-    {
-        return Step::make('complete')
-            ->label('Setup complete')
-            ->schema([
-                Placeholder::make('')
-                    ->content(new HtmlString('The setup is nearly complete!<br>As last step you need to create a new cronjob that runs every minute to process specific tasks, such as session cleanup and scheduled tasks, and also create a queue worker.')),
-                TextInput::make('crontab')
-                    ->label(new HtmlString('Run the following command to setup your crontab. Note that <code>www-data</code> is your webserver user. On some systems this username might be different!'))
-                    ->disabled()
-                    ->hintAction(CopyAction::make())
-                    ->default('(crontab -l -u www-data 2>/dev/null; echo "* * * * * php ' . base_path() . '/artisan schedule:run >> /dev/null 2>&1") | crontab -u www-data -'),
-                TextInput::make('queueService')
-                    ->label(new HtmlString('To setup the queue worker service you simply have to run the following command.'))
-                    ->disabled()
-                    ->hintAction(CopyAction::make())
-                    ->default('sudo php ' . base_path() . '/artisan p:environment:queue-service'),
-                Placeholder::make('')
-                    ->content('After you finished these two last tasks you can click on "Finish" and use your new panel! Have fun!'),
-            ]);
-    }
-}

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

@@ -1,109 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-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\DB;
-
-class DatabaseStep
-{
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('database')
-            ->label('Database')
-            ->columns()
-            ->schema([
-                TextInput::make('env_database.DB_DATABASE')
-                    ->label(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite' ? 'Database Path' : 'Database Name')
-                    ->columnSpanFull()
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip(fn (Get $get) => $get('env_general.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_general.DB_CONNECTION') === 'sqlite' ? 'database.sqlite' : 'panel')),
-                TextInput::make('env_database.DB_HOST')
-                    ->label('Database Host')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The host of your database. Make sure it is reachable.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_HOST', '127.0.0.1') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
-                TextInput::make('env_database.DB_PORT')
-                    ->label('Database Port')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The port of your database.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
-                    ->numeric()
-                    ->minValue(1)
-                    ->maxValue(65535)
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_PORT', 3306) : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
-                TextInput::make('env_database.DB_USERNAME')
-                    ->label('Database Username')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The name of your database user.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_USERNAME', 'pelican') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
-                TextInput::make('env_database.DB_PASSWORD')
-                    ->label('Database Password')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The password of your database user. Can be empty.')
-                    ->password()
-                    ->revealable()
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_PASSWORD') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
-            ])
-            ->afterValidation(function (Get $get) use ($installer) {
-                $driver = $get('env_general.DB_CONNECTION');
-
-                if (!self::testConnection($driver, $get('env_database.DB_HOST'), $get('env_database.DB_PORT'), $get('env_database.DB_DATABASE'), $get('env_database.DB_USERNAME'), $get('env_database.DB_PASSWORD'))) {
-                    throw new Halt('Database connection failed');
-                }
-
-                $installer->writeToEnv('env_database');
-
-                $installer->runMigrations($driver);
-            });
-    }
-
-    private static function testConnection(string $driver, ?string $host, null|string|int $port, ?string $database, ?string $username, ?string $password): bool
-    {
-        if ($driver === 'sqlite') {
-            return true;
-        }
-
-        try {
-            config()->set('database.connections._panel_install_test', [
-                'driver' => $driver,
-                'host' => $host,
-                'port' => $port,
-                'database' => $database,
-                'username' => $username,
-                'password' => $password,
-                'charset' => 'utf8mb4',
-                'collation' => 'utf8mb4_unicode_ci',
-                'strict' => true,
-            ]);
-
-            DB::connection('_panel_install_test')->getPdo();
-        } catch (Exception $exception) {
-            DB::disconnect('_panel_install_test');
-
-            Notification::make()
-                ->title('Database connection failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -1,98 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use App\Traits\EnvironmentWriterTrait;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Set;
-
-class EnvironmentStep
-{
-    use EnvironmentWriterTrait;
-
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem',
-        'redis' => 'Redis',
-    ];
-
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-        'redis' => 'Redis',
-    ];
-
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database',
-        'sync' => 'Sync',
-        'redis' => 'Redis',
-    ];
-
-    public const DATABASE_DRIVERS = [
-        'sqlite' => 'SQLite',
-        'mariadb' => 'MariaDB',
-        'mysql' => 'MySQL',
-    ];
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('environment')
-            ->label('Environment')
-            ->columns()
-            ->schema([
-                TextInput::make('env_general.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_general.APP_URL')
-                    ->label('App URL')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('This will be the URL you access your Panel from.')
-                    ->required()
-                    ->default(url(''))
-                    ->live()
-                    ->afterStateUpdated(fn ($state, Set $set) => $set('env_general.SESSION_SECURE_COOKIE', str_starts_with($state, 'https://') ? 'true' : 'false')),
-                TextInput::make('env_general.SESSION_SECURE_COOKIE')
-                    ->hidden()
-                    ->default(str_starts_with(url(''), 'https://') ? 'true' : 'false'),
-                ToggleButtons::make('env_general.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_general.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_general.QUEUE_CONNECTION')
-                    ->label('Queue Driver')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The driver used for handling queues. We recommend "Database".')
-                    ->required()
-                    ->inline()
-                    ->options(self::QUEUE_DRIVERS)
-                    ->default(config('queue.default', 'database')),
-                ToggleButtons::make('env_general.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')),
-            ])
-            ->afterValidation(fn () => $installer->writeToEnv('env_general'));
-    }
-}

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

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use App\Traits\EnvironmentWriterTrait;
-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
-{
-    use EnvironmentWriterTrait;
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('redis')
-            ->label('Redis')
-            ->columns()
-            ->schema([
-                TextInput::make('env_redis.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.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.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.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) use ($installer) {
-                if (!self::testConnection($get('env_redis.REDIS_HOST'), $get('env_redis.REDIS_PORT'), $get('env_redis.REDIS_USERNAME'), $get('env_redis.REDIS_PASSWORD'))) {
-                    throw new Halt('Redis connection failed');
-                }
-
-                $installer->writeToEnv('env_redis');
-            });
-    }
-
-    private static function testConnection(string $host, null|string|int $port, ?string $username, ?string $password): bool
-    {
-        try {
-            config()->set('database.redis._panel_install_test', [
-                'host' => $host,
-                'port' => $port,
-                'username' => $username,
-                'password' => $password,
-            ]);
-
-            Redis::connection('_panel_install_test')->command('ping');
-        } catch (Exception $exception) {
-            Notification::make()
-                ->title('Redis connection failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -1,89 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Notifications\Notification;
-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;
-
-        $fields = [
-            Section::make('PHP Version')
-                ->description(self::MIN_PHP_VERSION . ' or newer')
-                ->icon($correctPhpVersion ? 'tabler-check' : 'tabler-x')
-                ->iconColor($correctPhpVersion ? 'success' : 'danger')
-                ->schema([
-                    Placeholder::make('')
-                        ->content('Your PHP Version is ' . PHP_VERSION . '.'),
-                ]),
-        ];
-
-        $phpExtensions = [
-            'BCMath' => extension_loaded('bcmath'),
-            'cURL' => extension_loaded('curl'),
-            'GD' => extension_loaded('gd'),
-            'intl' => extension_loaded('intl'),
-            'mbstring' => extension_loaded('mbstring'),
-            'MySQL' => extension_loaded('pdo_mysql'),
-            'SQLite3' => extension_loaded('pdo_sqlite'),
-            'XML' => extension_loaded('xml'),
-            'Zip' => extension_loaded('zip'),
-        ];
-        $allExtensionsInstalled = !in_array(false, $phpExtensions);
-
-        $fields[] = Section::make('PHP Extensions')
-            ->description(implode(', ', array_keys($phpExtensions)))
-            ->icon($allExtensionsInstalled ? 'tabler-check' : 'tabler-x')
-            ->iconColor($allExtensionsInstalled ? 'success' : 'danger')
-            ->schema([
-                Placeholder::make('')
-                    ->content('All needed PHP Extensions are installed.')
-                    ->visible($allExtensionsInstalled),
-                Placeholder::make('')
-                    ->content('The following PHP Extensions are missing: ' . implode(', ', array_keys($phpExtensions, false)))
-                    ->visible(!$allExtensionsInstalled),
-            ]);
-
-        $folderPermissions = [
-            'Storage' => substr(sprintf('%o', fileperms(base_path('storage/'))), -4) >= 755,
-            'Cache' => substr(sprintf('%o', fileperms(base_path('bootstrap/cache/'))), -4) >= 755,
-        ];
-        $correctFolderPermissions = !in_array(false, $folderPermissions);
-
-        $fields[] = Section::make('Folder Permissions')
-            ->description(implode(', ', array_keys($folderPermissions)))
-            ->icon($correctFolderPermissions ? 'tabler-check' : 'tabler-x')
-            ->iconColor($correctFolderPermissions ? 'success' : 'danger')
-            ->schema([
-                Placeholder::make('')
-                    ->content('All Folders have the correct permissions.')
-                    ->visible($correctFolderPermissions),
-                Placeholder::make('')
-                    ->content('The following Folders have wrong permissions: ' . implode(', ', array_keys($folderPermissions, false)))
-                    ->visible(!$correctFolderPermissions),
-            ]);
-
-        return Step::make('requirements')
-            ->label('Server Requirements')
-            ->schema($fields)
-            ->afterValidation(function () use ($correctPhpVersion, $allExtensionsInstalled, $correctFolderPermissions) {
-                if (!$correctPhpVersion || !$allExtensionsInstalled || !$correctFolderPermissions) {
-                    Notification::make()
-                        ->title('Some requirements are missing!')
-                        ->danger()
-                        ->send();
-
-                    throw new Halt('Some requirements are missing');
-                }
-            });
-    }
-}

app/Filament/Pages/Settings.php

@@ -1,597 +0,0 @@
-<?php
-
-namespace App\Filament\Pages;
-
-use App\Models\Backup;
-use App\Notifications\MailTested;
-use App\Traits\EnvironmentWriterTrait;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Forms\Components\Actions\Action as FormAction;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Concerns\InteractsWithForms;
-use Filament\Forms\Contracts\HasForms;
-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 Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Notification as MailNotification;
-
-/**
- * @property Form $form
- */
-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';
-
-    public ?array $data = [];
-
-    public function mount(): void
-    {
-        $this->form->fill();
-    }
-
-    public static function canAccess(): bool
-    {
-        return auth()->user()->can('view settings');
-    }
-
-    protected function getFormSchema(): array
-    {
-        return [
-            Tabs::make('Tabs')
-                ->columns()
-                ->persistTabInQueryString()
-                ->disabled(fn () => !auth()->user()->can('update settings'))
-                ->tabs([
-                    Tab::make('general')
-                        ->label('General')
-                        ->icon('tabler-home')
-                        ->schema($this->generalSettings()),
-                    Tab::make('recaptcha')
-                        ->label('reCAPTCHA')
-                        ->icon('tabler-shield')
-                        ->schema($this->recaptchaSettings()),
-                    Tab::make('mail')
-                        ->label('Mail')
-                        ->icon('tabler-mail')
-                        ->schema($this->mailSettings()),
-                    Tab::make('backup')
-                        ->label('Backup')
-                        ->icon('tabler-box')
-                        ->schema($this->backupSettings()),
-                    Tab::make('misc')
-                        ->label('Misc')
-                        ->icon('tabler-tool')
-                        ->schema($this->miscSettings()),
-                ]),
-        ];
-    }
-
-    private function generalSettings(): array
-    {
-        return [
-            TextInput::make('APP_NAME')
-                ->label('App Name')
-                ->required()
-                ->default(env('APP_NAME', 'Pelican')),
-            TextInput::make('APP_FAVICON')
-                ->label('App Favicon')
-                ->hintIcon('tabler-question-mark')
-                ->hintIconTooltip('Favicons should be placed in the public folder, located in the root panel directory.')
-                ->required()
-                ->default(env('APP_FAVICON', '/pelican.ico')),
-            Toggle::make('APP_DEBUG')
-                ->label('Enable Debug Mode?')
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('APP_DEBUG', (bool) $state))
-                ->default(env('APP_DEBUG', config('app.debug'))),
-            ToggleButtons::make('FILAMENT_TOP_NAVIGATION')
-                ->label('Navigation')
-                ->inline()
-                ->options([
-                    false => 'Sidebar',
-                    true => 'Topbar',
-                ])
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('FILAMENT_TOP_NAVIGATION', (bool) $state))
-                ->default(env('FILAMENT_TOP_NAVIGATION', config('panel.filament.top-navigation'))),
-            ToggleButtons::make('PANEL_USE_BINARY_PREFIX')
-                ->label('Unit prefix')
-                ->inline()
-                ->options([
-                    false => 'Decimal Prefix (MB/ GB)',
-                    true => 'Binary Prefix (MiB/ GiB)',
-                ])
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_USE_BINARY_PREFIX', (bool) $state))
-                ->default(env('PANEL_USE_BINARY_PREFIX', config('panel.use_binary_prefix'))),
-            ToggleButtons::make('APP_2FA_REQUIRED')
-                ->label('2FA Requirement')
-                ->inline()
-                ->options([
-                    0 => 'Not required',
-                    1 => 'Required for only Admins',
-                    2 => 'Required for all Users',
-                ])
-                ->formatStateUsing(fn ($state): int => (int) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('APP_2FA_REQUIRED', (int) $state))
-                ->default(env('APP_2FA_REQUIRED', config('panel.auth.2fa_required'))),
-            TagsInput::make('TRUSTED_PROXIES')
-                ->label('Trusted Proxies')
-                ->separator()
-                ->splitKeys(['Tab', ' '])
-                ->placeholder('New IP or IP Range')
-                ->default(env('TRUSTED_PROXIES', config('trustedproxy.proxies')))
-                ->hintActions([
-                    FormAction::make('clear')
-                        ->label('Clear')
-                        ->color('danger')
-                        ->icon('tabler-trash')
-                        ->requiresConfirmation()
-                        ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [])),
-                    FormAction::make('cloudflare')
-                        ->label('Set to Cloudflare IPs')
-                        ->icon('tabler-brand-cloudflare')
-                        ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->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',
-                        ])),
-                ]),
-        ];
-    }
-
-    private function recaptchaSettings(): array
-    {
-        return [
-            Toggle::make('RECAPTCHA_ENABLED')
-                ->label('Enable reCAPTCHA?')
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->live()
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->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('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('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_SECRET_KEY', config('recaptcha.secret_key'))),
-        ];
-    }
-
-    private function mailSettings(): array
-    {
-        return [
-            ToggleButtons::make('MAIL_MAILER')
-                ->label('Mail Driver')
-                ->columnSpanFull()
-                ->inline()
-                ->options([
-                    'log' => 'Print mails to Log',
-                    'smtp' => 'SMTP Server',
-                    'sendmail' => 'sendmail Binary',
-                    'mailgun' => 'Mailgun',
-                    'mandrill' => 'Mandrill',
-                    'postmark' => 'Postmark',
-                ])
-                ->live()
-                ->default(env('MAIL_MAILER', config('mail.default')))
-                ->hintAction(
-                    FormAction::make('test')
-                        ->label('Send Test Mail')
-                        ->icon('tabler-send')
-                        ->hidden(fn (Get $get) => $get('MAIL_MAILER') === 'log')
-                        ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(function () {
-                            try {
-                                MailNotification::route('mail', auth()->user()->email)
-                                    ->notify(new MailTested(auth()->user()));
-
-                                Notification::make()
-                                    ->title('Test Mail sent')
-                                    ->success()
-                                    ->send();
-                            } catch (Exception $exception) {
-                                Notification::make()
-                                    ->title('Test Mail failed')
-                                    ->body($exception->getMessage())
-                                    ->danger()
-                                    ->send();
-                            }
-                        })
-                ),
-            Section::make('"From" Settings')
-                ->description('Set the Address and Name used as "From" in mails.')
-                ->columns()
-                ->schema([
-                    TextInput::make('MAIL_FROM_ADDRESS')
-                        ->label('From Address')
-                        ->required()
-                        ->email()
-                        ->default(env('MAIL_FROM_ADDRESS', config('mail.from.address'))),
-                    TextInput::make('MAIL_FROM_NAME')
-                        ->label('From Name')
-                        ->required()
-                        ->default(env('MAIL_FROM_NAME', config('mail.from.name'))),
-                ]),
-            Section::make('SMTP Configuration')
-                ->columns()
-                ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp')
-                ->schema([
-                    TextInput::make('MAIL_HOST')
-                        ->label('Host')
-                        ->required()
-                        ->default(env('MAIL_HOST', config('mail.mailers.smtp.host'))),
-                    TextInput::make('MAIL_PORT')
-                        ->label('Port')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(env('MAIL_PORT', config('mail.mailers.smtp.port'))),
-                    TextInput::make('MAIL_USERNAME')
-                        ->label('Username')
-                        ->default(env('MAIL_USERNAME', config('mail.mailers.smtp.username'))),
-                    TextInput::make('MAIL_PASSWORD')
-                        ->label('Password')
-                        ->password()
-                        ->revealable()
-                        ->default(env('MAIL_PASSWORD')),
-                    ToggleButtons::make('MAIL_ENCRYPTION')
-                        ->label('Encryption')
-                        ->inline()
-                        ->options(['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'])
-                        ->default(env('MAIL_ENCRYPTION', config('mail.mailers.smtp.encryption', 'tls'))),
-                ]),
-            Section::make('Mailgun Configuration')
-                ->columns()
-                ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun')
-                ->schema([
-                    TextInput::make('MAILGUN_DOMAIN')
-                        ->label('Domain')
-                        ->required()
-                        ->default(env('MAILGUN_DOMAIN', config('services.mailgun.domain'))),
-                    TextInput::make('MAILGUN_SECRET')
-                        ->label('Secret')
-                        ->required()
-                        ->default(env('MAILGUN_SECRET', config('services.mailgun.secret'))),
-                    TextInput::make('MAILGUN_ENDPOINT')
-                        ->label('Endpoint')
-                        ->required()
-                        ->default(env('MAILGUN_ENDPOINT', config('services.mailgun.endpoint'))),
-                ]),
-        ];
-    }
-
-    private function backupSettings(): array
-    {
-        return [
-            ToggleButtons::make('APP_BACKUP_DRIVER')
-                ->label('Backup Driver')
-                ->columnSpanFull()
-                ->inline()
-                ->options([
-                    Backup::ADAPTER_DAEMON => 'Wings',
-                    Backup::ADAPTER_AWS_S3 => 'S3',
-                ])
-                ->live()
-                ->default(env('APP_BACKUP_DRIVER', config('backups.default'))),
-            Section::make('Throttles')
-                ->description('Configure how many backups can be created in a period. Set period to 0 to disable this throttle.')
-                ->columns()
-                ->schema([
-                    TextInput::make('BACKUP_THROTTLE_LIMIT')
-                        ->label('Limit')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->default(config('backups.throttles.limit')),
-                    TextInput::make('BACKUP_THROTTLE_PERIOD')
-                        ->label('Period')
-                        ->required()
-                        ->numeric()
-                        ->minValue(0)
-                        ->suffix('Seconds')
-                        ->default(config('backups.throttles.period')),
-                ]),
-            Section::make('S3 Configuration')
-                ->columns()
-                ->visible(fn (Get $get) => $get('APP_BACKUP_DRIVER') === Backup::ADAPTER_AWS_S3)
-                ->schema([
-                    TextInput::make('AWS_DEFAULT_REGION')
-                        ->label('Default Region')
-                        ->required()
-                        ->default(config('backups.disks.s3.region')),
-                    TextInput::make('AWS_ACCESS_KEY_ID')
-                        ->label('Access Key ID')
-                        ->required()
-                        ->default(config('backups.disks.s3.key')),
-                    TextInput::make('AWS_SECRET_ACCESS_KEY')
-                        ->label('Secret Access Key')
-                        ->required()
-                        ->default(config('backups.disks.s3.secret')),
-                    TextInput::make('AWS_BACKUPS_BUCKET')
-                        ->label('Bucket')
-                        ->required()
-                        ->default(config('backups.disks.s3.bucket')),
-                    TextInput::make('AWS_ENDPOINT')
-                        ->label('Endpoint')
-                        ->required()
-                        ->default(config('backups.disks.s3.endpoint')),
-                    Toggle::make('AWS_USE_PATH_STYLE_ENDPOINT')
-                        ->label('Use path style endpoint?')
-                        ->inline(false)
-                        ->onIcon('tabler-check')
-                        ->offIcon('tabler-x')
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('AWS_USE_PATH_STYLE_ENDPOINT', (bool) $state))
-                        ->default(env('AWS_USE_PATH_STYLE_ENDPOINT', config('backups.disks.s3.use_path_style_endpoint'))),
-                ]),
-        ];
-    }
-
-    private function miscSettings(): array
-    {
-        return [
-            Section::make('Automatic Allocation Creation')
-                ->description('Toggle if Users can create allocations via the client area.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    Toggle::make('PANEL_CLIENT_ALLOCATIONS_ENABLED')
-                        ->label('Allow Users to create allocations?')
-                        ->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_CLIENT_ALLOCATIONS_ENABLED', (bool) $state))
-                        ->default(env('PANEL_CLIENT_ALLOCATIONS_ENABLED', config('panel.client_features.allocations.enabled'))),
-                    TextInput::make('PANEL_CLIENT_ALLOCATIONS_RANGE_START')
-                        ->label('Starting Port')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1024)
-                        ->maxValue(65535)
-                        ->visible(fn (Get $get) => $get('PANEL_CLIENT_ALLOCATIONS_ENABLED'))
-                        ->default(env('PANEL_CLIENT_ALLOCATIONS_RANGE_START')),
-                    TextInput::make('PANEL_CLIENT_ALLOCATIONS_RANGE_END')
-                        ->label('Ending Port')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1024)
-                        ->maxValue(65535)
-                        ->visible(fn (Get $get) => $get('PANEL_CLIENT_ALLOCATIONS_ENABLED'))
-                        ->default(env('PANEL_CLIENT_ALLOCATIONS_RANGE_END')),
-                ]),
-            Section::make('Mail Notifications')
-                ->description('Toggle which mail notifications should be sent to Users.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    Toggle::make('PANEL_SEND_INSTALL_NOTIFICATION')
-                        ->label('Server Installed')
-                        ->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_SEND_INSTALL_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_INSTALL_NOTIFICATION', config('panel.email.send_install_notification'))),
-                    Toggle::make('PANEL_SEND_REINSTALL_NOTIFICATION')
-                        ->label('Server Reinstalled')
-                        ->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_SEND_REINSTALL_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_REINSTALL_NOTIFICATION', config('panel.email.send_reinstall_notification'))),
-                ]),
-            Section::make('Connections')
-                ->description('Timeouts used when making requests.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    TextInput::make('GUZZLE_TIMEOUT')
-                        ->label('Request Timeout')
-                        ->required()
-                        ->numeric()
-                        ->minValue(15)
-                        ->maxValue(60)
-                        ->suffix('Seconds')
-                        ->default(env('GUZZLE_TIMEOUT', config('panel.guzzle.timeout'))),
-                    TextInput::make('GUZZLE_CONNECT_TIMEOUT')
-                        ->label('Connect Timeout')
-                        ->required()
-                        ->numeric()
-                        ->minValue(5)
-                        ->maxValue(60)
-                        ->suffix('Seconds')
-                        ->default(env('GUZZLE_CONNECT_TIMEOUT', config('panel.guzzle.connect_timeout'))),
-                ]),
-            Section::make('Activity Logs')
-                ->description('Configure how often old activity logs should be pruned and whether admin activities should be logged.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    TextInput::make('APP_ACTIVITY_PRUNE_DAYS')
-                        ->label('Prune age')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->maxValue(365)
-                        ->suffix('Days')
-                        ->default(env('APP_ACTIVITY_PRUNE_DAYS', config('activity.prune_days'))),
-                    Toggle::make('APP_ACTIVITY_HIDE_ADMIN')
-                        ->label('Hide admin activities?')
-                        ->inline(false)
-                        ->onIcon('tabler-check')
-                        ->offIcon('tabler-x')
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('APP_ACTIVITY_HIDE_ADMIN', (bool) $state))
-                        ->default(env('APP_ACTIVITY_HIDE_ADMIN', config('activity.hide_admin_activity'))),
-                ]),
-            Section::make('API')
-                ->description('Defines the rate limit for the number of requests per minute that can be executed.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    TextInput::make('APP_API_CLIENT_RATELIMIT')
-                        ->label('Client API Rate Limit')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->suffix('Requests Per Minute')
-                        ->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
-                    TextInput::make('APP_API_APPLICATION_RATELIMIT')
-                        ->label('Application API Rate Limit')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->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'))),
-                ]),
-
-        ];
-    }
-
-    protected function getFormStatePath(): ?string
-    {
-        return 'data';
-    }
-
-    protected function hasUnsavedDataChangesAlert(): bool
-    {
-        return true;
-    }
-
-    public function save(): void
-    {
-        try {
-            $data = $this->form->getState();
-
-            // Convert bools to a string, so they are correctly written to the .env file
-            $data = array_map(fn ($value) => is_bool($value) ? ($value ? 'true' : 'false') : $value, $data);
-
-            $this->writeToEnvironment($data);
-
-            Artisan::call('config:clear');
-            Artisan::call('queue:restart');
-
-            $this->rememberData();
-
-            $this->redirect($this->getUrl());
-
-            Notification::make()
-                ->title('Settings saved')
-                ->success()
-                ->send();
-        } catch (Exception $exception) {
-            Notification::make()
-                ->title('Save failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-        }
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            Action::make('save')
-                ->action('save')
-                ->authorize(fn () => auth()->user()->can('update settings'))
-                ->keyBindings(['mod+s']),
-        ];
-
-    }
-}

app/Filament/Resources/ApiKeyResource.php

@@ -5,28 +5,31 @@ namespace App\Filament\Resources;
 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/ListApiKeys.php

@@ -6,7 +6,6 @@ use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 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;
@@ -52,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

@@ -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

@@ -4,22 +4,18 @@ namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
-use Closure;
-use Exception;
-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 Illuminate\Database\Eloquent\Model;
 use PDOException;
 
 class CreateDatabaseHost extends CreateRecord
 {
-    private HostCreationService $service;
-
     protected static string $resource = DatabaseHostResource::class;
 
     protected ?string $heading = 'Database Hosts';
@@ -28,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
@@ -103,10 +94,10 @@ class CreateDatabaseHost extends CreateRecord
 
     protected function handleRecordCreation(array $data): Model
     {
-        return $this->service->handle($data);
+        return resolve(HostCreationService::class)->handle($data);
     }
 
-    public function exception(Exception $e, Closure $stopPropagation): void
+    public function exception($e, $stopPropagation): void
     {
         if ($e instanceof PDOException) {
             Notification::make()

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

@@ -6,16 +6,14 @@ use App\Filament\Resources\DatabaseHostResource;
 use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
-use Closure;
-use Exception;
 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 Illuminate\Database\Eloquent\Model;
 use PDOException;
 
@@ -23,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,7 +64,8 @@ class EditDatabaseHost extends EditRecord
                             ->helperText('The password for the database user.')
                             ->password()
                             ->revealable()
-                            ->maxLength(255),
+                            ->maxLength(255)
+                            ->required(),
                         Select::make('node_id')
                             ->searchable()
                             ->preload()
@@ -106,16 +98,12 @@ class EditDatabaseHost extends EditRecord
         ];
     }
 
-    protected function handleRecordUpdate(Model $record, array $data): Model
+    protected function handleRecordUpdate($record, array $data): Model
     {
-        if (!$record instanceof DatabaseHost) {
-            return $record;
-        }
-
-        return $this->hostUpdateService->handle($record, $data);
+        return resolve(HostUpdateService::class)->handle($record->id, $data);
     }
 
-    public function exception(Exception $e, Closure $stopPropagation): void
+    public function exception($e, $stopPropagation): void
     {
         if ($e instanceof PDOException) {
             Notification::make()

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

@@ -3,11 +3,9 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Models\DatabaseHost;
 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,41 +30,27 @@ class ListDatabaseHosts extends ListRecords
                     ->sortable(),
                 TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('databases_count')
-                    ->counts('databases')
-                    ->icon('tabler-database')
-                    ->label('Databases'),
+                TextColumn::make('max_databases')
+                    ->numeric()
+                    ->sortable(),
                 TextColumn::make('node.name')
-                    ->icon('tabler-server-2')
-                    ->placeholder('No Nodes')
+                    ->numeric()
                     ->sortable(),
             ])
-            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
             ->actions([
                 EditAction::make(),
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete databasehost')),
+                    DeleteBulkAction::make(),
                 ]),
-            ])
-            ->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

@@ -8,7 +8,6 @@ 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;
@@ -41,7 +40,6 @@ class DatabasesRelationManager extends RelationManager
                     ->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
@@ -62,7 +60,7 @@ class DatabasesRelationManager extends RelationManager
             ]);
     }
 
-    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');

app/Filament/Resources/DatabaseResource.php

@@ -13,7 +13,6 @@ class DatabaseResource extends Resource
     protected static ?string $navigationIcon = 'tabler-database';
 
     protected static bool $shouldRegisterNavigation = false;
-
     protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
@@ -21,6 +20,13 @@ class DatabaseResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php

@@ -21,12 +21,9 @@ class CreateDatabase extends CreateRecord
                     ->searchable()
                     ->preload()
                     ->required(),
-                Select::make('database_host_id')
-                    ->relationship('host', 'name')
-                    ->searchable()
-                    ->selectablePlaceholder(false)
-                    ->preload()
-                    ->required(),
+                TextInput::make('database_host_id')
+                    ->required()
+                    ->numeric(),
                 TextInput::make('database')
                     ->required()
                     ->maxLength(255),

app/Filament/Resources/DatabaseResource/Pages/ListDatabases.php

@@ -4,10 +4,10 @@ namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
 use Filament\Actions;
+use Filament\Tables\Actions\EditAction;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 
@@ -48,8 +48,7 @@ class ListDatabases extends ListRecords
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete database')),
+                    DeleteBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/EggResource.php

@@ -21,6 +21,13 @@ class EggResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getGloballySearchableAttributes(): array
     {
         return ['name', 'tags', 'uuid', 'id'];

app/Filament/Resources/EggResource/Pages/CreateEgg.php

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Resources\EggResource\Pages;
 
-use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Resources\EggResource;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
@@ -16,9 +15,10 @@ use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
-use Filament\Forms\Set;
 use Filament\Resources\Pages\CreateRecord;
+use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
+use Filament\Forms;
+use Filament\Forms\Form;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -27,7 +27,6 @@ class CreateEgg extends CreateRecord
     protected static string $resource = EggResource::class;
 
     protected static bool $canCreateAnother = false;
-
     public function form(Form $form): Form
     {
         return $form
@@ -75,10 +74,9 @@ class CreateEgg extends CreateRecord
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             TextInput::make('update_url')
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('URLs must point directly to the raw .json file.')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->url(),
+                                ->disabled()
+                                ->helperText('Not implemented.')
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             KeyValue::make('docker_images')
                                 ->live()
                                 ->columnSpanFull()
@@ -135,7 +133,7 @@ class CreateEgg extends CreateRecord
                                 ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
@@ -144,7 +142,7 @@ class CreateEgg extends CreateRecord
                                 ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
@@ -156,7 +154,7 @@ class CreateEgg extends CreateRecord
                                         ->debounce(750)
                                         ->maxLength(255)
                                         ->columnSpanFull()
-                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
+                                        ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
                                         )
                                         ->required(),
                                     Textarea::make('description')->columnSpanFull(),
@@ -174,30 +172,7 @@ class CreateEgg extends CreateRecord
                                             Checkbox::make('user_viewable')->label('Viewable'),
                                             Checkbox::make('user_editable')->label('Editable'),
                                         ]),
-                                    TagsInput::make('rules')
-                                        ->columnSpanFull()
-                                        ->placeholder('Add Rule')
-                                        ->reorderable()
-                                        ->suggestions([
-                                            'required',
-                                            'nullable',
-                                            'string',
-                                            'integer',
-                                            'numeric',
-                                            'boolean',
-                                            'alpha',
-                                            'alpha_dash',
-                                            'alpha_num',
-                                            'url',
-                                            'email',
-                                            'regex:',
-                                            'min:',
-                                            'max:',
-                                            'between:',
-                                            'between:1024,65535',
-                                            'in:',
-                                            'in:true,false',
-                                        ]),
+                                    Textarea::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
                     Tab::make('Install Script')
@@ -211,7 +186,7 @@ class CreateEgg extends CreateRecord
                             TextInput::make('script_container')
                                 ->required()
                                 ->maxLength(255)
-                                ->default('ghcr.io/pelican-eggs/installers:debian'),
+                                ->default('alpine:3.4'),
 
                             Select::make('script_entry')
                                 ->selectablePlaceholder(false)

app/Filament/Resources/EggResource/Pages/EditEgg.php

@@ -2,11 +2,9 @@
 
 namespace App\Filament\Resources\EggResource\Pages;
 
-use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Resources\EggResource;
 use App\Filament\Resources\EggResource\RelationManagers\ServersRelationManager;
 use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;
 use Exception;
 use Filament\Actions;
@@ -24,10 +22,12 @@ use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
-use Filament\Forms\Form;
-use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
+use App\Services\Eggs\Sharing\EggExporterService;
+use Filament\Forms;
+use Filament\Forms\Form;
 
 class EditEgg extends EditRecord
 {
@@ -40,7 +40,6 @@ class EditEgg extends EditRecord
                 Tabs::make()->tabs([
                     Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
-                        ->icon('tabler-egg')
                         ->schema([
                             TextInput::make('name')
                                 ->required()
@@ -81,7 +80,6 @@ class EditEgg extends EditRecord
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             Toggle::make('force_outgoing_ip')
-                                ->inline(false)
                                 ->hintIcon('tabler-question-mark')
                                 ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
                                     Required for certain games to work properly when the Node has multiple public IP addresses.
@@ -93,10 +91,8 @@ class EditEgg extends EditRecord
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             TextInput::make('update_url')
-                                ->label('Update URL')
-                                ->url()
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('URLs must point directly to the raw .json file.')
+                                ->disabled()
+                                ->helperText('Not implemented.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             KeyValue::make('docker_images')
                                 ->live()
@@ -107,9 +103,9 @@ class EditEgg extends EditRecord
                                 ->valueLabel('Image URI')
                                 ->helperText('The docker images available to servers using this egg.'),
                         ]),
+
                     Tab::make('Process Management')
                         ->columns()
-                        ->icon('tabler-server-cog')
                         ->schema([
                             Select::make('config_from')
                                 ->label('Copy Settings From')
@@ -132,7 +128,6 @@ class EditEgg extends EditRecord
                         ]),
                     Tab::make('Egg Variables')
                         ->columnSpanFull()
-                        ->icon('tabler-variable')
                         ->schema([
                             Repeater::make('variables')
                                 ->label('')
@@ -147,7 +142,7 @@ class EditEgg extends EditRecord
                                 ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
@@ -156,7 +151,7 @@ class EditEgg extends EditRecord
                                 ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
@@ -168,7 +163,7 @@ class EditEgg extends EditRecord
                                         ->debounce(750)
                                         ->maxLength(255)
                                         ->columnSpanFull()
-                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
+                                        ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
                                         )
                                         ->required(),
                                     Textarea::make('description')->columnSpanFull(),
@@ -186,47 +181,27 @@ class EditEgg extends EditRecord
                                             Checkbox::make('user_viewable')->label('Viewable'),
                                             Checkbox::make('user_editable')->label('Editable'),
                                         ]),
-                                    TagsInput::make('rules')
-                                        ->columnSpanFull()
-                                        ->placeholder('Add Rule')
-                                        ->reorderable()
-                                        ->suggestions([
-                                            'required',
-                                            'nullable',
-                                            'string',
-                                            'integer',
-                                            'numeric',
-                                            'boolean',
-                                            'alpha',
-                                            'alpha_dash',
-                                            'alpha_num',
-                                            'url',
-                                            'email',
-                                            'regex:',
-                                            'min:',
-                                            'max:',
-                                            'between:',
-                                            'between:1024,65535',
-                                            'in:',
-                                            'in:true,false',
-                                        ]),
+                                    TextInput::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
                     Tab::make('Install Script')
                         ->columns(3)
-                        ->icon('tabler-file-download')
                         ->schema([
+
                             Select::make('copy_script_from')
                                 ->placeholder('None')
                                 ->relationship('scriptFrom', 'name', ignoreRecord: true),
+
                             TextInput::make('script_container')
                                 ->required()
                                 ->maxLength(255)
                                 ->default('alpine:3.4'),
+
                             TextInput::make('script_entry')
                                 ->required()
                                 ->maxLength(255)
                                 ->default('ash'),
+
                             MonacoEditor::make('script_install')
                                 ->label('Install Script')
                                 ->columnSpanFull()
@@ -234,6 +209,7 @@ class EditEgg extends EditRecord
                                 ->language('shell')
                                 ->view('filament.plugins.monaco-editor'),
                         ]),
+
                 ])->columnSpanFull()->persistTabInQueryString(),
             ]);
     }
@@ -244,13 +220,14 @@ class EditEgg extends EditRecord
             Actions\DeleteAction::make('deleteEgg')
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
                 ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete' : 'In Use'),
+
             Actions\Action::make('exportEgg')
                 ->label('Export')
                 ->color('primary')
                 ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
                     echo $service->handle($egg->id);
-                }, 'egg-' . $egg->getKebabName() . '.json'))
-                ->authorize(fn () => auth()->user()->can('export egg')),
+                }, 'egg-' . $egg->getKebabName() . '.json')),
+
             Actions\Action::make('importEgg')
                 ->label('Import')
                 ->form([
@@ -272,7 +249,6 @@ class EditEgg extends EditRecord
                                 ->schema([
                                     TextInput::make('url')
                                         ->label('URL')
-                                        ->default(fn (Egg $egg): ?string => $egg->update_url)
                                         ->hint('Link to the egg file (eg. minecraft.json)')
                                         ->url(),
                                 ]),
@@ -280,7 +256,10 @@ class EditEgg extends EditRecord
                         ->contained(false),
 
                 ])
-                ->action(function (array $data, Egg $egg, EggImporterService $eggImportService): void {
+                ->action(function (array $data, Egg $egg): void {
+                    /** @var EggImporterService $eggImportService */
+                    $eggImportService = resolve(EggImporterService::class);
+
                     if (!empty($data['egg'])) {
                         try {
                             $eggImportService->fromFile($data['egg'], $egg);
@@ -288,14 +267,16 @@ class EditEgg extends EditRecord
                             Notification::make()
                                 ->title('Import Failed')
                                 ->body($exception->getMessage())
-                                ->danger() // Will Robinson
+                                ->danger()
                                 ->send();
 
                             report($exception);
 
                             return;
                         }
-                    } elseif (!empty($data['url'])) {
+                    }
+
+                    if (!empty($data['url'])) {
                         try {
                             $eggImportService->fromUrl($data['url'], $egg);
                         } catch (Exception $exception) {
@@ -316,8 +297,8 @@ class EditEgg extends EditRecord
                         ->title('Import Success')
                         ->success()
                         ->send();
-                })
-                ->authorize(fn () => auth()->user()->can('import egg')),
+                }),
+
             $this->getSaveFormAction()->formId('form'),
         ];
     }

app/Filament/Resources/EggResource/Pages/ListEggs.php

@@ -14,13 +14,13 @@ use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\TextInput;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
+use Filament\Tables;
 
 class ListEggs extends ListRecords
 {
@@ -49,56 +49,20 @@ class ListEggs extends ListRecords
             ])
             ->actions([
                 EditAction::make(),
-                Action::make('export')
+                Tables\Actions\Action::make('export')
                     ->icon('tabler-download')
                     ->label('Export')
                     ->color('primary')
                     ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
                         echo $service->handle($egg->id);
-                    }, 'egg-' . $egg->getKebabName() . '.json'))
-                    ->authorize(fn () => auth()->user()->can('export egg')),
-                Action::make('update')
-                    ->icon('tabler-cloud-download')
-                    ->label('Update')
-                    ->color('success')
-                    ->requiresConfirmation()
-                    ->modalHeading('Are you sure you want to update this egg?')
-                    ->modalDescription('If you made any changes to the egg they will be overwritten!')
-                    ->modalIconColor('danger')
-                    ->modalSubmitAction(fn (Actions\StaticAction $action) => $action->color('danger'))
-                    ->action(function (Egg $egg, EggImporterService $eggImporterService) {
-                        try {
-                            $eggImporterService->fromUrl($egg->update_url, $egg);
-
-                            cache()->forget("eggs.{$egg->uuid}.update");
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Egg Update failed')
-                                ->body($exception->getMessage())
-                                ->danger()
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-
-                        Notification::make()
-                            ->title('Egg updated')
-                            ->success()
-                            ->send();
-                    })
-                    ->authorize(fn () => auth()->user()->can('import egg'))
-                    ->visible(fn (Egg $egg) => cache()->get("eggs.{$egg->uuid}.update", false)),
+                    }, 'egg-' . $egg->getKebabName() . '.json')),
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete egg')),
+                    DeleteBulkAction::make(),
                 ]),
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [
@@ -131,7 +95,10 @@ class ListEggs extends ListRecords
                         ->contained(false),
 
                 ])
-                ->action(function (array $data, EggImporterService $eggImportService): void {
+                ->action(function (array $data): void {
+                    /** @var EggImporterService $eggImportService */
+                    $eggImportService = resolve(EggImporterService::class);
+
                     if (!empty($data['egg'])) {
                         /** @var TemporaryUploadedFile[] $eggFile */
                         $eggFile = $data['egg'];
@@ -171,8 +138,7 @@ class ListEggs extends ListRecords
                         ->title('Import Success')
                         ->success()
                         ->send();
-                })
-                ->authorize(fn () => auth()->user()->can('import egg')),
+                }),
         ];
     }
 }

app/Filament/Resources/EggResource/RelationManagers/ServersRelationManager.php

@@ -16,7 +16,7 @@ class ServersRelationManager extends RelationManager
     {
         return $table
             ->recordTitleAttribute('servers')
-            ->emptyStateDescription('No Servers')->emptyStateHeading('No servers are assigned to this Egg.')
+            ->emptyStateDescription('No Servers')->emptyStateHeading('No servers are assigned this egg.')
             ->searchable(false)
             ->columns([
                 TextColumn::make('user.username')

app/Filament/Resources/MountResource.php

@@ -11,7 +11,6 @@ class MountResource extends Resource
     protected static ?string $model = Mount::class;
 
     protected static ?string $navigationIcon = 'tabler-layers-linked';
-
     protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
@@ -19,6 +18,13 @@ class MountResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/MountResource/Pages/EditMount.php

@@ -4,14 +4,14 @@ namespace App\Filament\Resources\MountResource\Pages;
 
 use App\Filament\Resources\MountResource;
 use Filament\Actions;
-use Filament\Forms\Components\Group;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Form;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Form;
 
 class EditMount extends EditRecord
 {
@@ -96,7 +96,6 @@ class EditMount extends EditRecord
                 'lg' => 2,
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/MountResource/Pages/ListMounts.php

@@ -17,7 +17,6 @@ use Filament\Tables\Table;
 class ListMounts extends ListRecords
 {
     protected static string $resource = MountResource::class;
-
     public function table(Table $table): Table
     {
         return $table
@@ -44,8 +43,7 @@ class ListMounts extends ListRecords
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete mount')),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon('tabler-layers-linked')
@@ -57,7 +55,6 @@ class ListMounts extends ListRecords
                     ->button(),
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/NodeResource/Pages/CreateNode.php

@@ -3,8 +3,8 @@
 namespace App\Filament\Resources\NodeResource\Pages;
 
 use App\Filament\Resources\NodeResource;
-use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
+use Filament\Forms;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
@@ -153,6 +153,7 @@ class CreateNode extends CreateRecord
                                     'lg' => 2,
                                 ])
                                 ->required()
+                                ->regex('/[a-zA-Z0-9_\.\- ]+/')
                                 ->helperText('This name is for display only and can be changed later.')
                                 ->maxLength(100),
 
@@ -219,7 +220,7 @@ class CreateNode extends CreateRecord
                             ToggleButtons::make('public')
                                 ->default(true)
                                 ->columnSpan(1)
-                                ->label('Use Node for deployment?')->inline()
+                                ->label('Automatic Allocation')->inline()
                                 ->options([
                                     true => 'Yes',
                                     false => 'No',
@@ -229,7 +230,11 @@ class CreateNode extends CreateRecord
                                     false => 'danger',
                                 ]),
                             TagsInput::make('tags')
-                                ->placeholder('Add Tags')
+                                ->label('Tags')
+                                ->disabled()
+                                ->placeholder('Not Implemented')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Not Implemented')
                                 ->columnSpan(2),
                             TextInput::make('upload_size')
                                 ->label('Upload Limit')
@@ -398,7 +403,7 @@ class CreateNode extends CreateRecord
     protected function getRedirectUrlParameters(): array
     {
         return [
-            'tab' => '-configuration-file-tab',
+            'tab' => '-configuration-tab',
         ];
     }
 

app/Filament/Resources/NodeResource/Pages/EditNode.php

@@ -3,13 +3,12 @@
 namespace App\Filament\Resources\NodeResource\Pages;
 
 use App\Filament\Resources\NodeResource;
+use App\Filament\Resources\NodeResource\Widgets\NodeMemoryChart;
+use App\Filament\Resources\NodeResource\Widgets\NodeStorageChart;
 use App\Models\Node;
-use App\Services\Nodes\NodeAutoDeployService;
 use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
 use Filament\Forms;
-use Filament\Forms\Components\Actions as FormActions;
-use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Tabs;
@@ -18,12 +17,10 @@ use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\View;
 use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Enums\Alignment;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
@@ -44,32 +41,6 @@ class EditNode extends EditRecord
                 ->persistTabInQueryString()
                 ->columnSpanFull()
                 ->tabs([
-                    Tab::make('')
-                        ->label('Overview')
-                        ->icon('tabler-chart-area-line-filled')
-                        ->columns(6)
-                        ->schema([
-                            Fieldset::make()
-                                ->label('Node Information')
-                                ->columns(4)
-                                ->schema([
-                                    Placeholder::make('')
-                                        ->label('Wings Version')
-                                        ->content(fn (Node $node) => $node->systemInformation()['version'] ?? 'Unknown'),
-                                    Placeholder::make('')
-                                        ->label('CPU Threads')
-                                        ->content(fn (Node $node) => $node->systemInformation()['cpu_count'] ?? 0),
-                                    Placeholder::make('')
-                                        ->label('Architecture')
-                                        ->content(fn (Node $node) => $node->systemInformation()['architecture'] ?? 'Unknown'),
-                                    Placeholder::make('')
-                                        ->label('Kernel')
-                                        ->content(fn (Node $node) => $node->systemInformation()['kernel_version'] ?? 'Unknown'),
-                                ]),
-                            View::make('filament.components.node-cpu-chart')->columnSpan(3),
-                            View::make('filament.components.node-memory-chart')->columnSpan(3),
-                            // TODO: Make purdy View::make('filament.components.node-storage-chart')->columnSpan(3),
-                        ]),
                     Tab::make('Basic Settings')
                         ->icon('tabler-server')
                         ->schema([
@@ -86,7 +57,7 @@ class EditNode extends EditRecord
                                         if (request()->isSecure()) {
                                             return '
                                     Your panel is currently secured via an SSL certificate and that means your nodes require one too.
-                                    You must use a domain name, because you cannot get SSL certificates for IP Addresses.
+                                    You must use a domain name, because you cannot get SSL certificates for IP Addresses
                                 ';
                                         }
 
@@ -101,7 +72,7 @@ class EditNode extends EditRecord
                                 ->hintColor('danger')
                                 ->hint(function ($state) {
                                     if (is_ip($state) && request()->isSecure()) {
-                                        return 'You cannot connect to an IP Address over SSL!';
+                                        return 'You cannot connect to an IP Address over SSL';
                                     }
 
                                     return '';
@@ -133,9 +104,11 @@ class EditNode extends EditRecord
                                     $set('dns', false);
                                 })
                                 ->maxLength(255),
+
                             TextInput::make('ip')
                                 ->disabled()
                                 ->hidden(),
+
                             ToggleButtons::make('dns')
                                 ->label('DNS Record Check')
                                 ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
@@ -152,9 +125,20 @@ class EditNode extends EditRecord
                                     true => 'success',
                                     false => 'danger',
                                 ])
-                                ->columnSpan(1),
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ]),
+
                             TextInput::make('daemon_listen')
-                                ->columnSpan(1)
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ])
                                 ->label(trans('strings.port'))
                                 ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
                                 ->minValue(1)
@@ -162,6 +146,7 @@ class EditNode extends EditRecord
                                 ->default(8080)
                                 ->required()
                                 ->integer(),
+
                             TextInput::make('name')
                                 ->label('Display Name')
                                 ->columnSpan([
@@ -171,11 +156,18 @@ class EditNode extends EditRecord
                                     'lg' => 2,
                                 ])
                                 ->required()
+                                ->regex('/[a-zA-Z0-9_\.\- ]+/')
                                 ->helperText('This name is for display only and can be changed later.')
                                 ->maxLength(100),
+
                             ToggleButtons::make('scheme')
                                 ->label('Communicate over SSL')
-                                ->columnSpan(1)
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 1,
+                                ])
                                 ->inline()
                                 ->helperText(function (Get $get) {
                                     if (request()->isSecure()) {
@@ -203,48 +195,27 @@ class EditNode extends EditRecord
                                 ])
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
                     Tab::make('Advanced Settings')
-                        ->columns([
-                            'default' => 1,
-                            'sm' => 1,
-                            'md' => 4,
-                            'lg' => 6,
-                        ])
+                        ->columns(['default' => 1, 'sm' => 1, 'md' => 4, 'lg' => 6])
                         ->icon('tabler-server-cog')
                         ->schema([
                             TextInput::make('id')
                                 ->label('Node ID')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 2,
-                                    'lg' => 1,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
                                 ->disabled(),
                             TextInput::make('uuid')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 2,
-                                    'lg' => 2,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->label('Node UUID')
                                 ->hintAction(CopyAction::make())
                                 ->disabled(),
                             TagsInput::make('tags')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 2,
-                                    'lg' => 2,
-                                ])
-                                ->placeholder('Add Tags'),
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->label('Tags')
+                                ->disabled()
+                                ->placeholder('Not Implemented')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Not Implemented'),
                             TextInput::make('upload_size')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 2,
-                                    'lg' => 1,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
                                 ->label('Upload Limit')
                                 ->hintIcon('tabler-question-mark')
                                 ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
@@ -253,12 +224,7 @@ class EditNode extends EditRecord
                                 ->maxValue(1024)
                                 ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
                             TextInput::make('daemon_sftp')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 3,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('SFTP Port')
                                 ->minValue(1)
                                 ->maxValue(65535)
@@ -266,22 +232,12 @@ class EditNode extends EditRecord
                                 ->required()
                                 ->integer(),
                             TextInput::make('daemon_sftp_alias')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 3,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('SFTP Alias')
                                 ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
                             ToggleButtons::make('public')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 3,
-                                ])
-                                ->label('Use Node for deployment?')->inline()
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                                ->label('Automatic Allocation')->inline()
                                 ->options([
                                     true => 'Yes',
                                     false => 'No',
@@ -291,12 +247,7 @@ class EditNode extends EditRecord
                                     false => 'danger',
                                 ]),
                             ToggleButtons::make('maintenance_mode')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 3,
-                                ])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
                                 ->label('Maintenance Mode')->inline()
                                 ->hinticon('tabler-question-mark')
                                 ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
@@ -309,12 +260,7 @@ class EditNode extends EditRecord
                                     true => 'danger',
                                 ]),
                             Grid::make()
-                                ->columns([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 3,
-                                    'lg' => 6,
-                                ])
+                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_mem')
@@ -331,24 +277,14 @@ class EditNode extends EditRecord
                                             true => 'primary',
                                             false => 'warning',
                                         ])
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ]),
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
                                     TextInput::make('memory')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
                                         ->label('Memory Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ])
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->numeric()
                                         ->minValue(0),
                                     TextInput::make('memory_overallocate')
@@ -358,24 +294,14 @@ class EditNode extends EditRecord
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ])
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->numeric()
                                         ->minValue(-1)
                                         ->maxValue(100)
                                         ->suffix('%'),
                                 ]),
                             Grid::make()
-                                ->columns([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 3,
-                                    'lg' => 6,
-                                ])
+                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
                                 ->schema([
                                     ToggleButtons::make('unlimited_disk')
                                         ->label('Disk')->inlineLabel()->inline()
@@ -391,24 +317,14 @@ class EditNode extends EditRecord
                                             true => 'primary',
                                             false => 'warning',
                                         ])
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ]),
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
                                     TextInput::make('disk')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_disk'))
                                         ->label('Disk Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ])
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->numeric()
                                         ->minValue(0),
                                     TextInput::make('disk_overallocate')
@@ -417,12 +333,7 @@ class EditNode extends EditRecord
                                         ->label('Overallocate')->inlineLabel()
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 1,
-                                            'md' => 1,
-                                            'lg' => 2,
-                                        ])
+                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
                                         ->required()
                                         ->numeric()
                                         ->minValue(-1)
@@ -485,61 +396,19 @@ class EditNode extends EditRecord
                                 ->rows(19)
                                 ->hintAction(CopyAction::make())
                                 ->columnSpanFull(),
-                            Grid::make()
-                                ->columns()
-                                ->schema([
-                                    FormActions::make([
-                                        FormActions\Action::make('autoDeploy')
-                                            ->label('Auto Deploy Command')
-                                            ->color('primary')
-                                            ->modalHeading('Auto Deploy Command')
-                                            ->icon('tabler-rocket')
-                                            ->modalSubmitAction(false)
-                                            ->modalCancelAction(false)
-                                            ->modalFooterActionsAlignment(Alignment::Center)
-                                            ->form([
-                                                ToggleButtons::make('docker')
-                                                    ->label('Type')
-                                                    ->live()
-                                                    ->helperText('Choose between Standalone and Docker install.')
-                                                    ->inline()
-                                                    ->default(false)
-                                                    ->afterStateUpdated(fn (bool $state, NodeAutoDeployService $service, Node $node, Set $set) => $set('generatedToken', $service->handle(request(), $node, $state)))
-                                                    ->options([
-                                                        false => 'Standalone',
-                                                        true => 'Docker',
-                                                    ])
-                                                    ->colors([
-                                                        false => 'primary',
-                                                        true => 'success',
-                                                    ])
-                                                    ->columnSpan(1),
-                                                Textarea::make('generatedToken')
-                                                    ->label('To auto-configure your node run the following command:')
-                                                    ->readOnly()
-                                                    ->autosize()
-                                                    ->hintAction(fn (string $state) => CopyAction::make()->copyable($state))
-                                                    ->formatStateUsing(fn (NodeAutoDeployService $service, Node $node, Set $set, Get $get) => $set('generatedToken', $service->handle(request(), $node, $get('docker')))),
-                                            ])
-                                            ->mountUsing(function (Forms\Form $form) {
-                                                Notification::make()->success()->title('Autodeploy Generated')->send();
-                                                $form->fill();
-                                            }),
-                                    ])->fullWidth(),
-                                    FormActions::make([
-                                        FormActions\Action::make('resetKey')
-                                            ->label('Reset Daemon Token')
-                                            ->color('danger')
-                                            ->requiresConfirmation()
-                                            ->modalHeading('Reset Daemon Token?')
-                                            ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
-                                            ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
-                                                $nodeUpdateService->handle($node, [], true);
-                                                Notification::make()->success()->title('Daemon Key Reset')->send();
-                                                $this->fillForm();
-                                            }),
-                                    ])->fullWidth(),
-                                ]),
+                            Forms\Components\Actions::make([
+                                Forms\Components\Actions\Action::make('resetKey')
+                                    ->label('Reset Daemon Token')
+                                    ->color('danger')
+                                    ->requiresConfirmation()
+                                    ->modalHeading('Reset Daemon Token?')
+                                    ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
+                                    ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
+                                        $nodeUpdateService->handle($node, [], true);
+                                        Notification::make()->success()->title('Daemon Key Reset')->send();
+                                        $this->fillForm();
+                                    }),
+                            ]),
                         ]),
                 ]),
         ]);
@@ -551,16 +420,6 @@ class EditNode extends EditRecord
 
         $data['config'] = $node->getYamlConfiguration();
 
-        if (!is_ip($node->fqdn)) {
-            $validRecords = gethostbynamel($node->fqdn);
-            if ($validRecords) {
-                $data['dns'] = true;
-                $data['ip'] = collect($validRecords)->first();
-            } else {
-                $data['dns'] = false;
-            }
-        }
-
         return $data;
     }
 
@@ -568,7 +427,6 @@ class EditNode extends EditRecord
     {
         return [];
     }
-
     protected function getHeaderActions(): array
     {
         return [
@@ -579,18 +437,16 @@ class EditNode extends EditRecord
         ];
     }
 
+    protected function getFooterWidgets(): array
+    {
+        return [
+            NodeStorageChart::class,
+            NodeMemoryChart::class,
+        ];
+    }
+
     protected function afterSave(): void
     {
         $this->fillForm();
     }
-
-    protected function getColumnSpan(): ?int
-    {
-        return null;
-    }
-
-    protected function getColumnStart(): ?int
-    {
-        return null;
-    }
 }

app/Filament/Resources/NodeResource/Pages/ListNodes.php

@@ -6,12 +6,13 @@ use App\Filament\Resources\NodeResource;
 use App\Models\Node;
 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\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Support\Number;
 
 class ListNodes extends ListRecords
 {
@@ -46,18 +47,18 @@ class ListNodes extends ListRecords
                     ->icon('tabler-device-desktop-analytics')
                     ->numeric()
                     ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
-                    ->formatStateUsing(fn ($state) => Number::format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), maxPrecision: 2, locale: auth()->user()->language))
+                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
                     ->sortable(),
                 TextColumn::make('disk')
                     ->visibleFrom('sm')
                     ->icon('tabler-file')
                     ->numeric()
                     ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
-                    ->formatStateUsing(fn ($state) => Number::format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), maxPrecision: 2, locale: auth()->user()->language))
+                    ->formatStateUsing(fn ($state) => number_format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), 2))
                     ->sortable(),
                 TextColumn::make('cpu')
                     ->visibleFrom('sm')
-                    ->icon('tabler-cpu')
+                    ->icon('tabler-file')
                     ->numeric()
                     ->suffix(' %')
                     ->sortable(),
@@ -81,6 +82,11 @@ class ListNodes extends ListRecords
             ->actions([
                 EditAction::make(),
             ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make(),
+                ]),
+            ])
             ->emptyStateIcon('tabler-server-2')
             ->emptyStateDescription('')
             ->emptyStateHeading('No Nodes')

app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php

@@ -7,12 +7,12 @@ use App\Models\Node;
 use App\Services\Allocations\AssignmentService;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
 use Filament\Forms\Set;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables;
 use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Columns\TextInputColumn;
 use Filament\Tables\Table;
@@ -148,12 +148,11 @@ class AllocationsRelationManager extends RelationManager
                             ->splitKeys(['Tab', ' ', ','])
                             ->required(),
                     ])
-                    ->action(fn (array $data, AssignmentService $service) => $service->handle($this->getOwnerRecord(), $data)),
+                    ->action(fn (array $data) => resolve(AssignmentService::class)->handle($this->getOwnerRecord(), $data)),
             ])
             ->bulkActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete allocation')),
+                    DeleteBulkAction::make(),
                 ]),
             ]);
     }

app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php

@@ -3,10 +3,10 @@
 namespace App\Filament\Resources\NodeResource\RelationManagers;
 
 use App\Models\Server;
-use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Filament\Resources\RelationManagers\RelationManager;
 
 class NodesRelationManager extends RelationManager
 {

app/Filament/Resources/NodeResource/Widgets/NodeCpuChart.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\NodeResource\Widgets;
-
-use App\Models\Node;
-use Carbon\Carbon;
-use Filament\Support\RawJs;
-use Filament\Widgets\ChartWidget;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Number;
-
-class NodeCpuChart extends ChartWidget
-{
-    protected static ?string $pollingInterval = '5s';
-
-    protected static ?string $maxHeight = '300px';
-
-    public ?Model $record = null;
-
-    protected function getData(): array
-    {
-        /** @var Node $node */
-        $node = $this->record;
-        $threads = $node->systemInformation()['cpu_count'] ?? 0;
-
-        $cpu = collect(cache()->get("nodes.$node->id.cpu_percent"))
-            ->slice(-10)
-            ->map(fn ($value, $key) => [
-                'cpu' => Number::format($value * $threads, maxPrecision: 2, locale: auth()->user()->language),
-                'timestamp' => Carbon::createFromTimestamp($key, (auth()->user()->timezone ?? 'UTC'))->format('H:i:s'),
-            ])
-            ->all();
-
-        return [
-            'datasets' => [
-                [
-                    'data' => array_column($cpu, 'cpu'),
-                    'backgroundColor' => [
-                        'rgba(96, 165, 250, 0.3)',
-                    ],
-                    'tension' => '0.3',
-                    'fill' => true,
-                ],
-            ],
-            'labels' => array_column($cpu, 'timestamp'),
-        ];
-    }
-
-    protected function getType(): string
-    {
-        return 'line';
-    }
-
-    protected function getOptions(): RawJs
-    {
-        return RawJs::make(<<<'JS'
-        {
-            scales: {
-                y: {
-                    min: 0,
-                },
-            },
-            plugins: {
-                legend: {
-                    display: false,
-                }
-            }
-        }
-    JS);
-    }
-
-    public function getHeading(): string
-    {
-        /** @var Node $node */
-        $node = $this->record;
-        $threads = $node->systemInformation()['cpu_count'] ?? 0;
-
-        $cpu = Number::format(collect(cache()->get("nodes.$node->id.cpu_percent"))->last() * $threads, maxPrecision: 2, locale: auth()->user()->language);
-        $max = Number::format($threads * 100, locale: auth()->user()->language) . '%';
-
-        return 'CPU - ' . $cpu . '% Of ' . $max;
-    }
-}

app/Filament/Resources/NodeResource/Widgets/NodeMemoryChart.php

@@ -3,85 +3,66 @@
 namespace App\Filament\Resources\NodeResource\Widgets;
 
 use App\Models\Node;
-use Carbon\Carbon;
-use Filament\Support\RawJs;
 use Filament\Widgets\ChartWidget;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Number;
 
 class NodeMemoryChart extends ChartWidget
 {
-    protected static ?string $pollingInterval = '5s';
+    protected static ?string $heading = 'Memory';
 
-    protected static ?string $maxHeight = '300px';
+    protected static ?string $pollingInterval = '60s';
 
     public ?Model $record = null;
 
+    protected static ?array $options = [
+        'scales' => [
+            'x' => [
+                'grid' => [
+                    'display' => false,
+                ],
+                'ticks' => [
+                    'display' => false,
+                ],
+            ],
+            'y' => [
+                'grid' => [
+                    'display' => false,
+                ],
+                'ticks' => [
+                    'display' => false,
+                ],
+            ],
+        ],
+    ];
+
     protected function getData(): array
     {
         /** @var Node $node */
         $node = $this->record;
 
-        $memUsed = collect(cache()->get("nodes.$node->id.memory_used"))->slice(-10)
-            ->map(fn ($value, $key) => [
-                'memory' => Number::format(config('panel.use_binary_prefix') ? $value / 1024 / 1024 / 1024 : $value / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language),
-                'timestamp' => Carbon::createFromTimestamp($key, (auth()->user()->timezone ?? 'UTC'))->format('H:i:s'),
-            ])
-            ->all();
+        $total = ($node->statistics()['memory_total'] ?? 0) / 1024 / 1024 / 1024;
+        $used = ($node->statistics()['memory_used'] ?? 0) / 1024 / 1024 / 1024;
+        $unused = $total - $used;
 
         return [
             'datasets' => [
                 [
-                    'data' => array_column($memUsed, 'memory'),
+                    'label' => 'Data Cool',
+                    'data' => [$used, $unused],
                     'backgroundColor' => [
-                        'rgba(96, 165, 250, 0.3)',
+                        'rgb(255, 99, 132)',
+                        'rgb(54, 162, 235)',
+                        'rgb(255, 205, 86)',
                     ],
-                    'tension' => '0.3',
-                    'fill' => true,
                 ],
+                // 'backgroundColor' => [],
             ],
-            'labels' => array_column($memUsed, 'timestamp'),
+            'labels' => ['Used', 'Unused'],
         ];
     }
 
     protected function getType(): string
     {
-        return 'line';
-    }
-
-    protected function getOptions(): RawJs
-    {
-        return RawJs::make(<<<'JS'
-        {
-            scales: {
-                y: {
-                    min: 0,
-                },
-            },
-            plugins: {
-                legend: {
-                    display: false,
-                }
-            }
-        }
-    JS);
-    }
-
-    public function getHeading(): string
-    {
-        /** @var Node $node */
-        $node = $this->record;
-        $latestMemoryUsed = collect(cache()->get("nodes.$node->id.memory_used"))->last();
-        $totalMemory = collect(cache()->get("nodes.$node->id.memory_total"))->last();
-
-        $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';
-
-        $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 'Memory - ' . $used . ' Of ' . $total;
+        return 'pie';
     }
 }

app/Filament/Resources/NodeResource/Widgets/NodeStorageChart.php

@@ -12,8 +12,6 @@ class NodeStorageChart extends ChartWidget
 
     protected static ?string $pollingInterval = '60s';
 
-    protected static ?string $maxHeight = '300px';
-
     public ?Model $record = null;
 
     protected static ?array $options = [
@@ -49,6 +47,7 @@ class NodeStorageChart extends ChartWidget
         return [
             'datasets' => [
                 [
+                    'label' => 'Data Cool',
                     'data' => [$used, $unused],
                     'backgroundColor' => [
                         'rgb(255, 99, 132)',
@@ -56,6 +55,7 @@ class NodeStorageChart extends ChartWidget
                         'rgb(255, 205, 86)',
                     ],
                 ],
+                // 'backgroundColor' => [],
             ],
             'labels' => ['Used', 'Unused'],
         ];

app/Filament/Resources/RoleResource.php

@@ -1,146 +0,0 @@
-<?php
-
-namespace App\Filament\Resources;
-
-use App\Enums\RolePermissionModels;
-use App\Enums\RolePermissionPrefixes;
-use App\Filament\Resources\RoleResource\Pages;
-use App\Models\Role;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Resources\Resource;
-use Illuminate\Support\Str;
-
-class RoleResource extends Resource
-{
-    protected static ?string $model = Role::class;
-
-    protected static ?string $navigationIcon = 'tabler-users-group';
-
-    protected static ?string $recordTitleAttribute = 'name';
-
-    public static function getNavigationBadge(): ?string
-    {
-        return static::getModel()::count() ?: null;
-    }
-
-    public static function form(Form $form): Form
-    {
-        $permissions = [];
-
-        foreach (RolePermissionModels::cases() as $model) {
-            $options = [];
-
-            foreach (RolePermissionPrefixes::cases() as $prefix) {
-                $options[$prefix->value . ' ' . strtolower($model->value)] = Str::headline($prefix->value);
-            }
-
-            if (array_key_exists($model->value, Role::MODEL_SPECIFIC_PERMISSIONS)) {
-                foreach (Role::MODEL_SPECIFIC_PERMISSIONS[$model->value] as $permission) {
-                    $options[$permission . ' ' . strtolower($model->value)] = Str::headline($permission);
-                }
-            }
-
-            $permissions[] = self::makeSection($model->value, $options);
-        }
-
-        foreach (Role::SPECIAL_PERMISSIONS as $model => $prefixes) {
-            $options = [];
-
-            foreach ($prefixes as $prefix) {
-                $options[$prefix . ' ' . strtolower($model)] = Str::headline($prefix);
-            }
-
-            $permissions[] = self::makeSection($model, $options);
-        }
-
-        return $form
-            ->columns(1)
-            ->schema([
-                TextInput::make('name')
-                    ->label('Role Name')
-                    ->required()
-                    ->disabled(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
-                TextInput::make('guard_name')
-                    ->label('Guard Name')
-                    ->default(Filament::getCurrentPanel()?->getAuthGuard() ?? '')
-                    ->nullable()
-                    ->hidden(),
-                Fieldset::make('Permissions')
-                    ->columns(3)
-                    ->schema($permissions)
-                    ->hidden(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
-                Placeholder::make('permissions')
-                    ->content('The Root Admin has all permissions.')
-                    ->visible(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
-            ]);
-    }
-
-    private static function makeSection(string $model, array $options): Section
-    {
-        $icon = null;
-
-        if (class_exists('\App\Filament\Resources\\' . $model . 'Resource')) {
-            $icon = ('\App\Filament\Resources\\' . $model . 'Resource')::getNavigationIcon();
-        } elseif (class_exists('\App\Filament\Pages\\' . $model)) {
-            $icon = ('\App\Filament\Pages\\' . $model)::getNavigationIcon();
-        }
-
-        return Section::make(Str::headline(Str::plural($model)))
-            ->columnSpan(1)
-            ->collapsible()
-            ->collapsed()
-            ->icon($icon)
-            ->headerActions([
-                Action::make('count')
-                    ->label(fn (Get $get) => count($get(strtolower($model) . '_list')))
-                    ->badge(),
-            ])
-            ->schema([
-                CheckboxList::make(strtolower($model) . '_list')
-                    ->label('')
-                    ->options($options)
-                    ->columns()
-                    ->gridDirection('row')
-                    ->bulkToggleable()
-                    ->live()
-                    ->afterStateHydrated(
-                        function (Component $component, string $operation, ?Role $record) use ($options) {
-                            if (in_array($operation, ['edit', 'view'])) {
-
-                                if (blank($record)) {
-                                    return;
-                                }
-
-                                if ($component->isVisible()) {
-                                    $component->state(
-                                        collect($options)
-                                            ->filter(fn ($value, $key) => $record->checkPermissionTo($key))
-                                            ->keys()
-                                            ->toArray()
-                                    );
-                                }
-                            }
-                        }
-                    )
-                    ->dehydrated(fn ($state) => !blank($state)),
-            ]);
-    }
-
-    public static function getPages(): array
-    {
-        return [
-            'index' => Pages\ListRoles::route('/'),
-            'create' => Pages\CreateRole::route('/create'),
-            'edit' => Pages\EditRole::route('/{record}/edit'),
-        ];
-    }
-}

app/Filament/Resources/RoleResource/Pages/CreateRole.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RoleResource\Pages;
-
-use App\Filament\Resources\RoleResource;
-use App\Models\Role;
-use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-use Spatie\Permission\Models\Permission;
-
-/**
- * @property Role $record
- */
-class CreateRole extends CreateRecord
-{
-    protected static string $resource = RoleResource::class;
-
-    protected static bool $canCreateAnother = false;
-
-    public Collection $permissions;
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $this->permissions = collect($data)
-            ->filter(function ($permission, $key) {
-                return !in_array($key, ['name', 'guard_name']);
-            })
-            ->values()
-            ->flatten()
-            ->unique();
-
-        return Arr::only($data, ['name', 'guard_name']);
-    }
-
-    protected function afterCreate(): void
-    {
-        $permissionModels = collect();
-        $this->permissions->each(function ($permission) use ($permissionModels) {
-            $permissionModels->push(Permission::firstOrCreate([
-                'name' => $permission,
-                'guard_name' => $this->data['guard_name'],
-            ]));
-        });
-
-        $this->record->syncPermissions($permissionModels);
-    }
-}

app/Filament/Resources/RoleResource/Pages/EditRole.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RoleResource\Pages;
-
-use App\Filament\Resources\RoleResource;
-use App\Models\Role;
-use Filament\Actions\DeleteAction;
-use Filament\Resources\Pages\EditRecord;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-use Spatie\Permission\Models\Permission;
-
-/**
- * @property Role $record
- */
-class EditRole extends EditRecord
-{
-    protected static string $resource = RoleResource::class;
-
-    public Collection $permissions;
-
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        $this->permissions = collect($data)
-            ->filter(function ($permission, $key) {
-                return !in_array($key, ['name', 'guard_name']);
-            })
-            ->values()
-            ->flatten()
-            ->unique();
-
-        return Arr::only($data, ['name', 'guard_name']);
-    }
-
-    protected function afterSave(): void
-    {
-        $permissionModels = collect();
-        $this->permissions->each(function ($permission) use ($permissionModels) {
-            $permissionModels->push(Permission::firstOrCreate([
-                'name' => $permission,
-                'guard_name' => $this->data['guard_name'],
-            ]));
-        });
-
-        $this->record->syncPermissions($permissionModels);
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            DeleteAction::make()
-                ->disabled(fn (Role $role) => $role->isRootAdmin() || $role->users_count >= 1)
-                ->label(fn (Role $role) => $role->isRootAdmin() ? 'Can\'t delete Root Admin' : ($role->users_count >= 1 ? 'In Use' : 'Delete')),
-        ];
-    }
-}

app/Filament/Resources/RoleResource/Pages/ListRoles.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Filament\Resources\RoleResource\Pages;
-
-use App\Filament\Resources\RoleResource;
-use App\Models\Role;
-use Filament\Actions\CreateAction;
-use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
-use Filament\Tables\Actions\CreateAction as CreateActionTable;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
-
-class ListRoles extends ListRecords
-{
-    protected static string $resource = RoleResource::class;
-
-    public function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('name')
-                    ->sortable()
-                    ->searchable(),
-                TextColumn::make('guard_name')
-                    ->hidden()
-                    ->sortable()
-                    ->searchable(),
-                TextColumn::make('permissions_count')
-                    ->label('Permissions')
-                    ->badge()
-                    ->counts('permissions')
-                    ->formatStateUsing(fn (Role $role, $state) => $role->isRootAdmin() ? 'All' : $state),
-                TextColumn::make('users_count')
-                    ->label('Users')
-                    ->counts('users')
-                    ->icon('tabler-users'),
-            ])
-            ->actions([
-                EditAction::make(),
-            ])
-            ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0)
-            ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete role')),
-                ]),
-            ])
-            ->emptyStateIcon('tabler-users-group')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('No Roles')
-            ->emptyStateActions([
-                CreateActionTable::make('create')
-                    ->label('Create Role')
-                    ->button(),
-            ]);
-    }
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->label('Create Role'),
-        ];
-    }
-}

app/Filament/Resources/ServerResource.php

@@ -19,6 +19,13 @@ class ServerResource extends Resource
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

app/Filament/Resources/ServerResource/Pages/CreateServer.php

@@ -11,74 +11,47 @@ use App\Services\Allocations\AssignmentService;
 use App\Services\Servers\RandomWordService;
 use App\Services\Servers\ServerCreationService;
 use App\Services\Users\UserCreationService;
-use Closure;
-use Exception;
-use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Repeater;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard;
-use Filament\Forms\Components\Wizard\Step;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Filament\Forms;
+use Filament\Forms\Components\Wizard;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\HtmlString;
-use LogicException;
+use Closure;
 
 class CreateServer extends CreateRecord
 {
     protected static string $resource = ServerResource::class;
-
     protected static bool $canCreateAnother = false;
 
     public ?Node $node = null;
 
-    private ServerCreationService $serverCreationService;
-
-    public function boot(ServerCreationService $serverCreationService): void
-    {
-        $this->serverCreationService = $serverCreationService;
-    }
-
     public function form(Form $form): Form
     {
         return $form
             ->schema([
                 Wizard::make([
-                    Step::make('Information')
+                    Wizard\Step::make('Information')
                         ->label('Information')
                         ->icon('tabler-info-circle')
                         ->completedIcon('tabler-check')
                         ->columns([
-                            'default' => 1,
-                            'sm' => 1,
+                            'default' => 2,
+                            'sm' => 2,
                             'md' => 4,
                             'lg' => 6,
                         ])
                         ->schema([
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->prefixIcon('tabler-server')
                                 ->label('Name')
                                 ->suffixAction(Forms\Components\Actions\Action::make('random')
                                     ->icon('tabler-dice-' . random_int(1, 6))
-                                    ->action(function (Set $set, Get $get) {
+                                    ->action(function (Forms\Set $set, Forms\Get $get) {
                                         $egg = Egg::find($get('egg_id'));
                                         $prefix = $egg ? str($egg->name)->lower()->kebab() . '-' : '';
 
@@ -88,85 +61,99 @@ class CreateServer extends CreateRecord
                                     }))
                                 ->columnSpan([
                                     'default' => 2,
-                                    'sm' => 3,
+                                    'sm' => 4,
                                     'md' => 2,
                                     'lg' => 3,
                                 ])
                                 ->required()
                                 ->maxLength(255),
 
-                            Select::make('owner_id')
+                            Forms\Components\Select::make('owner_id')
                                 ->preload()
                                 ->prefixIcon('tabler-user')
                                 ->default(auth()->user()->id)
                                 ->label('Owner')
                                 ->columnSpan([
                                     'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 3,
+                                    'sm' => 4,
+                                    'md' => 2,
                                     'lg' => 3,
                                 ])
                                 ->relationship('user', 'username')
-                                ->searchable(['username', 'email'])
-                                ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . ($user->isRootAdmin() ? '(admin)' : ''))
+                                ->searchable(['user', 'username', 'email'])
+                                ->getOptionLabelFromRecordUsing(fn (User $user) => "$user->email | $user->username " . ($user->root_admin ? '(admin)' : ''))
                                 ->createOptionForm([
-                                    TextInput::make('username')
+                                    Forms\Components\TextInput::make('username')
                                         ->alphaNum()
                                         ->required()
                                         ->maxLength(255),
 
-                                    TextInput::make('email')
+                                    Forms\Components\TextInput::make('email')
                                         ->email()
                                         ->required()
                                         ->unique()
                                         ->maxLength(255),
 
-                                    TextInput::make('password')
+                                    Forms\Components\TextInput::make('password')
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('Providing a user password is optional. New user email will prompt users to create a password the first time they login.')
                                         ->password(),
-                                ])
-                                ->createOptionUsing(function ($data, UserCreationService $service) {
-                                    $service->handle($data);
 
+                                    Forms\Components\ToggleButtons::make('root_admin')
+                                        ->label('Administrator (Root)')
+                                        ->options([
+                                            false => 'No',
+                                            true => 'Admin',
+                                        ])
+                                        ->colors([
+                                            false => 'primary',
+                                            true => 'danger',
+                                        ])
+                                        ->inline()
+                                        ->required()
+                                        ->default(false)
+                                        ->hidden(),
+                                ])
+                                ->createOptionUsing(function ($data) {
+                                    resolve(UserCreationService::class)->handle($data);
                                     $this->refreshForm();
                                 })
                                 ->required(),
 
-                            Select::make('node_id')
+                            Forms\Components\Select::make('node_id')
                                 ->disabledOn('edit')
                                 ->prefixIcon('tabler-server-2')
                                 ->default(fn () => ($this->node = Node::query()->latest()->first())?->id)
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 6,
-                                    'lg' => 6,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
+                                    'lg' => 2,
                                 ])
                                 ->live()
                                 ->relationship('node', 'name')
                                 ->searchable()
                                 ->preload()
-                                ->afterStateUpdated(function (Set $set, $state) {
+                                ->afterStateUpdated(function (Forms\Set $set, $state) {
                                     $set('allocation_id', null);
                                     $this->node = Node::find($state);
                                 })
                                 ->required(),
 
-                            Select::make('allocation_id')
+                            Forms\Components\Select::make('allocation_id')
                                 ->preload()
                                 ->live()
                                 ->prefixIcon('tabler-network')
                                 ->label('Primary Allocation')
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 2,
-                                    'lg' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 1,
+                                    'lg' => 2,
                                 ])
-                                ->disabled(fn (Get $get) => $get('node_id') === null)
+                                ->disabled(fn (Forms\Get $get) => $get('node_id') === null)
                                 ->searchable(['ip', 'port', 'ip_alias'])
-                                ->afterStateUpdated(function (Set $set) {
+                                ->afterStateUpdated(function (Forms\Set $set) {
                                     $set('allocation_additional', null);
                                     $set('allocation_additional.needstobeastringhere.extra_allocations', null);
                                 })
@@ -174,7 +161,7 @@ class CreateServer extends CreateRecord
                                     fn (Allocation $allocation) => "$allocation->ip:$allocation->port" .
                                         ($allocation->ip_alias ? " ($allocation->ip_alias)" : '')
                                 )
-                                ->placeholder(function (Get $get) {
+                                ->placeholder(function (Forms\Get $get) {
                                     $node = Node::find($get('node_id'));
 
                                     if ($node?->allocations) {
@@ -186,12 +173,12 @@ class CreateServer extends CreateRecord
                                 ->relationship(
                                     'allocation',
                                     'ip',
-                                    fn (Builder $query, Get $get) => $query
+                                    fn (Builder $query, Forms\Get $get) => $query
                                         ->where('node_id', $get('node_id'))
                                         ->whereNull('server_id'),
                                 )
-                                ->createOptionForm(fn (Get $get) => [
-                                    TextInput::make('allocation_ip')
+                                ->createOptionForm(fn (Forms\Get $get) => [
+                                    Forms\Components\TextInput::make('allocation_ip')
                                         ->datalist(Node::find($get('node_id'))?->ipAddresses() ?? [])
                                         ->label('IP Address')
                                         ->inlineLabel()
@@ -199,7 +186,7 @@ class CreateServer extends CreateRecord
                                         ->helperText("Usually your machine's public IP unless you are port forwarding.")
                                         // ->selectablePlaceholder(false)
                                         ->required(),
-                                    TextInput::make('allocation_alias')
+                                    Forms\Components\TextInput::make('allocation_alias')
                                         ->label('Alias')
                                         ->inlineLabel()
                                         ->default(null)
@@ -209,7 +196,7 @@ class CreateServer extends CreateRecord
                                         ])
                                         ->helperText('Optional display name to help you remember what these are.')
                                         ->required(false),
-                                    TagsInput::make('allocation_ports')
+                                    Forms\Components\TagsInput::make('allocation_ports')
                                         ->placeholder('Examples: 27015, 27017-27019')
                                         ->helperText(new HtmlString('
                                 These are the ports that users can connect to this Server through.
@@ -219,7 +206,7 @@ class CreateServer extends CreateRecord
                                         ->label('Ports')
                                         ->inlineLabel()
                                         ->live()
-                                        ->afterStateUpdated(function ($state, Set $set) {
+                                        ->afterStateUpdated(function ($state, Forms\Set $set) {
                                             $ports = collect();
                                             $update = false;
                                             foreach ($state as $portEntry) {
@@ -246,9 +233,7 @@ class CreateServer extends CreateRecord
                                                 $end = min((int) $end, 2 ** 16 - 1);
                                                 $range = $start <= $end ? range($start, $end) : range($end, $start);
                                                 foreach ($range as $i) {
-                                                    if ($i > 1024 && $i <= 65535) {
-                                                        $ports->push($i);
-                                                    }
+                                                    $ports->push($i);
                                                 }
                                             }
 
@@ -264,6 +249,8 @@ class CreateServer extends CreateRecord
                                                 $ports = $sortedPorts;
                                             }
 
+                                            $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
+
                                             if ($update) {
                                                 $set('allocation_ports', $ports->all());
                                             }
@@ -271,34 +258,34 @@ class CreateServer extends CreateRecord
                                         ->splitKeys(['Tab', ' ', ','])
                                         ->required(),
                                 ])
-                                ->createOptionUsing(function (array $data, Get $get, AssignmentService $assignmentService): int {
+                                ->createOptionUsing(function (array $data, Forms\Get $get): int {
                                     return collect(
-                                        $assignmentService->handle(Node::find($get('node_id')), $data)
+                                        resolve(AssignmentService::class)->handle(Node::find($get('node_id')), $data)
                                     )->first();
                                 })
                                 ->required(),
 
-                            Repeater::make('allocation_additional')
+                            Forms\Components\Repeater::make('allocation_additional')
                                 ->label('Additional Allocations')
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 3,
-                                    'md' => 3,
-                                    'lg' => 3,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 1,
+                                    'lg' => 2,
                                 ])
                                 ->addActionLabel('Add Allocation')
-                                ->disabled(fn (Get $get) => $get('allocation_id') === null)
+                                ->disabled(fn (Forms\Get $get) => $get('allocation_id') === null)
                                 // ->addable() TODO disable when all allocations are taken
                                 // ->addable() TODO disable until first additional allocation is selected
                                 ->simple(
-                                    Select::make('extra_allocations')
+                                    Forms\Components\Select::make('extra_allocations')
                                         ->live()
                                         ->preload()
                                         ->disableOptionsWhenSelectedInSiblingRepeaterItems()
                                         ->prefixIcon('tabler-network')
                                         ->label('Additional Allocations')
                                         ->columnSpan(2)
-                                        ->disabled(fn (Get $get) => $get('../../node_id') === null)
+                                        ->disabled(fn (Forms\Get $get) => $get('../../node_id') === null)
                                         ->searchable(['ip', 'port', 'ip_alias'])
                                         ->getOptionLabelFromRecordUsing(
                                             fn (Allocation $allocation) => "$allocation->ip:$allocation->port" .
@@ -309,49 +296,48 @@ class CreateServer extends CreateRecord
                                         ->relationship(
                                             'allocations',
                                             'ip',
-                                            fn (Builder $query, Get $get, Select $component, $state) => $query
+                                            fn (Builder $query, Forms\Get $get, Forms\Components\Select $component, $state) => $query
                                                 ->where('node_id', $get('../../node_id'))
                                                 ->whereNot('id', $get('../../allocation_id'))
                                                 ->whereNull('server_id'),
                                         ),
                                 ),
 
-                            Textarea::make('description')
+                            Forms\Components\TextInput::make('description')
                                 ->placeholder('Description')
-                                ->rows(3)
                                 ->columnSpan([
-                                    'default' => 2,
-                                    'sm' => 6,
-                                    'md' => 6,
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
                                     'lg' => 6,
                                 ])
-                                ->label('Description'),
+                                ->label('Notes'),
                         ]),
 
-                    Step::make('Egg Configuration')
+                    Wizard\Step::make('Egg Configuration')
                         ->label('Egg Configuration')
                         ->icon('tabler-egg')
                         ->completedIcon('tabler-check')
                         ->columns([
                             'default' => 1,
-                            'sm' => 4,
-                            'md' => 4,
-                            'lg' => 6,
+                            'sm' => 2,
+                            'md' => 2,
+                            'lg' => 4,
                         ])
                         ->schema([
-                            Select::make('egg_id')
+                            Forms\Components\Select::make('egg_id')
                                 ->prefixIcon('tabler-egg')
                                 ->relationship('egg', 'name')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 2,
                                     'md' => 2,
-                                    'lg' => 4,
+                                    'lg' => 3,
                                 ])
                                 ->searchable()
                                 ->preload()
                                 ->live()
-                                ->afterStateUpdated(function ($state, Set $set, Get $get, $old) {
+                                ->afterStateUpdated(function ($state, Forms\Set $set, Forms\Get $get, $old) {
                                     $egg = Egg::query()->find($state);
                                     $set('startup', $egg->startup ?? '');
                                     $set('image', '');
@@ -379,7 +365,7 @@ class CreateServer extends CreateRecord
                                 })
                                 ->required(),
 
-                            ToggleButtons::make('skip_scripts')
+                            Forms\Components\ToggleButtons::make('skip_scripts')
                                 ->label('Run Egg Install Script?')
                                 ->default(false)
                                 ->columnSpan([
@@ -403,67 +389,45 @@ class CreateServer extends CreateRecord
                                 ->inline()
                                 ->required(),
 
-                            ToggleButtons::make('start_on_completion')
-                                ->label('Start Server After Install?')
-                                ->default(true)
-                                ->required()
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
-                                ->options([
-                                    true => 'Yes',
-                                    false => 'No',
-                                ])
-                                ->colors([
-                                    true => 'primary',
-                                    false => 'danger',
-                                ])
-                                ->icons([
-                                    true => 'tabler-code',
-                                    false => 'tabler-code-off',
-                                ])
-                                ->inline(),
-
-                            Textarea::make('startup')
+                            Forms\Components\Textarea::make('startup')
                                 ->hintIcon('tabler-code')
                                 ->label('Startup Command')
-                                ->hidden(fn (Get $get) => $get('egg_id') === null)
+                                ->hidden(fn (Forms\Get $get) => $get('egg_id') === null)
                                 ->required()
                                 ->live()
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 2,
+                                    'md' => 2,
+                                    'lg' => 4,
+                                ])
                                 ->rows(function ($state) {
                                     return str($state)->explode("\n")->reduce(
                                         fn (int $carry, $line) => $carry + floor(strlen($line) / 125),
                                         1
                                     );
-                                })
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 4,
-                                    'md' => 4,
-                                    'lg' => 6,
-                                ]),
+                                }),
 
-                            Hidden::make('environment')->default([]),
+                            Forms\Components\Hidden::make('environment')->default([]),
 
-                            Section::make('Variables')
+                            Forms\Components\Hidden::make('start_on_completion')->default(true),
+
+                            Forms\Components\Section::make('Variables')
                                 ->icon('tabler-eggs')
                                 ->iconColor('primary')
-                                ->hidden(fn (Get $get) => $get('egg_id') === null)
+                                ->hidden(fn (Forms\Get $get) => $get('egg_id') === null)
                                 ->collapsible()
                                 ->columnSpanFull()
                                 ->schema([
-                                    Placeholder::make('Select an egg first to show its variables!')
-                                        ->hidden(fn (Get $get) => $get('egg_id')),
+                                    Forms\Components\Placeholder::make('Select an egg first to show its variables!')
+                                        ->hidden(fn (Forms\Get $get) => $get('egg_id')),
 
-                                    Placeholder::make('The selected egg has no variables!')
-                                        ->hidden(fn (Get $get) => !$get('egg_id') ||
+                                    Forms\Components\Placeholder::make('The selected egg has no variables!')
+                                        ->hidden(fn (Forms\Get $get) => !$get('egg_id') ||
                                             Egg::query()->find($get('egg_id'))?->variables()?->count()
                                         ),
 
-                                    Repeater::make('server_variables')
+                                    Forms\Components\Repeater::make('server_variables')
                                         ->label('')
                                         ->relationship('serverVariables')
                                         ->saveRelationshipsBeforeChildrenUsing(null)
@@ -476,11 +440,12 @@ class CreateServer extends CreateRecord
                                         ->hidden(fn ($state) => empty($state))
                                         ->schema(function () {
 
-                                            $text = TextInput::make('variable_value')
+                                            $text = Forms\Components\TextInput::make('variable_value')
                                                 ->hidden($this->shouldHideComponent(...))
-                                                ->required(fn (Get $get) => in_array('required', $get('rules')))
+                                                ->maxLength(255)
+                                                ->required(fn (Forms\Get $get) => in_array('required', explode('|', $get('rules'))))
                                                 ->rules(
-                                                    fn (Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
+                                                    fn (Forms\Get $get): Closure => function (string $attribute, $value, Closure $fail) use ($get) {
                                                         $validator = Validator::make(['validatorkey' => $value], [
                                                             'validatorkey' => $get('rules'),
                                                         ]);
@@ -493,7 +458,7 @@ class CreateServer extends CreateRecord
                                                     },
                                                 );
 
-                                            $select = Select::make('variable_value')
+                                            $select = Forms\Components\Select::make('variable_value')
                                                 ->hidden($this->shouldHideComponent(...))
                                                 ->options($this->getSelectOptionsFromRules(...))
                                                 ->selectablePlaceholder(false);
@@ -504,11 +469,11 @@ class CreateServer extends CreateRecord
                                                 $component = $component
                                                     ->live(onBlur: true)
                                                     ->hintIcon('tabler-code')
-                                                    ->label(fn (Get $get) => $get('name'))
-                                                    ->hintIconTooltip(fn (Get $get) => implode('|', $get('rules')))
-                                                    ->prefix(fn (Get $get) => '{{' . $get('env_variable') . '}}')
-                                                    ->helperText(fn (Get $get) => empty($get('description')) ? '—' : $get('description'))
-                                                    ->afterStateUpdated(function (Set $set, Get $get, $state) {
+                                                    ->label(fn (Forms\Get $get) => $get('name'))
+                                                    ->hintIconTooltip(fn (Forms\Get $get) => $get('rules'))
+                                                    ->prefix(fn (Forms\Get $get) => '{{' . $get('env_variable') . '}}')
+                                                    ->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description'))
+                                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
                                                         $environment = $get($envPath = '../../environment');
                                                         $environment[$get('env_variable')] = $state;
                                                         $set($envPath, $environment);
@@ -520,13 +485,18 @@ class CreateServer extends CreateRecord
                                         ->columnSpan(2),
                                 ]),
                         ]),
-                    Step::make('Environment Configuration')
+                    Wizard\Step::make('Environment Configuration')
                         ->label('Environment Configuration')
                         ->icon('tabler-brand-docker')
                         ->completedIcon('tabler-check')
                         ->schema([
-                            Fieldset::make('Resource Limits')
-                                ->columnSpan(6)
+                            Forms\Components\Fieldset::make('Resource Limits')
+                                ->columnSpan([
+                                    'default' => 2,
+                                    'sm' => 4,
+                                    'md' => 4,
+                                    'lg' => 6,
+                                ])
                                 ->columns([
                                     'default' => 1,
                                     'sm' => 2,
@@ -534,14 +504,14 @@ class CreateServer extends CreateRecord
                                     'lg' => 3,
                                 ])
                                 ->schema([
-                                    Grid::make()
+                                    Forms\Components\Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
                                         ->schema([
-                                            ToggleButtons::make('unlimited_mem')
+                                            Forms\Components\ToggleButtons::make('unlimited_mem')
                                                 ->label('Memory')->inlineLabel()->inline()
                                                 ->default(true)
-                                                ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
+                                                ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
                                                 ->live()
                                                 ->options([
                                                     true => 'Unlimited',
@@ -553,9 +523,9 @@ class CreateServer extends CreateRecord
                                                 ])
                                                 ->columnSpan(2),
 
-                                            TextInput::make('memory')
+                                            Forms\Components\TextInput::make('memory')
                                                 ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                                ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                                 ->label('Memory Limit')->inlineLabel()
                                                 ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                 ->default(0)
@@ -565,15 +535,15 @@ class CreateServer extends CreateRecord
                                                 ->minValue(0),
                                         ]),
 
-                                    Grid::make()
+                                    Forms\Components\Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
                                         ->schema([
-                                            ToggleButtons::make('unlimited_disk')
+                                            Forms\Components\ToggleButtons::make('unlimited_disk')
                                                 ->label('Disk Space')->inlineLabel()->inline()
                                                 ->default(true)
                                                 ->live()
-                                                ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
+                                                ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
                                                 ->options([
                                                     true => 'Unlimited',
                                                     false => 'Limited',
@@ -584,9 +554,9 @@ class CreateServer extends CreateRecord
                                                 ])
                                                 ->columnSpan(2),
 
-                                            TextInput::make('disk')
+                                            Forms\Components\TextInput::make('disk')
                                                 ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => $get('unlimited_disk'))
+                                                ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                                 ->label('Disk Space Limit')->inlineLabel()
                                                 ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                 ->default(0)
@@ -596,14 +566,14 @@ class CreateServer extends CreateRecord
                                                 ->minValue(0),
                                         ]),
 
-                                    Grid::make()
+                                    Forms\Components\Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
                                         ->schema([
-                                            ToggleButtons::make('unlimited_cpu')
+                                            Forms\Components\ToggleButtons::make('unlimited_cpu')
                                                 ->label('CPU')->inlineLabel()->inline()
                                                 ->default(true)
-                                                ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
+                                                ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
                                                 ->live()
                                                 ->options([
                                                     true => 'Unlimited',
@@ -615,9 +585,9 @@ class CreateServer extends CreateRecord
                                                 ])
                                                 ->columnSpan(2),
 
-                                            TextInput::make('cpu')
+                                            Forms\Components\TextInput::make('cpu')
                                                 ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                                ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
                                                 ->label('CPU Limit')->inlineLabel()
                                                 ->suffix('%')
                                                 ->default(0)
@@ -627,34 +597,24 @@ class CreateServer extends CreateRecord
                                                 ->minValue(0)
                                                 ->helperText('100% equals one CPU core.'),
                                         ]),
-                                ]),
 
-                            Fieldset::make('Advanced Limits')
-                                ->columnSpan(6)
-                                ->columns([
-                                    'default' => 1,
-                                    'sm' => 2,
-                                    'md' => 3,
-                                    'lg' => 3,
-                                ])
-                                ->schema([
-                                    Grid::make()
+                                    Forms\Components\Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
                                         ->schema([
-                                            ToggleButtons::make('swap_support')
+                                            Forms\Components\ToggleButtons::make('swap_support')
                                                 ->live()
-                                                ->label('Swap Memory')
+                                                ->label('Enable Swap Memory')
                                                 ->inlineLabel()
                                                 ->inline()
                                                 ->columnSpan(2)
                                                 ->default('disabled')
-                                                ->afterStateUpdated(function ($state, Set $set) {
+                                                ->afterStateUpdated(function ($state, Forms\Set $set) {
                                                     $value = match ($state) {
                                                         'unlimited' => -1,
                                                         'disabled' => 0,
                                                         'limited' => 128,
-                                                        default => throw new LogicException('Invalid state'),
+                                                        default => throw new \LogicException('Invalid state'),
                                                     };
 
                                                     $set('swap', $value);
@@ -670,9 +630,9 @@ class CreateServer extends CreateRecord
                                                     'disabled' => 'danger',
                                                 ]),
 
-                                            TextInput::make('swap')
+                                            Forms\Components\TextInput::make('swap')
                                                 ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => match ($get('swap_support')) {
+                                                ->hidden(fn (Forms\Get $get) => match ($get('swap_support')) {
                                                     'disabled', 'unlimited' => true,
                                                     default => false,
                                                 })
@@ -686,46 +646,16 @@ class CreateServer extends CreateRecord
                                                 ->integer(),
                                         ]),
 
-                                    Hidden::make('io')
+                                    Forms\Components\Hidden::make('io')
                                         ->helperText('The IO performance relative to other running containers')
                                         ->label('Block IO Proportion')
                                         ->default(500),
 
-                                    Grid::make()
+                                    Forms\Components\Grid::make()
                                         ->columns(4)
                                         ->columnSpanFull()
                                         ->schema([
-                                            ToggleButtons::make('cpu_pinning')
-                                                ->label('CPU Pinning')->inlineLabel()->inline()
-                                                ->default(false)
-                                                ->afterStateUpdated(fn (Set $set) => $set('threads', []))
-                                                ->live()
-                                                ->options([
-                                                    false => 'Disabled',
-                                                    true => 'Enabled',
-                                                ])
-                                                ->colors([
-                                                    false => 'success',
-                                                    true => 'warning',
-                                                ])
-                                                ->columnSpan(2),
-
-                                            TagsInput::make('threads')
-                                                ->dehydratedWhenHidden()
-                                                ->hidden(fn (Get $get) => !$get('cpu_pinning'))
-                                                ->label('Pinned Threads')->inlineLabel()
-                                                ->required(fn (Get $get) => $get('cpu_pinning'))
-                                                ->columnSpan(2)
-                                                ->separator()
-                                                ->splitKeys([','])
-                                                ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
-                                        ]),
-
-                                    Grid::make()
-                                        ->columns(4)
-                                        ->columnSpanFull()
-                                        ->schema([
-                                            ToggleButtons::make('oom_killer')
+                                            Forms\Components\ToggleButtons::make('oom_killer')
                                                 ->label('OOM Killer')
                                                 ->inlineLabel()->inline()
                                                 ->default(false)
@@ -739,14 +669,19 @@ class CreateServer extends CreateRecord
                                                     true => 'danger',
                                                 ]),
 
-                                            TextInput::make('oom_disabled_hidden')
+                                            Forms\Components\TextInput::make('oom_disabled_hidden')
                                                 ->hidden(),
                                         ]),
                                 ]),
 
-                            Fieldset::make('Feature Limits')
+                            Forms\Components\Fieldset::make('Feature Limits')
                                 ->inlineLabel()
-                                ->columnSpan(6)
+                                ->columnSpan([
+                                    'default' => 2,
+                                    'sm' => 4,
+                                    'md' => 4,
+                                    'lg' => 6,
+                                ])
                                 ->columns([
                                     'default' => 1,
                                     'sm' => 2,
@@ -754,21 +689,21 @@ class CreateServer extends CreateRecord
                                     'lg' => 3,
                                 ])
                                 ->schema([
-                                    TextInput::make('allocation_limit')
+                                    Forms\Components\TextInput::make('allocation_limit')
                                         ->label('Allocations')
                                         ->suffixIcon('tabler-network')
                                         ->required()
                                         ->numeric()
                                         ->minValue(0)
                                         ->default(0),
-                                    TextInput::make('database_limit')
+                                    Forms\Components\TextInput::make('database_limit')
                                         ->label('Databases')
                                         ->suffixIcon('tabler-database')
                                         ->required()
                                         ->numeric()
                                         ->minValue(0)
                                         ->default(0),
-                                    TextInput::make('backup_limit')
+                                    Forms\Components\TextInput::make('backup_limit')
                                         ->label('Backups')
                                         ->suffixIcon('tabler-copy-check')
                                         ->required()
@@ -776,19 +711,24 @@ class CreateServer extends CreateRecord
                                         ->minValue(0)
                                         ->default(0),
                                 ]),
-                            Fieldset::make('Docker Settings')
+                            Forms\Components\Fieldset::make('Docker Settings')
+                                ->columnSpan([
+                                    'default' => 2,
+                                    'sm' => 4,
+                                    'md' => 4,
+                                    'lg' => 6,
+                                ])
                                 ->columns([
                                     'default' => 1,
                                     'sm' => 2,
                                     'md' => 3,
-                                    'lg' => 4,
+                                    'lg' => 3,
                                 ])
-                                ->columnSpan(6)
                                 ->schema([
-                                    Select::make('select_image')
+                                    Forms\Components\Select::make('select_image')
                                         ->label('Image Name')
-                                        ->afterStateUpdated(fn (Set $set, $state) => $set('image', $state))
-                                        ->options(function ($state, Get $get, Set $set) {
+                                        ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('image', $state))
+                                        ->options(function ($state, Forms\Get $get, Forms\Set $set) {
                                             $egg = Egg::query()->find($get('egg_id'));
                                             $images = $egg->docker_images ?? [];
 
@@ -802,17 +742,12 @@ class CreateServer extends CreateRecord
                                             return array_flip($images) + ['ghcr.io/custom-image' => 'Custom Image'];
                                         })
                                         ->selectablePlaceholder(false)
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 2,
-                                            'md' => 3,
-                                            'lg' => 2,
-                                        ]),
+                                        ->columnSpan(1),
 
-                                    TextInput::make('image')
+                                    Forms\Components\TextInput::make('image')
                                         ->label('Image')
                                         ->debounce(500)
-                                        ->afterStateUpdated(function ($state, Get $get, Set $set) {
+                                        ->afterStateUpdated(function ($state, Forms\Get $get, Forms\Set $set) {
                                             $egg = Egg::query()->find($get('egg_id'));
                                             $images = $egg->docker_images ?? [];
 
@@ -823,20 +758,15 @@ class CreateServer extends CreateRecord
                                             }
                                         })
                                         ->placeholder('Enter a custom Image')
-                                        ->columnSpan([
-                                            'default' => 1,
-                                            'sm' => 2,
-                                            'md' => 3,
-                                            'lg' => 2,
-                                        ]),
+                                        ->columnSpan(2),
 
-                                    KeyValue::make('docker_labels')
+                                    Forms\Components\KeyValue::make('docker_labels')
                                         ->label('Container Labels')
                                         ->keyLabel('Title')
                                         ->valueLabel('Description')
-                                        ->columnSpanFull(),
+                                        ->columnSpan(3),
 
-                                    CheckboxList::make('mounts')
+                                    Forms\Components\CheckboxList::make('mounts')
                                         ->live()
                                         ->relationship('mounts')
                                         ->options(fn () => $this->node?->mounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]) ?? [])
@@ -874,29 +804,32 @@ class CreateServer extends CreateRecord
     {
         $data['allocation_additional'] = collect($data['allocation_additional'])->filter()->all();
 
-        return $this->serverCreationService->handle($data);
+        /** @var ServerCreationService $service */
+        $service = resolve(ServerCreationService::class);
+
+        return $service->handle($data);
     }
 
-    private function shouldHideComponent(Get $get, Component $component): bool
+    private function shouldHideComponent(Forms\Get $get, Forms\Components\Component $component): bool
     {
-        $containsRuleIn = collect($get('rules'))->reduce(
+        $containsRuleIn = str($get('rules'))->explode('|')->reduce(
             fn ($result, $value) => $result === true && !str($value)->startsWith('in:'), true
         );
 
-        if ($component instanceof Select) {
+        if ($component instanceof Forms\Components\Select) {
             return $containsRuleIn;
         }
 
-        if ($component instanceof TextInput) {
+        if ($component instanceof Forms\Components\TextInput) {
             return !$containsRuleIn;
         }
 
-        throw new Exception('Component type not supported: ' . $component::class);
+        throw new \Exception('Component type not supported: ' . $component::class);
     }
 
-    private function getSelectOptionsFromRules(Get $get): array
+    private function getSelectOptionsFromRules(Forms\Get $get): array
     {
-        $inRule = collect($get('rules'))->reduce(
+        $inRule = str($get('rules'))->explode('|')->reduce(
             fn ($result, $value) => str($value)->startsWith('in:') ? $value : $result, ''
         );
 

app/Filament/Resources/ServerResource/Pages/EditServer.php

@@ -2,45 +2,31 @@
 
 namespace App\Filament\Resources\ServerResource\Pages;
 
-use App\Enums\ContainerStatus;
-use App\Enums\ServerState;
+use App\Models\Database;
+use App\Services\Databases\DatabaseManagementService;
+use App\Services\Databases\DatabasePasswordService;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Repeater;
+use LogicException;
 use App\Filament\Resources\ServerResource;
 use App\Http\Controllers\Admin\ServersController;
-use App\Models\Database;
+use App\Services\Servers\RandomWordService;
+use App\Services\Servers\SuspensionService;
+use App\Services\Servers\TransferServerService;
+use Filament\Actions;
+use Filament\Forms;
+use App\Enums\ContainerStatus;
+use App\Enums\ServerState;
 use App\Models\Egg;
 use App\Models\Server;
 use App\Models\ServerVariable;
-use App\Services\Databases\DatabaseManagementService;
-use App\Services\Databases\DatabasePasswordService;
-use App\Services\Servers\RandomWordService;
 use App\Services\Servers\ServerDeletionService;
-use App\Services\Servers\SuspensionService;
-use App\Services\Servers\TransferServerService;
-use Closure;
-use Exception;
-use Filament\Actions;
-use Filament\Forms;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\Repeater;
-use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Validator;
-use LogicException;
+use Closure;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
 class EditServer extends EditRecord
@@ -50,26 +36,32 @@ class EditServer extends EditRecord
     public function form(Form $form): Form
     {
         return $form
+            ->columns([
+                'default' => 1,
+                'sm' => 2,
+                'md' => 2,
+                'lg' => 4,
+            ])
             ->schema([
                 Tabs::make('Tabs')
                     ->persistTabInQueryString()
+                    ->columnSpan(6)
                     ->columns([
                         'default' => 2,
                         'sm' => 2,
                         'md' => 4,
                         'lg' => 6,
                     ])
-                    ->columnSpanFull()
                     ->tabs([
-                        Tab::make('Information')
+                        Tabs\Tab::make('Information')
                             ->icon('tabler-info-circle')
                             ->schema([
-                                TextInput::make('name')
+                                Forms\Components\TextInput::make('name')
                                     ->prefixIcon('tabler-server')
                                     ->label('Display Name')
-                                    ->suffixAction(Action::make('random')
+                                    ->suffixAction(Forms\Components\Actions\Action::make('random')
                                         ->icon('tabler-dice-' . random_int(1, 6))
-                                        ->action(function (Set $set, Get $get) {
+                                        ->action(function (Forms\Set $set, Forms\Get $get) {
                                             $egg = Egg::find($get('egg_id'));
                                             $prefix = $egg ? str($egg->name)->lower()->kebab() . '-' : '';
 
@@ -86,7 +78,7 @@ class EditServer extends EditRecord
                                     ->required()
                                     ->maxLength(255),
 
-                                Select::make('owner_id')
+                                Forms\Components\Select::make('owner_id')
                                     ->prefixIcon('tabler-user')
                                     ->label('Owner')
                                     ->columnSpan([
@@ -100,7 +92,7 @@ class EditServer extends EditRecord
                                     ->preload()
                                     ->required(),
 
-                                ToggleButtons::make('condition')
+                                Forms\Components\ToggleButtons::make('condition')
                                     ->label('Server Status')
                                     ->formatStateUsing(fn (Server $server) => $server->condition)
                                     ->options(fn ($state) => collect(array_merge(ContainerStatus::cases(), ServerState::cases()))
@@ -120,11 +112,11 @@ class EditServer extends EditRecord
                                         'lg' => 1,
                                     ]),
 
-                                Textarea::make('description')
+                                Forms\Components\Textarea::make('description')
                                     ->label('Description')
                                     ->columnSpanFull(),
 
-                                TextInput::make('uuid')
+                                Forms\Components\TextInput::make('uuid')
                                     ->hintAction(CopyAction::make())
                                     ->columnSpan([
                                         'default' => 2,
@@ -132,9 +124,8 @@ class EditServer extends EditRecord
                                         'md' => 2,
                                         'lg' => 3,
                                     ])
-                                    ->readOnly()
-                                    ->dehydrated(false),
-                                TextInput::make('uuid_short')
+                                    ->readOnly(),
+                                Forms\Components\TextInput::make('uuid_short')
                                     ->label('Short UUID')
                                     ->hintAction(CopyAction::make())
                                     ->columnSpan([
@@ -143,9 +134,8 @@ class EditServer extends EditRecord
                                         'md' => 2,
                                         'lg' => 3,
                                     ])
-                                    ->readOnly()
-                                    ->dehydrated(false),
-                                TextInput::make('external_id')
+                                    ->readOnly(),
+                                Forms\Components\TextInput::make('external_id')
                                     ->label('External ID')
                                     ->columnSpan([
                                         'default' => 2,
@@ -154,7 +144,7 @@ class EditServer extends EditRecord
                                         'lg' => 3,
                                     ])
                                     ->maxLength(255),
-                                Select::make('node_id')
+                                Forms\Components\Select::make('node_id')
                                     ->label('Node')
                                     ->relationship('node', 'name')
                                     ->columnSpan([
@@ -165,10 +155,16 @@ class EditServer extends EditRecord
                                     ])
                                     ->disabled(),
                             ]),
-                        Tab::make('Environment')
+                        Tabs\Tab::make('Environment')
                             ->icon('tabler-brand-docker')
                             ->schema([
-                                Fieldset::make('Resource Limits')
+                                Forms\Components\Fieldset::make('Resource Limits')
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 4,
+                                        'md' => 4,
+                                        'lg' => 6,
+                                    ])
                                     ->columns([
                                         'default' => 1,
                                         'sm' => 2,
@@ -176,14 +172,14 @@ class EditServer extends EditRecord
                                         'lg' => 3,
                                     ])
                                     ->schema([
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
-                                                ToggleButtons::make('unlimited_mem')
+                                                Forms\Components\ToggleButtons::make('unlimited_mem')
                                                     ->label('Memory')->inlineLabel()->inline()
-                                                    ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                                    ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
+                                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
+                                                    ->formatStateUsing(fn (Forms\Get $get) => $get('memory') == 0)
                                                     ->live()
                                                     ->options([
                                                         true => 'Unlimited',
@@ -195,9 +191,9 @@ class EditServer extends EditRecord
                                                     ])
                                                     ->columnSpan(2),
 
-                                                TextInput::make('memory')
+                                                Forms\Components\TextInput::make('memory')
                                                     ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                                     ->label('Memory Limit')->inlineLabel()
                                                     ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                     ->required()
@@ -206,15 +202,15 @@ class EditServer extends EditRecord
                                                     ->minValue(0),
                                             ]),
 
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
-                                                ToggleButtons::make('unlimited_disk')
+                                                Forms\Components\ToggleButtons::make('unlimited_disk')
                                                     ->label('Disk Space')->inlineLabel()->inline()
                                                     ->live()
-                                                    ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                                    ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
+                                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
+                                                    ->formatStateUsing(fn (Forms\Get $get) => $get('disk') == 0)
                                                     ->options([
                                                         true => 'Unlimited',
                                                         false => 'Limited',
@@ -225,9 +221,9 @@ class EditServer extends EditRecord
                                                     ])
                                                     ->columnSpan(2),
 
-                                                TextInput::make('disk')
+                                                Forms\Components\TextInput::make('disk')
                                                     ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => $get('unlimited_disk'))
+                                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                                     ->label('Disk Space Limit')->inlineLabel()
                                                     ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                                     ->required()
@@ -236,14 +232,14 @@ class EditServer extends EditRecord
                                                     ->minValue(0),
                                             ]),
 
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
-                                                ToggleButtons::make('unlimited_cpu')
+                                                Forms\Components\ToggleButtons::make('unlimited_cpu')
                                                     ->label('CPU')->inlineLabel()->inline()
-                                                    ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                                    ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
+                                                    ->afterStateUpdated(fn (Forms\Set $set) => $set('cpu', 0))
+                                                    ->formatStateUsing(fn (Forms\Get $get) => $get('cpu') == 0)
                                                     ->live()
                                                     ->options([
                                                         true => 'Unlimited',
@@ -255,9 +251,9 @@ class EditServer extends EditRecord
                                                     ])
                                                     ->columnSpan(2),
 
-                                                TextInput::make('cpu')
+                                                Forms\Components\TextInput::make('cpu')
                                                     ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                                    ->hidden(fn (Forms\Get $get) => $get('unlimited_cpu'))
                                                     ->label('CPU Limit')->inlineLabel()
                                                     ->suffix('%')
                                                     ->required()
@@ -265,25 +261,16 @@ class EditServer extends EditRecord
                                                     ->numeric()
                                                     ->minValue(0),
                                             ]),
-                                    ]),
 
-                                Fieldset::make('Advanced Limits')
-                                    ->columns([
-                                        'default' => 1,
-                                        'sm' => 2,
-                                        'md' => 3,
-                                        'lg' => 3,
-                                    ])
-                                    ->schema([
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
-                                                ToggleButtons::make('swap_support')
+                                                Forms\Components\ToggleButtons::make('swap_support')
                                                     ->live()
-                                                    ->label('Swap Memory')->inlineLabel()->inline()
+                                                    ->label('Enable Swap Memory')->inlineLabel()->inline()
                                                     ->columnSpan(2)
-                                                    ->afterStateUpdated(function ($state, Set $set) {
+                                                    ->afterStateUpdated(function ($state, Forms\Set $set) {
                                                         $value = match ($state) {
                                                             'unlimited' => -1,
                                                             'disabled' => 0,
@@ -293,7 +280,7 @@ class EditServer extends EditRecord
 
                                                         $set('swap', $value);
                                                     })
-                                                    ->formatStateUsing(function (Get $get) {
+                                                    ->formatStateUsing(function (Forms\Get $get) {
                                                         return match (true) {
                                                             $get('swap') > 0 => 'limited',
                                                             $get('swap') == 0 => 'disabled',
@@ -312,9 +299,9 @@ class EditServer extends EditRecord
                                                         'disabled' => 'danger',
                                                     ]),
 
-                                                TextInput::make('swap')
+                                                Forms\Components\TextInput::make('swap')
                                                     ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => match ($get('swap_support')) {
+                                                    ->hidden(fn (Forms\Get $get) => match ($get('swap_support')) {
                                                         'disabled', 'unlimited', true => true,
                                                         default => false,
                                                     })
@@ -326,46 +313,15 @@ class EditServer extends EditRecord
                                                     ->integer(),
                                             ]),
 
-                                        Hidden::make('io')
+                                        Forms\Components\Hidden::make('io')
                                             ->helperText('The IO performance relative to other running containers')
                                             ->label('Block IO Proportion'),
 
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columns(4)
                                             ->columnSpanFull()
                                             ->schema([
-                                                ToggleButtons::make('cpu_pinning')
-                                                    ->label('CPU Pinning')->inlineLabel()->inline()
-                                                    ->default(false)
-                                                    ->afterStateUpdated(fn (Set $set) => $set('threads', []))
-                                                    ->formatStateUsing(fn (Get $get) => !empty($get('threads')))
-                                                    ->live()
-                                                    ->options([
-                                                        false => 'Disabled',
-                                                        true => 'Enabled',
-                                                    ])
-                                                    ->colors([
-                                                        false => 'success',
-                                                        true => 'warning',
-                                                    ])
-                                                    ->columnSpan(2),
-
-                                                TagsInput::make('threads')
-                                                    ->dehydratedWhenHidden()
-                                                    ->hidden(fn (Get $get) => !$get('cpu_pinning'))
-                                                    ->label('Pinned Threads')->inlineLabel()
-                                                    ->required(fn (Get $get) => $get('cpu_pinning'))
-                                                    ->columnSpan(2)
-                                                    ->separator()
-                                                    ->splitKeys([','])
-                                                    ->placeholder('Add pinned thread, e.g. 0 or 2-4'),
-                                            ]),
-
-                                        Grid::make()
-                                            ->columns(4)
-                                            ->columnSpanFull()
-                                            ->schema([
-                                                ToggleButtons::make('oom_killer')
+                                                Forms\Components\ToggleButtons::make('oom_killer')
                                                     ->label('OOM Killer')->inlineLabel()->inline()
                                                     ->columnSpan(2)
                                                     ->options([
@@ -377,13 +333,19 @@ class EditServer extends EditRecord
                                                         true => 'danger',
                                                     ]),
 
-                                                TextInput::make('oom_disabled_hidden')
+                                                Forms\Components\TextInput::make('oom_disabled_hidden')
                                                     ->hidden(),
                                             ]),
                                     ]),
 
-                                Fieldset::make('Feature Limits')
+                                Forms\Components\Fieldset::make('Feature Limits')
                                     ->inlineLabel()
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 4,
+                                        'md' => 4,
+                                        'lg' => 6,
+                                    ])
                                     ->columns([
                                         'default' => 1,
                                         'sm' => 2,
@@ -391,23 +353,29 @@ class EditServer extends EditRecord
                                         'lg' => 3,
                                     ])
                                     ->schema([
-                                        TextInput::make('allocation_limit')
+                                        Forms\Components\TextInput::make('allocation_limit')
                                             ->suffixIcon('tabler-network')
                                             ->required()
                                             ->minValue(0)
                                             ->numeric(),
-                                        TextInput::make('database_limit')
+                                        Forms\Components\TextInput::make('database_limit')
                                             ->suffixIcon('tabler-database')
                                             ->required()
                                             ->minValue(0)
                                             ->numeric(),
-                                        TextInput::make('backup_limit')
+                                        Forms\Components\TextInput::make('backup_limit')
                                             ->suffixIcon('tabler-copy-check')
                                             ->required()
                                             ->minValue(0)
                                             ->numeric(),
                                     ]),
-                                Fieldset::make('Docker Settings')
+                                Forms\Components\Fieldset::make('Docker Settings')
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 4,
+                                        'md' => 4,
+                                        'lg' => 6,
+                                    ])
                                     ->columns([
                                         'default' => 1,
                                         'sm' => 2,
@@ -415,10 +383,10 @@ class EditServer extends EditRecord
                                         'lg' => 3,
                                     ])
                                     ->schema([
-                                        Select::make('select_image')
+                                        Forms\Components\Select::make('select_image')
                                             ->label('Image Name')
-                                            ->afterStateUpdated(fn (Set $set, $state) => $set('image', $state))
-                                            ->options(function ($state, Get $get, Set $set) {
+                                            ->afterStateUpdated(fn (Forms\Set $set, $state) => $set('image', $state))
+                                            ->options(function ($state, Forms\Get $get, Forms\Set $set) {
                                                 $egg = Egg::query()->find($get('egg_id'));
                                                 $images = $egg->docker_images ?? [];
 
@@ -434,10 +402,10 @@ class EditServer extends EditRecord
                                             ->selectablePlaceholder(false)
                                             ->columnSpan(1),
 
-                                        TextInput::make('image')
+                                        Forms\Components\TextInput::make('image')
                                             ->label('Image')
                                             ->debounce(500)
-                                            ->afterStateUpdated(function ($state, Get $get, Set $set) {
+                                            ->afterStateUpdated(function ($state, Forms\Get $get, Forms\Set $set) {
                                                 $egg = Egg::query()->find($get('egg_id'));
                                                 $images = $egg->docker_images ?? [];
 
@@ -457,7 +425,7 @@ class EditServer extends EditRecord
                                             ->columnSpanFull(),
                                     ]),
                             ]),
-                        Tab::make('Egg')
+                        Tabs\Tab::make('Egg')
                             ->icon('tabler-egg')
                             ->columns([
                                 'default' => 1,
@@ -466,28 +434,22 @@ class EditServer extends EditRecord
                                 'lg' => 5,
                             ])
                             ->schema([
-                                Select::make('egg_id')
+                                Forms\Components\Select::make('egg_id')
                                     ->disabledOn('edit')
                                     ->prefixIcon('tabler-egg')
                                     ->columnSpan([
-                                        'default' => 6,
+                                        'default' => 1,
                                         'sm' => 3,
                                         'md' => 3,
-                                        'lg' => 4,
+                                        'lg' => 5,
                                     ])
                                     ->relationship('egg', 'name')
                                     ->searchable()
                                     ->preload()
                                     ->required(),
 
-                                ToggleButtons::make('skip_scripts')
+                                Forms\Components\ToggleButtons::make('skip_scripts')
                                     ->label('Run Egg Install Script?')->inline()
-                                    ->columnSpan([
-                                        'default' => 6,
-                                        'sm' => 1,
-                                        'md' => 1,
-                                        'lg' => 2,
-                                    ])
                                     ->options([
                                         false => 'Yes',
                                         true => 'Skip',
@@ -502,10 +464,15 @@ class EditServer extends EditRecord
                                     ])
                                     ->required(),
 
-                                Textarea::make('startup')
+                                Forms\Components\Textarea::make('startup')
                                     ->label('Startup Command')
                                     ->required()
-                                    ->columnSpan(6)
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 4,
+                                        'md' => 4,
+                                        'lg' => 6,
+                                    ])
                                     ->rows(function ($state) {
                                         return str($state)->explode("\n")->reduce(
                                             fn (int $carry, $line) => $carry + floor(strlen($line) / 125),
@@ -513,33 +480,24 @@ class EditServer extends EditRecord
                                         );
                                     }),
 
-                                Textarea::make('defaultStartup')
+                                Forms\Components\Textarea::make('defaultStartup')
                                     ->hintAction(CopyAction::make())
                                     ->label('Default Startup Command')
                                     ->disabled()
-                                    ->formatStateUsing(function ($state, Get $get) {
+                                    ->formatStateUsing(function ($state, Forms\Get $get, Forms\Set $set) {
                                         $egg = Egg::query()->find($get('egg_id'));
 
                                         return $egg->startup;
                                     })
-                                    ->columnSpan(6),
+                                    ->columnSpan([
+                                        'default' => 2,
+                                        'sm' => 4,
+                                        'md' => 4,
+                                        'lg' => 6,
+                                    ]),
 
-                                Repeater::make('server_variables')
-                                    ->relationship('serverVariables', function (Builder $query) {
-                                        /** @var Server $server */
-                                        $server = $this->getRecord();
-
-                                        foreach ($server->variables as $variable) {
-                                            ServerVariable::query()->firstOrCreate([
-                                                'server_id' => $server->id,
-                                                'variable_id' => $variable->id,
-                                            ], [
-                                                'variable_value' => $variable->server_value ?? '',
-                                            ]);
-                                        }
-
-                                        return $query;
-                                    })
+                                Forms\Components\Repeater::make('server_variables')
+                                    ->relationship('serverVariables')
                                     ->grid()
                                     ->mutateRelationshipDataBeforeSaveUsing(function (array &$data): array {
                                         foreach ($data as $key => $value) {
@@ -553,9 +511,9 @@ class EditServer extends EditRecord
                                     ->reorderable(false)->addable(false)->deletable(false)
                                     ->schema(function () {
 
-                                        $text = TextInput::make('variable_value')
+                                        $text = Forms\Components\TextInput::make('variable_value')
                                             ->hidden($this->shouldHideComponent(...))
-                                            ->required(fn (ServerVariable $serverVariable) => $serverVariable->variable->getRequiredAttribute())
+                                            ->required(fn (ServerVariable $serverVariable) => in_array('required', explode('|', $serverVariable->variable->rules)))
                                             ->rules([
                                                 fn (ServerVariable $serverVariable): Closure => function (string $attribute, $value, Closure $fail) use ($serverVariable) {
                                                     $validator = Validator::make(['validatorkey' => $value], [
@@ -570,7 +528,7 @@ class EditServer extends EditRecord
                                                 },
                                             ]);
 
-                                        $select = Select::make('variable_value')
+                                        $select = Forms\Components\Select::make('variable_value')
                                             ->hidden($this->shouldHideComponent(...))
                                             ->options($this->getSelectOptionsFromRules(...))
                                             ->selectablePlaceholder(false);
@@ -582,7 +540,7 @@ class EditServer extends EditRecord
                                                 ->live(onBlur: true)
                                                 ->hintIcon('tabler-code')
                                                 ->label(fn (ServerVariable $serverVariable) => $serverVariable->variable->name)
-                                                ->hintIconTooltip(fn (ServerVariable $serverVariable) => implode('|', $serverVariable->variable->rules))
+                                                ->hintIconTooltip(fn (ServerVariable $serverVariable) => $serverVariable->variable->rules)
                                                 ->prefix(fn (ServerVariable $serverVariable) => '{{' . $serverVariable->variable->env_variable . '}}')
                                                 ->helperText(fn (ServerVariable $serverVariable) => empty($serverVariable->variable->description) ? '—' : $serverVariable->variable->description);
                                         }
@@ -591,10 +549,10 @@ class EditServer extends EditRecord
                                     })
                                     ->columnSpan(6),
                             ]),
-                        Tab::make('Mounts')
+                        Tabs\Tab::make('Mounts')
                             ->icon('tabler-layers-linked')
                             ->schema([
-                                CheckboxList::make('mounts')
+                                Forms\Components\CheckboxList::make('mounts')
                                     ->relationship('mounts')
                                     ->options(fn (Server $server) => $server->node->mounts->mapWithKeys(fn ($mount) => [$mount->id => $mount->name]))
                                     ->descriptions(fn (Server $server) => $server->node->mounts->mapWithKeys(fn ($mount) => [$mount->id => "$mount->source -> $mount->target"]))
@@ -602,7 +560,7 @@ class EditServer extends EditRecord
                                     ->helperText(fn (Server $server) => $server->node->mounts->isNotEmpty() ? '' : 'No Mounts exist for this Node')
                                     ->columnSpanFull(),
                             ]),
-                        Tab::make('Databases')
+                        Tabs\Tab::make('Databases')
                             ->icon('tabler-database')
                             ->schema([
                                 Repeater::make('databases')
@@ -610,7 +568,7 @@ class EditServer extends EditRecord
                                     ->helperText(fn (Server $server) => $server->databases->isNotEmpty() ? '' : 'No Databases exist for this Server')
                                     ->columns(2)
                                     ->schema([
-                                        TextInput::make('database')
+                                        Forms\Components\TextInput::make('database')
                                             ->columnSpan(2)
                                             ->label('Database Name')
                                             ->disabled()
@@ -621,11 +579,11 @@ class EditServer extends EditRecord
                                                     ->icon('tabler-trash')
                                                     ->action(fn (DatabaseManagementService $databaseManagementService, $record) => $databaseManagementService->delete($record))
                                             ),
-                                        TextInput::make('username')
+                                        Forms\Components\TextInput::make('username')
                                             ->disabled()
                                             ->formatStateUsing(fn ($record) => $record->username)
                                             ->columnSpan(2),
-                                        TextInput::make('password')
+                                        Forms\Components\TextInput::make('password')
                                             ->disabled()
                                             ->hintAction(
                                                 Action::make('rotate')
@@ -635,30 +593,30 @@ class EditServer extends EditRecord
                                             )
                                             ->formatStateUsing(fn (Database $database) => $database->password)
                                             ->columnSpan(2),
-                                        TextInput::make('remote')
+                                        Forms\Components\TextInput::make('remote')
                                             ->disabled()
                                             ->formatStateUsing(fn ($record) => $record->remote)
                                             ->columnSpan(1)
                                             ->label('Connections From'),
-                                        TextInput::make('max_connections')
+                                        Forms\Components\TextInput::make('max_connections')
                                             ->disabled()
                                             ->formatStateUsing(fn ($record) => $record->max_connections)
                                             ->columnSpan(1),
-                                        TextInput::make('JDBC')
+                                        Forms\Components\TextInput::make('JDBC')
                                             ->disabled()
                                             ->label('JDBC Connection String')
                                             ->columnSpan(2)
-                                            ->formatStateUsing(fn (Get $get, $record) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($record->password) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database')),
+                                            ->formatStateUsing(fn (Forms\Get $get, $record) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($record->password) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database')),
                                     ])
                                     ->relationship('databases')
                                     ->deletable(false)
                                     ->addable(false)
                                     ->columnSpan(4),
                             ])->columns(4),
-                        Tab::make('Actions')
+                        Tabs\Tab::make('Actions')
                             ->icon('tabler-settings')
                             ->schema([
-                                Fieldset::make('Server Actions')
+                                Forms\Components\Fieldset::make('Server Actions')
                                     ->columns([
                                         'default' => 1,
                                         'sm' => 2,
@@ -666,11 +624,11 @@ class EditServer extends EditRecord
                                         'lg' => 6,
                                     ])
                                     ->schema([
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columnSpan(3)
                                             ->schema([
                                                 Forms\Components\Actions::make([
-                                                    Action::make('toggleInstall')
+                                                    Forms\Components\Actions\Action::make('toggleInstall')
                                                         ->label('Toggle Install Status')
                                                         ->disabled(fn (Server $server) => $server->isSuspended())
                                                         ->action(function (ServersController $serversController, Server $server) {
@@ -679,14 +637,14 @@ class EditServer extends EditRecord
                                                             $this->refreshFormData(['status', 'docker']);
                                                         }),
                                                 ])->fullWidth(),
-                                                ToggleButtons::make('')
+                                                Forms\Components\ToggleButtons::make('')
                                                     ->hint('If you need to change the install status from uninstalled to installed, or vice versa, you may do so with this button.'),
                                             ]),
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columnSpan(3)
                                             ->schema([
                                                 Forms\Components\Actions::make([
-                                                    Action::make('toggleSuspend')
+                                                    Forms\Components\Actions\Action::make('toggleSuspend')
                                                         ->label('Suspend')
                                                         ->color('warning')
                                                         ->hidden(fn (Server $server) => $server->isSuspended())
@@ -696,7 +654,7 @@ class EditServer extends EditRecord
 
                                                             $this->refreshFormData(['status', 'docker']);
                                                         }),
-                                                    Action::make('toggleUnsuspend')
+                                                    Forms\Components\Actions\Action::make('toggleUnsuspend')
                                                         ->label('Unsuspend')
                                                         ->color('success')
                                                         ->hidden(fn (Server $server) => !$server->isSuspended())
@@ -707,37 +665,37 @@ class EditServer extends EditRecord
                                                             $this->refreshFormData(['status', 'docker']);
                                                         }),
                                                 ])->fullWidth(),
-                                                ToggleButtons::make('')
+                                                Forms\Components\ToggleButtons::make('')
                                                     ->hidden(fn (Server $server) => $server->isSuspended())
                                                     ->hint('This will suspend the server, stop any running processes, and immediately block the user from being able to access their files or otherwise manage the server through the panel or API.'),
-                                                ToggleButtons::make('')
+                                                Forms\Components\ToggleButtons::make('')
                                                     ->hidden(fn (Server $server) => !$server->isSuspended())
                                                     ->hint('This will unsuspend the server and restore normal user access.'),
                                             ]),
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columnSpan(3)
                                             ->schema([
                                                 Forms\Components\Actions::make([
-                                                    Action::make('transfer')
+                                                    Forms\Components\Actions\Action::make('transfer')
                                                         ->label('Transfer Soon™')
                                                         ->action(fn (TransferServerService $transfer, Server $server) => $transfer->handle($server, []))
                                                         ->disabled() //TODO!
                                                         ->form([ //TODO!
-                                                            Select::make('newNode')
+                                                            Forms\Components\Select::make('newNode')
                                                                 ->label('New Node')
                                                                 ->required()
                                                                 ->options([
                                                                     true => 'on',
                                                                     false => 'off',
                                                                 ]),
-                                                            Select::make('newMainAllocation')
+                                                            Forms\Components\Select::make('newMainAllocation')
                                                                 ->label('New Main Allocation')
                                                                 ->required()
                                                                 ->options([
                                                                     true => 'on',
                                                                     false => 'off',
                                                                 ]),
-                                                            Select::make('newAdditionalAllocation')
+                                                            Forms\Components\Select::make('newAdditionalAllocation')
                                                                 ->label('New Additional Allocations')
                                                                 ->options([
                                                                     true => 'on',
@@ -746,14 +704,14 @@ class EditServer extends EditRecord
                                                         ])
                                                         ->modalHeading('Transfer'),
                                                 ])->fullWidth(),
-                                                ToggleButtons::make('')
+                                                Forms\Components\ToggleButtons::make('')
                                                     ->hint('Transfer this server to another node connected to this panel. Warning! This feature has not been fully tested and may have bugs.'),
                                             ]),
-                                        Grid::make()
+                                        Forms\Components\Grid::make()
                                             ->columnSpan(3)
                                             ->schema([
                                                 Forms\Components\Actions::make([
-                                                    Action::make('reinstall')
+                                                    Forms\Components\Actions\Action::make('reinstall')
                                                         ->label('Reinstall')
                                                         ->color('danger')
                                                         ->requiresConfirmation()
@@ -762,7 +720,7 @@ class EditServer extends EditRecord
                                                         ->disabled(fn (Server $server) => $server->isSuspended())
                                                         ->action(fn (ServersController $serversController, Server $server) => $serversController->reinstallServer($server)),
                                                 ])->fullWidth(),
-                                                ToggleButtons::make('')
+                                                Forms\Components\ToggleButtons::make('')
                                                     ->hint('This will reinstall the server with the assigned egg install script.'),
                                             ]),
                                     ]),
@@ -776,28 +734,23 @@ class EditServer extends EditRecord
         return $form
             ->columns()
             ->schema([
-                Select::make('toNode')
+                Forms\Components\Select::make('toNode')
                     ->label('New Node'),
-                TextInput::make('newAllocation')
+                Forms\Components\TextInput::make('newAllocation')
                     ->label('Allocation'),
             ]);
 
     }
-
     protected function getHeaderActions(): array
     {
         return [
-            Actions\Action::make('Delete')
+            Actions\DeleteAction::make('Delete')
                 ->successRedirectUrl(route('filament.admin.resources.servers.index'))
                 ->color('danger')
-                ->label('Delete')
-                ->requiresConfirmation()
-                ->action(function (Server $server, ServerDeletionService $service) {
-                    $service->handle($server);
-
-                    return redirect(ListServers::getUrl());
-                })
-                ->authorize(fn (Server $server) => auth()->user()->can('delete server', $server)),
+                ->disabled(fn (Server $server) => $server->databases()->count() > 0)
+                ->label(fn (Server $server) => $server->databases()->count() > 0 ? 'Server has a Database' : 'Delete')
+                ->after(fn (Server $server) => resolve(ServerDeletionService::class)->handle($server))
+                ->requiresConfirmation(),
             Actions\Action::make('console')
                 ->label('Console')
                 ->icon('tabler-terminal')
@@ -806,7 +759,6 @@ class EditServer extends EditRecord
         ];
 
     }
-
     protected function getFormActions(): array
     {
         return [];
@@ -830,24 +782,28 @@ class EditServer extends EditRecord
         ];
     }
 
-    private function shouldHideComponent(ServerVariable $serverVariable, Forms\Components\Component $component): bool
+    private function shouldHideComponent(Forms\Get $get, Forms\Components\Component $component): bool
     {
-        $containsRuleIn = array_first($serverVariable->variable->rules, fn ($value) => str($value)->startsWith('in:'), false);
+        $containsRuleIn = str($get('rules'))->explode('|')->reduce(
+            fn ($result, $value) => $result === true && !str($value)->startsWith('in:'), true
+        );
 
-        if ($component instanceof Select) {
-            return !$containsRuleIn;
-        }
-
-        if ($component instanceof TextInput) {
+        if ($component instanceof Forms\Components\Select) {
             return $containsRuleIn;
         }
 
-        throw new Exception('Component type not supported: ' . $component::class);
+        if ($component instanceof Forms\Components\TextInput) {
+            return !$containsRuleIn;
+        }
+
+        throw new \Exception('Component type not supported: ' . $component::class);
     }
 
-    private function getSelectOptionsFromRules(ServerVariable $serverVariable): array
+    private function getSelectOptionsFromRules(Forms\Get $get): array
     {
-        $inRule = array_first($serverVariable->variable->rules, fn ($value) => str($value)->startsWith('in:'));
+        $inRule = str($get('rules'))->explode('|')->reduce(
+            fn ($result, $value) => str($value)->startsWith('in:') ? $value : $result, ''
+        );
 
         return str($inRule)
             ->after('in:')
@@ -857,7 +813,7 @@ class EditServer extends EditRecord
             ->all();
     }
 
-    protected function rotatePassword(DatabasePasswordService $service, Database $record, Set $set, Get $get): void
+    protected function rotatePassword(DatabasePasswordService $service, $record, $set, $get): void
     {
         $newPassword = $service->handle($record);
         $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $record->host->host . ':' . $record->host->port . '/' . $get('database');

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

@@ -6,13 +6,10 @@ use App\Filament\Resources\ServerResource;
 use App\Models\Server;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\Action;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Columns\SelectColumn;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Grouping\Group;
 use Filament\Tables\Table;
+use Filament\Tables;
 
 class ListServers extends ListRecords
 {
@@ -29,50 +26,47 @@ class ListServers extends ListRecords
                 Group::make('egg.name')->getDescriptionFromRecordUsing(fn (Server $server): string => str($server->egg->description)->limit(150)),
             ])
             ->columns([
-                TextColumn::make('condition')
+                Tables\Columns\TextColumn::make('condition')
                     ->default('unknown')
                     ->badge()
                     ->icon(fn (Server $server) => $server->conditionIcon())
                     ->color(fn (Server $server) => $server->conditionColor()),
-                TextColumn::make('uuid')
+                Tables\Columns\TextColumn::make('uuid')
                     ->hidden()
                     ->label('UUID')
                     ->searchable(),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-brand-docker')
                     ->searchable()
                     ->sortable(),
-                TextColumn::make('node.name')
+                Tables\Columns\TextColumn::make('node.name')
                     ->icon('tabler-server-2')
                     ->url(fn (Server $server): string => route('filament.admin.resources.nodes.edit', ['record' => $server->node]))
                     ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'node.name')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('egg.name')
+                Tables\Columns\TextColumn::make('egg.name')
                     ->icon('tabler-egg')
                     ->url(fn (Server $server): string => route('filament.admin.resources.eggs.edit', ['record' => $server->egg]))
                     ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'egg.name')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('user.username')
+                Tables\Columns\TextColumn::make('user.username')
                     ->icon('tabler-user')
                     ->label('Owner')
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
                     ->hidden(fn (Table $table) => $table->getGrouping()?->getId() === 'user.username')
                     ->sortable()
                     ->searchable(),
-                SelectColumn::make('allocation_id')
+                Tables\Columns\SelectColumn::make('allocation_id')
                     ->label('Primary Allocation')
-                    ->hidden(!auth()->user()->can('update server'))
-                    ->options(fn (Server $server) => $server->allocations->mapWithKeys(fn ($allocation) => [$allocation->id => $allocation->address]))
+                    ->options(fn (Server $server) => $server->allocations->mapWithKeys(
+                        fn ($allocation) => [$allocation->id => $allocation->address])
+                    )
                     ->selectablePlaceholder(false)
                     ->sortable(),
-                TextColumn::make('allocation_id_readonly')
-                    ->label('Primary Allocation')
-                    ->hidden(auth()->user()->can('update server'))
-                    ->state(fn (Server $server) => $server->allocation->address),
-                TextColumn::make('image')->hidden(),
-                TextColumn::make('backups_count')
+                Tables\Columns\TextColumn::make('image')->hidden(),
+                Tables\Columns\TextColumn::make('backups_count')
                     ->counts('backups')
                     ->label('Backups')
                     ->icon('tabler-file-download')
@@ -80,11 +74,10 @@ class ListServers extends ListRecords
                     ->sortable(),
             ])
             ->actions([
-                Action::make('View')
+                Tables\Actions\Action::make('View')
                     ->icon('tabler-terminal')
-                    ->url(fn (Server $server) => "/server/$server->uuid_short")
-                    ->authorize(fn () => auth()->user()->can('view server')),
-                EditAction::make(),
+                    ->url(fn (Server $server) => "/server/$server->uuid_short"),
+                Tables\Actions\EditAction::make(),
             ])
             ->emptyStateIcon('tabler-brand-docker')
             ->searchable()
@@ -96,7 +89,6 @@ class ListServers extends ListRecords
                     ->button(),
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [