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,35 @@
 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
+
+HASHIDS_SALT=
+HASHIDS_LENGTH=8
+
+MAIL_MAILER=log
+MAIL_HOST=smtp.example.com
+MAIL_PORT=25
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=no-reply@example.com
+MAIL_FROM_NAME="Pelican Admin"
+# Set this to your domain to prevent it defaulting to 'localhost', causing mail servers such as Gmail to reject your mail
+# MAIL_EHLO_DOMAIN=panel.example.com
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null

.github/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,64 +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/
-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

@@ -25,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/build.yaml

@@ -1,9 +1,6 @@
 name: Build
 
 on:
-  push:
-    branches:
-      - '**'
   pull_request:
     branches:
       - '**'

.github/workflows/ci.yaml

@@ -1,10 +1,9 @@
 name: Tests
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
+    branches:
+      - '**'
 
 jobs:
   mysql:
@@ -14,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         php: [8.2, 8.3]
-        database: ["mysql:8"]
+        database: ["mariadb:10.2", "mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -30,16 +29,16 @@ 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
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: mysql
       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
@@ -61,80 +60,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --prefer-dist
-
-      - name: Unit tests
-        run: vendor/bin/phpunit tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/phpunit tests/Integration
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-          DB_USERNAME: root
-
-  mariadb:
-    name: MariaDB
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.2, 8.3]
-        database: ["mariadb:10.3", "mariadb:10.11", "mariadb:11.4"]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: testing
-        ports:
-          - 3306
-        options: --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    env:
-      APP_ENV: testing
-      APP_DEBUG: "false"
-      APP_KEY: ThisIsARandomStringForTests12345
-      APP_TIMEZONE: UTC
-      APP_URL: http://localhost/
-      CACHE_DRIVER: array
-      MAIL_MAILER: array
-      SESSION_DRIVER: array
-      QUEUE_CONNECTION: sync
-      DB_CONNECTION: mariadb
-      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
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 
@@ -166,14 +92,14 @@ 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
+      HASHIDS_SALT: alittlebitofsalt1234
       DB_CONNECTION: sqlite
-      DB_DATABASE: testing.sqlite
-      GUZZLE_TIMEOUT: 60
-      GUZZLE_CONNECT_TIMEOUT: 60
+      DB_DATABASE: ${{ github.workspace }}/database/testing.sqlite
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -195,7 +121,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
 

.github/workflows/docker-publish.yml

@@ -1,82 +0,0 @@
-name: Docker
-
-
-on:
-  push:
-    branches:
-      - main
-  release:
-    types:
-      - published
-
-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: ghcr.io/pelican-dev/panel
-          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

.github/workflows/lint.yaml

@@ -6,8 +6,8 @@ on:
       - '**'
 
 jobs:
-  pint:
-    name: Pint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
@@ -16,7 +16,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.3"
+          php-version: "8.2"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -29,26 +29,3 @@ jobs:
 
       - name: Pint
         run: vendor/bin/pint --test
-  phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: "8.3"
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Setup .env
-        run: cp .env.example .env
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-progress --prefer-dist
-
-      - name: PHPStan
-        run: vendor/bin/phpstan --memory-limit=-1

.github/workflows/release.yaml

@@ -54,12 +54,31 @@ jobs:
 
       - name: Create release
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
           prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-          files: |
-            panel.tar.gz
-            checksum.txt
+
+      - name: Upload release archive
+        id: upload-release-archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: panel.tar.gz
+          asset_name: panel.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload release checksum
+        id: upload-release-checksum
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./checksum.txt
+          asset_name: checksum.txt
+          asset_content_type: text/plain

.gitignore

@@ -1,28 +1,41 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/hot
-/public/storage
-/storage/*.key
-/storage/clockwork/*
 /vendor
 *.DS_Store*
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
+!.env.ci
+!.env.example
+.env*
+.vagrant/*
+.vscode/*
+storage/framework/*
 /.idea
-/.vscode
+/nbproject
+/.direnv
 
+node_modules
+*.log
+_ide_helper.php
+_ide_helper_models.php
+.phpstorm.meta.php
+.yarn
 public/assets/manifest.json
-/database/*.sqlite
-filament-monaco-editor/
-_ide_helper*
-/.phpstorm.meta.php
+*.sqlite
+
+# For local development with docker
+# Remove if we ever put the Dockerfile in the repo
+.dockerignore
+docker-compose.yml
+
+# for image related files
+misc
+.php-cs-fixer.cache
+coverage.xml
+resources/lang/locales.js
+.phpunit.result.cache
+
+/public/build
+/public/hot
+result
+docker-compose.yaml
+
+public/css/filament-monaco-editor/
+
+public/js/filament-monaco-editor/

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,58 +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
-
-# 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/Casts/EndpointCollection.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Casts;
-
-use App\Models\Objects\Endpoint;
-use Illuminate\Contracts\Database\Eloquent\Castable;
-use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
-use Illuminate\Support\Collection;
-
-class EndpointCollection implements Castable
-{
-    public static function castUsing(array $arguments)
-    {
-        return new class() implements CastsAttributes
-        {
-            public function get($model, $key, $value, $attributes)
-            {
-                if (!isset($attributes[$key])) {
-                    return new Collection();
-                }
-
-                $data = json_decode($attributes[$key], true);
-
-                return (new Collection($data))->map(function ($value) {
-                    return new Endpoint($value);
-                });
-            }
-
-            public function set($model, $key, $value, $attributes)
-            {
-                if (!is_array($value) && !$value instanceof Collection) {
-                    return new Collection();
-                }
-
-                if (!$value instanceof Collection) {
-                    $value = new Collection($value);
-                }
-
-                return [
-                    'ports' => $value->toJson(),
-                ];
-            }
-        };
-    }
-}

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,164 @@
 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 = [
+        'sync' => 'Synchronous (recommended)',
+        'database' => 'Database',
+        'redis' => 'Redis',
+    ];
+
     protected $description = 'Configure basic environment settings for the Panel.';
 
-    protected $signature = 'p:environment:setup';
+    protected $signature = 'p:environment:setup
+                            {--new-salt : Whether or not to generate a new salt for Hashids.}
+                            {--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';
+
+        if (empty(config('hashids.salt')) || $this->option('new-salt')) {
+            $this->variables['HASHIDS_SALT'] = str_random(20);
+        }
+
+        $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';
+        }
+
+        $this->checkForRedis();
+
         $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');
+        $this->info($this->console->output());
+
+        return 0;
+    }
+
+    /**
+     * Check if redis is selected, if so, request connection details and verify them.
+     */
+    private function checkForRedis()
+    {
+        $items = collect($this->variables)->filter(function ($item) {
+            return $item === 'redis';
+        });
+
+        // Redis was not selected, no need to continue.
+        if (count($items) === 0) {
+            return;
+        }
+
+        $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
 {
@@ -13,7 +13,6 @@ class DatabaseSettingsCommand extends Command
 
     public const DATABASE_DRIVERS = [
         'sqlite' => 'SQLite (recommended)',
-        'mariadb' => 'MariaDB',
         'mysql' => 'MySQL',
     ];
 
@@ -22,10 +21,10 @@ class DatabaseSettingsCommand extends Command
     protected $signature = 'p:environment:database
                             {--driver= : The database driver backend to use.}
                             {--database= : The database to use.}
-                            {--host= : The connection address for the MySQL/ MariaDB server.}
-                            {--port= : The connection port for the MySQL/ MariaDB server.}
-                            {--username= : Username to use when connecting to the MySQL/ MariaDB server.}
-                            {--password= : Password to use for the MySQL/ MariaDB database.}';
+                            {--host= : The connection address for the MySQL server.}
+                            {--port= : The connection port for the MySQL server.}
+                            {--username= : Username to use when connecting to the MySQL server.}
+                            {--password= : Password to use for the MySQL database.}';
 
     protected array $variables = [];
 
@@ -42,13 +41,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',
@@ -90,20 +82,7 @@ class DatabaseSettingsCommand extends Command
             }
 
             try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mysql',
-                    'host' => $this->variables['DB_HOST'],
-                    'port' => $this->variables['DB_PORT'],
-                    'database' => $this->variables['DB_DATABASE'],
-                    'username' => $this->variables['DB_USERNAME'],
-                    'password' => $this->variables['DB_PASSWORD'],
-                    'charset' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
+                $this->testMySQLConnection();
             } catch (\PDOException $exception) {
                 $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
                 $this->output->error(__('commands.database_settings.DB_error_2'));
@@ -114,72 +93,12 @@ class DatabaseSettingsCommand extends Command
                     return $this->handle();
                 }
 
-                return 1;
-            }
-        } elseif ($this->variables['DB_CONNECTION'] === 'mariadb') {
-            $this->output->note(__('commands.database_settings.DB_HOST_note'));
-            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
-                'Database Host',
-                config('database.connections.mariadb.host', '127.0.0.1')
-            );
-
-            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-                'Database Port',
-                config('database.connections.mariadb.port', 3306)
-            );
-
-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Name',
-                config('database.connections.mariadb.database', 'panel')
-            );
-
-            $this->output->note(__('commands.database_settings.DB_USERNAME_note'));
-            $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
-                'Database Username',
-                config('database.connections.mariadb.username', 'pelican')
-            );
-
-            $askForMariaDBPassword = true;
-            if (!empty(config('database.connections.mariadb.password')) && $this->input->isInteractive()) {
-                $this->variables['DB_PASSWORD'] = config('database.connections.mariadb.password');
-                $askForMariaDBPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
-            }
-
-            if ($askForMariaDBPassword) {
-                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
-            }
-
-            try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mariadb',
-                    'host' => $this->variables['DB_HOST'],
-                    'port' => $this->variables['DB_PORT'],
-                    'database' => $this->variables['DB_DATABASE'],
-                    'username' => $this->variables['DB_USERNAME'],
-                    'password' => $this->variables['DB_PASSWORD'],
-                    'charset' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
-            } catch (\PDOException $exception) {
-                $this->output->error(sprintf('Unable to connect to the MariaDB server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
-                $this->output->error(__('commands.database_settings.DB_error_2'));
-
-                if ($this->confirm(__('commands.database_settings.go_back'))) {
-                    $this->database->disconnect('_panel_command_test');
-
-                    return $this->handle();
-                }
-
                 return 1;
             }
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {
             $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
                 'Database Path',
-                env('DB_DATABASE', 'database.sqlite')
+                config('database.connections.sqlite.database', database_path('database.sqlite'))
             );
         }
 
@@ -189,4 +108,24 @@ class DatabaseSettingsCommand extends Command
 
         return 0;
     }
+
+    /**
+     * Test that we can connect to the provided MySQL instance and perform a selection.
+     */
+    private function testMySQLConnection()
+    {
+        config()->set('database.connections._panel_command_test', [
+            'driver' => 'mysql',
+            'host' => $this->variables['DB_HOST'],
+            'port' => $this->variables['DB_PORT'],
+            'database' => $this->variables['DB_DATABASE'],
+            'username' => $this->variables['DB_USERNAME'],
+            'password' => $this->variables['DB_PASSWORD'],
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'strict' => true,
+        ]);
+
+        $this->database->connection('_panel_command_test')->getPdo();
+    }
 }

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

@@ -1,85 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Process;
-
-class QueueWorkerServiceCommand extends Command
-{
-    protected $description = 'Create the service for the queue worker.';
-
-    protected $signature = 'p:environment:queue-service
-        {--service-name= : Name of the queue worker service.}
-        {--user= : The user that PHP runs under.}
-        {--group= : The group that PHP runs under.}
-        {--overwrite : Force overwrite if the service file already exists.}';
-
-    public function handle(): void
-    {
-        $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
-        $path = '/etc/systemd/system/' . $serviceName  . '.service';
-
-        $fileExists = file_exists($path);
-        if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
-            $this->line('Creation of queue worker service file aborted because service file already exists.');
-
-            return;
-        }
-
-        $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 ? '
-After=redis-server.service' : '';
-
-        $basePath = base_path();
-
-        $success = File::put($path, "# Pelican Queue File
-# ----------------------------------
-
-[Unit]
-Description=Pelican Queue Service$afterRedis
-
-[Service]
-User=$user
-Group=$group
-Restart=always
-ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
-StartLimitInterval=180
-StartLimitBurst=30
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-        ");
-
-        if (!$success) {
-            $this->error('Error creating service file');
-
-            return;
-        }
-
-        if ($fileExists) {
-            $result = Process::run("systemctl restart $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file updated successfully.');
-        } else {
-            $result = Process::run("systemctl enable --now $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error enabling service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file created successfully.');
-        }
-    }
-}

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

@@ -7,12 +7,12 @@ use App\Services\Helpers\SoftwareVersionService;
 
 class InfoCommand extends Command
 {
-    protected $description = 'Displays the application, database, email and backup configurations along with the panel version.';
+    protected $description = 'Displays the application, database, and email configurations along with the panel version.';
 
     protected $signature = 'p:info';
 
     /**
-     * InfoCommand constructor.
+     * VersionCommand constructor.
      */
     public function __construct(private SoftwareVersionService $versionService)
     {
@@ -26,76 +26,45 @@ class InfoCommand extends Command
     {
         $this->output->title('Version Information');
         $this->table([], [
-            ['Panel Version', $this->versionService->versionData()['version']],
+            ['Panel Version', config('app.version')],
             ['Latest Version', $this->versionService->getPanel()],
             ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
         ], 'compact');
 
         $this->output->title('Application Configuration');
         $this->table([], [
-            ['Environment', config('app.env') === 'production' ? config('app.env') : $this->formatText(config('app.env'), 'bg=red')],
-            ['Debug Mode', config('app.debug') ? $this->formatText('Yes', 'bg=red') : 'No'],
-            ['Application Name', config('app.name')],
-            ['Application URL', config('app.url')],
+            ['Environment', $this->formatText(config('app.env'), config('app.env') === 'production' ?: 'bg=red')],
+            ['Debug Mode', $this->formatText(config('app.debug') ? 'Yes' : 'No', !config('app.debug') ?: 'bg=red')],
+            ['Installation URL', config('app.url')],
             ['Installation Directory', base_path()],
             ['Cache Driver', config('cache.default')],
-            ['Queue Driver', config('queue.default') === 'sync' ? $this->formatText(config('queue.default'), 'bg=red') : config('queue.default')],
+            ['Queue Driver', config('queue.default')],
             ['Session Driver', config('session.driver')],
             ['Filesystem Driver', config('filesystems.default')],
+            ['Default Theme', config('themes.active')],
         ], 'compact');
 
         $this->output->title('Database Configuration');
         $driver = config('database.default');
-        if ($driver === 'sqlite') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Database', config("database.connections.$driver.database")],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("database.connections.$driver.host")],
-                ['Port', config("database.connections.$driver.port")],
-                ['Database', config("database.connections.$driver.database")],
-                ['Username', config("database.connections.$driver.username")],
-            ], 'compact');
-        }
+        $this->table([], [
+            ['Driver', $driver],
+            ['Host', config("database.connections.$driver.host")],
+            ['Port', config("database.connections.$driver.port")],
+            ['Database', config("database.connections.$driver.database")],
+            ['Username', config("database.connections.$driver.username")],
+        ], 'compact');
 
+        // TODO: Update this to handle other mail drivers
         $this->output->title('Email Configuration');
-        $driver = config('mail.default');
-        if ($driver === 'smtp') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Host', config("mail.mailers.$driver.host")],
-                ['Port', config("mail.mailers.$driver.port")],
-                ['Username', config("mail.mailers.$driver.username")],
-                ['Encryption', config("mail.mailers.$driver.encryption")],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-                ['From Address', config('mail.from.address')],
-                ['From Name', config('mail.from.name')],
-            ], 'compact');
-        }
-
-        $this->output->title('Backup Configuration');
-        $driver = config('backups.default');
-        if ($driver === 's3') {
-            $this->table([], [
-                ['Driver', $driver],
-                ['Region', config("backups.disks.$driver.region")],
-                ['Bucket', config("backups.disks.$driver.bucket")],
-                ['Endpoint', config("backups.disks.$driver.endpoint")],
-                ['Use path style endpoint', config("backups.disks.$driver.use_path_style_endpoint") ? 'Yes' : 'No'],
-            ], 'compact');
-        } else {
-            $this->table([], [
-                ['Driver', $driver],
-            ], 'compact');
-        }
+        $this->table([], [
+            ['Driver', config('mail.default')],
+            ['Host', config('mail.mailers.smtp.host')],
+            ['Port', config('mail.mailers.smtp.port')],
+            ['Username', config('mail.mailers.smtp.username')],
+            ['From Address', config('mail.from.address')],
+            ['From Name', config('mail.from.name')],
+            ['Encryption', config('mail.mailers.smtp.encryption')],
+        ], 'compact');
     }
 
     /**

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/Node/MakeNodeCommand.php

@@ -20,12 +20,9 @@ class MakeNodeCommand extends Command
                             {--overallocateMemory= : Enter the amount of ram to overallocate (% or -1 to overallocate the maximum).}
                             {--maxDisk= : Set the max disk amount.}
                             {--overallocateDisk= : Enter the amount of disk to overallocate (% or -1 to overallocate the maximum).}
-                            {--maxCpu= : Set the max cpu amount.}
-                            {--overallocateCpu= : Enter the amount of cpu to overallocate (% or -1 to overallocate the maximum).}
                             {--uploadSize= : Enter the maximum upload filesize.}
                             {--daemonListeningPort= : Enter the daemon listening port.}
                             {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
-                            {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
                             {--daemonBase= : Enter the base folder.}';
 
     protected $description = 'Creates a new node on the system via the CLI.';
@@ -57,19 +54,16 @@ class MakeNodeCommand extends Command
         $data['public'] = $this->option('public') ?? $this->confirm(__('commands.make_node.public'), true);
         $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(__('commands.make_node.behind_proxy'));
         $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(__('commands.make_node.maintenance_mode'));
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'), '0');
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'), '-1');
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'), '0');
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'), '-1');
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(__('commands.make_node.cpu'), '0');
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(__('commands.make_node.cpu_overallocate'), '-1');
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '256');
+        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'));
+        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'));
+        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'));
+        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'));
+        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '100');
         $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(__('commands.make_node.daemonListen'), '8080');
         $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(__('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(__('commands.make_node.daemonSFTPAlias'), '');
         $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(__('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
         $node = $this->creationService->handle($data);
-        $this->line(__('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
+        $this->line(__('commands.make_node.succes1') . $data['name'] . __('commands.make_node.succes2')  . $node->id . '.');
     }
 }

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

@@ -24,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', '<=', Carbon::now()->toDateTimeString())
+            ->whereDate('next_run_at', '<=', Carbon::now()->toDateString())
             ->get();
 
         if ($schedules->count() < 1) {
@@ -51,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;
@@ -62,7 +62,7 @@ class ProcessRunnableCommand extends Command
 
             $this->line(trans('command/messages.schedule.output_line', [
                 'schedule' => $schedule->name,
-                'id' => $schedule->id,
+                'hash' => $schedule->hashid,
             ]));
         } catch (\Throwable|\Exception $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);

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

@@ -30,7 +30,7 @@ class MakeUserCommand extends Command
     public function handle(): int
     {
         try {
-            DB::connection()->getPdo();
+            DB::select('select 1 where 1');
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 
@@ -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/Contracts/Extensions/HashidsInterface.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Contracts\Extensions;
+
+use Hashids\HashidsInterface as VendorHashidsInterface;
+
+interface HashidsInterface extends VendorHashidsInterface
+{
+    /**
+     * Decode an encoded hashid and return the first result.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed;
+}

app/Enums/ContainerStatus.php

@@ -6,15 +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
     case Missing = 'missing';
@@ -22,17 +19,14 @@ 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',
         };
     }
 
@@ -40,7 +34,6 @@ enum ContainerStatus: string
     {
         return match ($this) {
             self::Created => 'primary',
-            self::Starting => 'warning',
             self::Running => 'success',
             self::Restarting => 'info',
             self::Exited => 'danger',
@@ -48,8 +41,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/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,23 +46,22 @@ 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')) {
+        if (str($request->url())->contains('livewire')) {
             Notification::make()
                 ->title(static::class)
                 ->body($this->getMessage())
                 ->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
     {
@@ -215,7 +215,7 @@ class Handler extends ExceptionHandler
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
                     'previous' => Collection::make($this->extractPrevious($e))
-                        ->map(fn ($exception) => $exception->getTrace())
+                        ->map(fn ($exception) => $e->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
                 ],
@@ -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/Allocation/AllocationDoesNotBelongToServerException.php

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

app/Exceptions/Service/Allocation/AutoAllocationNotEnabledException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class AutoAllocationNotEnabledException extends DisplayException
+{
+    /**
+     * AutoAllocationNotEnabledException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(
+            'Server auto-allocation is not enabled for this instance.'
+        );
+    }
+}

app/Exceptions/Service/Allocation/CidrOutOfRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class CidrOutOfRangeException extends DisplayException
+{
+    /**
+     * CidrOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.cidr_out_of_range'));
+    }
+}

app/Exceptions/Service/Allocation/InvalidPortMappingException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class InvalidPortMappingException extends DisplayException
+{
+    /**
+     * InvalidPortMappingException constructor.
+     */
+    public function __construct(mixed $port)
+    {
+        parent::__construct(trans('exceptions.allocations.invalid_mapping', ['port' => $port]));
+    }
+}

app/Exceptions/Service/Allocation/NoAutoAllocationSpaceAvailableException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class NoAutoAllocationSpaceAvailableException extends DisplayException
+{
+    /**
+     * NoAutoAllocationSpaceAvailableException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(
+            'Cannot assign additional allocation: no more space available on node.'
+        );
+    }
+}

app/Exceptions/Service/Allocation/PortOutOfRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class PortOutOfRangeException extends DisplayException
+{
+    /**
+     * PortOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.port_out_of_range'));
+    }
+}

app/Exceptions/Service/Allocation/ServerUsingAllocationException.php

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

app/Exceptions/Service/Allocation/TooManyPortsInRangeException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class TooManyPortsInRangeException extends DisplayException
+{
+    /**
+     * TooManyPortsInRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.too_many_ports'));
+    }
+}

app/Exceptions/Service/Deployment/NoViableAllocationException.php

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

app/Exceptions/Service/Deployment/NoViableNodeException.php

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

app/Exceptions/Service/Helper/CdnVersionFetchingException.php

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

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

@@ -6,10 +6,9 @@ use App\Exceptions\DisplayException;
 
 class TwoFactorAuthenticationTokenInvalid extends DisplayException
 {
-    public string $title = 'Invalid 2FA Code';
-
-    public string $icon = 'tabler-2fa';
-
+    /**
+     * TwoFactorAuthenticationTokenInvalid constructor.
+     */
     public function __construct()
     {
         parent::__construct('The provided two-factor authentication token was not valid.');

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';
 
     /**
@@ -27,7 +25,7 @@ class DynamicDatabaseConnection
             'port' => $host->port,
             'database' => $database,
             'username' => $host->username,
-            'password' => $host->password,
+            'password' => decrypt($host->password),
             'charset' => self::DB_CHARSET,
             'collation' => self::DB_COLLATION,
         ]);

app/Extensions/Hashids.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Extensions;
+
+use Hashids\Hashids as VendorHashids;
+use App\Contracts\Extensions\HashidsInterface;
+
+class Hashids extends VendorHashids implements HashidsInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed
+    {
+        $result = $this->decode($encoded);
+        if (!is_array($result)) {
+            return $default;
+        }
+
+        return array_first($result, null, $default);
+    }
+}

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

@@ -7,7 +7,6 @@ use App\Models\Egg;
 use App\Models\Node;
 use App\Models\Server;
 use App\Models\User;
-use App\Services\Helpers\SoftwareVersionService;
 use Filament\Actions\CreateAction;
 use Filament\Pages\Page;
 
@@ -28,20 +27,10 @@ class Dashboard extends Page
 
     public string $activeTab = 'nodes';
 
-    private SoftwareVersionService $softwareVersionService;
-
-    public function mount(SoftwareVersionService $softwareVersionService): void
-    {
-        $this->softwareVersionService = $softwareVersionService;
-    }
-
     public function getViewData(): array
     {
         return [
             'inDevelopment' => config('app.version') === 'canary',
-            'version' => $this->softwareVersionService->versionData()['version'],
-            'latestVersion' => $this->softwareVersionService->getPanel(),
-            'isLatest' => $this->softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
             'nodesCount' => Node::query()->count(),
@@ -50,17 +39,15 @@ class Dashboard extends Page
 
             'devActions' => [
                 CreateAction::make()
-                    ->label('Bugs & Features')
+                    ->label(trans('dashboard/index.sections.intro-developers.button_issues'))
+                    ->icon('tabler-brand-github')
+                    ->url('https://github.com/pelican-dev/panel/issues/new/choose', true)
+                    ->color('warning'),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-developers.button_features'))
                     ->icon('tabler-brand-github')
                     ->url('https://github.com/pelican-dev/panel/discussions', true),
             ],
-            'updateActions' => [
-                CreateAction::make()
-                    ->label('Read Documentation')
-                    ->icon('tabler-clipboard-text')
-                    ->url('https://pelican.dev/docs/panel/update', true)
-                    ->color('warning'),
-            ],
             'nodeActions' => [
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
@@ -68,10 +55,14 @@ class Dashboard extends Page
                     ->url(route('filament.admin.resources.nodes.create')),
             ],
             'supportActions' => [
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-support.button_translate'))
+                    ->icon('tabler-language')
+                    ->url('https://crowdin.com/project/pelican-dev', true),
                 CreateAction::make()
                     ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
-                    ->url($this->softwareVersionService->getDonations(), true)
+                    ->url('https://pelican.dev/donate', true)
                     ->color('success'),
             ],
             'helpActions' => [
@@ -79,6 +70,11 @@ class Dashboard extends Page
                     ->label(trans('dashboard/index.sections.intro-help.button_docs'))
                     ->icon('tabler-speedboat')
                     ->url('https://pelican.dev/docs', true),
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-help.button_discord'))
+                    ->icon('tabler-brand-discord')
+                    ->url('https://discord.gg/pelican-panel', true)
+                    ->color('blurple'),
             ],
         ];
     }

app/Filament/Pages/Installer/PanelInstaller.php

@@ -1,182 +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\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(): 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, string $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, string $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

@@ -4,29 +4,47 @@ namespace App\Filament\Resources;
 
 use App\Filament\Resources\ApiKeyResource\Pages;
 use App\Models\ApiKey;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Resource;
-use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 
 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', '2')->count() ?: null;
+        return static::getModel()::count() ?: null;
     }
 
-    public static function canEdit(Model $record): bool
+    public static function canEdit($record): bool
     {
         return false;
     }
 
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

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

@@ -4,13 +4,9 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
 
 class CreateApiKey extends CreateRecord
 {
@@ -22,26 +18,40 @@ class CreateApiKey extends CreateRecord
     {
         return $form
             ->schema([
-                Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
-                Hidden::make('token')->default(str_random(ApiKey::KEY_LENGTH)),
+                Forms\Components\Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
+                Forms\Components\Hidden::make('token')->default(encrypt(str_random(ApiKey::KEY_LENGTH))),
 
-                Hidden::make('user_id')
+                Forms\Components\Hidden::make('user_id')
                     ->default(auth()->user()->id)
                     ->required(),
 
-                Hidden::make('key_type')
+                Forms\Components\Select::make('key_type')
                     ->inlineLabel()
-                    ->default(ApiKey::TYPE_APPLICATION)
-                    ->required(),
+                    ->options(function (ApiKey $apiKey) {
+                        $originalOptions = [
+                            //ApiKey::TYPE_NONE => 'None',
+                            ApiKey::TYPE_ACCOUNT => 'Account',
+                            ApiKey::TYPE_APPLICATION => 'Application',
+                            //ApiKey::TYPE_DAEMON_USER => 'Daemon User',
+                            //ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
+                        ];
 
-                Fieldset::make('Permissions')
+                        return collect($originalOptions)
+                            ->filter(fn ($value, $key) => $key <= ApiKey::TYPE_APPLICATION || $apiKey->key_type === $key)
+                            ->all();
+                    })
+                    ->selectablePlaceholder(false)
+                    ->required()
+                    ->default(ApiKey::TYPE_APPLICATION),
+
+                Forms\Components\Fieldset::make('Permissions')
                     ->columns([
                         'default' => 1,
                         'sm' => 1,
                         'md' => 2,
                     ])
                     ->schema(
-                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
+                        collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource")
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -71,13 +81,15 @@ class CreateApiKey extends CreateRecord
                         )->all(),
                     ),
 
-                TagsInput::make('allowed_ips')
+                Forms\Components\TagsInput::make('allowed_ips')
                     ->placeholder('Example: 127.0.0.1 or 192.168.1.1')
                     ->label('Whitelisted IPv4 Addresses')
                     ->helperText('Press enter to add a new IP address or leave blank to allow any IP address')
-                    ->columnSpanFull(),
+                    ->columnSpanFull()
+                    ->hidden()
+                    ->default(null),
 
-                Textarea::make('memo')
+                Forms\Components\Textarea::make('memo')
                     ->required()
                     ->label('Description')
                     ->helperText('

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

@@ -5,11 +5,11 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;
 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
 use Filament\Actions;
+use Filament\Resources\Components\Tab;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteAction;
-use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
+use Filament\Tables;
 
 class ListApiKeys extends ListRecords
 {
@@ -19,56 +19,67 @@ class ListApiKeys extends ListRecords
     {
         return $table
             ->searchable(false)
-            ->modifyQueryUsing(fn ($query) => $query->where('key_type', ApiKey::TYPE_APPLICATION))
             ->columns([
-                TextColumn::make('key')
+                Tables\Columns\TextColumn::make('user.username')
+                    ->hidden()
+                    ->searchable()
+                    ->sortable(),
+
+                Tables\Columns\TextColumn::make('key')
                     ->copyable()
                     ->icon('tabler-clipboard-text')
-                    ->state(fn (ApiKey $key) => $key->identifier . $key->token),
+                    ->state(fn (ApiKey $key) => $key->identifier . decrypt($key->token)),
 
-                TextColumn::make('memo')
+                Tables\Columns\TextColumn::make('memo')
                     ->label('Description')
                     ->wrap()
                     ->limit(50),
 
-                TextColumn::make('identifier')
+                Tables\Columns\TextColumn::make('identifier')
                     ->hidden()
                     ->searchable(),
 
-                TextColumn::make('last_used_at')
+                Tables\Columns\TextColumn::make('last_used_at')
                     ->label('Last Used')
-                    ->placeholder('Not Used')
                     ->dateTime()
                     ->sortable(),
 
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->label('Created')
                     ->dateTime()
                     ->sortable(),
-
-                TextColumn::make('user.username')
-                    ->label('Created By')
-                    ->url(fn (ApiKey $apiKey): string => route('filament.admin.resources.users.edit', ['record' => $apiKey->user])),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
-                DeleteAction::make(),
-            ])
-            ->emptyStateIcon('tabler-key')
-            ->emptyStateDescription('')
-            ->emptyStateHeading('No API Keys')
-            ->emptyStateActions([
-                CreateAction::make('create')
-                    ->label('Create API Key')
-                    ->button(),
+                Tables\Actions\DeleteAction::make(),
+                //Tables\Actions\EditAction::make()
             ]);
     }
 
     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(),
         ];
     }
+
+    public function getTabs(): array
+    {
+        return [
+            'all' => Tab::make('All Keys'),
+            'application' => Tab::make('Application Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION)
+                ),
+            'account' => Tab::make('Account Keys')
+                ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT)
+                ),
+        ];
+    }
+
+    public function getDefaultActiveTab(): string|int|null
+    {
+        return 'application';
+    }
 }

app/Filament/Resources/DatabaseHostResource.php

@@ -10,17 +10,22 @@ 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
     {
         return static::getModel()::count() ?: null;
     }
 
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
     public static function getPages(): array
     {
         return [

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

@@ -3,24 +3,13 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Models\Objects\Endpoint;
-use App\Services\Databases\Hosts\HostCreationService;
-use Closure;
-use Exception;
+use Filament\Resources\Pages\CreateRecord;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 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';
@@ -29,11 +18,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
@@ -46,41 +30,41 @@ class CreateDatabaseHost extends CreateRecord
                         'lg' => 4,
                     ])
                     ->schema([
-                        TextInput::make('host')
+                        Forms\Components\TextInput::make('host')
                             ->columnSpan(2)
                             ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
                             ->required()
                             ->live(onBlur: true)
                             ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
-                            ->maxLength(255),
-                        TextInput::make('port')
+                            ->maxLength(191),
+                        Forms\Components\TextInput::make('port')
                             ->columnSpan(1)
                             ->helperText('The port that MySQL is running on for this host.')
                             ->required()
                             ->numeric()
                             ->default(3306)
                             ->minValue(0)
-                            ->maxValue(Endpoint::PORT_CEIL),
-                        TextInput::make('max_databases')
+                            ->maxValue(65535),
+                        Forms\Components\TextInput::make('max_databases')
                             ->label('Max databases')
                             ->helpertext('Blank is unlimited.')
                             ->numeric(),
-                        TextInput::make('name')
+                        Forms\Components\TextInput::make('name')
                             ->label('Display Name')
                             ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
                             ->required()
                             ->maxLength(60),
-                        TextInput::make('username')
+                        Forms\Components\TextInput::make('username')
                             ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
                             ->required()
-                            ->maxLength(255),
-                        TextInput::make('password')
+                            ->maxLength(191),
+                        Forms\Components\TextInput::make('password')
                             ->helperText('The password for the database user.')
                             ->password()
                             ->revealable()
-                            ->maxLength(255)
+                            ->maxLength(191)
                             ->required(),
-                        Select::make('node_id')
+                        Forms\Components\Select::make('node_id')
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
@@ -90,35 +74,25 @@ class CreateDatabaseHost extends CreateRecord
             ]);
     }
 
+    protected function mutateFormDataBeforeCreate(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
+        }
+
+        return $data;
+    }
+
     protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),
         ];
-    }
 
+    }
     protected function getFormActions(): array
     {
         return [];
     }
 
-    protected function handleRecordCreation(array $data): Model
-    {
-        return $this->service->handle($data);
-    }
-
-    public function exception(Exception $e, Closure $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
-            Notification::make()
-                ->title('Error connecting to database host')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-database')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
-        }
-    }
 }

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

@@ -3,34 +3,16 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
-use App\Models\DatabaseHost;
-use App\Models\Objects\Endpoint;
-use App\Services\Databases\Hosts\HostUpdateService;
-use Closure;
-use Exception;
 use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
 use Filament\Forms;
 use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
-use Filament\Resources\Pages\EditRecord;
-use Illuminate\Database\Eloquent\Model;
-use PDOException;
 
 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
@@ -43,39 +25,40 @@ class EditDatabaseHost extends EditRecord
                         'lg' => 4,
                     ])
                     ->schema([
-                        TextInput::make('host')
+                        Forms\Components\TextInput::make('host')
                             ->columnSpan(2)
                             ->helperText('The IP address or Domain name that should be used when attempting to connect to this MySQL host from this Panel to create new databases.')
                             ->required()
                             ->live(onBlur: true)
                             ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
-                            ->maxLength(255),
-                        TextInput::make('port')
+                            ->maxLength(191),
+                        Forms\Components\TextInput::make('port')
                             ->columnSpan(1)
                             ->helperText('The port that MySQL is running on for this host.')
                             ->required()
                             ->numeric()
                             ->minValue(0)
-                            ->maxValue(Endpoint::PORT_CEIL),
-                        TextInput::make('max_databases')
+                            ->maxValue(65535),
+                        Forms\Components\TextInput::make('max_databases')
                             ->label('Max databases')
                             ->helpertext('Blank is unlimited.')
                             ->numeric(),
-                        TextInput::make('name')
+                        Forms\Components\TextInput::make('name')
                             ->label('Display Name')
                             ->helperText('A short identifier used to distinguish this location from others. Must be between 1 and 60 characters, for example, us.nyc.lvl3.')
                             ->required()
                             ->maxLength(60),
-                        TextInput::make('username')
+                        Forms\Components\TextInput::make('username')
                             ->helperText('The username of an account that has enough permissions to create new users and databases on the system.')
                             ->required()
-                            ->maxLength(255),
-                        TextInput::make('password')
+                            ->maxLength(191),
+                        Forms\Components\TextInput::make('password')
                             ->helperText('The password for the database user.')
                             ->password()
                             ->revealable()
-                            ->maxLength(255),
-                        Select::make('node_id')
+                            ->maxLength(191)
+                            ->required(),
+                        Forms\Components\Select::make('node_id')
                             ->searchable()
                             ->preload()
                             ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
@@ -88,13 +71,20 @@ class EditDatabaseHost extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make()
-                ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? 'Database Host Has Databases' : 'Delete')
-                ->disabled(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0),
+            Actions\DeleteAction::make(),
             $this->getSaveFormAction()->formId('form'),
         ];
     }
 
+    protected function mutateFormDataBeforeSave(array $data): array
+    {
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
+        }
+
+        return $data;
+    }
+
     protected function getFormActions(): array
     {
         return [];
@@ -103,31 +93,7 @@ class EditDatabaseHost extends EditRecord
     public function getRelationManagers(): array
     {
         return [
-            DatabasesRelationManager::class,
+            DatabaseHostResource\RelationManagers\DatabasesRelationManager::class,
         ];
     }
-
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        if (!$record instanceof DatabaseHost) {
-            return $record;
-        }
-
-        return $this->hostUpdateService->handle($record, $data);
-    }
-
-    public function exception(Exception $e, Closure $stopPropagation): void
-    {
-        if ($e instanceof PDOException) {
-            Notification::make()
-                ->title('Error connecting to database host')
-                ->body($e->getMessage())
-                ->color('danger')
-                ->icon('tabler-database')
-                ->danger()
-                ->send();
-
-            $stopPropagation();
-        }
-    }
 }

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

@@ -3,14 +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;
+use Filament\Tables;
 use Filament\Tables\Table;
 
 class ListDatabaseHosts extends ListRecords
@@ -24,49 +19,38 @@ class ListDatabaseHosts extends ListRecords
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable(),
-                TextColumn::make('host')
+                Tables\Columns\TextColumn::make('host')
                     ->searchable(),
-                TextColumn::make('port')
+                Tables\Columns\TextColumn::make('port')
                     ->sortable(),
-                TextColumn::make('username')
+                Tables\Columns\TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('databases_count')
-                    ->counts('databases')
-                    ->icon('tabler-database')
-                    ->label('Databases'),
-                TextColumn::make('node.name')
-                    ->icon('tabler-server-2')
-                    ->placeholder('No Nodes')
+                Tables\Columns\TextColumn::make('max_databases')
+                    ->numeric()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('node.name')
+                    ->numeric()
                     ->sortable(),
             ])
-            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete databasehost')),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\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

@@ -4,70 +4,60 @@ namespace App\Filament\Resources\DatabaseHostResource\RelationManagers;
 
 use App\Models\Database;
 use App\Services\Databases\DatabasePasswordService;
+use Filament\Forms;
 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;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 
 class DatabasesRelationManager extends RelationManager
 {
     protected static string $relationship = 'databases';
 
+    protected $listeners = ['refresh' => 'refreshForm'];
+
     public function form(Form $form): Form
     {
         return $form
             ->schema([
-                TextInput::make('database')->columnSpanFull(),
-                TextInput::make('username'),
-                TextInput::make('password')
+                Forms\Components\TextInput::make('database')->columnSpanFull(),
+                Forms\Components\TextInput::make('username'),
+                Forms\Components\TextInput::make('password')
                     ->hintAction(
                         Action::make('rotate')
                             ->icon('tabler-refresh')
                             ->requiresConfirmation()
-                            ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
+                            ->action(fn (DatabasePasswordService $service, Database $database) => $service->handle($database))
                     )
-                    ->formatStateUsing(fn (Database $database) => $database->password),
-                TextInput::make('remote')->label('Connections From'),
-                TextInput::make('max_connections'),
-                TextInput::make('JDBC')
+                    ->formatStateUsing(fn (Database $database) => decrypt($database->password)),
+                Forms\Components\TextInput::make('remote')->label('Connections From'),
+                Forms\Components\TextInput::make('max_connections'),
+                Forms\Components\TextInput::make('JDBC')
                     ->label('JDBC Connection String')
                     ->columnSpanFull()
-                    ->formatStateUsing(fn (Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
+                    ->formatStateUsing(fn (Forms\Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode(decrypt($database->password)) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
             ]);
     }
-
     public function table(Table $table): Table
     {
         return $table
             ->recordTitleAttribute('servers')
             ->columns([
-                TextColumn::make('database')->icon('tabler-database'),
-                TextColumn::make('username')->icon('tabler-user'),
-                TextColumn::make('remote'),
-                TextColumn::make('server.name')
+                Tables\Columns\TextColumn::make('database')->icon('tabler-database'),
+                Tables\Columns\TextColumn::make('username')->icon('tabler-user'),
+                //Tables\Columns\TextColumn::make('password'),
+                Tables\Columns\TextColumn::make('remote'),
+                Tables\Columns\TextColumn::make('server.name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
-                TextColumn::make('max_connections'),
-                TextColumn::make('created_at')->dateTime(),
+                Tables\Columns\TextColumn::make('max_connections'),
+                Tables\Columns\TextColumn::make('created_at')->dateTime(),
             ])
             ->actions([
-                DeleteAction::make(),
-                ViewAction::make()->color('primary'),
+                Tables\Actions\DeleteAction::make(),
+                Tables\Actions\ViewAction::make()->color('primary'),
+                //Tables\Actions\EditAction::make(),
             ]);
     }
-
-    protected function rotatePassword(DatabasePasswordService $service, Database $database, Set $set, Get $get): void
-    {
-        $newPassword = $service->handle($database);
-        $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database');
-
-        $set('password', $newPassword);
-        $set('JDBC', $jdbcString);
-    }
 }

app/Filament/Resources/DatabaseResource.php

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

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

@@ -3,10 +3,9 @@
 namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Forms;
 
 class CreateDatabase extends CreateRecord
 {
@@ -16,32 +15,29 @@ class CreateDatabase extends CreateRecord
     {
         return $form
             ->schema([
-                Select::make('server_id')
+                Forms\Components\Select::make('server_id')
                     ->relationship('server', 'name')
                     ->searchable()
                     ->preload()
                     ->required(),
-                Select::make('database_host_id')
-                    ->relationship('host', 'name')
-                    ->searchable()
-                    ->selectablePlaceholder(false)
-                    ->preload()
-                    ->required(),
-                TextInput::make('database')
+                Forms\Components\TextInput::make('database_host_id')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('remote')
+                    ->numeric(),
+                Forms\Components\TextInput::make('database')
                     ->required()
-                    ->maxLength(255)
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('remote')
+                    ->required()
+                    ->maxLength(191)
                     ->default('%'),
-                TextInput::make('username')
+                Forms\Components\TextInput::make('username')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('password')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('password')
                     ->password()
                     ->revealable()
                     ->required(),
-                TextInput::make('max_connections')
+                Forms\Components\TextInput::make('max_connections')
                     ->numeric()
                     ->minValue(0)
                     ->default(0),

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

@@ -4,10 +4,9 @@ namespace App\Filament\Resources\DatabaseResource\Pages;
 
 use App\Filament\Resources\DatabaseResource;
 use Filament\Actions;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Forms;
 
 class EditDatabase extends EditRecord
 {
@@ -17,29 +16,29 @@ class EditDatabase extends EditRecord
     {
         return $form
             ->schema([
-                Select::make('server_id')
+                Forms\Components\Select::make('server_id')
                     ->relationship('server', 'name')
                     ->searchable()
                     ->preload()
                     ->required(),
-                TextInput::make('database_host_id')
+                Forms\Components\TextInput::make('database_host_id')
                     ->required()
                     ->numeric(),
-                TextInput::make('database')
+                Forms\Components\TextInput::make('database')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('remote')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('remote')
                     ->required()
-                    ->maxLength(255)
+                    ->maxLength(191)
                     ->default('%'),
-                TextInput::make('username')
+                Forms\Components\TextInput::make('username')
                     ->required()
-                    ->maxLength(255),
-                TextInput::make('password')
+                    ->maxLength(191),
+                Forms\Components\TextInput::make('password')
                     ->password()
                     ->revealable()
                     ->required(),
-                TextInput::make('max_connections')
+                Forms\Components\TextInput::make('max_connections')
                     ->numeric()
                     ->minValue(0)
                     ->default(0),

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

@@ -5,11 +5,8 @@ namespace App\Filament\Resources\DatabaseResource\Pages;
 use App\Filament\Resources\DatabaseResource;
 use Filament\Actions;
 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;
+use Filament\Tables;
 
 class ListDatabases extends ListRecords
 {
@@ -19,37 +16,39 @@ class ListDatabases extends ListRecords
     {
         return $table
             ->columns([
-                TextColumn::make('server.name')
+                Tables\Columns\TextColumn::make('server.name')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('database_host_id')
+                Tables\Columns\TextColumn::make('database_host_id')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('database')
+                Tables\Columns\TextColumn::make('database')
                     ->searchable(),
-                TextColumn::make('username')
+                Tables\Columns\TextColumn::make('username')
                     ->searchable(),
-                TextColumn::make('remote')
+                Tables\Columns\TextColumn::make('remote')
                     ->searchable(),
-                TextColumn::make('max_connections')
+                Tables\Columns\TextColumn::make('max_connections')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('created_at')
+                Tables\Columns\TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
-                TextColumn::make('updated_at')
+                Tables\Columns\TextColumn::make('updated_at')
                     ->dateTime()
                     ->sortable()
                     ->toggleable(isToggledHiddenByDefault: true),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete database')),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\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,23 +2,11 @@
 
 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;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\KeyValue;
-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\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,31 +15,30 @@ class CreateEgg extends CreateRecord
     protected static string $resource = EggResource::class;
 
     protected static bool $canCreateAnother = false;
-
     public function form(Form $form): Form
     {
         return $form
             ->schema([
-                Tabs::make()->tabs([
-                    Tab::make('Configuration')
+                Forms\Components\Tabs::make()->tabs([
+                    Forms\Components\Tabs\Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->schema([
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
-                            TextInput::make('author')
-                                ->maxLength(255)
+                            Forms\Components\TextInput::make('author')
+                                ->maxLength(191)
                                 ->required()
                                 ->email()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('The author of this version of the Egg.'),
-                            Textarea::make('description')
+                            Forms\Components\Textarea::make('description')
                                 ->rows(3)
                                 ->columnSpanFull()
                                 ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
-                            Textarea::make('startup')
+                            Forms\Components\Textarea::make('startup')
                                 ->rows(3)
                                 ->columnSpanFull()
                                 ->required()
@@ -59,27 +46,26 @@ class CreateEgg extends CreateRecord
                                     'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}',
                                 ]))
                                 ->helperText('The default startup command that should be used for new servers using this Egg.'),
-                            TagsInput::make('features')
+                            Forms\Components\TagsInput::make('features')
                                 ->placeholder('Add Feature')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            Toggle::make('force_outgoing_ip')
+                            Forms\Components\Toggle::make('force_outgoing_ip')
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary endpoint.
+                                ->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.
                                     Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
-                            Hidden::make('script_is_privileged')
+                            Forms\Components\Hidden::make('script_is_privileged')
                                 ->default(1),
-                            TagsInput::make('tags')
+                            Forms\Components\TagsInput::make('tags')
                                 ->placeholder('Add Tags')
                                 ->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(),
-                            KeyValue::make('docker_images')
+                            Forms\Components\TextInput::make('update_url')
+                                ->disabled()
+                                ->helperText('Not implemented.')
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
+                            Forms\Components\KeyValue::make('docker_images')
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
@@ -91,37 +77,37 @@ class CreateEgg extends CreateRecord
                                 ->helperText('The docker images available to servers using this egg.'),
                         ]),
 
-                    Tab::make('Process Management')
+                    Forms\Components\Tabs\Tab::make('Process Management')
                         ->columns()
                         ->schema([
-                            Hidden::make('config_from')
+                            Forms\Components\Hidden::make('config_from')
                                 ->default(null)
                                 ->label('Copy Settings From')
                                 // ->placeholder('None')
                                 // ->relationship('configFrom', 'name', ignoreRecord: true)
                                 ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
-                            TextInput::make('config_stop')
+                            Forms\Components\TextInput::make('config_stop')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->label('Stop Command')
                                 ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
-                            Textarea::make('config_startup')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_startup')->rows(10)->json()
                                 ->label('Start Configuration')
                                 ->default('{}')
                                 ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
-                            Textarea::make('config_files')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_files')->rows(10)->json()
                                 ->label('Configuration Files')
                                 ->default('{}')
                                 ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
-                            Textarea::make('config_logs')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_logs')->rows(10)->json()
                                 ->label('Log Configuration')
                                 ->default('{}')
                                 ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make('Egg Variables')
+                    Forms\Components\Tabs\Tab::make('Egg Variables')
                         ->columnSpanFull()
                         ->schema([
-                            Repeater::make('variables')
+                            Forms\Components\Repeater::make('variables')
                                 ->label('')
                                 ->addActionLabel('Add New Egg Variable')
                                 ->grid()
@@ -135,7 +121,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,76 +130,53 @@ class CreateEgg extends CreateRecord
                                 ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
                                     return $data;
                                 })
                                 ->schema([
-                                    TextInput::make('name')
+                                    Forms\Components\TextInput::make('name')
                                         ->live()
                                         ->debounce(750)
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->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(),
-                                    TextInput::make('env_variable')
+                                    Forms\Components\Textarea::make('description')->columnSpanFull(),
+                                    Forms\Components\TextInput::make('env_variable')
                                         ->label('Environment Variable')
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
                                         ->required(),
-                                    TextInput::make('default_value')->maxLength(255),
-                                    Fieldset::make('User Permissions')
+                                    Forms\Components\TextInput::make('default_value')->maxLength(191),
+                                    Forms\Components\Fieldset::make('User Permissions')
                                         ->schema([
-                                            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',
+                                            Forms\Components\Checkbox::make('user_viewable')->label('Viewable'),
+                                            Forms\Components\Checkbox::make('user_editable')->label('Editable'),
                                         ]),
+                                    Forms\Components\Textarea::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
-                    Tab::make('Install Script')
+                    Forms\Components\Tabs\Tab::make('Install Script')
                         ->columns(3)
                         ->schema([
 
-                            Hidden::make('copy_script_from'),
+                            Forms\Components\Hidden::make('copy_script_from'),
                             //->placeholder('None')
                             //->relationship('scriptFrom', 'name', ignoreRecord: true),
 
-                            TextInput::make('script_container')
+                            Forms\Components\TextInput::make('script_container')
                                 ->required()
-                                ->maxLength(255)
-                                ->default('ghcr.io/pelican-eggs/installers:debian'),
+                                ->maxLength(191)
+                                ->default('alpine:3.4'),
 
-                            Select::make('script_entry')
+                            Forms\Components\Select::make('script_entry')
                                 ->selectablePlaceholder(false)
                                 ->default('bash')
                                 ->options(['bash', 'ash', '/bin/bash'])

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

@@ -2,32 +2,13 @@
 
 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;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Hidden;
-use Filament\Forms\Components\KeyValue;
-use Filament\Forms\Components\Placeholder;
-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\Toggle;
-use Filament\Forms\Form;
-use Filament\Forms\Set;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
+use Filament\Forms;
+use Filament\Forms\Form;
 
 class EditEgg extends EditRecord
 {
@@ -37,68 +18,64 @@ class EditEgg extends EditRecord
     {
         return $form
             ->schema([
-                Tabs::make()->tabs([
-                    Tab::make('Configuration')
+                Forms\Components\Tabs::make()->tabs([
+                    Forms\Components\Tabs\Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
-                        ->icon('tabler-egg')
                         ->schema([
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->required()
-                                ->maxLength(255)
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
+                                ->maxLength(191)
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1])
                                 ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
-                            TextInput::make('uuid')
+                            Forms\Components\TextInput::make('uuid')
                                 ->label('Egg UUID')
                                 ->disabled()
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('This is the globally unique identifier for this Egg which Wings uses as an identifier.'),
-                            TextInput::make('id')
+                            Forms\Components\TextInput::make('id')
                                 ->label('Egg ID')
                                 ->disabled(),
-                            Textarea::make('description')
+                            Forms\Components\Textarea::make('description')
                                 ->rows(3)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
-                            TextInput::make('author')
+                            Forms\Components\TextInput::make('author')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->email()
                                 ->disabled()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->helperText('The author of this version of the Egg. Uploading a new Egg configuration from a different author will change this.'),
-                            Textarea::make('startup')
+                            Forms\Components\Textarea::make('startup')
                                 ->rows(2)
                                 ->columnSpanFull()
                                 ->required()
                                 ->helperText('The default startup command that should be used for new servers using this Egg.'),
-                            TagsInput::make('file_denylist')
+                            Forms\Components\TagsInput::make('file_denylist')
                                 ->hidden() // latest wings breaks it.
                                 ->placeholder('denied-file.txt')
                                 ->helperText('A list of files that the end user is not allowed to edit.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            TagsInput::make('features')
+                            Forms\Components\TagsInput::make('features')
                                 ->placeholder('Add Feature')
                                 ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            Toggle::make('force_outgoing_ip')
-                                ->inline(false)
+                            Forms\Components\Toggle::make('force_outgoing_ip')
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's endpoint.
+                                ->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.
                                     Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
-                            Hidden::make('script_is_privileged')
+                            Forms\Components\Hidden::make('script_is_privileged')
                                 ->helperText('The docker images available to servers using this egg.'),
-                            TagsInput::make('tags')
+                            Forms\Components\TagsInput::make('tags')
                                 ->placeholder('Add Tags')
                                 ->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.')
+                            Forms\Components\TextInput::make('update_url')
+                                ->disabled()
+                                ->helperText('Not implemented.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
-                            KeyValue::make('docker_images')
+                            Forms\Components\KeyValue::make('docker_images')
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
@@ -107,34 +84,33 @@ class EditEgg extends EditRecord
                                 ->valueLabel('Image URI')
                                 ->helperText('The docker images available to servers using this egg.'),
                         ]),
-                    Tab::make('Process Management')
+
+                    Forms\Components\Tabs\Tab::make('Process Management')
                         ->columns()
-                        ->icon('tabler-server-cog')
                         ->schema([
-                            Select::make('config_from')
+                            Forms\Components\Select::make('config_from')
                                 ->label('Copy Settings From')
                                 ->placeholder('None')
                                 ->relationship('configFrom', 'name', ignoreRecord: true)
                                 ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
-                            TextInput::make('config_stop')
-                                ->maxLength(255)
+                            Forms\Components\TextInput::make('config_stop')
+                                ->maxLength(191)
                                 ->label('Stop Command')
                                 ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
-                            Textarea::make('config_startup')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_startup')->rows(10)->json()
                                 ->label('Start Configuration')
                                 ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
-                            Textarea::make('config_files')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_files')->rows(10)->json()
                                 ->label('Configuration Files')
                                 ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
-                            Textarea::make('config_logs')->rows(10)->json()
+                            Forms\Components\Textarea::make('config_logs')->rows(10)->json()
                                 ->label('Log Configuration')
                                 ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make('Egg Variables')
+                    Forms\Components\Tabs\Tab::make('Egg Variables')
                         ->columnSpanFull()
-                        ->icon('tabler-variable')
                         ->schema([
-                            Repeater::make('variables')
+                            Forms\Components\Repeater::make('variables')
                                 ->label('')
                                 ->grid()
                                 ->relationship('variables')
@@ -147,7 +123,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,77 +132,57 @@ class EditEgg extends EditRecord
                                 ->mutateRelationshipDataBeforeSaveUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
                                     $data['description'] ??= '';
-                                    $data['rules'] ??= [];
+                                    $data['rules'] ??= '';
                                     $data['user_viewable'] ??= '';
                                     $data['user_editable'] ??= '';
 
                                     return $data;
                                 })
                                 ->schema([
-                                    TextInput::make('name')
+                                    Forms\Components\TextInput::make('name')
                                         ->live()
                                         ->debounce(750)
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->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(),
-                                    TextInput::make('env_variable')
+                                    Forms\Components\Textarea::make('description')->columnSpanFull(),
+                                    Forms\Components\TextInput::make('env_variable')
                                         ->label('Environment Variable')
-                                        ->maxLength(255)
+                                        ->maxLength(191)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
                                         ->required(),
-                                    TextInput::make('default_value')->maxLength(255),
-                                    Fieldset::make('User Permissions')
+                                    Forms\Components\TextInput::make('default_value')->maxLength(191),
+                                    Forms\Components\Fieldset::make('User Permissions')
                                         ->schema([
-                                            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',
+                                            Forms\Components\Checkbox::make('user_viewable')->label('Viewable'),
+                                            Forms\Components\Checkbox::make('user_editable')->label('Editable'),
                                         ]),
+                                    Forms\Components\TextInput::make('rules')->columnSpanFull(),
                                 ]),
                         ]),
-                    Tab::make('Install Script')
+                    Forms\Components\Tabs\Tab::make('Install Script')
                         ->columns(3)
-                        ->icon('tabler-file-download')
                         ->schema([
-                            Select::make('copy_script_from')
+
+                            Forms\Components\Select::make('copy_script_from')
                                 ->placeholder('None')
                                 ->relationship('scriptFrom', 'name', ignoreRecord: true),
-                            TextInput::make('script_container')
+
+                            Forms\Components\TextInput::make('script_container')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->default('alpine:3.4'),
-                            TextInput::make('script_entry')
+
+                            Forms\Components\TextInput::make('script_entry')
                                 ->required()
-                                ->maxLength(255)
+                                ->maxLength(191)
                                 ->default('ash'),
+
                             MonacoEditor::make('script_install')
                                 ->label('Install Script')
                                 ->columnSpanFull()
@@ -234,6 +190,7 @@ class EditEgg extends EditRecord
                                 ->language('shell')
                                 ->view('filament.plugins.monaco-editor'),
                         ]),
+
                 ])->columnSpanFull()->persistTabInQueryString(),
             ]);
     }
@@ -241,92 +198,19 @@ class EditEgg extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            Actions\DeleteAction::make('deleteEgg')
+            Actions\DeleteAction::make()
                 ->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')
+                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete Egg' : 'Egg In Use'),
+            Actions\ExportAction::make()
+                ->icon('tabler-download')
+                ->label('Export Egg')
                 ->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')),
-            Actions\Action::make('importEgg')
-                ->label('Import')
-                ->form([
-                    Placeholder::make('warning')
-                        ->label('This will overwrite the current egg to the one you upload.'),
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('eg. minecraft.json')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false),
-                                ]),
-                            Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    TextInput::make('url')
-                                        ->label('URL')
-                                        ->default(fn (Egg $egg): ?string => $egg->update_url)
-                                        ->hint('Link to the egg file (eg. minecraft.json)')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
-                ])
-                ->action(function (array $data, Egg $egg, EggImporterService $eggImportService): void {
-                    if (!empty($data['egg'])) {
-                        try {
-                            $eggImportService->fromFile($data['egg'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger() // Will Robinson
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    } elseif (!empty($data['url'])) {
-                        try {
-                            $eggImportService->fromUrl($data['url'], $egg);
-                        } catch (Exception $exception) {
-                            Notification::make()
-                                ->title('Import Failed')
-                                ->body($exception->getMessage())
-                                ->danger()
-                                ->send();
-
-                            report($exception);
-
-                            return;
-                        }
-                    }
-
-                    $this->refreshForm();
-                    Notification::make()
-                        ->title('Import Success')
-                        ->success()
-                        ->send();
-                })
-                ->authorize(fn () => auth()->user()->can('import egg')),
+                // TODO uses old admin panel export service
+                ->url(fn (Egg $egg): string => route('admin.eggs.export', ['egg' => $egg['id']])),
             $this->getSaveFormAction()->formId('form'),
         ];
     }
 
-    public function refreshForm(): void
-    {
-        $this->fillForm();
-    }
-
     protected function getFormActions(): array
     {
         return [];
@@ -335,7 +219,7 @@ class EditEgg extends EditRecord
     public function getRelationManagers(): array
     {
         return [
-            ServersRelationManager::class,
+            EggResource\RelationManagers\ServersRelationManager::class,
         ];
     }
 }

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

@@ -4,23 +4,15 @@ namespace App\Filament\Resources\EggResource\Pages;
 
 use App\Filament\Resources\EggResource;
 use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
 use App\Services\Eggs\Sharing\EggImporterService;
 use Exception;
 use Filament\Actions;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Tabs;
-use Filament\Forms\Components\Tabs\Tab;
-use Filament\Forms\Components\TextInput;
+use Filament\Forms;
 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
 {
@@ -29,76 +21,57 @@ class ListEggs extends ListRecords
     public function table(Table $table): Table
     {
         return $table
-            ->searchable(true)
+            ->searchable(false)
             ->defaultPaginationPageOption(25)
             ->checkIfRecordIsSelectableUsing(fn (Egg $egg) => $egg->servers_count <= 0)
             ->columns([
-                TextColumn::make('id')
+                Tables\Columns\TextColumn::make('id')
                     ->label('Id')
-                    ->hidden(),
-                TextColumn::make('name')
+                    ->hidden()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-egg')
-                    ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
+                    ->description(fn ($record): ?string => $record->description)
                     ->wrap()
-                    ->searchable()
-                    ->sortable(),
-                TextColumn::make('servers_count')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('author')
+                    ->hidden()
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('servers_count')
                     ->counts('servers')
                     ->icon('tabler-server')
                     ->label('Servers'),
+                Tables\Columns\TextColumn::make('script_container')
+                    ->searchable()
+                    ->hidden(),
+                Tables\Columns\TextColumn::make('copyFrom.name')
+                    ->hidden()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('script_entry')
+                    ->hidden()
+                    ->searchable(),
+            ])
+            ->filters([
+                //
             ])
             ->actions([
-                EditAction::make(),
-                Action::make('export')
+                Tables\Actions\EditAction::make(),
+                Tables\Actions\ExportAction::make()
                     ->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)),
+                    // TODO uses old admin panel export service
+                    ->url(fn (Egg $egg): string => route('admin.eggs.export', ['egg' => $egg])),
+            ])
+            ->headerActions([
+                //
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete egg')),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [
@@ -107,54 +80,21 @@ class ListEggs extends ListRecords
             Actions\Action::make('import')
                 ->label('Import')
                 ->form([
-                    Tabs::make('Tabs')
-                        ->tabs([
-                            Tab::make('From File')
-                                ->icon('tabler-file-upload')
-                                ->schema([
-                                    FileUpload::make('egg')
-                                        ->label('Egg')
-                                        ->hint('This should be the json file ( egg-minecraft.json )')
-                                        ->acceptedFileTypes(['application/json'])
-                                        ->storeFiles(false)
-                                        ->multiple(),
-                                ]),
-                            Tab::make('From URL')
-                                ->icon('tabler-world-upload')
-                                ->schema([
-                                    TextInput::make('url')
-                                        ->label('URL')
-                                        ->hint('This URL should point to a single json file')
-                                        ->url(),
-                                ]),
-                        ])
-                        ->contained(false),
-
+                    Forms\Components\FileUpload::make('egg')
+                        ->acceptedFileTypes(['application/json'])
+                        ->storeFiles(false)
+                        ->multiple(),
                 ])
-                ->action(function (array $data, EggImporterService $eggImportService): void {
-                    if (!empty($data['egg'])) {
-                        /** @var TemporaryUploadedFile[] $eggFile */
-                        $eggFile = $data['egg'];
+                ->action(function (array $data): void {
+                    /** @var TemporaryUploadedFile $eggFile */
+                    $eggFile = $data['egg'];
 
-                        foreach ($eggFile as $file) {
-                            try {
-                                $eggImportService->fromFile($file);
-                            } catch (Exception $exception) {
-                                Notification::make()
-                                    ->title('Import Failed')
-                                    ->danger()
-                                    ->send();
+                    /** @var EggImporterService $eggImportService */
+                    $eggImportService = resolve(EggImporterService::class);
 
-                                report($exception);
-
-                                return;
-                            }
-                        }
-                    }
-
-                    if (!empty($data['url'])) {
+                    foreach ($eggFile as $file) {
                         try {
-                            $eggImportService->fromUrl($data['url']);
+                            $eggImportService->handle($file);
                         } catch (Exception $exception) {
                             Notification::make()
                                 ->title('Import Failed')
@@ -171,8 +111,7 @@ class ListEggs extends ListRecords
                         ->title('Import Success')
                         ->success()
                         ->send();
-                })
-                ->authorize(fn () => auth()->user()->can('import egg')),
+                }),
         ];
     }
 }

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

@@ -4,7 +4,7 @@ namespace App\Filament\Resources\EggResource\RelationManagers;
 
 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
 
 class ServersRelationManager extends RelationManager
@@ -15,23 +15,28 @@ 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')
+                Tables\Columns\TextColumn::make('user.username')
                     ->label('Owner')
                     ->icon('tabler-user')
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
                     ->sortable(),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Server $server): string => route('filament.admin.resources.servers.edit', ['record' => $server]))
                     ->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])),
-                TextColumn::make('image')
+                Tables\Columns\TextColumn::make('image')
                     ->label('Docker Image'),
+                Tables\Columns\SelectColumn::make('allocation.id')
+                    ->label('Primary Allocation')
+                    ->options(fn ($state, Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
+                    ->sortable(),
             ]);
     }
 }

app/Filament/Resources/MountResource.php

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

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

@@ -4,14 +4,11 @@ namespace App\Filament\Resources\MountResource\Pages;
 
 use App\Filament\Resources\MountResource;
 use Filament\Forms\Components\Group;
-use Filament\Forms\Components\Hidden;
 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\CreateRecord;
+use Filament\Forms;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
@@ -26,11 +23,11 @@ class CreateMount extends CreateRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    TextInput::make('name')
+                    Forms\Components\TextInput::make('name')
                         ->required()
                         ->helperText('Unique name used to separate this mount from another.')
                         ->maxLength(64),
-                    ToggleButtons::make('read_only')
+                    Forms\Components\ToggleButtons::make('read_only')
                         ->label('Read only?')
                         ->helperText('Is the mount read only inside the container?')
                         ->options([
@@ -48,15 +45,15 @@ class CreateMount extends CreateRecord
                         ->inline()
                         ->default(false)
                         ->required(),
-                    TextInput::make('source')
+                    Forms\Components\TextInput::make('source')
                         ->required()
                         ->helperText('File path on the host system to mount to a container.')
-                        ->maxLength(255),
-                    TextInput::make('target')
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('target')
                         ->required()
                         ->helperText('Where the mount will be accessible inside a container.')
-                        ->maxLength(255),
-                    ToggleButtons::make('user_mountable')
+                        ->maxLength(191),
+                    Forms\Components\ToggleButtons::make('user_mountable')
                         ->hidden()
                         ->label('User mountable?')
                         ->options([
@@ -74,10 +71,10 @@ class CreateMount extends CreateRecord
                         ->default(false)
                         ->inline()
                         ->required(),
-                    Textarea::make('description')
+                    Forms\Components\Textarea::make('description')
                         ->helperText('A longer description for this mount.')
                         ->columnSpanFull(),
-                    Hidden::make('user_mountable')->default(1),
+                    Forms\Components\Hidden::make('user_mountable')->default(1),
                 ])->columnSpan(1)->columns([
                     'default' => 1,
                     'lg' => 2,

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

@@ -4,14 +4,12 @@ namespace App\Filament\Resources\MountResource\Pages;
 
 use App\Filament\Resources\MountResource;
 use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+use Filament\Forms;
 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;
 
 class EditMount extends EditRecord
 {
@@ -22,11 +20,11 @@ class EditMount extends EditRecord
         return $form
             ->schema([
                 Section::make()->schema([
-                    TextInput::make('name')
+                    Forms\Components\TextInput::make('name')
                         ->required()
                         ->helperText('Unique name used to separate this mount from another.')
                         ->maxLength(64),
-                    ToggleButtons::make('read_only')
+                    Forms\Components\ToggleButtons::make('read_only')
                         ->label('Read only?')
                         ->helperText('Is the mount read only inside the container?')
                         ->options([
@@ -44,15 +42,15 @@ class EditMount extends EditRecord
                         ->inline()
                         ->default(false)
                         ->required(),
-                    TextInput::make('source')
+                    Forms\Components\TextInput::make('source')
                         ->required()
                         ->helperText('File path on the host system to mount to a container.')
-                        ->maxLength(255),
-                    TextInput::make('target')
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('target')
                         ->required()
                         ->helperText('Where the mount will be accessible inside a container.')
-                        ->maxLength(255),
-                    ToggleButtons::make('user_mountable')
+                        ->maxLength(191),
+                    Forms\Components\ToggleButtons::make('user_mountable')
                         ->hidden()
                         ->label('User mountable?')
                         ->options([
@@ -70,7 +68,7 @@ class EditMount extends EditRecord
                         ->default(false)
                         ->inline()
                         ->required(),
-                    Textarea::make('description')
+                    Forms\Components\Textarea::make('description')
                         ->helperText('A longer description for this mount.')
                         ->columnSpanFull(),
                 ])->columnSpan(1)->columns([
@@ -96,7 +94,6 @@ class EditMount extends EditRecord
                 'lg' => 2,
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [

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

@@ -6,46 +6,43 @@ use App\Filament\Resources\MountResource;
 use App\Models\Mount;
 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 Filament\Tables;
 
 class ListMounts extends ListRecords
 {
     protected static string $resource = MountResource::class;
-
     public function table(Table $table): Table
     {
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->searchable(),
-                TextColumn::make('source')
+                Tables\Columns\TextColumn::make('source')
                     ->searchable(),
-                TextColumn::make('target')
+                Tables\Columns\TextColumn::make('target')
                     ->searchable(),
-                IconColumn::make('read_only')
+                Tables\Columns\IconColumn::make('read_only')
                     ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
                     ->color(fn (bool $state) => $state ? 'success' : 'danger')
                     ->sortable(),
-                IconColumn::make('user_mountable')
+                Tables\Columns\IconColumn::make('user_mountable')
                     ->hidden()
                     ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
                     ->color(fn (bool $state) => $state ? 'success' : 'danger')
                     ->sortable(),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete mount')),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon('tabler-layers-linked')
@@ -57,7 +54,6 @@ class ListMounts extends ListRecords
                     ->button(),
             ]);
     }
-
     protected function getHeaderActions(): array
     {
         return [

app/Filament/Resources/NodeResource.php

@@ -3,7 +3,7 @@
 namespace App\Filament\Resources;
 
 use App\Filament\Resources\NodeResource\Pages;
-use App\Filament\Resources\NodeResource\RelationManagers\NodesRelationManager;
+use App\Filament\Resources\NodeResource\RelationManagers;
 use App\Models\Node;
 use Filament\Resources\Resource;
 
@@ -23,7 +23,8 @@ class NodeResource extends Resource
     public static function getRelations(): array
     {
         return [
-            NodesRelationManager::class,
+            RelationManagers\AllocationsRelationManager::class,
+            RelationManagers\NodesRelationManager::class,
         ];
     }
 

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

@@ -3,19 +3,9 @@
 namespace App\Filament\Resources\NodeResource\Pages;
 
 use App\Filament\Resources\NodeResource;
-use App\Models\Objects\Endpoint;
 use Filament\Forms;
-use Filament\Forms\Components\Actions\Action;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
+use Filament\Forms\Components\Tabs;
 use Filament\Resources\Pages\CreateRecord;
-use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
 class CreateNode extends CreateRecord
@@ -28,21 +18,21 @@ class CreateNode extends CreateRecord
 
     public function form(Forms\Form $form): Forms\Form
     {
-        return $form
-            ->schema([
-                Wizard::make([
-                    Step::make('basic')
-                        ->label('Basic Settings')
+        return $form->schema([
+            Tabs::make('Tabs')
+                ->columns([
+                    'default' => 2,
+                    'sm' => 3,
+                    'md' => 3,
+                    'lg' => 4,
+                ])
+                ->persistTabInQueryString()
+                ->columnSpanFull()
+                ->tabs([
+                    Tabs\Tab::make('Basic Settings')
                         ->icon('tabler-server')
-                        ->columnSpanFull()
-                        ->columns([
-                            'default' => 2,
-                            'sm' => 3,
-                            'md' => 3,
-                            'lg' => 4,
-                        ])
                         ->schema([
-                            TextInput::make('fqdn')
+                            Forms\Components\TextInput::make('fqdn')
                                 ->columnSpan(2)
                                 ->required()
                                 ->autofocus()
@@ -65,7 +55,7 @@ class CreateNode extends CreateRecord
                                     return "
                             This is the domain name that points to your node's IP Address.
                             If you've already set up this, you can verify it by checking the next field!
-                            ";
+                        ";
                                 })
                                 ->hintColor('danger')
                                 ->hint(function ($state) {
@@ -75,7 +65,7 @@ class CreateNode extends CreateRecord
 
                                     return '';
                                 })
-                                ->afterStateUpdated(function (Set $set, ?string $state) {
+                                ->afterStateUpdated(function (Forms\Set $set, ?string $state) {
                                     $set('dns', null);
                                     $set('ip', null);
 
@@ -101,19 +91,19 @@ class CreateNode extends CreateRecord
 
                                     $set('dns', false);
                                 })
-                                ->maxLength(255),
+                                ->maxLength(191),
 
-                            TextInput::make('ip')
+                            Forms\Components\TextInput::make('ip')
                                 ->disabled()
                                 ->hidden(),
 
-                            ToggleButtons::make('dns')
+                            Forms\Components\ToggleButtons::make('dns')
                                 ->label('DNS Record Check')
                                 ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
                                 ->disabled()
                                 ->inline()
                                 ->default(null)
-                                ->hint(fn (Get $get) => $get('ip'))
+                                ->hint(fn (Forms\Get $get) => $get('ip'))
                                 ->hintColor('success')
                                 ->options([
                                     true => 'Valid',
@@ -130,7 +120,7 @@ class CreateNode extends CreateRecord
                                     'lg' => 1,
                                 ]),
 
-                            TextInput::make('daemon_listen')
+                            Forms\Components\TextInput::make('daemon_listen')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -139,13 +129,13 @@ class CreateNode extends CreateRecord
                                 ])
                                 ->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)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->minValue(0)
+                                ->maxValue(65536)
                                 ->default(8080)
                                 ->required()
                                 ->integer(),
 
-                            TextInput::make('name')
+                            Forms\Components\TextInput::make('name')
                                 ->label('Display Name')
                                 ->columnSpan([
                                     'default' => 1,
@@ -154,10 +144,11 @@ 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),
 
-                            ToggleButtons::make('scheme')
+                            Forms\Components\ToggleButtons::make('scheme')
                                 ->label('Communicate over SSL')
                                 ->columnSpan([
                                     'default' => 1,
@@ -165,8 +156,9 @@ class CreateNode extends CreateRecord
                                     'md' => 1,
                                     'lg' => 1,
                                 ])
+                                ->required()
                                 ->inline()
-                                ->helperText(function (Get $get) {
+                                ->helperText(function (Forms\Get $get) {
                                     if (request()->isSecure()) {
                                         return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
                                     }
@@ -192,18 +184,31 @@ class CreateNode extends CreateRecord
                                 ])
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'),
                         ]),
-                    Step::make('advanced')
-                        ->label('Advanced Settings')
+                    Tabs\Tab::make('Advanced Settings')
                         ->icon('tabler-server-cog')
-                        ->columnSpanFull()
-                        ->columns([
-                            'default' => 2,
-                            'sm' => 3,
-                            'md' => 3,
-                            'lg' => 4,
-                        ])
                         ->schema([
-                            ToggleButtons::make('maintenance_mode')
+                            Forms\Components\TextInput::make('upload_size')
+                                ->label('Upload Limit')
+                                ->helperText('Enter the maximum size of files that can be uploaded through the web-based file manager.')
+                                ->columnSpan(1)
+                                ->numeric()->required()
+                                ->default(256)
+                                ->minValue(1)
+                                ->maxValue(1024)
+                                ->suffix('MiB'),
+                            Forms\Components\ToggleButtons::make('public')
+                                ->label('Automatic Allocation')->inline()
+                                ->default(true)
+                                ->columnSpan(1)
+                                ->options([
+                                    true => 'Yes',
+                                    false => 'No',
+                                ])
+                                ->colors([
+                                    true => 'success',
+                                    false => 'danger',
+                                ]),
+                            Forms\Components\ToggleButtons::make('maintenance_mode')
                                 ->label('Maintenance Mode')->inline()
                                 ->columnSpan(1)
                                 ->default(false)
@@ -217,51 +222,22 @@ class CreateNode extends CreateRecord
                                     true => 'danger',
                                     false => 'success',
                                 ]),
-                            ToggleButtons::make('public')
-                                ->default(true)
-                                ->columnSpan(1)
-                                ->label('Use Node for deployment?')->inline()
-                                ->options([
-                                    true => 'Yes',
-                                    false => 'No',
-                                ])
-                                ->colors([
-                                    true => 'success',
-                                    false => 'danger',
-                                ]),
-                            TagsInput::make('tags')
-                                ->placeholder('Add Tags')
-                                ->columnSpan(2),
-                            TextInput::make('upload_size')
-                                ->label('Upload Limit')
-                                ->helperText('Enter the maximum size of files that can be uploaded through the web-based file manager.')
-                                ->columnSpan(1)
-                                ->numeric()->required()
-                                ->default(256)
-                                ->minValue(1)
-                                ->maxValue(1024)
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                            TextInput::make('daemon_sftp')
-                                ->columnSpan(1)
-                                ->label('SFTP Port')
-                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
-                                ->default(2022)
-                                ->required()
-                                ->integer(),
-                            TextInput::make('daemon_sftp_alias')
-                                ->columnSpan(2)
-                                ->label('SFTP Alias')
-                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
-                            Grid::make()
+                            Forms\Components\TagsInput::make('tags')
+                                ->label('Tags')
+                                ->disabled()
+                                ->placeholder('Not Implemented')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Not Implemented')
+                                ->columnSpan(1),
+                            Forms\Components\Grid::make()
                                 ->columns(6)
                                 ->columnSpanFull()
                                 ->schema([
-                                    ToggleButtons::make('unlimited_mem')
+                                    Forms\Components\ToggleButtons::make('unlimited_mem')
                                         ->label('Memory')->inlineLabel()->inline()
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('memory_overallocate', 0))
+                                        ->formatStateUsing(fn (Forms\Get $get) => $get('memory') == 0)
                                         ->live()
                                         ->options([
                                             true => 'Unlimited',
@@ -272,20 +248,19 @@ class CreateNode extends CreateRecord
                                             false => 'warning',
                                         ])
                                         ->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')
+                                        ->suffix('MiB')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0)
-                                        ->default(0)
-                                        ->required(),
-                                    TextInput::make('memory_overallocate')
+                                        ->default(0),
+                                    Forms\Components\TextInput::make('memory_overallocate')
                                         ->dehydratedWhenHidden()
                                         ->label('Overallocate')->inlineLabel()
-                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
@@ -293,19 +268,18 @@ class CreateNode extends CreateRecord
                                         ->minValue(-1)
                                         ->maxValue(100)
                                         ->default(0)
-                                        ->suffix('%')
-                                        ->required(),
+                                        ->suffix('%'),
                                 ]),
-                            Grid::make()
+                            Forms\Components\Grid::make()
                                 ->columns(6)
                                 ->columnSpanFull()
                                 ->schema([
-                                    ToggleButtons::make('unlimited_disk')
+                                    Forms\Components\ToggleButtons::make('unlimited_disk')
                                         ->label('Disk')->inlineLabel()->inline()
                                         ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('disk_overallocate', 0))
+                                        ->formatStateUsing(fn (Forms\Get $get) => $get('disk') == 0)
                                         ->options([
                                             true => 'Unlimited',
                                             false => 'Limited',
@@ -315,19 +289,18 @@ class CreateNode extends CreateRecord
                                             false => 'warning',
                                         ])
                                         ->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 Limit')->inlineLabel()
-                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
+                                        ->suffix('MiB')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0)
-                                        ->default(0)
-                                        ->required(),
-                                    TextInput::make('disk_overallocate')
+                                        ->default(0),
+                                    Forms\Components\TextInput::make('disk_overallocate')
                                         ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                         ->label('Overallocate')->inlineLabel()
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
@@ -336,75 +309,17 @@ class CreateNode extends CreateRecord
                                         ->minValue(-1)
                                         ->maxValue(100)
                                         ->default(0)
-                                        ->suffix('%')
-                                        ->required(),
-                                ]),
-                            Grid::make()
-                                ->columns(6)
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->columnSpan(2),
-                                    TextInput::make('cpu')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(0)
-                                        ->required(),
-                                    TextInput::make('cpu_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->hintIcon('tabler-question-mark')
-                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(2)
-                                        ->numeric()
-                                        ->default(0)
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%')
-                                        ->required(),
+                                        ->suffix('%'),
                                 ]),
                         ]),
-                ])->columnSpanFull()
-                    ->nextAction(fn (Action $action) => $action->label('Next Step'))
-                    ->submitAction(new HtmlString(Blade::render(<<<'BLADE'
-                                        <x-filament::button
-                                                type="submit"
-                                                size="sm"
-                                            >
-                                                Create Node
-                                            </x-filament::button>
-                                        BLADE))),
-            ]);
+                ]),
+        ]);
     }
 
     protected function getRedirectUrlParameters(): array
     {
         return [
-            'tab' => '-configuration-file-tab',
+            'tab' => '-configuration-tab',
         ];
     }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
 }

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

@@ -3,24 +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\Models\Objects\Endpoint;
-use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
 use Filament\Forms;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Placeholder;
 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\Components\View;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
-use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
@@ -42,36 +30,10 @@ 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')
+                    Tabs\Tab::make('Basic Settings')
                         ->icon('tabler-server')
                         ->schema([
-                            TextInput::make('fqdn')
+                            Forms\Components\TextInput::make('fqdn')
                                 ->columnSpan(2)
                                 ->required()
                                 ->autofocus()
@@ -84,7 +46,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
                                 ';
                                         }
 
@@ -99,12 +61,12 @@ 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 '';
                                 })
-                                ->afterStateUpdated(function (Set $set, ?string $state) {
+                                ->afterStateUpdated(function (Forms\Set $set, ?string $state) {
                                     $set('dns', null);
                                     $set('ip', null);
 
@@ -130,17 +92,19 @@ class EditNode extends EditRecord
 
                                     $set('dns', false);
                                 })
-                                ->maxLength(255),
-                            TextInput::make('ip')
+                                ->maxLength(191),
+
+                            Forms\Components\TextInput::make('ip')
                                 ->disabled()
                                 ->hidden(),
-                            ToggleButtons::make('dns')
+
+                            Forms\Components\ToggleButtons::make('dns')
                                 ->label('DNS Record Check')
                                 ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
                                 ->disabled()
                                 ->inline()
                                 ->default(null)
-                                ->hint(fn (Get $get) => $get('ip'))
+                                ->hint(fn (Forms\Get $get) => $get('ip'))
                                 ->hintColor('success')
                                 ->options([
                                     true => 'Valid',
@@ -156,7 +120,8 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 1,
                                 ]),
-                            TextInput::make('daemon_listen')
+
+                            Forms\Components\TextInput::make('daemon_listen')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -165,12 +130,13 @@ class EditNode extends EditRecord
                                 ])
                                 ->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)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->minValue(0)
+                                ->maxValue(65536)
                                 ->default(8080)
                                 ->required()
                                 ->integer(),
-                            TextInput::make('name')
+
+                            Forms\Components\TextInput::make('name')
                                 ->label('Display Name')
                                 ->columnSpan([
                                     'default' => 1,
@@ -179,9 +145,11 @@ 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')
+
+                            Forms\Components\ToggleButtons::make('scheme')
                                 ->label('Communicate over SSL')
                                 ->columnSpan([
                                     'default' => 1,
@@ -189,8 +157,9 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 1,
                                 ])
+                                ->required()
                                 ->inline()
-                                ->helperText(function (Get $get) {
+                                ->helperText(function (Forms\Get $get) {
                                     if (request()->isSecure()) {
                                         return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
                                     }
@@ -215,46 +184,27 @@ class EditNode extends EditRecord
                                     'https' => 'tabler-lock',
                                 ])
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
-                    Tab::make('Advanced Settings')
-                        ->columns(['default' => 1, 'sm' => 1, 'md' => 4, 'lg' => 6])
+                    Tabs\Tab::make('Advanced Settings')
                         ->icon('tabler-server-cog')
                         ->schema([
-                            TextInput::make('id')
+                            Forms\Components\TextInput::make('id')
                                 ->label('Node ID')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
                                 ->disabled(),
-                            TextInput::make('uuid')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                            Forms\Components\TextInput::make('uuid')
                                 ->label('Node UUID')
                                 ->hintAction(CopyAction::make())
+                                ->columnSpan(2)
                                 ->disabled(),
-                            TagsInput::make('tags')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->placeholder('Add Tags'),
-                            TextInput::make('upload_size')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
-                                ->label('Upload Limit')
+                            Forms\Components\TagsInput::make('tags')
+                                ->label('Tags')
+                                ->disabled()
+                                ->placeholder('Not Implemented')
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
-                                ->numeric()->required()
-                                ->minValue(1)
-                                ->maxValue(1024)
-                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
-                            TextInput::make('daemon_sftp')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
-                                ->label('SFTP Port')
-                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
-                                ->default(2022)
-                                ->required()
-                                ->integer(),
-                            TextInput::make('daemon_sftp_alias')
-                                ->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()
+                                ->hintIconTooltip('Not Implemented')
+                                ->columnSpan(1),
+                            Forms\Components\ToggleButtons::make('public')
+                                ->label('Automatic Allocation')->inline()
+                                ->columnSpan(1)
                                 ->options([
                                     true => 'Yes',
                                     false => 'No',
@@ -263,110 +213,38 @@ class EditNode extends EditRecord
                                     true => 'success',
                                     false => 'danger',
                                 ]),
-                            ToggleButtons::make('maintenance_mode')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                            Forms\Components\ToggleButtons::make('maintenance_mode')
                                 ->label('Maintenance Mode')->inline()
+                                ->columnSpan(1)
                                 ->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.")
                                 ->options([
-                                    false => 'Disable',
                                     true => 'Enable',
+                                    false => 'Disable',
                                 ])
                                 ->colors([
-                                    false => 'success',
                                     true => 'danger',
+                                    false => 'success',
                                 ]),
-                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
-                                ->columnSpanFull()
-                                ->schema([
-                                    ToggleButtons::make('unlimited_mem')
-                                        ->label('Memory')->inlineLabel()->inline()
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
-                                        ->live()
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->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])
-                                        ->numeric()
-                                        ->minValue(0),
-                                    TextInput::make('memory_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->label('Overallocate')->inlineLabel()
-                                        ->required()
-                                        ->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])
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
-                                ->schema([
-                                    ToggleButtons::make('unlimited_disk')
-                                        ->label('Disk')->inlineLabel()->inline()
-                                        ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
-                                        ->options([
-                                            true => 'Unlimited',
-                                            false => 'Limited',
-                                        ])
-                                        ->colors([
-                                            true => 'primary',
-                                            false => 'warning',
-                                        ])
-                                        ->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])
-                                        ->numeric()
-                                        ->minValue(0),
-                                    TextInput::make('disk_overallocate')
-                                        ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->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])
-                                        ->required()
-                                        ->numeric()
-                                        ->minValue(-1)
-                                        ->maxValue(100)
-                                        ->suffix('%'),
-                                ]),
-                            Grid::make()
+                            Forms\Components\TextInput::make('upload_size')
+                                ->label('Upload Limit')
+                                ->hintIcon('tabler-question-mark')
+                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
+                                ->columnStart(4)->columnSpan(1)
+                                ->numeric()->required()
+                                ->minValue(1)
+                                ->maxValue(1024)
+                                ->suffix('MiB'),
+                            Forms\Components\Grid::make()
                                 ->columns(6)
                                 ->columnSpanFull()
                                 ->schema([
-                                    ToggleButtons::make('unlimited_cpu')
-                                        ->label('CPU')->inlineLabel()->inline()
+                                    Forms\Components\ToggleButtons::make('unlimited_mem')
+                                        ->label('Memory')->inlineLabel()->inline()
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('memory', 0))
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('memory_overallocate', 0))
+                                        ->formatStateUsing(fn (Forms\Get $get) => $get('memory') == 0)
                                         ->live()
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
-                                        ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
-                                        ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
                                         ->options([
                                             true => 'Unlimited',
                                             false => 'Limited',
@@ -376,18 +254,59 @@ class EditNode extends EditRecord
                                             false => 'warning',
                                         ])
                                         ->columnSpan(2),
-                                    TextInput::make('cpu')
+                                    Forms\Components\TextInput::make('memory')
                                         ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label('CPU Limit')->inlineLabel()
-                                        ->suffix('%')
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
+                                        ->label('Memory Limit')->inlineLabel()
+                                        ->suffix('MiB')
                                         ->required()
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(0),
-                                    TextInput::make('cpu_overallocate')
+                                    Forms\Components\TextInput::make('memory_overallocate')
                                         ->dehydratedWhenHidden()
-                                        ->hidden(fn (Get $get) => $get('unlimited_cpu'))
+                                        ->label('Overallocate')->inlineLabel()
+                                        ->required()
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_mem'))
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(-1)
+                                        ->maxValue(100)
+                                        ->suffix('%'),
+                                ]),
+                            Forms\Components\Grid::make()
+                                ->columns(6)
+                                ->columnSpanFull()
+                                ->schema([
+                                    Forms\Components\ToggleButtons::make('unlimited_disk')
+                                        ->label('Disk')->inlineLabel()->inline()
+                                        ->live()
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('disk', 0))
+                                        ->afterStateUpdated(fn (Forms\Set $set) => $set('disk_overallocate', 0))
+                                        ->formatStateUsing(fn (Forms\Get $get) => $get('disk') == 0)
+                                        ->options([
+                                            true => 'Unlimited',
+                                            false => 'Limited',
+                                        ])
+                                        ->colors([
+                                            true => 'primary',
+                                            false => 'warning',
+                                        ])
+                                        ->columnSpan(2),
+                                    Forms\Components\TextInput::make('disk')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
+                                        ->label('Disk Limit')->inlineLabel()
+                                        ->suffix('MiB')
+                                        ->required()
+                                        ->columnSpan(2)
+                                        ->numeric()
+                                        ->minValue(0),
+                                    Forms\Components\TextInput::make('disk_overallocate')
+                                        ->dehydratedWhenHidden()
+                                        ->hidden(fn (Forms\Get $get) => $get('unlimited_disk'))
                                         ->label('Overallocate')->inlineLabel()
                                         ->hintIcon('tabler-question-mark')
                                         ->hintIconTooltip('The % allowable to go over the set limit.')
@@ -399,33 +318,20 @@ class EditNode extends EditRecord
                                         ->suffix('%'),
                                 ]),
                         ]),
-                    Tab::make('Configuration File')
+                    Tabs\Tab::make('Configuration File')
                         ->icon('tabler-code')
                         ->schema([
-                            Placeholder::make('instructions')
+                            Forms\Components\Placeholder::make('instructions')
                                 ->columnSpanFull()
                                 ->content(new HtmlString('
                                   Save this file to your <span title="usually /etc/pelican/">daemon\'s root directory</span>, named <code>config.yml</code>
                             ')),
-                            Textarea::make('config')
+                            Forms\Components\Textarea::make('config')
                                 ->label('/etc/pelican/config.yml')
                                 ->disabled()
                                 ->rows(19)
                                 ->hintAction(CopyAction::make())
                                 ->columnSpanFull(),
-                            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();
-                                    }),
-                            ]),
                         ]),
                 ]),
         ]);
@@ -437,16 +343,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;
     }
 
@@ -454,7 +350,6 @@ class EditNode extends EditRecord
     {
         return [];
     }
-
     protected function getHeaderActions(): array
     {
         return [
@@ -465,18 +360,11 @@ class EditNode extends EditRecord
         ];
     }
 
-    protected function afterSave(): void
+    protected function getFooterWidgets(): array
     {
-        $this->fillForm();
-    }
-
-    protected function getColumnSpan(): ?int
-    {
-        return null;
-    }
-
-    protected function getColumnStart(): ?int
-    {
-        return null;
+        return [
+            NodeStorageChart::class,
+            NodeMemoryChart::class,
+        ];
     }
 }

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

@@ -6,14 +6,9 @@ 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;
+use Filament\Tables;
 
 class ListNodes extends ListRecords
 {
@@ -25,68 +20,64 @@ class ListNodes extends ListRecords
             ->searchable(false)
             ->checkIfRecordIsSelectableUsing(fn (Node $node) => $node->servers_count <= 0)
             ->columns([
-                TextColumn::make('uuid')
+                Tables\Columns\TextColumn::make('uuid')
                     ->label('UUID')
                     ->searchable()
                     ->hidden(),
-                IconColumn::make('health')
+                Tables\Columns\IconColumn::make('health')
                     ->alignCenter()
                     ->state(fn (Node $node) => $node)
                     ->view('livewire.columns.version-column'),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-server-2')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('fqdn')
+                Tables\Columns\TextColumn::make('fqdn')
                     ->visibleFrom('md')
                     ->label('Address')
                     ->icon('tabler-network')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('memory')
+                Tables\Columns\TextColumn::make('memory')
                     ->visibleFrom('sm')
                     ->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))
+                    ->suffix(' GiB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1024, 2))
                     ->sortable(),
-                TextColumn::make('disk')
+                Tables\Columns\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))
+                    ->suffix(' GiB')
+                    ->formatStateUsing(fn ($state) => number_format($state / 1024, 2))
                     ->sortable(),
-                TextColumn::make('cpu')
-                    ->visibleFrom('sm')
-                    ->icon('tabler-cpu')
-                    ->numeric()
-                    ->suffix(' %')
-                    ->sortable(),
-                IconColumn::make('scheme')
+                Tables\Columns\IconColumn::make('scheme')
                     ->visibleFrom('xl')
                     ->label('SSL')
                     ->trueIcon('tabler-lock')
                     ->falseIcon('tabler-lock-open-off')
                     ->state(fn (Node $node) => $node->scheme === 'https'),
-                IconColumn::make('public')
+                Tables\Columns\IconColumn::make('public')
                     ->visibleFrom('lg')
                     ->trueIcon('tabler-eye-check')
                     ->falseIcon('tabler-eye-cancel'),
-                TextColumn::make('servers_count')
+                Tables\Columns\TextColumn::make('servers_count')
                     ->visibleFrom('sm')
                     ->counts('servers')
                     ->label('Servers')
                     ->sortable()
                     ->icon('tabler-brand-docker'),
             ])
+            ->filters([
+                //
+            ])
             ->actions([
-                EditAction::make(),
+                Tables\Actions\EditAction::make(),
             ])
             ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete node')),
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon('tabler-server-2')

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

@@ -0,0 +1,150 @@
+<?php
+
+namespace App\Filament\Resources\NodeResource\RelationManagers;
+
+use App\Models\Allocation;
+use App\Models\Server;
+use App\Services\Allocations\AssignmentService;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Support\HtmlString;
+
+class AllocationsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'allocations';
+
+    protected static ?string $icon = 'tabler-plug-connected';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Forms\Components\TextInput::make('ip')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('ip')
+
+            // Non Primary Allocations
+            // ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->id !== $allocation->server?->allocation_id)
+
+            // All assigned allocations
+            ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
+            ->searchable()
+            ->columns([
+                Tables\Columns\TextColumn::make('server.name')
+                    ->label('Server')
+                    ->icon('tabler-brand-docker')
+                    ->searchable()
+                    ->url(fn (Allocation $allocation): string => $allocation->server ? route('filament.admin.resources.servers.edit', ['record' => $allocation->server]) : ''),
+                Tables\Columns\TextInputColumn::make('ip_alias')
+                    ->searchable()
+                    ->label('Alias'),
+                Tables\Columns\TextInputColumn::make('ip')
+                    ->searchable()
+                    ->label('IP'),
+                Tables\Columns\TextColumn::make('port')
+                    ->searchable()
+                    ->label('Port'),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\Action::make('create new allocation')->label('Create Allocations')
+                    ->form(fn () => [
+                        Forms\Components\TextInput::make('allocation_ip')
+                            ->datalist($this->getOwnerRecord()->ipAddresses() ?? [])
+                            ->label('IP Address')
+                            ->inlineLabel()
+                            ->ipv4()
+                            ->helperText("Usually your machine's public IP unless you are port forwarding.")
+                            ->required(),
+                        Forms\Components\TextInput::make('allocation_alias')
+                            ->label('Alias')
+                            ->inlineLabel()
+                            ->default(null)
+                            ->helperText('Optional display name to help you remember what these are.')
+                            ->required(false),
+                        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.
+                                <br />
+                                You would have to port forward these on your home network.
+                            '))
+                            ->label('Ports')
+                            ->inlineLabel()
+                            ->live()
+                            ->afterStateUpdated(function ($state, Forms\Set $set) {
+                                $ports = collect();
+                                $update = false;
+                                foreach ($state as $portEntry) {
+                                    if (!str_contains($portEntry, '-')) {
+                                        if (is_numeric($portEntry)) {
+                                            $ports->push((int) $portEntry);
+
+                                            continue;
+                                        }
+
+                                        // Do not add non numerical ports
+                                        $update = true;
+
+                                        continue;
+                                    }
+
+                                    $update = true;
+                                    [$start, $end] = explode('-', $portEntry);
+                                    if (!is_numeric($start) || !is_numeric($end)) {
+                                        continue;
+                                    }
+
+                                    $start = max((int) $start, 0);
+                                    $end = min((int) $end, 2 ** 16 - 1);
+                                    for ($i = $start; $i <= $end; $i++) {
+                                        $ports->push($i);
+                                    }
+                                }
+
+                                $uniquePorts = $ports->unique()->values();
+                                if ($ports->count() > $uniquePorts->count()) {
+                                    $update = true;
+                                    $ports = $uniquePorts;
+                                }
+
+                                $sortedPorts = $ports->sort()->values();
+                                if ($sortedPorts->all() !== $ports->all()) {
+                                    $update = true;
+                                    $ports = $sortedPorts;
+                                }
+
+                                $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
+
+                                if ($update) {
+                                    $set('allocation_ports', $ports->all());
+                                }
+                            })
+                            ->splitKeys(['Tab', ' ', ','])
+                            ->required(),
+                    ])
+                    ->action(fn (array $data) => resolve(AssignmentService::class)->handle($this->getOwnerRecord(), $data)),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    // Tables\Actions\DissociateBulkAction::make(),
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

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

@@ -3,9 +3,9 @@
 namespace App\Filament\Resources\NodeResource\RelationManagers;
 
 use App\Models\Server;
-use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Columns\TextColumn;
+use Filament\Tables;
 use Filament\Tables\Table;
+use Filament\Resources\RelationManagers\RelationManager;
 
 class NodesRelationManager extends RelationManager
 {
@@ -18,29 +18,34 @@ class NodesRelationManager extends RelationManager
         return $table
             ->searchable(false)
             ->columns([
-                TextColumn::make('user.username')
+                Tables\Columns\TextColumn::make('user.username')
                     ->label('Owner')
                     ->icon('tabler-user')
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
                     ->searchable(),
-                TextColumn::make('name')
+                Tables\Columns\TextColumn::make('name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Server $server): string => route('filament.admin.resources.servers.edit', ['record' => $server]))
                     ->searchable()
                     ->sortable(),
-                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->user]))
                     ->sortable(),
-                TextColumn::make('memory')->icon('tabler-device-desktop-analytics'),
-                TextColumn::make('cpu')->icon('tabler-cpu'),
-                TextColumn::make('databases_count')
+                Tables\Columns\SelectColumn::make('allocation.id')
+                    ->label('Primary Allocation')
+                    ->options(fn ($state, Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('memory')->icon('tabler-device-desktop-analytics'),
+                Tables\Columns\TextColumn::make('cpu')->icon('tabler-cpu'),
+                Tables\Columns\TextColumn::make('databases_count')
                     ->counts('databases')
                     ->label('Databases')
                     ->icon('tabler-database')
                     ->numeric()
                     ->sortable(),
-                TextColumn::make('backups_count')
+                Tables\Columns\TextColumn::make('backups_count')
                     ->counts('backups')
                     ->label('Backups')
                     ->icon('tabler-file-download')

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'],
         ];