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,39 @@
 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
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+CACHE_STORE=file
+QUEUE_CONNECTION=sync
+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/FUNDING.yml

@@ -1,2 +1,2 @@
 github: pelican-dev
-custom: [https://hub.pelican.dev/donors]
+custom: [https://buy.stripe.com/14kdU99SI4UT7ni9AB, https://buy.stripe.com/14kaHXc0Q9b9372eUU]

.github/ISSUE_TEMPLATE/bug-report.yml

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

.github/docker/entrypoint.sh

@@ -1,65 +1,81 @@
 #!/bin/ash -e
+cd /app
 
-#mkdir -p /var/log/supervisord/ /var/log/php8/ \
+mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php8/ \
+  && chmod 777 /var/log/panel/logs/ \
+  && ln -s /app/storage/logs/ /var/log/panel/
 
 ## check for .env file and generate app keys if missing
-if [ -f /pelican-data/.env ]; then
+if [ -f /app/var/.env ]; then
   echo "external vars exist."
-  rm -rf /var/www/html/.env
+  rm -rf /app/.env
+  ln -s /app/var/.env /app/
 else
   echo "external vars don't exist."
-  rm -rf /var/www/html/.env
-  touch /pelican-data/.env
+  rm -rf /app/.env
+  touch /app/var/.env
 
   ## manually generate a key because key generate --force fails
   if [ -z $APP_KEY ]; then
      echo -e "Generating key."
      APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
      echo -e "Generated app key: $APP_KEY"
-     echo -e "APP_KEY=$APP_KEY" > /pelican-data/.env
+     echo -e "APP_KEY=$APP_KEY" > /app/var/.env
   else
     echo -e "APP_KEY exists in environment, using that."
-    echo -e "APP_KEY=$APP_KEY" > /pelican-data/.env
+    echo -e "APP_KEY=$APP_KEY" > /app/var/.env
   fi
 
-  ## enable installer
-  echo -e "APP_INSTALLED=false" >> /pelican-data/.env
+  ln -s /app/var/.env /app/
 fi
 
-mkdir /pelican-data/database
-ln -s /pelican-data/.env /var/www/html/
-chown -h www-data:www-data /var/www/html/.env
-ln -s /pelican-data/database/database.sqlite /var/www/html/database/
-
-if ! grep -q "APP_KEY=" .env || grep -q "APP_KEY=$" .env; then
-  echo "Generating APP_KEY..."
-  php artisan key:generate --force
+echo "Checking if https is required."
+if [ -f /etc/nginx/http.d/panel.conf ]; then
+  echo "Using nginx config already in place."
+  if [ $LE_EMAIL ]; then
+    echo "Checking for cert update"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  else
+    echo "No letsencrypt email is set"
+  fi
 else
-  echo "APP_KEY is already set."
+  echo "Checking if letsencrypt email is set."
+  if [ -z $LE_EMAIL ]; then
+    echo "No letsencrypt email is set using http config."
+    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
+  else
+    echo "writing ssl config"
+    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
+    echo "updating ssl config for domain"
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
+    echo "generating certs"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  fi
+  echo "Removing the default nginx config"
+  rm -rf /etc/nginx/http.d/default.conf
 fi
 
+if [[ -z $DB_PORT ]]; then
+  echo -e "DB_PORT not specified, defaulting to 3306"
+  DB_PORT=3306
+fi
+
+## check for DB up before starting the panel
+echo "Checking database status."
+until nc -z -v -w30 $DB_HOST $DB_PORT
+do
+  echo "Waiting for database connection..."
+  # wait for 1 seconds before check again
+  sleep 1
+done
+
 ## make sure the db is set up
-echo -e "Migrating Database"
-php artisan migrate --force
-
-echo -e "Optimizing Filament"
-php artisan filament:optimize
+echo -e "Migrating and Seeding D.B"
+php artisan migrate --seed --force
 
 ## start cronjobs for the queue
 echo -e "Starting cron jobs."
 crond -L /var/log/crond -l 5
 
-export SUPERVISORD_CADDY=false
-
-## disable caddy if SKIP_CADDY is set
-if [[ "${SKIP_CADDY:-}" == "true" ]]; then
-  echo "Starting PHP-FPM only"
-else
-  echo "Starting PHP-FPM and Caddy"
-  export SUPERVISORD_CADDY=true
-fi
-
-chown -R www-data:www-data /pelican-data/.env /pelican-data/database
-
-echo "Starting Supervisord"
+echo -e "Starting supervisord."
 exec "$@"

.github/docker/supervisord.conf

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

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

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

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

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

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -3,27 +3,165 @@
 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 = [
+        'redis' => 'Redis',
+        'memcached' => 'Memcached',
+        'file' => 'Filesystem (recommended)',
+    ];
+
+    public const SESSION_DRIVERS = [
+        'redis' => 'Redis',
+        'memcached' => 'Memcached',
+        'database' => 'MySQL Database',
+        'file' => 'Filesystem (recommended)',
+        'cookie' => 'Cookie',
+    ];
+
+    public const QUEUE_DRIVERS = [
+        'redis' => 'Redis',
+        'database' => 'MySQL Database',
+        'sync' => 'Sync (recommended)',
+    ];
+
     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', 'sync');
+        $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
 {
@@ -31,7 +31,7 @@ class EmailSettingsCommand extends Command
      */
     public function handle(): void
     {
-        $this->variables['MAIL_MAILER'] = $this->option('driver') ?? $this->choice(
+        $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
             trans('command/messages.environment.mail.ask_driver'),
             [
                 'log' => 'Log',
@@ -41,10 +41,10 @@ class EmailSettingsCommand extends Command
                 'mandrill' => 'Mandrill',
                 'postmark' => 'Postmark',
             ],
-            env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
+            'smtp',
         );
 
-        $method = 'setup' . studly_case($this->variables['MAIL_MAILER']) . 'DriverVariables';
+        $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
         if (method_exists($this, $method)) {
             $this->{$method}();
         }
@@ -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->currentPanelVersion()],
-            ['Latest Version', $this->versionService->latestPanelVersion()],
+            ['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

@@ -6,6 +6,7 @@ use Illuminate\Console\Command;
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
 use App\Services\Schedules\ProcessScheduleService;
+use Carbon\Carbon;
 
 class ProcessRunnableCommand extends Command
 {
@@ -23,7 +24,7 @@ class ProcessRunnableCommand extends Command
             ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
-            ->where('next_run_at', '<=', now('UTC')->toDateTimeString())
+            ->whereDate('next_run_at', '<=', Carbon::now()->toDateString())
             ->get();
 
         if ($schedules->count() < 1) {
@@ -50,7 +51,7 @@ class ProcessRunnableCommand extends Command
      * never throw an exception out, otherwise you'll end up killing the entire run group causing
      * any other schedules to not process correctly.
      */
-    protected function processSchedule(Schedule $schedule): void
+    protected function processSchedule(Schedule $schedule)
     {
         if ($schedule->tasks->isEmpty()) {
             return;
@@ -61,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,17 +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 App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use App\Console\Commands\Schedule\ProcessRunnableCommand;
+use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
+use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -34,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.
@@ -49,9 +40,5 @@ class Kernel extends ConsoleKernel
         if (config('activity.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
         }
-
-        if (config('panel.webhook.prune_days')) {
-            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
-        }
     }
 }

app/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/Events/Auth/FailedCaptcha.php

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

app/Events/Server/Created.php

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

app/Events/Server/Creating.php

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

app/Events/Server/Deleted.php

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

app/Events/Server/Deleting.php

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

app/Events/Server/Saved.php

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

app/Events/Server/Saving.php

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

app/Events/Server/Updated.php

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

app/Events/Server/Updating.php

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

app/Events/Subuser/Created.php

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

app/Events/Subuser/Creating.php

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

app/Events/Subuser/Deleted.php

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

app/Events/Subuser/Deleting.php

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

app/Events/User/Created.php

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

app/Events/User/Creating.php

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

app/Events/User/Deleted.php

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

app/Events/User/Deleting.php

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

app/Exceptions/AccountNotFoundException.php

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

app/Exceptions/AutoDeploymentException.php

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

app/Exceptions/DisplayException.php

@@ -4,22 +4,20 @@ namespace App\Exceptions;
 
 use Exception;
 use Filament\Notifications\Notification;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Container\Container;
+use Illuminate\Http\RedirectResponse;
+use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class DisplayException extends PanelException implements HttpExceptionInterface
 {
     public const LEVEL_DEBUG = 'debug';
-
     public const LEVEL_INFO = 'info';
-
     public const LEVEL_WARNING = 'warning';
-
     public const LEVEL_ERROR = 'error';
 
     /**
@@ -50,22 +48,24 @@ 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());
         }
 
+        app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
+
         return redirect()->back()->withInput();
     }
 
@@ -75,10 +75,10 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      *
      * @throws \Throwable
      */
-    public function report(): void
+    public function report()
     {
         if (!$this->getPrevious() instanceof \Exception || !Handler::isReportable($this->getPrevious())) {
-            return;
+            return null;
         }
 
         try {
@@ -87,6 +87,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/Connection/DaemonConnectionException.php

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

app/Exceptions/Http/HttpForbiddenException.php

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

app/Exceptions/Http/Server/FileTypeNotEditableException.php

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

app/Exceptions/Http/Server/ServerStateConflictException.php

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

app/Exceptions/Http/TwoFactorAuthRequiredException.php

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

app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php

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

app/Exceptions/Repository/RepositoryException.php

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

app/Exceptions/Service/Allocation/AllocationDoesNotBelongToServerException.php

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

app/Exceptions/Service/Deployment/NoViableNodeException.php

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

app/Exceptions/Service/Egg/BadJsonFormatException.php

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

app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Exceptions\Service\Egg;
+
+use App\Exceptions\DisplayException;
+
+class NoParentConfigurationFoundException 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/Schedule/Task/TaskIntervalTooLongException.php

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

app/Exceptions/Service/Server/RequiredVariableMissingException.php

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

app/Exceptions/Service/ServiceLimitExceededException.php

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

app/Exceptions/Service/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/Exceptions/Transformer/InvalidTransformerLevelException.php

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

app/Extensions/Backups/BackupManager.php

@@ -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/Facades/Theme.php

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

app/Extensions/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

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

app/Facades/LogBatch.php

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

app/Filament/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/Auth/Login.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Auth;
-
-use Coderflex\FilamentTurnstile\Forms\Components\Turnstile;
-use Filament\Pages\Auth\Login as BaseLogin;
-
-class Login extends BaseLogin
-{
-    protected function getForms(): array
-    {
-        return [
-            'form' => $this->form(
-                $this->makeForm()
-                    ->schema([
-                        $this->getEmailFormComponent(),
-                        $this->getPasswordFormComponent(),
-                        $this->getRememberFormComponent(),
-                        Turnstile::make('captcha')
-                            ->hidden(!config('turnstile.turnstile_enabled'))
-                            ->validationMessages([
-                                'required' => config('turnstile.error_messages.turnstile_check_message'),
-                            ]),
-                    ])
-                    ->statePath('data'),
-            ),
-        ];
-    }
-
-    protected function throwFailureValidationException(): never
-    {
-        $this->dispatch('reset-captcha');
-
-        parent::throwFailureValidationException();
-    }
-}

app/Filament/Pages/Dashboard.php

@@ -2,13 +2,11 @@
 
 namespace App\Filament\Pages;
 
-use App\Filament\Resources\NodeResource\Pages\CreateNode;
 use App\Filament\Resources\NodeResource\Pages\ListNodes;
 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;
 
@@ -29,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->currentPanelVersion(),
-            'latestVersion' => $this->softwareVersionService->latestPanelVersion(),
-            'isLatest' => $this->softwareVersionService->isLatestPanel(),
             'eggsCount' => Egg::query()->count(),
             'nodesList' => ListNodes::getUrl(),
             'nodesCount' => Node::query()->count(),
@@ -51,24 +39,26 @@ 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'))
                     ->icon('tabler-server-2')
-                    ->url(CreateNode::getUrl()),
+                    ->url(route('filament.admin.resources.nodes.create')),
             ],
             'supportActions' => [
+                CreateAction::make()
+                    ->label(trans('dashboard/index.sections.intro-support.button_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')
@@ -80,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,184 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer;
-
-use App\Filament\Pages\Dashboard;
-use App\Filament\Pages\Installer\Steps\CacheStep;
-use App\Filament\Pages\Installer\Steps\DatabaseStep;
-use App\Filament\Pages\Installer\Steps\EnvironmentStep;
-use App\Filament\Pages\Installer\Steps\QueueStep;
-use App\Filament\Pages\Installer\Steps\RequirementsStep;
-use App\Filament\Pages\Installer\Steps\SessionStep;
-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\Notifications\Notification;
-use Filament\Pages\SimplePage;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Routing\Redirector;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-
-/**
- * @property Form $form
- */
-class PanelInstaller extends SimplePage implements HasForms
-{
-    use CheckMigrationsTrait;
-    use EnvironmentWriterTrait;
-    use InteractsWithForms;
-
-    public array $data = [];
-
-    protected static string $view = 'filament.pages.installer';
-
-    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),
-                CacheStep::make($this),
-                QueueStep::make($this),
-                SessionStep::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(UserCreationService $userCreationService): Redirector|RedirectResponse
-    {
-        // Disable installer
-        $this->writeToEnvironment(['APP_INSTALLED' => 'true']);
-
-        // Create admin user & login
-        $user = $this->createAdminUser($userCreationService);
-        auth()->guard()->login($user, true);
-
-        // Write session data at the very end to avoid "page expired" errors
-        $this->writeToEnv('env_session');
-
-        // Redirect to admin panel
-        return redirect(Dashboard::getUrl());
-    }
-
-    public function writeToEnv(string $key): void
-    {
-        try {
-            $variables = array_get($this->data, $key);
-            $variables = array_filter($variables); // Filter array to remove NULL values
-            $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): User
-    {
-        try {
-            $userData = array_get($this->data, 'user');
-            $userData['root_admin'] = true;
-
-            return $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/CacheStep.php

@@ -1,123 +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\ToggleButtons;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
-use Filament\Notifications\Notification;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Foundation\Application;
-use Illuminate\Redis\RedisManager;
-
-class CacheStep
-{
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem',
-        'redis' => 'Redis',
-    ];
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('cache')
-            ->label('Cache')
-            ->columns()
-            ->schema([
-                ToggleButtons::make('env_cache.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'))
-                    ->columnSpanFull()
-                    ->live()
-                    ->afterStateUpdated(function ($state, Set $set, Get $get) {
-                        if ($state !== 'redis') {
-                            $set('env_cache.REDIS_HOST', null);
-                            $set('env_cache.REDIS_PORT', null);
-                            $set('env_cache.REDIS_USERNAME', null);
-                            $set('env_cache.REDIS_PASSWORD', null);
-                        } else {
-                            $set('env_cache.REDIS_HOST', $get('env_cache.REDIS_HOST') ?? '127.0.0.1');
-                            $set('env_cache.REDIS_PORT', $get('env_cache.REDIS_PORT') ?? '6379');
-                            $set('env_cache.REDIS_USERNAME', null);
-                        }
-                    }),
-                TextInput::make('env_cache.REDIS_HOST')
-                    ->label('Redis Host')
-                    ->placeholder('127.0.0.1')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The host of your redis server. Make sure it is reachable.')
-                    ->required(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis')
-                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.host') : null)
-                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
-                TextInput::make('env_cache.REDIS_PORT')
-                    ->label('Redis Port')
-                    ->placeholder('6379')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The port of your redis server.')
-                    ->required(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis')
-                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.port') : null)
-                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
-                TextInput::make('env_cache.REDIS_USERNAME')
-                    ->label('Redis Username')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The name of your redis user. Can be empty')
-                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.username') : null)
-                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
-                TextInput::make('env_cache.REDIS_PASSWORD')
-                    ->label('Redis Password')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The password for your redis user. Can be empty.')
-                    ->password()
-                    ->revealable()
-                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.password') : null)
-                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
-            ])
-            ->afterValidation(function (Get $get, Application $app) use ($installer) {
-                $driver = $get('env_cache.CACHE_STORE');
-
-                if (!self::testConnection($app, $driver, $get('env_cache.REDIS_HOST'), $get('env_cache.REDIS_PORT'), $get('env_cache.REDIS_USERNAME'), $get('env_cache.REDIS_PASSWORD'))) {
-                    throw new Halt('Redis connection failed');
-                }
-
-                $installer->writeToEnv('env_cache');
-            });
-    }
-
-    private static function testConnection(Application $app, string $driver, ?string $host, null|string|int $port, ?string $username, ?string $password): bool
-    {
-        if ($driver !== 'redis') {
-            return true;
-        }
-
-        try {
-            $redis = new RedisManager($app, 'predis', [
-                'default' => [
-                    'host' => $host,
-                    'port' => $port,
-                    'username' => $username,
-                    'password' => $password,
-                ],
-            ]);
-
-            $redis->connection()->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/DatabaseStep.php

@@ -1,139 +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\ToggleButtons;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
-use Filament\Notifications\Notification;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Support\Facades\DB;
-
-class DatabaseStep
-{
-    public const DATABASE_DRIVERS = [
-        'sqlite' => 'SQLite',
-        'mariadb' => 'MariaDB',
-        'mysql' => 'MySQL',
-    ];
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('database')
-            ->label('Database')
-            ->columns()
-            ->schema([
-                ToggleButtons::make('env_database.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'))
-                    ->live()
-                    ->afterStateUpdated(function ($state, Set $set, Get $get) {
-                        $set('env_database.DB_DATABASE', $state === 'sqlite' ? 'database.sqlite' : 'panel');
-
-                        if ($state === 'sqlite') {
-                            $set('env_database.DB_HOST', null);
-                            $set('env_database.DB_PORT', null);
-                            $set('env_database.DB_USERNAME', null);
-                            $set('env_database.DB_PASSWORD', null);
-                        } else {
-                            $set('env_database.DB_HOST', $get('env_database.DB_HOST') ?? '127.0.0.1');
-                            $set('env_database.DB_PORT', $get('env_database.DB_PORT') ?? '3306');
-                            $set('env_database.DB_USERNAME', $get('env_database.DB_USERNAME') ?? 'pelican');
-                        }
-                    }),
-                TextInput::make('env_database.DB_DATABASE')
-                    ->label(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'Database Path' : 'Database Name')
-                    ->placeholder(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'database.sqlite' : 'panel')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'The path of your .sqlite file relative to the database folder.' : 'The name of the panel database.')
-                    ->required()
-                    ->default('database.sqlite'),
-                TextInput::make('env_database.DB_HOST')
-                    ->label('Database Host')
-                    ->placeholder('127.0.0.1')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The host of your database. Make sure it is reachable.')
-                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
-                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
-                TextInput::make('env_database.DB_PORT')
-                    ->label('Database Port')
-                    ->placeholder('3306')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The port of your database.')
-                    ->numeric()
-                    ->minValue(1)
-                    ->maxValue(65535)
-                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
-                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
-                TextInput::make('env_database.DB_USERNAME')
-                    ->label('Database Username')
-                    ->placeholder('pelican')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The name of your database user.')
-                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
-                    ->hidden(fn (Get $get) => $get('env_database.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()
-                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
-            ])
-            ->afterValidation(function (Get $get) use ($installer) {
-                $driver = $get('env_database.DB_CONNECTION');
-
-                if (!self::testConnection($driver, $get('env_database.DB_HOST'), $get('env_database.DB_PORT'), $get('env_database.DB_DATABASE'), $get('env_database.DB_USERNAME'), $get('env_database.DB_PASSWORD'))) {
-                    throw new Halt('Database connection failed');
-                }
-
-                $installer->writeToEnv('env_database');
-
-                $installer->runMigrations($driver);
-            });
-    }
-
-    private static function testConnection(string $driver, ?string $host, null|string|int $port, ?string $database, ?string $username, ?string $password): bool
-    {
-        if ($driver === 'sqlite') {
-            return true;
-        }
-
-        try {
-            config()->set('database.connections._panel_install_test', [
-                'driver' => $driver,
-                'host' => $host,
-                'port' => $port,
-                'database' => $database,
-                'username' => $username,
-                'password' => $password,
-                'charset' => 'utf8mb4',
-                'collation' => 'utf8mb4_unicode_ci',
-                'strict' => true,
-            ]);
-
-            DB::connection('_panel_install_test')->getPdo();
-        } catch (Exception $exception) {
-            DB::disconnect('_panel_install_test');
-
-            Notification::make()
-                ->title('Database connection failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-
-            return false;
-        }
-
-        return true;
-    }
-}

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

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-
-class EnvironmentStep
-{
-    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('')),
-                Fieldset::make('adminuser')
-                    ->label('Admin User')
-                    ->columns(3)
-                    ->schema([
-                        TextInput::make('user.email')
-                            ->label('E-Mail')
-                            ->required()
-                            ->email()
-                            ->placeholder('admin@example.com'),
-                        TextInput::make('user.username')
-                            ->label('Username')
-                            ->required()
-                            ->placeholder('admin'),
-                        TextInput::make('user.password')
-                            ->label('Password')
-                            ->required()
-                            ->password()
-                            ->revealable(),
-                    ]),
-            ])
-            ->afterValidation(fn () => $installer->writeToEnv('env_general'));
-    }
-}

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

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Illuminate\Support\HtmlString;
-use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
-
-class QueueStep
-{
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database',
-        'redis' => 'Redis',
-        'sync' => 'Sync',
-    ];
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('queue')
-            ->label('Queue')
-            ->columns()
-            ->schema([
-                ToggleButtons::make('env_queue.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)
-                    ->disableOptionWhen(fn ($value, Get $get) => $value === 'redis' && $get('env_cache.CACHE_STORE') !== 'redis')
-                    ->default(config('queue.default')),
-                Toggle::make('done')
-                    ->label('I have done both steps below.')
-                    ->accepted(fn () => !file_exists('/.dockerenv'))
-                    ->inline(false)
-                    ->validationMessages([
-                        'accepted' => 'You need to do both steps before continuing!',
-                    ])
-                    ->hidden(fn () => file_exists('/.dockerenv')),
-                TextInput::make('crontab')
-                    ->label(new HtmlString('Run the following command to set up 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 -')
-                    ->hidden(fn () => file_exists('/.dockerenv'))
-                    ->columnSpanFull(),
-                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')
-                    ->hidden(fn () => file_exists('/.dockerenv'))
-                    ->columnSpanFull(),
-            ])
-            ->afterValidation(function () use ($installer) {
-                $installer->writeToEnv('env_queue');
-            });
-    }
-}

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/Installer/Steps/SessionStep.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-
-class SessionStep
-{
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-        'redis' => 'Redis',
-    ];
-
-    public static function make(): Step
-    {
-        return Step::make('session')
-            ->label('Session')
-            ->schema([
-                ToggleButtons::make('env_session.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)
-                    ->disableOptionWhen(fn ($value, Get $get) => $value === 'redis' && $get('env_cache.CACHE_STORE') !== 'redis')
-                    ->default(config('session.driver')),
-                TextInput::make('env_session.SESSION_SECURE_COOKIE')
-                    ->hidden()
-                    ->default(request()->isSecure()),
-            ]);
-    }
-}

app/Filament/Pages/Settings.php

@@ -1,631 +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\Placeholder;
-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 GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Illuminate\Support\Facades\Artisan;
-use Illuminate\Support\Facades\Notification as MailNotification;
-use Illuminate\Support\HtmlString;
-
-/**
- * @property Form $form
- */
-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('captcha')
-                        ->label('Captcha')
-                        ->icon('tabler-shield')
-                        ->schema($this->captchaSettings())
-                        ->columns(3),
-                    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', implode(',', 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(function (Client $client, Set $set) {
-                            $ips = collect();
-                            try {
-                                $response = $client->request(
-                                    'GET',
-                                    'https://api.cloudflare.com/client/v4/ips',
-                                    config('panel.guzzle')
-                                );
-                                if ($response->getStatusCode() === 200) {
-                                    $result = json_decode($response->getBody(), true)['result'];
-                                    foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
-                                        $ips->push(...data_get($result, $value));
-                                    }
-                                    $ips->unique();
-                                }
-                            } catch (GuzzleException $e) {
-                            }
-
-                            $set('TRUSTED_PROXIES', $ips->values()->all());
-                        }),
-                ]),
-        ];
-    }
-
-    private function captchaSettings(): array
-    {
-        return [
-            Toggle::make('TURNSTILE_ENABLED')
-                ->label('Enable Turnstile Captcha?')
-                ->inline(false)
-                ->columnSpan(1)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->live()
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_ENABLED', (bool) $state))
-                ->default(env('TURNSTILE_ENABLED', config('turnstile.turnstile_enabled'))),
-            Placeholder::make('info')
-                ->columnSpan(2)
-                ->content(new HtmlString('<p>You can generate the keys on your <u><a href="https://developers.cloudflare.com/turnstile/get-started/#get-a-sitekey-and-secret-key" target="_blank">Cloudflare Dashboard</a></u>. A Cloudflare account is required.</p>')),
-            TextInput::make('TURNSTILE_SITE_KEY')
-                ->label('Site Key')
-                ->required()
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->default(env('TURNSTILE_SITE_KEY', config('turnstile.turnstile_site_key')))
-                ->placeholder('1x00000000000000000000AA'),
-            TextInput::make('TURNSTILE_SECRET_KEY')
-                ->label('Secret Key')
-                ->required()
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->default(env('TURNSTILE_SECRET_KEY', config('turnstile.secret_key')))
-                ->placeholder('1x0000000000000000000000000000000AA'),
-            Toggle::make('TURNSTILE_VERIFY_DOMAIN')
-                ->label('Verify domain?')
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
-                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_VERIFY_DOMAIN', (bool) $state))
-                ->default(env('TURNSTILE_VERIFY_DOMAIN', config('turnstile.turnstile_verify_domain'))),
-        ];
-    }
-
-    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'))),
-                ]),
-            Section::make('Webhook')
-                ->description('Configure how often old webhook logs should be pruned.')
-                ->columns()
-                ->collapsible()
-                ->collapsed()
-                ->schema([
-                    TextInput::make('APP_WEBHOOK_PRUNE_DAYS')
-                        ->label('Prune age')
-                        ->required()
-                        ->numeric()
-                        ->minValue(1)
-                        ->maxValue(365)
-                        ->suffix('Days')
-                        ->default(env('APP_WEBHOOK_PRUNE_DAYS', config('panel.webhook.prune_days'))),
-                ]),
-        ];
-    }
-
-    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,43 @@ 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', ApiKey::TYPE_APPLICATION)->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,14 +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 Illuminate\Database\Eloquent\Model;
+use Filament\Forms;
 
 class CreateApiKey extends CreateRecord
 {
@@ -23,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::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                        collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource")
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -72,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('
@@ -88,20 +99,4 @@ class CreateApiKey extends CreateRecord
                     ->columnSpanFull(),
             ]);
     }
-
-    protected function handleRecordCreation(array $data): Model
-    {
-        $permissions = [];
-
-        foreach (ApiKey::getPermissionList() as $permission) {
-            if (isset($data['permissions_' . $permission])) {
-                $permissions[$permission] = intval($data['permissions_' . $permission]);
-                unset($data['permissions_' . $permission]);
-            }
-        }
-
-        $data['permissions'] = $permissions;
-
-        return parent::handleRecordCreation($data);
-    }
 }

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

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

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

@@ -3,23 +3,13 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-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';
@@ -28,96 +18,59 @@ 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
             ->schema([
-                Section::make()
-                    ->columns([
-                        'default' => 2,
-                        'sm' => 3,
-                        'md' => 3,
-                        'lg' => 4,
-                    ])
-                    ->schema([
-                        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')
-                            ->columnSpan(1)
-                            ->helperText('The port that MySQL is running on for this host.')
-                            ->required()
-                            ->numeric()
-                            ->default(3306)
-                            ->minValue(0)
-                            ->maxValue(65535),
-                        TextInput::make('max_databases')
-                            ->label('Max databases')
-                            ->helpertext('Blank is unlimited.')
-                            ->numeric(),
-                        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')
-                            ->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')
-                            ->helperText('The password for the database user.')
-                            ->password()
-                            ->revealable()
-                            ->maxLength(255)
-                            ->required(),
-                        Select::make('node_id')
-                            ->searchable()
-                            ->preload()
-                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
-                    ]),
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('host')
+                        ->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()
+                        ->debounce(500)
+                        ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('port')
+                        ->helperText('The port that MySQL is running on for this host.')
+                        ->required()
+                        ->numeric()
+                        ->default(3306)
+                        ->minValue(0)
+                        ->maxValue(65535),
+                    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(191),
+                    Forms\Components\TextInput::make('password')
+                        ->helperText('The password for the database user.')
+                        ->password()
+                        ->revealable()
+                        ->maxLength(191)
+                        ->required(),
+                    Forms\Components\TextInput::make('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),
+                    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.')
+                        ->label('Linked Node')
+                        ->relationship('node', 'name'),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
             ]);
+
     }
 
-    protected function getHeaderActions(): array
+    protected function mutateFormDataBeforeSave(array $data): 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();
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
         }
+
+        return $data;
     }
 }

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

@@ -3,130 +3,75 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Resources\DatabaseHostResource;
-use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
-use App\Models\DatabaseHost;
-use App\Services\Databases\Hosts\HostUpdateService;
-use Closure;
-use Exception;
 use Filament\Actions;
+use Filament\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
             ->schema([
-                Section::make()
-                    ->columns([
-                        'default' => 2,
-                        'sm' => 3,
-                        'md' => 3,
-                        'lg' => 4,
-                    ])
-                    ->schema([
-                        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')
-                            ->columnSpan(1)
-                            ->helperText('The port that MySQL is running on for this host.')
-                            ->required()
-                            ->numeric()
-                            ->minValue(0)
-                            ->maxValue(65535),
-                        TextInput::make('max_databases')
-                            ->label('Max databases')
-                            ->helpertext('Blank is unlimited.')
-                            ->numeric(),
-                        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')
-                            ->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')
-                            ->helperText('The password for the database user.')
-                            ->password()
-                            ->revealable()
-                            ->maxLength(255),
-                        Select::make('node_id')
-                            ->searchable()
-                            ->preload()
-                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
-                            ->label('Linked Node')
-                            ->relationship('node', 'name'),
-                    ]),
+                Section::make()->schema([
+                    Forms\Components\TextInput::make('host')
+                        ->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()
+                        ->debounce(500)
+                        ->afterStateUpdated(fn ($state, Forms\Set $set) => $set('name', $state))
+                        ->maxLength(191),
+                    Forms\Components\TextInput::make('port')
+                        ->helperText('The port that MySQL is running on for this host.')
+                        ->required()
+                        ->numeric()
+                        ->default(3306)
+                        ->minValue(0)
+                        ->maxValue(65535),
+                    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(191),
+                    Forms\Components\TextInput::make('password')
+                        ->helperText('The password for the database user.')
+                        ->password()
+                        ->revealable()
+                        ->maxLength(191)
+                        ->required(),
+                    Forms\Components\TextInput::make('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),
+                    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.')
+                        ->label('Linked Node')
+                        ->relationship('node', 'name'),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
             ]);
     }
 
     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),
-            $this->getSaveFormAction()->formId('form'),
+            Actions\DeleteAction::make(),
         ];
     }
 
-    protected function getFormActions(): array
+    protected function mutateFormDataBeforeSave(array $data): array
     {
-        return [];
-    }
-
-    public function getRelationManagers(): array
-    {
-        return [
-            DatabasesRelationManager::class,
-        ];
-    }
-
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        if (!$record instanceof DatabaseHost) {
-            return $record;
+        if (isset($data['password'])) {
+            $data['password'] = encrypt($data['password']);
         }
 
-        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();
-        }
+        return $data;
     }
 }

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

@@ -3,70 +3,52 @@
 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
 {
     protected static string $resource = DatabaseHostResource::class;
 
-    protected ?string $heading = 'Database Hosts';
-
     public function table(Table $table): Table
     {
         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(),
         ];
     }
 }