ci(release): bump version

.dockerignore

@@ -1,29 +1,10 @@
-**.DS_Store
-.env
-.devcontainer
-.dockerignore
-.editorconfig
 .git
-.github
-**.gitignore
-.php-cs-fixer.dist.php
-.prettierrc.json
-.vscode
-Dockerfile
-bounties.md
-compose.yml
-contributing.md
-contributor_license_agreement.md
-database/database.sqlite
-docker/README.md
 node_modules
-phpstan.neon
-phpunit.xml
-readme.md
+vendor
+database/database.sqlite
 storage/debugbar/*.json
+storage/logs/*.log
 storage/framework/cache/data/*
 storage/framework/sessions/*
 storage/framework/testing
 storage/framework/views/*.php
-storage/logs/*.log
-vendor

.eslintignore

@@ -0,0 +1,6 @@
+public
+node_modules
+resources/views
+babel.config.js
+tailwind.config.js
+webpack.config.js

.eslintrc.js

@@ -0,0 +1,52 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        ecmaVersion: 6,
+        ecmaFeatures: {
+            jsx: true,
+        },
+        project: './tsconfig.json',
+        tsconfigRootDir: './',
+    },
+    settings: {
+        react: {
+            pragma: 'React',
+            version: 'detect',
+        },
+        linkComponents: [
+            { name: 'Link', linkAttribute: 'to' },
+            { name: 'NavLink', linkAttribute: 'to' },
+        ],
+    },
+    env: {
+        browser: true,
+        es6: true,
+    },
+    plugins: ['react', 'react-hooks', 'prettier', '@typescript-eslint'],
+    extends: [
+        // 'standard',
+        'eslint:recommended',
+        'plugin:react/recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:jest-dom/recommended',
+    ],
+    rules: {
+        eqeqeq: 'error',
+        'prettier/prettier': ['error', {}, { usePrettierrc: true }],
+        // TypeScript can infer this significantly better than eslint ever can.
+        'react/prop-types': 0,
+        'react/display-name': 0,
+        '@typescript-eslint/no-explicit-any': 0,
+        '@typescript-eslint/no-non-null-assertion': 0,
+        // 'react/no-unknown-property': ['error', { ignore: ['css'] }],
+        // This setup is required to avoid a spam of errors when running eslint about React being
+        // used before it is defined.
+        //
+        // @see https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-use-before-define.md#how-to-use
+        'no-use-before-define': 0,
+        '@typescript-eslint/no-use-before-define': 'warn',
+        '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+        '@typescript-eslint/ban-ts-comment': ['error', { 'ts-expect-error': 'allow-with-description' }],
+    },
+};

.github/CODEOWNERS

@@ -1,15 +0,0 @@
-# Lines starting with '#' are comments.
-# Each line is a file pattern followed by one or more owners.
-
-# More details are here: https://help.github.com/articles/about-codeowners/
-
-# The '*' pattern is global owners.
-
-# Order is important. The last matching pattern has the most precedence.
-# The folders are ordered as follows:
-
-# In each subsection folders are ordered first by depth, then alphabetically.
-# This should make it easy to add new rules without breaking existing ones.
-
-# Global
-* @pelican-dev/panel

.github/docker/default.conf

@@ -0,0 +1,75 @@
+# If using Ubuntu this file should be placed in:
+# 			/etc/nginx/sites-available/
+#
+# If using CentOS this file should be placed in:
+#				 /etc/nginx/conf.d/
+#
+
+# The MIT License (MIT)
+#
+# Pterodactyl®
+# Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+server {
+    listen 80;
+    server_name _;
+
+    root /app/public;
+    index index.html index.htm index.php;
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    access_log off;
+    error_log  /var/log/nginx/panel.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+
+    sendfile off;
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        # the fastcgi_pass path needs to be changed accordingly when using CentOS
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}

.github/docker/default_ssl.conf

@@ -0,0 +1,70 @@
+# If using Ubuntu this file should be placed in:
+# 			/etc/nginx/sites-available/
+#
+server {
+    listen 80;
+    server_name <domain>;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name <domain>;
+
+    root /app/public;
+    index index.php;
+
+    access_log /var/log/nginx/panel.app-access.log;
+    error_log  /var/log/nginx/panel.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+
+    sendfile off;
+
+    # strengthen ssl security
+    ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+
+    # See the link below for more SSL information:
+    #     https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
+    #
+    # ssl_dhparam /etc/ssl/certs/dhparam.pem;
+
+    # Add headers to serve security related headers
+    add_header Strict-Transport-Security "max-age=15768000; preload;";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Robots-Tag none;
+    add_header Content-Security-Policy "frame-ancestors 'self'";
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}

.github/docker/entrypoint.sh

@@ -1,11 +1,14 @@
 #!/bin/ash -e
 
-## check for .env file or symlink and generate app keys if missing
-if [ -f /var/www/html/.env ]; then
+#mkdir -p /var/log/supervisord/ /var/log/php8/ \
+
+## check for .env file and generate app keys if missing
+if [ -f /pelican-data/.env ]; then
   echo "external vars exist."
+  rm -rf /var/www/html/.env
 else
   echo "external vars don't exist."
-  # webroot .env is symlinked to this path
+  rm -rf /var/www/html/.env
   touch /pelican-data/.env
 
   ## manually generate a key because key generate --force fails
@@ -23,7 +26,10 @@ else
   echo -e "APP_INSTALLED=false" >> /pelican-data/.env
 fi
 
-mkdir /pelican-data/database /var/www/html/storage/logs/supervisord 2>/dev/null
+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..."
@@ -39,6 +45,10 @@ php artisan migrate --force
 echo -e "Optimizing Filament"
 php artisan filament:optimize
 
+## start cronjobs for the queue
+echo -e "Starting cron jobs."
+crond -L /var/log/crond -l 5
+
 export SUPERVISORD_CADDY=false
 
 ## disable caddy if SKIP_CADDY is set
@@ -49,5 +59,7 @@ else
   export SUPERVISORD_CADDY=true
 fi
 
+chown -R www-data:www-data /pelican-data/.env /pelican-data/database
+
 echo "Starting Supervisord"
 exec "$@"

.github/docker/supervisord.conf

@@ -4,14 +4,16 @@ username=dummy
 password=dummy
 
 [supervisord]
-logfile=/var/www/html/storage/logs/supervisord/supervisord.log    ; supervisord log file
+logfile=/var/log/supervisord/supervisord.log    ; supervisord log file
 logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
 logfile_backups=2                               ; number of backed up logfiles
 loglevel=error                                  ; info, debug, warn, trace
-pidfile=/var/run/supervisord/supervisord.pid    ; pidfile location
-nodaemon=true                                   ; run supervisord as a daemon
+pidfile=/var/run/supervisord.pid                ; pidfile location
+nodaemon=false                                  ; run supervisord as a daemon
 minfds=1024                                     ; number of startup file descriptors
 minprocs=200                                    ; number of process descriptors
+user=root                                       ; default user
+childlogdir=/var/log/supervisord/               ; where child log files will live
 
 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
@@ -28,6 +30,7 @@ autorestart=true
 
 [program:queue-worker]
 command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3
+user=www-data
 autostart=true
 autorestart=true
 
@@ -36,12 +39,5 @@ command=caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
 autostart=%(ENV_SUPERVISORD_CADDY)s
 autorestart=%(ENV_SUPERVISORD_CADDY)s
 priority=10
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-
-[program:supercronic]
-command=supercronic -overlapping /etc/supercronic/crontab
-autostart=true
-autorestart=true
-redirect_stderr=true
+stdout_events_enabled=true
+stderr_events_enabled=true

.github/docker/www.conf

@@ -0,0 +1,16 @@
+[www]
+
+user = nginx
+group = nginx
+
+listen = 127.0.0.1:9000
+listen.owner = nginx
+listen.group = nginx
+listen.mode = 0750
+
+pm = ondemand
+pm.max_children = 9
+pm.process_idle_timeout = 10s
+pm.max_requests = 200
+
+clear_env = no

.github/workflows/build.yaml

@@ -3,8 +3,10 @@ name: Build
 on:
   push:
     branches:
-      - main
+      - '**'
   pull_request:
+    branches:
+      - '**'
 
 jobs:
   ui:
@@ -18,25 +20,14 @@ jobs:
       - name: Code Checkout
         uses: actions/checkout@v4
 
-      - name: Setup PHP
-        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 PHP dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "yarn"
 
-      - name: Install JS dependencies
+      - name: Install dependencies
         run: yarn install --frozen-lockfile
 
       - name: Build
-        run: yarn build
+        run: yarn build:production

.github/workflows/ci.yaml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3]
         database: ["mysql:8"]
     services:
       database:
@@ -66,16 +66,16 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+        run: composer install --no-interaction --no-suggest --prefer-dist
 
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit
+        run: vendor/bin/phpunit tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration
+        run: vendor/bin/phpunit tests/Integration
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -86,7 +86,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3]
         database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
@@ -139,16 +139,16 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+        run: composer install --no-interaction --no-suggest --prefer-dist
 
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit
+        run: vendor/bin/phpunit tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration
+        run: vendor/bin/phpunit tests/Integration
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -159,7 +159,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.2, 8.3, 8.4]
+        php: [8.2, 8.3]
     env:
       APP_ENV: testing
       APP_DEBUG: "false"
@@ -200,16 +200,16 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+        run: composer install --no-interaction --no-suggest --prefer-dist
 
       - name: Create SQLite file
         run: touch database/testing.sqlite
 
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit
+        run: vendor/bin/phpunit tests/Unit
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration
+        run: vendor/bin/phpunit tests/Integration

.github/workflows/docker-publish.yml

@@ -1,5 +1,6 @@
 name: Docker
 
+
 on:
   push:
     branches:
@@ -13,73 +14,18 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  build-php-base:
-    name: Build PHP base image on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-24.04
-            arch: amd64
-            platform: linux/amd64
-          - os: ubuntu-24.04-arm
-            arch: arm64
-            platform: linux/arm64
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-      
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      
-      - name: Build the base PHP image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.base
-          push: false
-          load: true
-          platforms: ${{ matrix.platform }}
-          tags: base-php:${{ matrix.arch }}
-          cache-from: type=gha,scope=base-php${{ matrix.arch }}
-          cache-to: type=gha,scope=base-php${{ matrix.arch }}
-
-      - name: Export image to file
-        run: docker save -o base-php-${{ matrix.arch }}.tar base-php:${{ matrix.arch }}
-      
-      - name: Push the docker build to the artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: base-php-${{ matrix.arch }}.tar
-          path: base-php-${{ matrix.arch }}.tar
-          retention-days: 7
-
-
   build-and-push:
-    name: Build and Push ubuntu-24.04
-    runs-on: ubuntu-24.04
-    needs: build-php-base
+    name: Build and Push
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
-    strategy:
-      fail-fast: false
-    # Start a temp local registry because workflow can not pull from localy loaded images
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000 
     # 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
@@ -92,14 +38,11 @@ jobs:
             type=ref,event=tag
             type=ref,event=branch
 
-      - name: Set up QEMU
+      - name: Setup QEMU
         uses: docker/setup-qemu-action@v3
-      
-      # We Need to start it in host mode else it can't acces the local registry on port 5000
+
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          driver-opts: network=host
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -114,52 +57,30 @@ jobs:
           echo "version_tag=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
           echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
-        # Download the base PHP image AMD64
-      - uses: actions/download-artifact@v4
-        with:
-          name: base-php-amd64.tar
-        
-        # Download the base PHP image ARM64
-      - uses: actions/download-artifact@v4
-        with:
-          name: base-php-arm64.tar
-
-      - name: Load base images into local registry
-        run: |
-          docker load -i base-php-amd64.tar
-          docker load -i base-php-arm64.tar
-          docker tag base-php:amd64 localhost:5000/base-php:amd64
-          docker tag base-php:arm64 localhost:5000/base-php:arm64
-          docker push localhost:5000/base-php:amd64
-          docker push localhost:5000/base-php:arm64
-          rm base-php-arm64.tar base-php-amd64.tar
-          
       - name: Build and Push (tag)
-        uses: docker/build-push-action@v6
+        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'
+          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 }}
-          cache-from: type=gha,scope=tagged${{ matrix.os }}
-          cache-to: type=gha,scope=tagged${{ matrix.os }},mode=max
-        
+
       - name: Build and Push (main)
-        uses: docker/build-push-action@v6
+        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'
+          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,scope=${{ matrix.os }}
-          cache-to: type=gha,scope=${{ matrix.os }},mode=max
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/lint.yaml

@@ -25,38 +25,21 @@ jobs:
         run: cp .env.example .env
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts
+        run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: Pint
         run: vendor/bin/pint --test
   phpstan:
     name: PHPStan
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [8.2, 8.3, 8.4]
     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 }}
+          php-version: "8.3"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -65,7 +48,7 @@ jobs:
         run: cp .env.example .env
 
       - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+        run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: PHPStan
-        run: vendor/bin/phpstan --memory-limit=-1
+        run: vendor/bin/phpstan --memory-limit=-1

.github/workflows/release.yaml

@@ -11,33 +11,22 @@ jobs:
     runs-on: ubuntu-22.04
     permissions:
       contents: write
-
+      
     steps:
       - name: Code checkout
         uses: actions/checkout@v4
 
-      - name: Setup PHP
-        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 PHP dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
-
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: "yarn"
 
-      - name: Install JS dependencies
+      - name: Install dependencies
         run: yarn install --frozen-lockfile
 
       - name: Build
-        run: yarn build
+        run: yarn build:production
 
       - name: Create release branch and bump version
         env:
@@ -55,8 +44,8 @@ jobs:
 
       - name: Create release archive
         run: |
-          rm -rf node_modules vendor tests CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml shell.nix
-          tar -czf panel.tar.gz * .env.example
+          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix
+          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
 
       - name: Create checksum
         run: |

.gitignore

@@ -4,7 +4,6 @@
 /public/hot
 /public/storage
 /storage/*.key
-/storage/pail
 /storage/clockwork/*
 /vendor
 *.DS_Store*
@@ -20,12 +19,10 @@ npm-debug.log
 yarn-error.log
 /.fleet
 /.idea
-/.nova
 /.vscode
 
 public/assets/manifest.json
 /database/*.sqlite
-/database/*.sqlite-journal
 filament-monaco-editor/
 _ide_helper*
 /.phpstorm.meta.php

.php-cs-fixer.dist.php

@@ -0,0 +1,52 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = (new Finder())
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+        'node_modules',
+        'storage',
+        'bootstrap/cache',
+    ])
+    ->notName(['_ide_helper*']);
+
+return (new Config())
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@PSR12' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'heredoc_to_nowdoc' => true,
+        'no_alias_functions' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'length',
+        ],
+        'phpdoc_align' => [
+            'align' => 'left',
+            'tags' => [
+                'param',
+                'property',
+                'return',
+                'throws',
+                'type',
+                'var',
+            ],
+        ],
+        'random_api_migration' => true,
+        'ternary_to_null_coalescing' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
+    ]);

Dockerfile

@@ -1,103 +1,52 @@
-# syntax=docker.io/docker/dockerfile:1.13-labs
 # Pelican Production Dockerfile
 
-
-# For those who want to build this Dockerfile themselves, uncomment lines 6-12 and replace "localhost:5000/base-php:$TARGETARCH" on lines 17 and 67 with "base".
-
-# FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine as base
-
-# ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-# RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql
-
-# RUN rm /usr/local/bin/install-php-extensions
-
-# ================================
-# Stage 1-1: Composer Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS composer
+FROM node:20-alpine AS yarn
+#FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
 
 WORKDIR /build
 
+COPY . ./
+
+RUN yarn config set network-timeout 300000 \
+    && yarn install --frozen-lockfile \
+    && yarn run build:production
+
+FROM php:8.3-fpm-alpine
+# FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
+
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 
-# Copy bare minimum to install Composer dependencies
-COPY composer.json composer.lock ./
-
-RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
-
-# ================================
-# Stage 1-2: Yarn Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
-
-WORKDIR /build
-
-# Copy bare minimum to install Yarn dependencies
-COPY package.json yarn.lock ./
-
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile
-
-# ================================
-# Stage 2-1: Composer Optimize
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
-
-# Copy full code to optimize autoload
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-
-RUN composer dump-autoload --optimize
-
-# ================================
-# Stage 2-2: Build Frontend Assets
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
-
-WORKDIR /build
-
-# Copy full code
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-COPY --from=composer /build .
-
-RUN yarn run build
-
-# ================================
-# Stage 5: Build Final Application Image
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS final
-
 WORKDIR /var/www/html
 
-# Install additional required libraries
+# Install dependencies
 RUN apk update && apk add --no-cache \
-    caddy ca-certificates supervisor supercronic
+    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 --chown=root:www-data --chmod=640 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
+# Copy the Caddyfile to the container
+COPY Caddyfile /etc/caddy/Caddyfile
 
-# Set permissions
-# First ensure all files are owned by root and restrict www-data to read access
-RUN chown root:www-data ./ \
-    && chmod 750 ./ \
-    # Files should not have execute set, but directories need it
-    && find ./ -type d -exec chmod 750 {} \; \
-    # Symlink to env/database path, as www-data won't be able to write to webroot
-    && ln -s /pelican-data/.env ./.env \
-    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
-    # Create necessary directories
-    && mkdir -p /pelican-data /var/run/supervisord /etc/supercronic \
-    # Finally allow www-data write permissions where necessary
-    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
+# Copy the application code to the container
+COPY . .
 
-# Configure Supervisor
-COPY docker/supervisord.conf /etc/supervisord.conf
-COPY docker/Caddyfile /etc/caddy/Caddyfile
-# Add Laravel scheduler to crontab
-COPY docker/crontab /etc/supercronic/crontab
+COPY --from=yarn /build/public/assets ./public/assets
 
-COPY docker/entrypoint.sh ./docker/entrypoint.sh
+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
@@ -106,7 +55,5 @@ EXPOSE 80 443
 
 VOLUME /pelican-data
 
-USER www-data
-
-ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
+ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

Dockerfile.base

@@ -1,10 +0,0 @@
-# ================================
-# Stage 0: Build PHP Base Image
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH php:8.3-fpm-alpine
-
-ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-
-RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql
-
-RUN rm /usr/local/bin/install-php-extensions

app/Checks/CacheCheck.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Exception;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Str;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class CacheCheck extends Check
-{
-    protected ?string $driver = null;
-
-    public function driver(string $driver): self
-    {
-        $this->driver = $driver;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $driver = $this->driver ?? $this->defaultDriver();
-
-        $result = Result::make()->meta([
-            'driver' => $driver,
-        ]);
-
-        try {
-            return $this->canWriteValuesToCache($driver)
-                ? $result->ok(trans('admin/health.results.cache.ok'))
-                : $result->failed(trans('admin/health.results.cache.failed_retrieve'));
-        } catch (Exception $exception) {
-            return $result->failed(trans('admin/health.results.cache.failed', ['error' => $exception->getMessage()]));
-        }
-    }
-
-    protected function defaultDriver(): ?string
-    {
-        return config('cache.default', 'file');
-    }
-
-    protected function canWriteValuesToCache(?string $driver): bool
-    {
-        $expectedValue = Str::random(5);
-
-        $cacheName = "laravel-health:check-{$expectedValue}";
-
-        Cache::driver($driver)->put($cacheName, $expectedValue, 10);
-
-        $actualValue = Cache::driver($driver)->get($cacheName);
-
-        Cache::driver($driver)->forget($cacheName);
-
-        return $actualValue === $expectedValue;
-    }
-}

app/Checks/DatabaseCheck.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Exception;
-use Illuminate\Support\Facades\DB;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class DatabaseCheck extends Check
-{
-    protected ?string $connectionName = null;
-
-    public function connectionName(string $connectionName): self
-    {
-        $this->connectionName = $connectionName;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $connectionName = $this->connectionName ?? $this->getDefaultConnectionName();
-
-        $result = Result::make()->meta([
-            'connection_name' => $connectionName,
-        ]);
-
-        try {
-            DB::connection($connectionName)->getPdo();
-
-            return $result->ok(trans('admin/health.results.database.ok'));
-        } catch (Exception $exception) {
-            return $result->failed(trans('admin/health.results.database.failed', ['error' => $exception->getMessage()]));
-        }
-    }
-
-    protected function getDefaultConnectionName(): string
-    {
-        return config('database.default');
-    }
-}

app/Checks/DebugModeCheck.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-use function config;
-
-class DebugModeCheck extends Check
-{
-    protected bool $expected = false;
-
-    public function expectedToBe(bool $bool): self
-    {
-        $this->expected = $bool;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $actual = config('app.debug');
-
-        $result = Result::make()
-            ->meta([
-                'actual' => $actual,
-                'expected' => $this->expected,
-            ])
-            ->shortSummary($this->convertToWord($actual));
-
-        return $this->expected === $actual
-            ? $result->ok()
-            : $result->failed(trans('admin/health.results.debugmode.failed', [
-                'actual' => $this->convertToWord($actual),
-                'expected' => $this->convertToWord($this->expected),
-            ]));
-    }
-
-    protected function convertToWord(bool $boolean): string
-    {
-        return $boolean ? 'true' : 'false';
-    }
-}

app/Checks/EnvironmentCheck.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Illuminate\Support\Facades\App;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class EnvironmentCheck extends Check
-{
-    protected string $expectedEnvironment = 'production';
-
-    public function expectEnvironment(string $expectedEnvironment): self
-    {
-        $this->expectedEnvironment = $expectedEnvironment;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $actualEnvironment = (string) App::environment();
-
-        $result = Result::make()
-            ->meta([
-                'actual' => $actualEnvironment,
-                'expected' => $this->expectedEnvironment,
-            ])
-            ->shortSummary($actualEnvironment);
-
-        return $this->expectedEnvironment === $actualEnvironment
-            ? $result->ok(trans('admin/health.results.environment.ok'))
-            : $result->failed(trans('admin/health.results.environment.failed', [
-                'actual' => $actualEnvironment,
-                'expected' => $this->expectedEnvironment,
-            ]));
-    }
-}

app/Checks/NodeVersionsCheck.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use App\Models\Node;
-use App\Services\Helpers\SoftwareVersionService;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-use Spatie\Health\Enums\Status;
-
-class NodeVersionsCheck extends Check
-{
-    public function __construct(private SoftwareVersionService $versionService) {}
-
-    public function run(): Result
-    {
-        $all = Node::query()->count();
-
-        if ($all === 0) {
-            $result = Result::make()
-                ->notificationMessage(trans('admin/health.results.nodeversions.no_nodes_created'))
-                ->shortSummary(trans('admin/health.results.nodeversions.no_nodes'));
-            $result->status = Status::skipped();
-
-            return $result;
-        }
-
-        $latestVersion = $this->versionService->latestWingsVersion();
-
-        $outdated = Node::query()->get()
-            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && $node->systemInformation()['version'] !== $latestVersion)
-            ->count();
-
-        $result = Result::make()
-            ->meta([
-                'all' => $all,
-                'outdated' => $outdated,
-            ])
-            ->shortSummary($outdated === 0 ? trans('admin/health.results.nodeversions.all_up_to_date') : trans('admin/health.results.nodeversions.outdated', ['outdated' => $outdated, 'all' => $all]));
-
-        return $outdated === 0
-            ? $result->ok(trans('admin/health.results.nodeversions.ok'))
-            : $result->failed(trans('admin/health.results.nodeversions.failed', ['outdated' => $outdated, 'all' => $all]));
-    }
-}

app/Checks/PanelVersionCheck.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use App\Services\Helpers\SoftwareVersionService;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class PanelVersionCheck extends Check
-{
-    public function __construct(private SoftwareVersionService $versionService) {}
-
-    public function run(): Result
-    {
-        $isLatest = $this->versionService->isLatestPanel();
-        $currentVersion = $this->versionService->currentPanelVersion();
-        $latestVersion = $this->versionService->latestPanelVersion();
-
-        $result = Result::make()
-            ->meta([
-                'isLatest' => $isLatest,
-                'currentVersion' => $currentVersion,
-                'latestVersion' => $latestVersion,
-            ])
-            ->shortSummary($isLatest ? trans('admin/health.results.panelversion.up_to_date') : trans('admin/health.results.panelversion.outdated'));
-
-        return $isLatest
-            ? $result->ok(trans('admin/health.results.panelversion.ok'))
-            : $result->failed(trans('admin/health.results.panelversion.failed', [
-                'currentVersion' => $currentVersion,
-                'latestVersion' => $latestVersion,
-            ]));
-    }
-}

app/Checks/ScheduleCheck.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Carbon\Carbon;
-use Composer\InstalledVersions;
-use Spatie\Health\Checks\Checks\ScheduleCheck as BaseCheck;
-use Spatie\Health\Checks\Result;
-
-class ScheduleCheck extends BaseCheck
-{
-    public function run(): Result
-    {
-        $result = Result::make()->ok(trans('admin/health.results.schedule.ok'));
-
-        $lastHeartbeatTimestamp = cache()->store($this->cacheStoreName)->get($this->cacheKey);
-
-        if (!$lastHeartbeatTimestamp) {
-            return $result->failed(trans('admin/health.results.schedule.failed_not_ran'));
-        }
-
-        $latestHeartbeatAt = Carbon::createFromTimestamp($lastHeartbeatTimestamp);
-
-        $carbonVersion = InstalledVersions::getVersion('nesbot/carbon');
-
-        $minutesAgo = $latestHeartbeatAt->diffInMinutes();
-
-        if (version_compare($carbonVersion,
-            '3.0.0', '<')) {
-            $minutesAgo += 1;
-        }
-
-        if ($minutesAgo > $this->heartbeatMaxAgeInMinutes) {
-            return $result->failed(trans('admin/health.results.schedule.failed_last_ran', [
-                'time' => $minutesAgo,
-            ]));
-        }
-
-        return $result;
-    }
-}

app/Checks/UsedDiskSpaceCheck.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Spatie\Health\Checks\Checks\UsedDiskSpaceCheck as BaseCheck;
-
-class UsedDiskSpaceCheck extends BaseCheck
-{
-    protected function getDiskUsagePercentage(): int
-    {
-        $freeSpace = disk_free_space($this->filesystemName ?? '/');
-        $totalSpace = disk_total_space($this->filesystemName ?? '/');
-
-        return 100 - ($freeSpace * 100 / $totalSpace);
-    }
-}

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -16,37 +16,28 @@ class CheckEggUpdatesCommand extends Command
         $eggs = Egg::all();
         foreach ($eggs as $egg) {
             try {
-                $this->check($egg, $exporterService);
+                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()})");
             }
         }
     }
-
-    private function check(Egg $egg, EggExporterService $exporterService): void
-    {
-        if (is_null($egg->update_url)) {
-            $this->comment("$egg->name: Skipping (no update url set)");
-
-            return;
-        }
-
-        $currentJson = json_decode($exporterService->handle($egg->id));
-        unset($currentJson->exported_at);
-
-        $updatedEgg = file_get_contents($egg->update_url);
-        assert($updatedEgg !== false);
-        $updatedJson = json_decode($updatedEgg);
-        unset($updatedJson->exported_at);
-
-        if (md5(json_encode($currentJson, JSON_THROW_ON_ERROR)) === md5(json_encode($updatedJson, JSON_THROW_ON_ERROR))) {
-            $this->info("$egg->name: Up-to-date");
-            cache()->put("eggs.$egg->uuid.update", false, now()->addHour());
-
-            return;
-        }
-
-        $this->warn("$egg->name: Found update");
-        cache()->put("eggs.$egg->uuid.update", true, now()->addHour());
-    }
 }

app/Console/Commands/Environment/CacheSettingsCommand.php

@@ -27,6 +27,8 @@ class CacheSettingsCommand extends Command
                             {--redis-pass= : Password used to connect to redis.}
                             {--redis-port= : Port to connect to redis over.}';
 
+    protected array $variables = [];
+
     /**
      * CacheSettingsCommand constructor.
      */

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -27,7 +27,6 @@ class DatabaseSettingsCommand extends Command
                             {--username= : Username to use when connecting to the MySQL/ MariaDB server.}
                             {--password= : Password to use for the MySQL/ MariaDB database.}';
 
-    /** @var array<array-key, mixed> */
     protected array $variables = [];
 
     /**
@@ -58,7 +57,7 @@ class DatabaseSettingsCommand extends Command
         );
 
         if ($this->variables['DB_CONNECTION'] === 'mysql') {
-            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
+            $this->output->note(__('commands.database_settings.DB_HOST_note'));
             $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
                 'Database Host',
                 config('database.connections.mysql.host', '127.0.0.1')
@@ -74,7 +73,7 @@ class DatabaseSettingsCommand extends Command
                 config('database.connections.mysql.database', 'panel')
             );
 
-            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
+            $this->output->note(__('commands.database_settings.DB_USERNAME_note'));
             $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
                 'Database Username',
                 config('database.connections.mysql.username', 'pelican')
@@ -83,7 +82,7 @@ class DatabaseSettingsCommand extends Command
             $askForMySQLPassword = true;
             if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
                 $this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
-                $askForMySQLPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
+                $askForMySQLPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
             }
 
             if ($askForMySQLPassword) {
@@ -107,9 +106,9 @@ class DatabaseSettingsCommand extends Command
                 $this->database->connection('_panel_command_test')->getPdo();
             } 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(trans('commands.database_settings.DB_error_2'));
+                $this->output->error(__('commands.database_settings.DB_error_2'));
 
-                if ($this->confirm(trans('commands.database_settings.go_back'))) {
+                if ($this->confirm(__('commands.database_settings.go_back'))) {
                     $this->database->disconnect('_panel_command_test');
 
                     return $this->handle();
@@ -118,7 +117,7 @@ class DatabaseSettingsCommand extends Command
                 return 1;
             }
         } elseif ($this->variables['DB_CONNECTION'] === 'mariadb') {
-            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
+            $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')
@@ -134,7 +133,7 @@ class DatabaseSettingsCommand extends Command
                 config('database.connections.mariadb.database', 'panel')
             );
 
-            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
+            $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')
@@ -143,7 +142,7 @@ class DatabaseSettingsCommand extends Command
             $askForMariaDBPassword = true;
             if (!empty(config('database.connections.mariadb.password')) && $this->input->isInteractive()) {
                 $this->variables['DB_PASSWORD'] = config('database.connections.mariadb.password');
-                $askForMariaDBPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
+                $askForMariaDBPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
             }
 
             if ($askForMariaDBPassword) {
@@ -167,9 +166,9 @@ class DatabaseSettingsCommand extends Command
                 $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(trans('commands.database_settings.DB_error_2'));
+                $this->output->error(__('commands.database_settings.DB_error_2'));
 
-                if ($this->confirm(trans('commands.database_settings.go_back'))) {
+                if ($this->confirm(__('commands.database_settings.go_back'))) {
                     $this->database->disconnect('_panel_command_test');
 
                     return $this->handle();
@@ -180,7 +179,7 @@ class DatabaseSettingsCommand extends Command
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {
             $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
                 'Database Path',
-                (string) env('DB_DATABASE', 'database.sqlite')
+                env('DB_DATABASE', 'database.sqlite')
             );
         }
 

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -22,7 +22,6 @@ class EmailSettingsCommand extends Command
                             {--username=}
                             {--password=}';
 
-    /** @var array<array-key, mixed> */
     protected array $variables = [];
 
     /**
@@ -92,7 +91,7 @@ class EmailSettingsCommand extends Command
             trans('command/messages.environment.mail.ask_smtp_password')
         );
 
-        $this->variables['MAIL_SCHEME'] = $this->option('encryption') ?? $this->choice(
+        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
             trans('command/messages.environment.mail.ask_encryption'),
             ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
             config('mail.mailers.smtp.encryption', 'tls')

app/Console/Commands/Environment/QueueSettingsCommand.php

@@ -27,6 +27,8 @@ class QueueSettingsCommand extends Command
                             {--redis-pass= : Password used to connect to redis.}
                             {--redis-port= : Port to connect to redis over.}';
 
+    protected array $variables = [];
+
     /**
      * QueueSettingsCommand constructor.
      */

app/Console/Commands/Environment/QueueWorkerServiceCommand.php

@@ -21,7 +21,7 @@ class QueueWorkerServiceCommand extends Command
         $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
         $path = '/etc/systemd/system/' . $serviceName  . '.service';
 
-        $fileExists = @file_exists($path);
+        $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.');
 

app/Console/Commands/Environment/RedisSetupCommand.php

@@ -20,6 +20,8 @@ class RedisSetupCommand extends Command
                             {--redis-pass= : Password used to connect to redis.}
                             {--redis-port= : Port to connect to redis over.}';
 
+    protected array $variables = [];
+
     /**
      * RedisSetupCommand constructor.
      */

app/Console/Commands/Environment/SessionSettingsCommand.php

@@ -28,6 +28,8 @@ class SessionSettingsCommand extends Command
                             {--redis-pass= : Password used to connect to redis.}
                             {--redis-port= : Port to connect to redis over.}';
 
+    protected array $variables = [];
+
     /**
      * SessionSettingsCommand constructor.
      */

app/Console/Commands/InfoCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use App\Services\Helpers\SoftwareVersionService;
 
 class InfoCommand extends Command
 {
@@ -10,8 +11,98 @@ class InfoCommand extends Command
 
     protected $signature = 'p:info';
 
+    /**
+     * InfoCommand constructor.
+     */
+    public function __construct(private SoftwareVersionService $versionService)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle execution of command.
+     */
     public function handle(): void
     {
-        $this->call('about');
+        $this->output->title('Version Information');
+        $this->table([], [
+            ['Panel Version', $this->versionService->currentPanelVersion()],
+            ['Latest Version', $this->versionService->latestPanelVersion()],
+            ['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')],
+            ['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')],
+            ['Session Driver', config('session.driver')],
+            ['Filesystem Driver', config('filesystems.default')],
+        ], '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->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');
+        }
+    }
+
+    /**
+     * Format output in a Name: Value manner.
+     */
+    private function formatText(string $value, string $opts = ''): string
+    {
+        return sprintf('<%s>%s</>', $opts, $value);
     }
 }

app/Console/Commands/Node/MakeNodeCommand.php

@@ -45,31 +45,31 @@ class MakeNodeCommand extends Command
      */
     public function handle(): void
     {
-        $data['name'] = $this->option('name') ?? $this->ask(trans('commands.make_node.name'));
-        $data['description'] = $this->option('description') ?? $this->ask(trans('commands.make_node.description'));
+        $data['name'] = $this->option('name') ?? $this->ask(__('commands.make_node.name'));
+        $data['description'] = $this->option('description') ?? $this->ask(__('commands.make_node.description'));
         $data['scheme'] = $this->option('scheme') ?? $this->anticipate(
-            trans('commands.make_node.scheme'),
+            __('commands.make_node.scheme'),
             ['https', 'http'],
             'https'
         );
 
-        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(trans('commands.make_node.fqdn'));
-        $data['public'] = $this->option('public') ?? $this->confirm(trans('commands.make_node.public'), true);
-        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(trans('commands.make_node.behind_proxy'));
-        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(trans('commands.make_node.maintenance_mode'));
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask(trans('commands.make_node.memory'), '0');
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(trans('commands.make_node.memory_overallocate'), '-1');
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask(trans('commands.make_node.disk'), '0');
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(trans('commands.make_node.disk_overallocate'), '-1');
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(trans('commands.make_node.cpu'), '0');
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(trans('commands.make_node.cpu_overallocate'), '-1');
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(trans('commands.make_node.upload_size'), '256');
-        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(trans('commands.make_node.daemonListen'), '8080');
-        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(trans('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(trans('commands.make_node.daemonSFTPAlias'), '');
-        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(trans('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
+        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(__('commands.make_node.fqdn'));
+        $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['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(trans('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
+        $this->line(__('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
     }
 }

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -19,14 +19,14 @@ class NodeConfigurationCommand extends Command
 
         /** @var \App\Models\Node $node */
         $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
-            $this->error(trans('commands.node_config.error_not_exist'));
+            $this->error(__('commands.node_config.error_not_exist'));
 
             exit(1);
         });
 
         $format = $this->option('format');
         if (!in_array($format, ['yaml', 'yml', 'json'])) {
-            $this->error(trans('commands.node_config.error_invalid_format'));
+            $this->error(__('commands.node_config.error_invalid_format'));
 
             return 1;
         }

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -13,12 +13,12 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
     public function handle(): void
     {
         if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning(trans('commands.key_generate.error_already_exist'));
-            if (!$this->confirm(trans('commands.key_generate.understand'))) {
+            $this->output->warning(__('commands.key_generate.error_already_exist'));
+            if (!$this->confirm(__('commands.key_generate.understand'))) {
                 return;
             }
 
-            if (!$this->confirm(trans('commands.key_generate.continue'))) {
+            if (!$this->confirm(__('commands.key_generate.continue'))) {
                 return;
             }
         }

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -6,7 +6,6 @@ use Illuminate\Console\Command;
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
 use App\Services\Schedules\ProcessScheduleService;
-use Throwable;
 
 class ProcessRunnableCommand extends Command
 {
@@ -14,7 +13,10 @@ class ProcessRunnableCommand extends Command
 
     protected $description = 'Process schedules in the database and determine which are ready to run.';
 
-    public function handle(ProcessScheduleService $processScheduleService): int
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
     {
         $schedules = Schedule::query()
             ->with('tasks')
@@ -25,7 +27,7 @@ class ProcessRunnableCommand extends Command
             ->get();
 
         if ($schedules->count() < 1) {
-            $this->line(trans('commands.schedule.process.no_tasks'));
+            $this->line(__('commands.schedule.process.no_tasks'));
 
             return 0;
         }
@@ -33,7 +35,7 @@ class ProcessRunnableCommand extends Command
         $bar = $this->output->createProgressBar(count($schedules));
         foreach ($schedules as $schedule) {
             $bar->clear();
-            $this->processSchedule($processScheduleService, $schedule);
+            $this->processSchedule($schedule);
             $bar->advance();
             $bar->display();
         }
@@ -48,23 +50,23 @@ 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(ProcessScheduleService $processScheduleService, Schedule $schedule): void
+    protected function processSchedule(Schedule $schedule): void
     {
         if ($schedule->tasks->isEmpty()) {
             return;
         }
 
         try {
-            $processScheduleService->handle($schedule);
+            $this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
 
             $this->line(trans('command/messages.schedule.output_line', [
                 'schedule' => $schedule->name,
                 'id' => $schedule->id,
             ]));
-        } catch (Throwable $exception) {
+        } catch (\Throwable|\Exception $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error(trans('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
+            $this->error(__('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory as ValidatorFactory;
 use App\Repositories\Daemon\DaemonPowerRepository;
-use Exception;
+use App\Exceptions\Http\Connection\DaemonConnectionException;
 
 class BulkPowerActionCommand extends Command
 {
@@ -19,13 +19,26 @@ class BulkPowerActionCommand extends Command
 
     protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
 
-    public function handle(DaemonPowerRepository $powerRepository, ValidatorFactory $validator): void
+    /**
+     * BulkPowerActionCommand constructor.
+     */
+    public function __construct(private DaemonPowerRepository $powerRepository, private ValidatorFactory $validator)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle the bulk power request.
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function handle(): void
     {
         $action = $this->argument('action');
         $nodes = empty($this->option('nodes')) ? [] : explode(',', $this->option('nodes'));
         $servers = empty($this->option('servers')) ? [] : explode(',', $this->option('servers'));
 
-        $validator = $validator->make([
+        $validator = $this->validator->make([
             'action' => $action,
             'nodes' => $nodes,
             'servers' => $servers,
@@ -51,17 +64,14 @@ class BulkPowerActionCommand extends Command
         }
 
         $bar = $this->output->createProgressBar($count);
-
-        $this->getQueryBuilder($servers, $nodes)->get()->each(function ($server, int $index) use ($action, $powerRepository, &$bar): mixed {
+        $powerRepository = $this->powerRepository;
+        // @phpstan-ignore-next-line
+        $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
             $bar->clear();
 
-            if (!$server instanceof Server) {
-                return null;
-            }
-
             try {
                 $powerRepository->setServer($server)->send($action);
-            } catch (Exception $exception) {
+            } catch (DaemonConnectionException $exception) {
                 $this->output->error(trans('command/messages.server.power.action_failed', [
                     'name' => $server->name,
                     'id' => $server->id,
@@ -72,8 +82,6 @@ class BulkPowerActionCommand extends Command
 
             $bar->advance();
             $bar->display();
-
-            return null;
         });
 
         $this->line('');
@@ -81,9 +89,6 @@ class BulkPowerActionCommand extends Command
 
     /**
      * Returns the query builder instance that will return the servers that should be affected.
-     *
-     * @param  string[]|int[]  $servers
-     * @param  string[]|int[]  $nodes
      */
     protected function getQueryBuilder(array $servers, array $nodes): Builder
     {

app/Console/Commands/UpgradeCommand.php

@@ -34,26 +34,30 @@ class UpgradeCommand extends Command
     {
         $skipDownload = $this->option('skip-download');
         if (!$skipDownload) {
-            $this->output->warning(trans('commands.upgrade.integrity'));
-            $this->output->comment(trans('commands.upgrade.source_url'));
+            $this->output->warning(__('commands.upgrade.integrity'));
+            $this->output->comment(__('commands.upgrade.source_url'));
             $this->line($this->getUrl());
         }
 
+        if (version_compare(PHP_VERSION, '7.4.0') < 0) {
+            $this->error(__('commands.upgrade.php_version') . ' [' . PHP_VERSION . '].');
+        }
+
         $user = 'www-data';
         $group = 'www-data';
         if ($this->input->isInteractive()) {
             if (!$skipDownload) {
-                $skipDownload = !$this->confirm(trans('commands.upgrade.skipDownload'), true);
+                $skipDownload = !$this->confirm(__('commands.upgrade.skipDownload'), true);
             }
 
             if (is_null($this->option('user'))) {
                 $userDetails = function_exists('posix_getpwuid') ? posix_getpwuid(fileowner('public')) : [];
                 $user = $userDetails['name'] ?? 'www-data';
 
-                $message = trans('commands.upgrade.webserver_user', ['user' => $user]);
+                $message = __('commands.upgrade.webserver_user', ['user' => $user]);
                 if (!$this->confirm($message, true)) {
                     $user = $this->anticipate(
-                        trans('commands.upgrade.name_webserver'),
+                        __('commands.upgrade.name_webserver'),
                         [
                             'www-data',
                             'nginx',
@@ -67,10 +71,10 @@ class UpgradeCommand extends Command
                 $groupDetails = function_exists('posix_getgrgid') ? posix_getgrgid(filegroup('public')) : [];
                 $group = $groupDetails['name'] ?? 'www-data';
 
-                $message = trans('commands.upgrade.group_webserver', ['group' => $user]);
+                $message = __('commands.upgrade.group_webserver', ['group' => $user]);
                 if (!$this->confirm($message, true)) {
                     $group = $this->anticipate(
-                        trans('commands.upgrade.group_webserver_question'),
+                        __('commands.upgrade.group_webserver_question'),
                         [
                             'www-data',
                             'nginx',
@@ -80,8 +84,8 @@ class UpgradeCommand extends Command
                 }
             }
 
-            if (!$this->confirm(trans('commands.upgrade.are_your_sure'))) {
-                $this->warn(trans('commands.upgrade.terminated'));
+            if (!$this->confirm(__('commands.upgrade.are_your_sure'))) {
+                $this->warn(__('commands.upgrade.terminated'));
 
                 return;
             }
@@ -171,7 +175,7 @@ class UpgradeCommand extends Command
         });
 
         $this->newLine(2);
-        $this->info(trans('commands.upgrade.success'));
+        $this->info(__('commands.upgrade.success'));
     }
 
     protected function withProgress(ProgressBar $bar, \Closure $callback): void

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -19,7 +19,7 @@ class DisableTwoFactorCommand extends Command
     public function handle(): void
     {
         if ($this->input->isInteractive()) {
-            $this->output->warning(trans('command/messages.user.2fa_help_text.0') . trans('command/messages.user.2fa_help_text.1'));
+            $this->output->warning(trans('command/messages.user.2fa_help_text'));
         }
 
         $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));

app/Console/Kernel.php

@@ -13,8 +13,6 @@ use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Spatie\Health\Commands\RunHealthChecksCommand;
-use Spatie\Health\Commands\ScheduleCheckHeartbeatCommand;
 
 class Kernel extends ConsoleKernel
 {
@@ -55,8 +53,5 @@ class Kernel extends ConsoleKernel
         if (config('panel.webhook.prune_days')) {
             $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
         }
-
-        $schedule->command(ScheduleCheckHeartbeatCommand::class)->everyMinute();
-        $schedule->command(RunHealthChecksCommand::class)->everyFiveMinutes();
     }
 }

app/Contracts/Validatable.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use Illuminate\Validation\Validator;
-
-interface Validatable
-{
-    public function getValidator(): Validator;
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function getRules(): array;
-
-    /**
-     * @return array<string, array<string, mixed>>
-     */
-    public static function getRulesForField(string $field): array;
-
-    public function validate(): void;
-}

app/Eloquent/BackupQueryBuilder.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Eloquent;
-
-use Illuminate\Database\Eloquent\Builder;
-
-/**
- * @template TModel of \Illuminate\Database\Eloquent\Model
- *
- * @extends Builder<TModel>
- */
-class BackupQueryBuilder extends Builder
-{
-    public function nonFailed(): self
-    {
-        $this->where(function (Builder $query) {
-            $query
-                ->whereNull('completed_at')
-                ->orWhere('is_successful', true);
-        });
-
-        return $this;
-    }
-}

app/Enums/ContainerStatus.php

@@ -2,11 +2,7 @@
 
 namespace App\Enums;
 
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-use Filament\Support\Contracts\HasLabel;
-
-enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
+enum ContainerStatus: string
 {
     // Docker Based
     case Created = 'created';
@@ -23,7 +19,7 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
     // HTTP Based
     case Missing = 'missing';
 
-    public function getIcon(): string
+    public function icon(): string
     {
         return match ($this) {
 
@@ -40,17 +36,8 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(bool $hex = false): string
+    public function color(): string
     {
-        if ($hex) {
-            return match ($this) {
-                self::Created, self::Restarting => '#2563EB',
-                self::Starting, self::Paused, self::Removing, self::Stopping => '#D97706',
-                self::Running => '#22C55E',
-                self::Exited, self::Missing, self::Dead, self::Offline => '#EF4444',
-            };
-        }
-
         return match ($this) {
             self::Created => 'primary',
             self::Starting => 'warning',
@@ -65,50 +52,4 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
             self::Offline => 'gray',
         };
     }
-
-    public function getLabel(): string
-    {
-        return str($this->value)->title();
-    }
-
-    public function isOffline(): bool
-    {
-        return in_array($this, [ContainerStatus::Offline, ContainerStatus::Missing]);
-    }
-
-    public function isStartingOrRunning(): bool
-    {
-        return in_array($this, [ContainerStatus::Starting, ContainerStatus::Running]);
-    }
-
-    public function isStartingOrStopping(): bool
-    {
-        return in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
-    }
-
-    public function isStartable(): bool
-    {
-        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
-    }
-
-    public function isRestartable(): bool
-    {
-        if ($this->isStartable()) {
-            return true;
-        }
-
-        return !in_array($this, [ContainerStatus::Offline]);
-    }
-
-    public function isStoppable(): bool
-    {
-        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline]);
-    }
-
-    public function isKillable(): bool
-    {
-        // [ContainerStatus::Restarting, ContainerStatus::Removing, ContainerStatus::Dead, ContainerStatus::Created]
-
-        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited]);
-    }
 }

app/Enums/EditorLanguages.php

@@ -36,7 +36,6 @@ enum EditorLanguages: string implements HasLabel
     case java = 'java';
     case javascript = 'javascript';
     case julia = 'julia';
-    case json = 'json';
     case kotlin = 'kotlin';
     case less = 'less';
     case lexon = 'lexon';
@@ -90,51 +89,9 @@ enum EditorLanguages: string implements HasLabel
     case wgsl = 'wgsl';
     case xml = 'xml';
     case yaml = 'yaml';
+    case json = 'json';
 
-    public static function fromWithAlias(string $match): self
-    {
-        return match ($match) {
-            'h' => self::c,
-
-            'cc', 'hpp' => self::cpp,
-
-            'cs' => self::csharp,
-
-            'class' => self::java,
-
-            'htm' => self::html,
-
-            'js', 'mjs', 'cjs' => self::javascript,
-
-            'kt', 'kts' => self::kotlin,
-
-            'md' => self::markdown,
-
-            'm' => self::objectivec,
-
-            'pl', 'pm' => self::perl,
-
-            'php3', 'php4', 'php5', 'phtml' => self::php,
-
-            'py', 'pyc', 'pyo', 'pyi' => self::python,
-
-            'rdata', 'rds' => self::r,
-
-            'rb', 'erb' => self::ruby,
-
-            'sc' => self::scala,
-
-            'sh', 'zsh' => self::shell,
-
-            'ts', 'tsx' => self::typescript,
-
-            'yml' => self::yaml,
-
-            default => self::tryFrom($match) ?? self::plaintext,
-        };
-    }
-
-    public function getLabel(): string
+    public function getLabel(): ?string
     {
         return $this->name;
     }

app/Enums/ServerResourceType.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum ServerResourceType
-{
-    case Unit;
-    case Percentage;
-    case Time;
-}

app/Enums/ServerState.php

@@ -2,11 +2,7 @@
 
 namespace App\Enums;
 
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-use Filament\Support\Contracts\HasLabel;
-
-enum ServerState: string implements HasColor, HasIcon, HasLabel
+enum ServerState: string
 {
     case Normal = 'normal';
     case Installing = 'installing';
@@ -15,7 +11,7 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
     case Suspended = 'suspended';
     case RestoringBackup = 'restoring_backup';
 
-    public function getIcon(): string
+    public function icon(): string
     {
         return match ($this) {
             self::Normal => 'tabler-heart',
@@ -27,7 +23,7 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(): string
+    public function color(): string
     {
         return match ($this) {
             self::Normal => 'primary',
@@ -38,9 +34,4 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
             self::RestoringBackup => 'primary',
         };
     }
-
-    public function getLabel(): string
-    {
-        return str($this->value)->headline();
-    }
 }

app/Enums/SuspendAction.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum SuspendAction: string
-{
-    case Suspend = 'suspend';
-    case Unsuspend = 'unsuspend';
-}

app/Events/Server/Installed.php

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

app/Events/Server/SubUserAdded.php

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

app/Events/Server/SubUserRemoved.php

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

app/Exceptions/DisplayException.php

@@ -12,9 +12,6 @@ use Illuminate\Http\Response;
 use Illuminate\Container\Container;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-/**
- * @deprecated
- */
 class DisplayException extends PanelException implements HttpExceptionInterface
 {
     public const LEVEL_DEBUG = 'debug';
@@ -43,9 +40,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface
         return Response::HTTP_BAD_REQUEST;
     }
 
-    /**
-     * @return array<string, string>
-     */
     public function getHeaders(): array
     {
         return [];

app/Exceptions/Handler.php

@@ -20,7 +20,6 @@ use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Mailer\Exception\TransportException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -46,8 +45,6 @@ class Handler extends ExceptionHandler
     /**
      * Maps exceptions to a specific response code. This handles special exception
      * types that don't have a defined response code.
-     *
-     * @var array<class-string, int>
      */
     protected static array $exceptionResponseCodes = [
         AuthenticationException::class => 401,
@@ -183,16 +180,9 @@ class Handler extends ExceptionHandler
     }
 
     /**
-     * @param  array<string, mixed>  $override
-     * @return array{errors: array{
-     *     code: string,
-     *     status: string,
-     *     detail: string,
-     *     source?: array{line: int, file: string},
-     *     meta?: array{trace: string[], previous: string[]}
-     * }}|array{errors: array{non-empty-array<string, mixed>}}
+     * Return the exception as a JSONAPI representation for use on API requests.
      */
-    public static function exceptionToArray(Throwable $e, array $override = []): array
+    protected function convertExceptionToArray(\Throwable $e, array $override = []): array
     {
         $match = self::$exceptionResponseCodes[get_class($e)] ?? null;
 
@@ -224,7 +214,7 @@ class Handler extends ExceptionHandler
                     'trace' => Collection::make($e->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
-                    'previous' => Collection::make(self::extractPrevious($e))
+                    'previous' => Collection::make($this->extractPrevious($e))
                         ->map(fn ($exception) => $exception->getTrace())
                         ->map(fn ($trace) => Arr::except($trace, ['args']))
                         ->all(),
@@ -235,17 +225,6 @@ class Handler extends ExceptionHandler
         return ['errors' => [array_merge($error, $override)]];
     }
 
-    /**
-     * Return the exception as a JSONAPI representation for use on API requests.
-     *
-     * @param  array{detail?: mixed, source?: mixed, meta?: mixed}  $override
-     * @return array{errors?: array<mixed>}
-     */
-    protected function convertExceptionToArray(Throwable $e, array $override = []): array
-    {
-        return self::exceptionToArray($e, $override);
-    }
-
     /**
      * Return an array of exceptions that should not be reported.
      */
@@ -265,19 +244,22 @@ class Handler extends ExceptionHandler
             return new JsonResponse($this->convertExceptionToArray($exception), JsonResponse::HTTP_UNAUTHORIZED);
         }
 
-        return redirect()->guest(route('filament.app.auth.login'));
+        return redirect()->guest('/auth/login');
     }
 
     /**
      * Extracts all the previous exceptions that lead to the one passed into this
      * function being thrown.
      *
-     * @return Throwable[]
+     * @return \Throwable[]
      */
-    public static function extractPrevious(Throwable $e): array
+    protected function extractPrevious(\Throwable $e): array
     {
         $previous = [];
         while ($value = $e->getPrevious()) {
+            if (!$value instanceof \Throwable) {
+                break;
+            }
             $previous[] = $value;
             $e = $value;
         }
@@ -288,11 +270,10 @@ class Handler extends ExceptionHandler
     /**
      * Helper method to allow reaching into the handler to convert an exception
      * into the expected array response type.
-     *
-     * @return array<mixed>
      */
     public static function toArray(\Throwable $e): array
     {
-        return self::exceptionToArray($e);
+        // @phpstan-ignore-next-line
+        return (new self(app()))->convertExceptionToArray($e);
     }
 }

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Exceptions\Http\Connection;
+
+use Illuminate\Http\Response;
+use GuzzleHttp\Exception\GuzzleException;
+use App\Exceptions\DisplayException;
+use Illuminate\Support\Facades\Context;
+
+class DaemonConnectionException extends DisplayException
+{
+    private int $statusCode = Response::HTTP_GATEWAY_TIMEOUT;
+
+    /**
+     * Every request to the daemon instance will return a unique X-Request-Id header
+     * which allows for all errors to be efficiently tied to a specific request that
+     * triggered them, and gives users a more direct method of informing hosts when
+     * something goes wrong.
+     */
+    private ?string $requestId;
+
+    /**
+     * Throw a displayable exception caused by a daemon connection error.
+     */
+    public function __construct(GuzzleException $previous, bool $useStatusCode = true)
+    {
+        /** @var \GuzzleHttp\Psr7\Response|null $response */
+        $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
+        $this->requestId = $response?->getHeaderLine('X-Request-Id');
+
+        Context::add('request_id', $this->requestId);
+
+        if ($useStatusCode) {
+            $this->statusCode = is_null($response) ? $this->statusCode : $response->getStatusCode();
+            // There are rare conditions where daemon encounters a panic condition and crashes the
+            // request being made after content has already been sent over the wire. In these cases
+            // you can end up with a "successful" response code that is actual an error.
+            //
+            // Handle those better here since we shouldn't ever end up in this exception state and
+            // be returning a 2XX level response.
+            if ($this->statusCode < 400) {
+                $this->statusCode = Response::HTTP_BAD_GATEWAY;
+            }
+        }
+
+        if (is_null($response)) {
+            $message = 'Could not establish a connection to the machine running this server. Please try again.';
+        } else {
+            $message = sprintf('There was an error while communicating with the machine running this server. This error has been logged, please try again. (code: %s) (request_id: %s)', $response->getStatusCode(), $this->requestId ?? '<nil>');
+        }
+
+        // Attempt to pull the actual error message off the response and return that if it is not
+        // a 500 level error.
+        if ($this->statusCode < 500 && !is_null($response)) {
+            $body = json_decode($response->getBody()->__toString(), true);
+            $message = sprintf('An error occurred on the remote host: %s. (request id: %s)', $body['error'] ?? $message, $this->requestId ?? '<nil>');
+        }
+
+        $level = $this->statusCode >= 500 && $this->statusCode !== 504
+            ? DisplayException::LEVEL_ERROR
+            : DisplayException::LEVEL_WARNING;
+
+        parent::__construct($message, $previous, $level);
+    }
+
+    /**
+     * Return the HTTP status code for this exception.
+     */
+    public function getStatusCode(): int
+    {
+        return $this->statusCode;
+    }
+}

app/Exceptions/Model/DataValidationException.php

@@ -42,9 +42,6 @@ class DataValidationException extends PanelException implements HttpExceptionInt
         return 500;
     }
 
-    /**
-     * @return array<string, string>
-     */
     public function getHeaders(): array
     {
         return [];

app/Extensions/Backups/BackupManager.php

@@ -16,18 +16,17 @@ class BackupManager
 {
     /**
      * The array of resolved backup drivers.
-     *
-     * @var array<string, FilesystemAdapter>
      */
     protected array $adapters = [];
 
     /**
      * The registered custom driver creators.
-     *
-     * @var array<string, callable>
      */
     protected array $customCreators;
 
+    /**
+     * BackupManager constructor.
+     */
     public function __construct(protected Application $app) {}
 
     /**
@@ -87,8 +86,6 @@ class BackupManager
 
     /**
      * Calls a custom creator for a given adapter type.
-     *
-     * @param  array{adapter: string}  $config
      */
     protected function callCustomCreator(array $config): mixed
     {
@@ -97,8 +94,6 @@ class BackupManager
 
     /**
      * Creates a new daemon adapter.
-     *
-     * @param  array<string, string>  $config
      */
     public function createWingsAdapter(array $config): FilesystemAdapter
     {
@@ -107,8 +102,6 @@ class BackupManager
 
     /**
      * Creates a new S3 adapter.
-     *
-     * @param  array<string, string>  $config
      */
     public function createS3Adapter(array $config): FilesystemAdapter
     {
@@ -125,8 +118,6 @@ class BackupManager
 
     /**
      * Returns the configuration associated with a given backup type.
-     *
-     * @return array<mixed>
      */
     protected function getConfig(string $name): array
     {
@@ -156,9 +147,8 @@ class BackupManager
      */
     public function forget(array|string $adapter): self
     {
-        $adapters = &$this->adapters;
         foreach ((array) $adapter as $adapterName) {
-            unset($adapters[$adapterName]);
+            unset($this->adapters[$adapterName]);
         }
 
         return $this;

app/Extensions/Captcha/Providers/CaptchaProvider.php

@@ -1,118 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Providers;
-
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\TextInput;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\Str;
-
-abstract class CaptchaProvider
-{
-    /**
-     * @var array<string, static>
-     */
-    protected static array $providers = [];
-
-    /**
-     * @return self|static[]
-     */
-    public static function get(?string $id = null): array|self
-    {
-        return $id ? static::$providers[$id] : static::$providers;
-    }
-
-    protected function __construct(protected Application $app)
-    {
-        if (array_key_exists($this->getId(), static::$providers)) {
-            if (!$this->app->runningUnitTests()) {
-                logger()->warning("Tried to create duplicate Captcha provider with id '{$this->getId()}'");
-            }
-
-            return;
-        }
-
-        config()->set('captcha.' . Str::lower($this->getId()), $this->getConfig());
-
-        static::$providers[$this->getId()] = $this;
-    }
-
-    abstract public function getId(): string;
-
-    abstract public function getComponent(): Component;
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getConfig(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            'site_key' => env("CAPTCHA_{$id}_SITE_KEY"),
-            'secret_key' => env("CAPTCHA_{$id}_SECRET_KEY"),
-        ];
-    }
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            TextInput::make("CAPTCHA_{$id}_SITE_KEY")
-                ->label('Site Key')
-                ->placeholder('Site Key')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("CAPTCHA_{$id}_SITE_KEY")),
-            TextInput::make("CAPTCHA_{$id}_SECRET_KEY")
-                ->label('Secret Key')
-                ->placeholder('Secret Key')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("CAPTCHA_{$id}_SECRET_KEY")),
-        ];
-    }
-
-    public function getName(): string
-    {
-        return Str::title($this->getId());
-    }
-
-    public function getIcon(): ?string
-    {
-        return null;
-    }
-
-    public function isEnabled(): bool
-    {
-        $id = Str::upper($this->getId());
-
-        return env("CAPTCHA_{$id}_ENABLED", false);
-    }
-
-    /**
-     * @return array<string, string|bool>
-     */
-    public function validateResponse(?string $captchaResponse = null): array
-    {
-        return [
-            'success' => false,
-            'message' => 'validateResponse not defined',
-        ];
-    }
-
-    public function verifyDomain(string $hostname, ?string $requestUrl = null): bool
-    {
-        return true;
-    }
-}

app/Extensions/Captcha/Providers/TurnstileProvider.php

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Providers;
-
-use App\Filament\Components\Forms\Fields\TurnstileCaptcha;
-use Exception;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\Toggle;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\HtmlString;
-
-class TurnstileProvider extends CaptchaProvider
-{
-    public function getId(): string
-    {
-        return 'turnstile';
-    }
-
-    public function getComponent(): Component
-    {
-        return TurnstileCaptcha::make('turnstile');
-    }
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getConfig(): array
-    {
-        return array_merge(parent::getConfig(), [
-            'verify_domain' => env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN'),
-        ]);
-    }
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array
-    {
-        return array_merge(parent::getSettingsForm(), [
-            Toggle::make('CAPTCHA_TURNSTILE_VERIFY_DOMAIN')
-                ->label(trans('admin/setting.captcha.verify'))
-                ->columnSpan(2)
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->default(env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN', true)),
-            Placeholder::make('info')
-                ->label(trans('admin/setting.captcha.info_label'))
-                ->columnSpan(2)
-                ->content(new HtmlString(trans('admin/setting.captcha.info'))),
-
-        ]);
-    }
-
-    public function getIcon(): string
-    {
-        return 'tabler-brand-cloudflare';
-    }
-
-    public static function register(Application $app): self
-    {
-        return new self($app);
-    }
-
-    /**
-     * @return array<string, string|bool>
-     */
-    public function validateResponse(?string $captchaResponse = null): array
-    {
-        $captchaResponse ??= request()->get('cf-turnstile-response');
-
-        if (!$secret = env('CAPTCHA_TURNSTILE_SECRET_KEY')) {
-            throw new Exception('Turnstile secret key is not defined.');
-        }
-
-        $response = Http::asJson()
-            ->timeout(15)
-            ->connectTimeout(5)
-            ->throw()
-            ->post('https://challenges.cloudflare.com/turnstile/v0/siteverify', [
-                'secret' => $secret,
-                'response' => $captchaResponse,
-            ]);
-
-        return count($response->json()) ? $response->json() : [
-            'success' => false,
-            'message' => 'Unknown error occurred, please try again',
-        ];
-    }
-
-    public function verifyDomain(string $hostname, ?string $requestUrl = null): bool
-    {
-        if (!env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN', true)) {
-            return true;
-        }
-
-        $requestUrl ??= request()->url;
-        $requestUrl = parse_url($requestUrl);
-
-        return $hostname === array_get($requestUrl, 'host');
-    }
-}

app/Extensions/Filesystem/S3Filesystem.php

@@ -1,5 +1,28 @@
 <?php
 
+/* The MIT License (MIT)
+
+ Pterodactyl®
+ Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE. */
+
 namespace App\Extensions\Filesystem;
 
 use Aws\S3\S3ClientInterface;
@@ -7,9 +30,6 @@ use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
 
 class S3Filesystem extends AwsS3V3Adapter
 {
-    /**
-     * @param  array<mixed>  $options
-     */
     public function __construct(
         private S3ClientInterface $client,
         private string $bucket,

app/Extensions/League/Fractal/Serializers/PanelSerializer.php

@@ -8,9 +8,6 @@ class PanelSerializer extends ArraySerializer
 {
     /**
      * Serialize an item.
-     *
-     * @param  array<mixed>  $data
-     * @return array{object: ?string, attributes: array<mixed>}
      */
     public function item(?string $resourceKey, array $data): array
     {
@@ -22,9 +19,6 @@ class PanelSerializer extends ArraySerializer
 
     /**
      * Serialize a collection.
-     *
-     * @param  array<mixed>  $data
-     * @return array{object: 'list', data: array<mixed>}
      */
     public function collection(?string $resourceKey, array $data): array
     {
@@ -41,8 +35,6 @@ class PanelSerializer extends ArraySerializer
 
     /**
      * Serialize a null resource.
-     *
-     * @return ?array{object: ?string, attributes: null}
      */
     public function null(): ?array
     {
@@ -54,10 +46,6 @@ class PanelSerializer extends ArraySerializer
 
     /**
      * Merge the included resources with the parent resource being serialized.
-     *
-     * @param  array{relationships: array{string, mixed}}  $transformedData
-     * @param  array{string, mixed}  $includedData
-     * @return array{relationships: array{string, mixed}}
      */
     public function mergeIncludes(array $transformedData, array $includedData): array
     {

app/Extensions/OAuth/Providers/AuthentikProvider.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Filament\Forms\Components\ColorPicker;
-use Filament\Forms\Components\TextInput;
-use Illuminate\Foundation\Application;
-use SocialiteProviders\Authentik\Provider;
-
-final class AuthentikProvider extends OAuthProvider
-{
-    public function __construct(protected Application $app)
-    {
-        parent::__construct($app);
-    }
-
-    public function getId(): string
-    {
-        return 'authentik';
-    }
-
-    public function getProviderClass(): string
-    {
-        return Provider::class;
-    }
-
-    public function getServiceConfig(): array
-    {
-        return [
-            'base_url' => env('OAUTH_AUTHENTIK_BASE_URL'),
-            'client_id' => env('OAUTH_AUTHENTIK_CLIENT_ID'),
-            'client_secret' => env('OAUTH_AUTHENTIK_CLIENT_SECRET'),
-        ];
-    }
-
-    public function getSettingsForm(): array
-    {
-        return array_merge(parent::getSettingsForm(), [
-            TextInput::make('OAUTH_AUTHENTIK_BASE_URL')
-                ->label('Base URL')
-                ->placeholder('Base URL')
-                ->columnSpan(2)
-                ->required()
-                ->url()
-                ->autocomplete(false)
-                ->default(env('OAUTH_AUTHENTIK_BASE_URL')),
-            TextInput::make('OAUTH_AUTHENTIK_DISPLAY_NAME')
-                ->label('Display Name')
-                ->placeholder('Display Name')
-                ->autocomplete(false)
-                ->default(env('OAUTH_AUTHENTIK_DISPLAY_NAME', 'Authentik')),
-            ColorPicker::make('OAUTH_AUTHENTIK_DISPLAY_COLOR')
-                ->label('Display Color')
-                ->placeholder('#fd4b2d')
-                ->default(env('OAUTH_AUTHENTIK_DISPLAY_COLOR', '#fd4b2d'))
-                ->hex(),
-        ]);
-    }
-
-    public function getName(): string
-    {
-        return env('OAUTH_AUTHENTIK_DISPLAY_NAME', 'Authentik');
-    }
-
-    public function getHexColor(): string
-    {
-        return env('OAUTH_AUTHENTIK_DISPLAY_COLOR', '#fd4b2d');
-    }
-
-    public static function register(Application $app): self
-    {
-        return new self($app);
-    }
-}

app/Extensions/OAuth/Providers/CommonProvider.php

@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Illuminate\Foundation\Application;
-
-final class CommonProvider extends OAuthProvider
-{
-    protected function __construct(protected Application $app, private string $id, private ?string $providerClass, private ?string $icon, private ?string $hexColor)
-    {
-        parent::__construct($app);
-    }
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getProviderClass(): ?string
-    {
-        return $this->providerClass;
-    }
-
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    public function getHexColor(): ?string
-    {
-        return $this->hexColor;
-    }
-
-    public static function register(Application $app, string $id, ?string $providerClass = null, ?string $icon = null, ?string $hexColor = null): static
-    {
-        return new self($app, $id, $providerClass, $icon, $hexColor);
-    }
-}

app/Extensions/OAuth/Providers/DiscordProvider.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\HtmlString;
-use Illuminate\Support\Str;
-use SocialiteProviders\Discord\Provider;
-use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
-
-final class DiscordProvider extends OAuthProvider
-{
-    public function __construct(protected Application $app)
-    {
-        parent::__construct($app);
-    }
-
-    public function getId(): string
-    {
-        return 'discord';
-    }
-
-    public function getProviderClass(): string
-    {
-        return Provider::class;
-    }
-
-    public function getSetupSteps(): array
-    {
-        return array_merge([
-            Step::make('Register new Discord OAuth App')
-                ->schema([
-                    Placeholder::make('')
-                        ->content(new HtmlString('<p>Visit the <u><a href="https://discord.com/developers/applications" target="_blank">Discord Developer Portal</a></u> and click on <b>New Application</b>. Enter a <b>Name</b> (e.g. your panel name) and click on <b>Create</b>.</p><p>Copy the <b>Client ID</b> and the <b>Client Secret</b>, you will need them in the final step.</p>')),
-                    Placeholder::make('')
-                        ->content(new HtmlString('<p>Under <b>Redirects</b> add the below URL.</p>')),
-                    TextInput::make('_noenv_callback')
-                        ->label('Redirect URL')
-                        ->dehydrated()
-                        ->disabled()
-                        ->hintAction(fn () => request()->isSecure() ? CopyAction::make() : null)
-                        ->formatStateUsing(fn () => config('app.url') . (Str::endsWith(config('app.url'), '/') ? '' : '/') . 'auth/oauth/callback/discord'),
-                ]),
-        ], parent::getSetupSteps());
-    }
-
-    public function getIcon(): string
-    {
-        return 'tabler-brand-discord-f';
-    }
-
-    public function getHexColor(): string
-    {
-        return '#5865F2';
-    }
-
-    public static function register(Application $app): self
-    {
-        return new self($app);
-    }
-}

app/Extensions/OAuth/Providers/GithubProvider.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\HtmlString;
-use Illuminate\Support\Str;
-use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
-
-final class GithubProvider extends OAuthProvider
-{
-    public function __construct(protected Application $app)
-    {
-        parent::__construct($app);
-    }
-
-    public function getId(): string
-    {
-        return 'github';
-    }
-
-    public function getSetupSteps(): array
-    {
-        return array_merge([
-            Step::make('Register new Github OAuth App')
-                ->schema([
-                    Placeholder::make('')
-                        ->content(new HtmlString('<p>Visit the <u><a href="https://github.com/settings/developers" target="_blank">Github Developer Dashboard</a></u>, go to <b>OAuth Apps</b> and click on <b>New OAuth App</b>.</p><p>Enter an <b>Application name</b> (e.g. your panel name), set <b>Homepage URL</b> to your panel url and enter the below url as <b>Authorization callback URL</b>.</p>')),
-                    TextInput::make('_noenv_callback')
-                        ->label('Authorization callback URL')
-                        ->dehydrated()
-                        ->disabled()
-                        ->hintAction(fn () => request()->isSecure() ? CopyAction::make() : null)
-                        ->default(fn () => config('app.url') . (Str::endsWith(config('app.url'), '/') ? '' : '/') . 'auth/oauth/callback/github'),
-                    Placeholder::make('')
-                        ->content(new HtmlString('<p>When you filled all fields click on <b>Register application</b>.</p>')),
-                ]),
-            Step::make('Create Client Secret')
-                ->schema([
-                    Placeholder::make('')
-                        ->content(new HtmlString('<p>Once you registered your app, generate a new <b>Client Secret</b>.</p><p>You will also need the <b>Client ID</b>.</p>')),
-                ]),
-        ], parent::getSetupSteps());
-    }
-
-    public function getIcon(): string
-    {
-        return 'tabler-brand-github-f';
-    }
-
-    public function getHexColor(): string
-    {
-        return '#4078c0';
-    }
-
-    public static function register(Application $app): self
-    {
-        return new self($app);
-    }
-}

app/Extensions/OAuth/Providers/OAuthProvider.php

@@ -1,131 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\Facades\Event;
-use Illuminate\Support\Str;
-use SocialiteProviders\Manager\SocialiteWasCalled;
-
-abstract class OAuthProvider
-{
-    /**
-     * @var array<string, static>
-     */
-    protected static array $providers = [];
-
-    /**
-     * @return self|static[]
-     */
-    public static function get(?string $id = null): array|self
-    {
-        return $id ? static::$providers[$id] : static::$providers;
-    }
-
-    protected function __construct(protected Application $app)
-    {
-        if (array_key_exists($this->getId(), static::$providers)) {
-            if (!$this->app->runningUnitTests()) {
-                logger()->warning("Tried to create duplicate OAuth provider with id '{$this->getId()}'");
-            }
-
-            return;
-        }
-
-        config()->set('services.' . $this->getId(), array_merge($this->getServiceConfig(), ['redirect' => '/auth/oauth/callback/' . $this->getId()]));
-
-        if ($this->getProviderClass()) {
-            Event::listen(function (SocialiteWasCalled $event) {
-                $event->extendSocialite($this->getId(), $this->getProviderClass());
-            });
-        }
-
-        static::$providers[$this->getId()] = $this;
-    }
-
-    abstract public function getId(): string;
-
-    public function getProviderClass(): ?string
-    {
-        return null;
-    }
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getServiceConfig(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            'client_id' => env("OAUTH_{$id}_CLIENT_ID"),
-            'client_secret' => env("OAUTH_{$id}_CLIENT_SECRET"),
-        ];
-    }
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array
-    {
-        $id = Str::upper($this->getId());
-
-        return [
-            TextInput::make("OAUTH_{$id}_CLIENT_ID")
-                ->label('Client ID')
-                ->placeholder('Client ID')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("OAUTH_{$id}_CLIENT_ID")),
-            TextInput::make("OAUTH_{$id}_CLIENT_SECRET")
-                ->label('Client Secret')
-                ->placeholder('Client Secret')
-                ->columnSpan(2)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env("OAUTH_{$id}_CLIENT_SECRET")),
-        ];
-    }
-
-    /**
-     * @return Step[]
-     */
-    public function getSetupSteps(): array
-    {
-        return [
-            Step::make('OAuth Config')
-                ->columns(4)
-                ->schema($this->getSettingsForm()),
-        ];
-    }
-
-    public function getName(): string
-    {
-        return Str::title($this->getId());
-    }
-
-    public function getIcon(): ?string
-    {
-        return null;
-    }
-
-    public function getHexColor(): ?string
-    {
-        return null;
-    }
-
-    public function isEnabled(): bool
-    {
-        $id = Str::upper($this->getId());
-
-        return env("OAUTH_{$id}_ENABLED", false);
-    }
-}

app/Extensions/OAuth/Providers/SteamProvider.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Providers;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Foundation\Application;
-use Illuminate\Support\HtmlString;
-use SocialiteProviders\Steam\Provider;
-
-final class SteamProvider extends OAuthProvider
-{
-    public function __construct(protected Application $app)
-    {
-        parent::__construct($app);
-    }
-
-    public function getId(): string
-    {
-        return 'steam';
-    }
-
-    public function getProviderClass(): string
-    {
-        return Provider::class;
-    }
-
-    public function getServiceConfig(): array
-    {
-        return [
-            'client_id' => null,
-            'client_secret' => env('OAUTH_STEAM_CLIENT_SECRET'),
-            'allowed_hosts' => [
-                str_replace(['http://', 'https://'], '', env('APP_URL')),
-            ],
-        ];
-    }
-
-    public function getSettingsForm(): array
-    {
-        return [
-            TextInput::make('OAUTH_STEAM_CLIENT_SECRET')
-                ->label('Web API Key')
-                ->placeholder('Web API Key')
-                ->columnSpan(4)
-                ->required()
-                ->password()
-                ->revealable()
-                ->autocomplete(false)
-                ->default(env('OAUTH_STEAM_CLIENT_SECRET')),
-        ];
-    }
-
-    public function getSetupSteps(): array
-    {
-        return array_merge([
-            Step::make('Create API Key')
-                ->schema([
-                    Placeholder::make('')
-                        ->content(new HtmlString('Visit <u><a href="https://steamcommunity.com/dev/apikey" target="_blank">https://steamcommunity.com/dev/apikey</a></u> to generate an API key.')),
-                ]),
-        ], parent::getSetupSteps());
-    }
-
-    public function getIcon(): string
-    {
-        return 'tabler-brand-steam-f';
-    }
-
-    public function getHexColor(): string
-    {
-        return '#00adee';
-    }
-
-    public static function register(Application $app): self
-    {
-        return new self($app);
-    }
-}

app/Filament/Admin/Pages/Dashboard.php

@@ -22,16 +22,13 @@ class Dashboard extends Page
 
     public function getTitle(): string
     {
-        return trans('admin/dashboard.title');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/dashboard.title');
+        return trans('strings.dashboard');
     }
 
     protected static ?string $slug = '/';
 
+    public string $activeTab = 'nodes';
+
     private SoftwareVersionService $softwareVersionService;
 
     public function mount(SoftwareVersionService $softwareVersionService): void
@@ -54,33 +51,33 @@ class Dashboard extends Page
 
             'devActions' => [
                 CreateAction::make()
-                    ->label(trans('admin/dashboard.sections.intro-developers.button_issues'))
+                    ->label('Bugs & Features')
                     ->icon('tabler-brand-github')
-                    ->url('https://github.com/pelican-dev/panel/issues', true),
+                    ->url('https://github.com/pelican-dev/panel/discussions', true),
             ],
             'updateActions' => [
                 CreateAction::make()
-                    ->label(trans('admin/dashboard.sections.intro-update-available.heading'))
+                    ->label('Read Documentation')
                     ->icon('tabler-clipboard-text')
                     ->url('https://pelican.dev/docs/panel/update', true)
                     ->color('warning'),
             ],
             'nodeActions' => [
                 CreateAction::make()
-                    ->label(trans('admin/dashboard.sections.intro-first-node.button_label'))
+                    ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
                     ->icon('tabler-server-2')
                     ->url(CreateNode::getUrl()),
             ],
             'supportActions' => [
                 CreateAction::make()
-                    ->label(trans('admin/dashboard.sections.intro-support.button_donate'))
+                    ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                     ->icon('tabler-cash')
                     ->url('https://pelican.dev/donate', true)
                     ->color('success'),
             ],
             'helpActions' => [
                 CreateAction::make()
-                    ->label(trans('admin/dashboard.sections.intro-help.button_docs'))
+                    ->label(trans('dashboard/index.sections.intro-help.button_docs'))
                     ->icon('tabler-speedboat')
                     ->url('https://pelican.dev/docs', true),
             ],

app/Filament/Admin/Pages/Health.php

@@ -1,173 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Pages;
-
-use Carbon\Carbon;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Filament\Pages\Page;
-use Illuminate\Support\Facades\Artisan;
-use Spatie\Health\Commands\RunHealthChecksCommand;
-use Spatie\Health\Enums\Status;
-use Spatie\Health\ResultStores\ResultStore;
-
-class Health extends Page
-{
-    protected static ?string $navigationIcon = 'tabler-heart';
-
-    protected static string $view = 'filament.pages.health';
-
-    /** @var array<string, string> */
-    protected $listeners = [
-        'refresh-component' => '$refresh',
-    ];
-
-    public function getTitle(): string
-    {
-        return trans('admin/health.title');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/health.title');
-    }
-
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.advanced');
-    }
-
-    public static function canAccess(): bool
-    {
-        return auth()->user()->can('view health');
-    }
-
-    protected function getActions(): array
-    {
-        return [
-            Action::make('refresh')
-                ->label(trans('admin/health.refresh'))
-                ->button()
-                ->action('refresh'),
-        ];
-    }
-
-    protected function getViewData(): array
-    {
-        // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
-        $checkResults = app(ResultStore::class)->latestResults();
-
-        if ($checkResults === null) {
-            Artisan::call(RunHealthChecksCommand::class);
-
-            $this->dispatch('refresh-component');
-        }
-
-        return [
-            'lastRanAt' => new Carbon($checkResults?->finishedAt),
-            'checkResults' => $checkResults,
-        ];
-    }
-
-    public function refresh(): void
-    {
-        Artisan::call(RunHealthChecksCommand::class);
-
-        $this->dispatch('refresh-component');
-
-        Notification::make()
-            ->title(trans('admin/health.results_refreshed'))
-            ->success()
-            ->send();
-    }
-
-    public static function getNavigationBadge(): ?string
-    {
-        // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
-        $results = app(ResultStore::class)->latestResults();
-
-        if ($results === null) {
-            return null;
-        }
-
-        $results = json_decode($results->toJson(), true);
-
-        $failed = array_reduce($results['checkResults'], function ($numFailed, $result) {
-            return $numFailed + ($result['status'] === 'failed' ? 1 : 0);
-        }, 0);
-
-        return $failed === 0 ? null : (string) $failed;
-    }
-
-    public static function getNavigationBadgeColor(): string
-    {
-        return self::getNavigationBadge() > null ? 'danger' : '';
-    }
-
-    public static function getNavigationBadgeTooltip(): ?string
-    {
-        // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
-        $results = app(ResultStore::class)->latestResults();
-
-        if ($results === null) {
-            return null;
-        }
-
-        $results = json_decode($results->toJson(), true);
-
-        $failedNames = array_reduce($results['checkResults'], function ($carry, $result) {
-            if ($result['status'] === 'failed') {
-                $carry[] = $result['name'];
-            }
-
-            return $carry;
-        }, []);
-
-        return trans('admin/health.checks.failed') . implode(', ', $failedNames);
-    }
-
-    public static function getNavigationIcon(): string
-    {
-        // @phpstan-ignore myCustomRules.forbiddenGlobalFunctions
-        $results = app(ResultStore::class)->latestResults();
-
-        if ($results === null) {
-            return 'tabler-heart-question';
-        }
-
-        return $results->containsFailingCheck() ? 'tabler-heart-exclamation' : 'tabler-heart-check';
-    }
-
-    public function backgroundColor(string $str): string
-    {
-        return match ($str) {
-            Status::ok()->value => 'bg-success-100 dark:bg-success-200',
-            Status::warning()->value => 'bg-warning-100 dark:bg-warning-200',
-            Status::skipped()->value => 'bg-info-100 dark:bg-info-200',
-            Status::failed()->value, Status::crashed()->value => 'bg-danger-100 dark:bg-danger-200',
-            default => 'bg-gray-100 dark:bg-gray-200'
-        };
-    }
-
-    public function iconColor(string $str): string
-    {
-        return match ($str) {
-            Status::ok()->value => 'text-success-500 dark:text-success-600',
-            Status::warning()->value => 'text-warning-500 dark:text-warning-600',
-            Status::skipped()->value => 'text-info-500 dark:text-info-600',
-            Status::failed()->value, Status::crashed()->value => 'text-danger-500 dark:text-danger-600',
-            default => 'text-gray-500 dark:text-gray-600'
-        };
-    }
-
-    public function icon(string $str): string
-    {
-        return match ($str) {
-            Status::ok()->value => 'tabler-circle-check',
-            Status::warning()->value => 'tabler-exclamation-circle',
-            Status::skipped()->value => 'tabler-circle-chevron-right',
-            Status::failed()->value, Status::crashed()->value => 'tabler-circle-x',
-            default => 'tabler-help-circle'
-        };
-    }
-}

app/Filament/Admin/Pages/Settings.php

@@ -2,18 +2,13 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Extensions\Captcha\Providers\CaptchaProvider;
-use App\Extensions\OAuth\Providers\OAuthProvider;
 use App\Models\Backup;
 use App\Notifications\MailTested;
 use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Forms\Components\Actions;
 use Filament\Forms\Components\Actions\Action as FormAction;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Group;
-use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
@@ -31,10 +26,11 @@ use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
 use Filament\Support\Enums\MaxWidth;
-use Illuminate\Http\Client\Factory;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Notification as MailNotification;
-use Illuminate\Support\Str;
+use Illuminate\Support\HtmlString;
 
 /**
  * @property Form $form
@@ -47,9 +43,10 @@ class Settings extends Page implements HasForms
 
     protected static ?string $navigationIcon = 'tabler-settings';
 
+    protected static ?string $navigationGroup = 'Advanced';
+
     protected static string $view = 'filament.pages.settings';
 
-    /** @var array<mixed>|null */
     public ?array $data = [];
 
     public function mount(): void
@@ -62,16 +59,6 @@ class Settings extends Page implements HasForms
         return auth()->user()->can('view settings');
     }
 
-    public function getTitle(): string
-    {
-        return trans('admin/setting.title');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/setting.title');
-    }
-
     protected function getFormSchema(): array
     {
         return [
@@ -81,50 +68,45 @@ class Settings extends Page implements HasForms
                 ->disabled(fn () => !auth()->user()->can('update settings'))
                 ->tabs([
                     Tab::make('general')
-                        ->label(trans('admin/setting.navigation.general'))
+                        ->label('General')
                         ->icon('tabler-home')
                         ->schema($this->generalSettings()),
                     Tab::make('captcha')
-                        ->label(trans('admin/setting.navigation.captcha'))
+                        ->label('Captcha')
                         ->icon('tabler-shield')
                         ->schema($this->captchaSettings())
                         ->columns(3),
                     Tab::make('mail')
-                        ->label(trans('admin/setting.navigation.mail'))
+                        ->label('Mail')
                         ->icon('tabler-mail')
                         ->schema($this->mailSettings()),
                     Tab::make('backup')
-                        ->label(trans('admin/setting.navigation.backup'))
+                        ->label('Backup')
                         ->icon('tabler-box')
                         ->schema($this->backupSettings()),
-                    Tab::make('OAuth')
-                        ->label(trans('admin/setting.navigation.oauth'))
-                        ->icon('tabler-brand-oauth')
-                        ->schema($this->oauthSettings()),
                     Tab::make('misc')
-                        ->label(trans('admin/setting.navigation.misc'))
+                        ->label('Misc')
                         ->icon('tabler-tool')
                         ->schema($this->miscSettings()),
                 ]),
         ];
     }
 
-    /** @return Component[] */
     private function generalSettings(): array
     {
         return [
             TextInput::make('APP_NAME')
-                ->label(trans('admin/setting.general.app_name'))
+                ->label('App Name')
                 ->required()
                 ->default(env('APP_NAME', 'Pelican')),
             TextInput::make('APP_FAVICON')
-                ->label(trans('admin/setting.general.app_favicon'))
+                ->label('App Favicon')
                 ->hintIcon('tabler-question-mark')
-                ->hintIconTooltip(trans('admin/setting.general.app_favicon_help'))
+                ->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(trans('admin/setting.general.debug_mode'))
+                ->label('Enable Debug Mode?')
                 ->inline(false)
                 ->onIcon('tabler-check')
                 ->offIcon('tabler-x')
@@ -134,295 +116,236 @@ class Settings extends Page implements HasForms
                 ->afterStateUpdated(fn ($state, Set $set) => $set('APP_DEBUG', (bool) $state))
                 ->default(env('APP_DEBUG', config('app.debug'))),
             ToggleButtons::make('FILAMENT_TOP_NAVIGATION')
-                ->label(trans('admin/setting.general.navigation'))
+                ->label('Navigation')
                 ->inline()
                 ->options([
-                    false => trans('admin/setting.general.sidebar'),
-                    true => trans('admin/setting.general.topbar'),
+                    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(trans('admin/setting.general.unit_prefix'))
+                ->label('Unit prefix')
                 ->inline()
                 ->options([
-                    false => trans('admin/setting.general.decimal_prefix'),
-                    true => trans('admin/setting.general.binary_prefix'),
+                    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(trans('admin/setting.general.2fa_requirement'))
+                ->label('2FA Requirement')
                 ->inline()
                 ->options([
-                    0 => trans('admin/setting.general.not_required'),
-                    1 => trans('admin/setting.general.admins_only'),
-                    2 => trans('admin/setting.general.all_users'),
+                    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(trans('admin/setting.general.trusted_proxies'))
+                ->label('Trusted Proxies')
                 ->separator()
                 ->splitKeys(['Tab', ' '])
-                ->placeholder(trans('admin/setting.general.trusted_proxies_help'))
+                ->placeholder('New IP or IP Range')
                 ->default(env('TRUSTED_PROXIES', implode(',', config('trustedproxy.proxies'))))
                 ->hintActions([
                     FormAction::make('clear')
-                        ->label(trans('admin/setting.general.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(trans('admin/setting.general.set_to_cf'))
+                        ->label('Set to Cloudflare IPs')
                         ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(function (Factory $client, Set $set) {
+                        ->action(function (Client $client, Set $set) {
                             $ips = collect();
-
                             try {
-                                $response = $client
-                                    ->timeout(3)
-                                    ->connectTimeout(3)
-                                    ->get('https://api.cloudflare.com/client/v4/ips');
-
+                                $response = $client->request(
+                                    'GET',
+                                    'https://api.cloudflare.com/client/v4/ips',
+                                    config('panel.guzzle')
+                                );
                                 if ($response->getStatusCode() === 200) {
-                                    $result = $response->json('result');
+                                    $result = json_decode($response->getBody(), true)['result'];
                                     foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
                                         $ips->push(...data_get($result, $value));
                                     }
                                     $ips->unique();
                                 }
-                            } catch (Exception) {
+                            } catch (GuzzleException $e) {
                             }
 
                             $set('TRUSTED_PROXIES', $ips->values()->all());
                         }),
                 ]),
             Select::make('FILAMENT_WIDTH')
-                ->label(trans('admin/setting.general.display_width'))
+                ->label('Display Width')
                 ->native(false)
                 ->options(MaxWidth::class)
-                ->selectablePlaceholder(false)
                 ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
         ];
     }
 
-    /**
-     * @return Component[]
-     */
     private function captchaSettings(): array
     {
-        $formFields = [];
-
-        $captchaProviders = CaptchaProvider::get();
-        foreach ($captchaProviders as $captchaProvider) {
-            $id = Str::upper($captchaProvider->getId());
-            $name = Str::title($captchaProvider->getId());
-
-            $formFields[] = Section::make($name)
-                ->columns(5)
-                ->icon($captchaProvider->getIcon() ?? 'tabler-shield')
-                ->collapsed(fn () => !env("CAPTCHA_{$id}_ENABLED", false))
-                ->collapsible()
-                ->schema([
-                    Hidden::make("CAPTCHA_{$id}_ENABLED")
-                        ->live()
-                        ->default(env("CAPTCHA_{$id}_ENABLED")),
-                    Actions::make([
-                        FormAction::make("disable_captcha_$id")
-                            ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
-                            ->label(trans('admin/setting.captcha.disable'))
-                            ->color('danger')
-                            ->action(function (Set $set) use ($id) {
-                                $set("CAPTCHA_{$id}_ENABLED", false);
-                            }),
-                        FormAction::make("enable_captcha_$id")
-                            ->visible(fn (Get $get) => !$get("CAPTCHA_{$id}_ENABLED"))
-                            ->label(trans('admin/setting.captcha.enable'))
-                            ->color('success')
-                            ->action(function (Set $set) use ($id, $captchaProviders) {
-                                foreach ($captchaProviders as $captchaProvider) {
-                                    $loopId = Str::upper($captchaProvider->getId());
-                                    $set("CAPTCHA_{$loopId}_ENABLED", $loopId === $id);
-                                }
-                            }),
-                    ])->columnSpan(1),
-                    Group::make($captchaProvider->getSettingsForm())
-                        ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
-                        ->columns(4)
-                        ->columnSpan(4),
-                ]);
-        }
-
-        return $formFields;
+        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'))),
+        ];
     }
 
-    /**
-     * @return Component[]
-     */
     private function mailSettings(): array
     {
         return [
             ToggleButtons::make('MAIL_MAILER')
-                ->label(trans('admin/setting.mail.mail_driver'))
+                ->label('Mail Driver')
                 ->columnSpanFull()
                 ->inline()
                 ->options([
-                    'log' => '/storage/logs Directory',
+                    'log' => 'Print mails to Log',
                     'smtp' => 'SMTP Server',
+                    'sendmail' => 'sendmail Binary',
                     'mailgun' => 'Mailgun',
                     'mandrill' => 'Mandrill',
                     'postmark' => 'Postmark',
-                    'sendmail' => 'sendmail (PHP)',
                 ])
                 ->live()
                 ->default(env('MAIL_MAILER', config('mail.default')))
                 ->hintAction(
                     FormAction::make('test')
-                        ->label(trans('admin/setting.mail.test_mail'))
+                        ->label('Send Test Mail')
                         ->icon('tabler-send')
                         ->hidden(fn (Get $get) => $get('MAIL_MAILER') === 'log')
                         ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(function (Get $get) {
-                            // Store original mail configuration
-                            $originalConfig = [
-                                'mail.default' => config('mail.default'),
-                                'mail.mailers.smtp.host' => config('mail.mailers.smtp.host'),
-                                'mail.mailers.smtp.port' => config('mail.mailers.smtp.port'),
-                                'mail.mailers.smtp.username' => config('mail.mailers.smtp.username'),
-                                'mail.mailers.smtp.password' => config('mail.mailers.smtp.password'),
-                                'mail.mailers.smtp.encryption' => config('mail.mailers.smtp.encryption'),
-                                'mail.from.address' => config('mail.from.address'),
-                                'mail.from.name' => config('mail.from.name'),
-                                'services.mailgun.domain' => config('services.mailgun.domain'),
-                                'services.mailgun.secret' => config('services.mailgun.secret'),
-                                'services.mailgun.endpoint' => config('services.mailgun.endpoint'),
-                            ];
-
+                        ->action(function () {
                             try {
-                                // Update mail configuration dynamically
-                                config([
-                                    'mail.default' => $get('MAIL_MAILER'),
-                                    'mail.mailers.smtp.host' => $get('MAIL_HOST'),
-                                    'mail.mailers.smtp.port' => $get('MAIL_PORT'),
-                                    'mail.mailers.smtp.username' => $get('MAIL_USERNAME'),
-                                    'mail.mailers.smtp.password' => $get('MAIL_PASSWORD'),
-                                    'mail.mailers.smtp.encryption' => $get('MAIL_SCHEME'),
-                                    'mail.from.address' => $get('MAIL_FROM_ADDRESS'),
-                                    'mail.from.name' => $get('MAIL_FROM_NAME'),
-                                    'services.mailgun.domain' => $get('MAILGUN_DOMAIN'),
-                                    'services.mailgun.secret' => $get('MAILGUN_SECRET'),
-                                    'services.mailgun.endpoint' => $get('MAILGUN_ENDPOINT'),
-                                ]);
-
                                 MailNotification::route('mail', auth()->user()->email)
                                     ->notify(new MailTested(auth()->user()));
 
                                 Notification::make()
-                                    ->title(trans('admin/setting.mail.test_mail_sent'))
+                                    ->title('Test Mail sent')
                                     ->success()
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
-                                    ->title(trans('admin/setting.mail.test_mail_failed'))
+                                    ->title('Test Mail failed')
                                     ->body($exception->getMessage())
                                     ->danger()
                                     ->send();
-                            } finally {
-                                config($originalConfig);
                             }
                         })
                 ),
-            Section::make(trans('admin/setting.mail.from_settings'))
-                ->description(trans('admin/setting.mail.from_settings_help'))
+            Section::make('"From" Settings')
+                ->description('Set the Address and Name used as "From" in mails.')
                 ->columns()
                 ->schema([
                     TextInput::make('MAIL_FROM_ADDRESS')
-                        ->label(trans('admin/setting.mail.from_address'))
+                        ->label('From Address')
                         ->required()
                         ->email()
                         ->default(env('MAIL_FROM_ADDRESS', config('mail.from.address'))),
                     TextInput::make('MAIL_FROM_NAME')
-                        ->label(trans('admin/setting.mail.from_name'))
+                        ->label('From Name')
                         ->required()
                         ->default(env('MAIL_FROM_NAME', config('mail.from.name'))),
                 ]),
-            Section::make(trans('admin/setting.mail.smtp.smtp_title'))
+            Section::make('SMTP Configuration')
                 ->columns()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp')
                 ->schema([
                     TextInput::make('MAIL_HOST')
-                        ->label(trans('admin/setting.mail.smtp.host'))
+                        ->label('Host')
                         ->required()
                         ->default(env('MAIL_HOST', config('mail.mailers.smtp.host'))),
                     TextInput::make('MAIL_PORT')
-                        ->label(trans('admin/setting.mail.smtp.port'))
+                        ->label('Port')
                         ->required()
                         ->numeric()
                         ->minValue(1)
                         ->maxValue(65535)
                         ->default(env('MAIL_PORT', config('mail.mailers.smtp.port'))),
                     TextInput::make('MAIL_USERNAME')
-                        ->label(trans('admin/setting.mail.smtp.username'))
+                        ->label('Username')
                         ->default(env('MAIL_USERNAME', config('mail.mailers.smtp.username'))),
                     TextInput::make('MAIL_PASSWORD')
-                        ->label(trans('admin/setting.mail.smtp.password'))
+                        ->label('Password')
                         ->password()
                         ->revealable()
                         ->default(env('MAIL_PASSWORD')),
-                    ToggleButtons::make('MAIL_SCHEME')
-                        ->label(trans('admin/setting.mail.smtp.encryption'))
+                    ToggleButtons::make('MAIL_ENCRYPTION')
+                        ->label('Encryption')
                         ->inline()
-                        ->options([
-                            'tls' => trans('admin/setting.mail.smtp.tls'),
-                            'ssl' => trans('admin/setting.mail.smtp.ssl'),
-                            '' => trans('admin/setting.mail.smtp.none'),
-                        ])
-                        ->default(env('MAIL_SCHEME', config('mail.mailers.smtp.encryption', 'tls')))
-                        ->live()
-                        ->afterStateUpdated(function ($state, Set $set) {
-                            $port = match ($state) {
-                                'tls' => 587,
-                                'ssl' => 465,
-                                default => 25,
-                            };
-                            $set('MAIL_PORT', $port);
-                        }),
+                        ->options(['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'])
+                        ->default(env('MAIL_ENCRYPTION', config('mail.mailers.smtp.encryption', 'tls'))),
                 ]),
-            Section::make(trans('admin/setting.mail.mailgun.mailgun_title'))
+            Section::make('Mailgun Configuration')
                 ->columns()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun')
                 ->schema([
                     TextInput::make('MAILGUN_DOMAIN')
-                        ->label(trans('admin/setting.mail.mailgun.domain'))
+                        ->label('Domain')
                         ->required()
                         ->default(env('MAILGUN_DOMAIN', config('services.mailgun.domain'))),
                     TextInput::make('MAILGUN_SECRET')
-                        ->label(trans('admin/setting.mail.mailgun.secret'))
+                        ->label('Secret')
                         ->required()
                         ->default(env('MAILGUN_SECRET', config('services.mailgun.secret'))),
                     TextInput::make('MAILGUN_ENDPOINT')
-                        ->label(trans('admin/setting.mail.mailgun.endpoint'))
+                        ->label('Endpoint')
                         ->required()
                         ->default(env('MAILGUN_ENDPOINT', config('services.mailgun.endpoint'))),
                 ]),
         ];
     }
 
-    /**
-     * @return Component[]
-     */
     private function backupSettings(): array
     {
         return [
             ToggleButtons::make('APP_BACKUP_DRIVER')
-                ->label(trans('admin/setting.backup.backup_driver'))
+                ->label('Backup Driver')
                 ->columnSpanFull()
                 ->inline()
                 ->options([
@@ -431,50 +354,50 @@ class Settings extends Page implements HasForms
                 ])
                 ->live()
                 ->default(env('APP_BACKUP_DRIVER', config('backups.default'))),
-            Section::make(trans('admin/setting.backup.throttle'))
-                ->description(trans('admin/setting.backup.throttle_help'))
+            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(trans('admin/setting.backup.limit'))
+                        ->label('Limit')
                         ->required()
                         ->numeric()
                         ->minValue(1)
                         ->default(config('backups.throttles.limit')),
                     TextInput::make('BACKUP_THROTTLE_PERIOD')
-                        ->label(trans('admin/setting.backup.period'))
+                        ->label('Period')
                         ->required()
                         ->numeric()
                         ->minValue(0)
                         ->suffix('Seconds')
                         ->default(config('backups.throttles.period')),
                 ]),
-            Section::make(trans('admin/setting.backup.s3.s3_title'))
+            Section::make('S3 Configuration')
                 ->columns()
                 ->visible(fn (Get $get) => $get('APP_BACKUP_DRIVER') === Backup::ADAPTER_AWS_S3)
                 ->schema([
                     TextInput::make('AWS_DEFAULT_REGION')
-                        ->label(trans('admin/setting.backup.s3.default_region'))
+                        ->label('Default Region')
                         ->required()
                         ->default(config('backups.disks.s3.region')),
                     TextInput::make('AWS_ACCESS_KEY_ID')
-                        ->label(trans('admin/setting.backup.s3.access_key'))
+                        ->label('Access Key ID')
                         ->required()
                         ->default(config('backups.disks.s3.key')),
                     TextInput::make('AWS_SECRET_ACCESS_KEY')
-                        ->label(trans('admin/setting.backup.s3.secret_key'))
+                        ->label('Secret Access Key')
                         ->required()
                         ->default(config('backups.disks.s3.secret')),
                     TextInput::make('AWS_BACKUPS_BUCKET')
-                        ->label(trans('admin/setting.backup.s3.bucket'))
+                        ->label('Bucket')
                         ->required()
                         ->default(config('backups.disks.s3.bucket')),
                     TextInput::make('AWS_ENDPOINT')
-                        ->label(trans('admin/setting.backup.s3.endpoint'))
+                        ->label('Endpoint')
                         ->required()
                         ->default(config('backups.disks.s3.endpoint')),
                     Toggle::make('AWS_USE_PATH_STYLE_ENDPOINT')
-                        ->label(trans('admin/setting.backup.s3.use_path_style_endpoint'))
+                        ->label('Use path style endpoint?')
                         ->inline(false)
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
@@ -488,77 +411,17 @@ class Settings extends Page implements HasForms
         ];
     }
 
-    /**
-     * @return Component[]
-     */
-    private function oauthSettings(): array
-    {
-        $formFields = [];
-
-        $oauthProviders = OAuthProvider::get();
-        foreach ($oauthProviders as $oauthProvider) {
-            $id = Str::upper($oauthProvider->getId());
-            $name = Str::title($oauthProvider->getId());
-
-            $formFields[] = Section::make($name)
-                ->columns(5)
-                ->icon($oauthProvider->getIcon() ?? 'tabler-brand-oauth')
-                ->collapsed(fn () => !env("OAUTH_{$id}_ENABLED", false))
-                ->collapsible()
-                ->schema([
-                    Hidden::make("OAUTH_{$id}_ENABLED")
-                        ->live()
-                        ->default(env("OAUTH_{$id}_ENABLED")),
-                    Actions::make([
-                        FormAction::make("disable_oauth_$id")
-                            ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
-                            ->label(trans('admin/setting.oauth.disable'))
-                            ->color('danger')
-                            ->action(function (Set $set) use ($id) {
-                                $set("OAUTH_{$id}_ENABLED", false);
-                            }),
-                        FormAction::make("enable_oauth_$id")
-                            ->visible(fn (Get $get) => !$get("OAUTH_{$id}_ENABLED"))
-                            ->label(trans('admin/setting.oauth.enable'))
-                            ->color('success')
-                            ->steps($oauthProvider->getSetupSteps())
-                            ->modalHeading(trans('admin/setting.oauth.enable') . ' ' . $name)
-                            ->modalSubmitActionLabel(trans('admin/setting.oauth.enable'))
-                            ->modalCancelAction(false)
-                            ->action(function ($data, Set $set) use ($id) {
-                                $data = array_merge([
-                                    "OAUTH_{$id}_ENABLED" => 'true',
-                                ], $data);
-
-                                foreach ($data as $key => $value) {
-                                    $set($key, $value);
-                                }
-                            }),
-                    ])->columnSpan(1),
-                    Group::make($oauthProvider->getSettingsForm())
-                        ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
-                        ->columns(4)
-                        ->columnSpan(4),
-                ]);
-        }
-
-        return $formFields;
-    }
-
-    /**
-     * @return Component[]
-     */
     private function miscSettings(): array
     {
         return [
-            Section::make(trans('admin/setting.misc.auto_allocation.title'))
-                ->description(trans('admin/setting.misc.auto_allocation.helper'))
+            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(trans('admin/setting.misc.auto_allocation.question'))
+                        ->label('Allow Users to create allocations?')
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
                         ->onColor('success')
@@ -569,7 +432,7 @@ class Settings extends Page implements HasForms
                         ->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(trans('admin/setting.misc.auto_allocation.start'))
+                        ->label('Starting Port')
                         ->required()
                         ->numeric()
                         ->minValue(1024)
@@ -577,7 +440,7 @@ class Settings extends Page implements HasForms
                         ->visible(fn (Get $get) => $get('PANEL_CLIENT_ALLOCATIONS_ENABLED'))
                         ->default(env('PANEL_CLIENT_ALLOCATIONS_RANGE_START')),
                     TextInput::make('PANEL_CLIENT_ALLOCATIONS_RANGE_END')
-                        ->label(trans('admin/setting.misc.auto_allocation.end'))
+                        ->label('Ending Port')
                         ->required()
                         ->numeric()
                         ->minValue(1024)
@@ -585,14 +448,14 @@ class Settings extends Page implements HasForms
                         ->visible(fn (Get $get) => $get('PANEL_CLIENT_ALLOCATIONS_ENABLED'))
                         ->default(env('PANEL_CLIENT_ALLOCATIONS_RANGE_END')),
                 ]),
-            Section::make(trans('admin/setting.misc.mail_notifications.title'))
-                ->description(trans('admin/setting.misc.mail_notifications.helper'))
+            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(trans('admin/setting.misc.mail_notifications.server_installed'))
+                        ->label('Server Installed')
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
                         ->onColor('success')
@@ -603,7 +466,7 @@ class Settings extends Page implements HasForms
                         ->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(trans('admin/setting.misc.mail_notifications.server_reinstalled'))
+                        ->label('Server Reinstalled')
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
                         ->onColor('success')
@@ -614,45 +477,45 @@ class Settings extends Page implements HasForms
                         ->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(trans('admin/setting.misc.connections.title'))
-                ->description(trans('admin/setting.misc.connections.helper'))
+            Section::make('Connections')
+                ->description('Timeouts used when making requests.')
                 ->columns()
                 ->collapsible()
                 ->collapsed()
                 ->schema([
                     TextInput::make('GUZZLE_TIMEOUT')
-                        ->label(trans('admin/setting.misc.connections.request_timeout'))
+                        ->label('Request Timeout')
                         ->required()
                         ->numeric()
                         ->minValue(15)
                         ->maxValue(60)
-                        ->suffix(trans('admin/setting.misc.connections.seconds'))
+                        ->suffix('Seconds')
                         ->default(env('GUZZLE_TIMEOUT', config('panel.guzzle.timeout'))),
                     TextInput::make('GUZZLE_CONNECT_TIMEOUT')
-                        ->label(trans('admin/setting.misc.connections.connection_timeout'))
+                        ->label('Connect Timeout')
                         ->required()
                         ->numeric()
                         ->minValue(5)
                         ->maxValue(60)
-                        ->suffix(trans('admin/setting.misc.connections.seconds'))
+                        ->suffix('Seconds')
                         ->default(env('GUZZLE_CONNECT_TIMEOUT', config('panel.guzzle.connect_timeout'))),
                 ]),
-            Section::make(trans('admin/setting.misc.activity_log.title'))
-                ->description(trans('admin/setting.misc.activity_log.helper'))
+            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(trans('admin/setting.misc.activity_log.prune_age'))
+                        ->label('Prune age')
                         ->required()
                         ->numeric()
                         ->minValue(1)
                         ->maxValue(365)
-                        ->suffix(trans('admin/setting.misc.activity_log.days'))
+                        ->suffix('Days')
                         ->default(env('APP_ACTIVITY_PRUNE_DAYS', config('activity.prune_days'))),
                     Toggle::make('APP_ACTIVITY_HIDE_ADMIN')
-                        ->label(trans('admin/setting.misc.activity_log.log_admin'))
+                        ->label('Hide admin activities?')
                         ->inline(false)
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
@@ -663,35 +526,35 @@ class Settings extends Page implements HasForms
                         ->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(trans('admin/setting.misc.api.title'))
-                ->description(trans('admin/setting.misc.api.helper'))
+            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(trans('admin/setting.misc.api.client_rate'))
+                        ->label('Client API Rate Limit')
                         ->required()
                         ->numeric()
                         ->minValue(1)
-                        ->suffix(trans('admin/setting.misc.api.rpm'))
+                        ->suffix('Requests Per Minute')
                         ->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
                     TextInput::make('APP_API_APPLICATION_RATELIMIT')
-                        ->label(trans('admin/setting.misc.api.app_rate'))
+                        ->label('Application API Rate Limit')
                         ->required()
                         ->numeric()
                         ->minValue(1)
-                        ->suffix(trans('admin/setting.misc.api.rpm'))
+                        ->suffix('Requests Per Minute')
                         ->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
                 ]),
-            Section::make(trans('admin/setting.misc.server.title'))
-                ->description(trans('admin/setting.misc.server.helper'))
+            Section::make('Server')
+                ->description('Settings for Servers.')
                 ->columns()
                 ->collapsible()
                 ->collapsed()
                 ->schema([
                     Toggle::make('PANEL_EDITABLE_SERVER_DESCRIPTIONS')
-                        ->label(trans('admin/setting.misc.server.edit_server_desc'))
+                        ->label('Allow Users to edit Server Descriptions?')
                         ->onIcon('tabler-check')
                         ->offIcon('tabler-x')
                         ->onColor('success')
@@ -702,19 +565,19 @@ class Settings extends Page implements HasForms
                         ->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(trans('admin/setting.misc.webhook.title'))
-                ->description(trans('admin/setting.misc.webhook.helper'))
+            Section::make('Webhook')
+                ->description('Configure how often old webhook logs should be pruned.')
                 ->columns()
                 ->collapsible()
                 ->collapsed()
                 ->schema([
                     TextInput::make('APP_WEBHOOK_PRUNE_DAYS')
-                        ->label(trans('admin/setting.misc.webhook.prune_age'))
+                        ->label('Prune age')
                         ->required()
                         ->numeric()
                         ->minValue(1)
                         ->maxValue(365)
-                        ->suffix(trans('admin/setting.misc.webhook.days'))
+                        ->suffix('Days')
                         ->default(env('APP_WEBHOOK_PRUNE_DAYS', config('panel.webhook.prune_days'))),
                 ]),
         ];
@@ -741,12 +604,12 @@ class Settings extends Page implements HasForms
             $this->redirect($this->getUrl());
 
             Notification::make()
-                ->title(trans('admin/setting.save_success'))
+                ->title('Settings saved')
                 ->success()
                 ->send();
         } catch (Exception $exception) {
             Notification::make()
-                ->title(trans('admin/setting.save_failed'))
+                ->title('Save failed')
                 ->body($exception->getMessage())
                 ->danger()
                 ->send();

app/Filament/Admin/Resources/ApiKeyResource.php

@@ -3,143 +3,28 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\ApiKeyResource\Pages;
-use App\Filament\Admin\Resources\UserResource\Pages\EditUser;
-use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\ApiKey;
-use Filament\Forms\Components\Fieldset;
-use Filament\Forms\Components\TagsInput;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Form;
 use Filament\Resources\Resource;
-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 Illuminate\Database\Eloquent\Model;
 
 class ApiKeyResource extends Resource
 {
     protected static ?string $model = ApiKey::class;
 
+    protected static ?string $label = 'API Key';
+
     protected static ?string $navigationIcon = 'tabler-key';
 
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/apikey.nav_title');
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans('admin/apikey.model_label');
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans('admin/apikey.model_label_plural');
-    }
+    protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
     {
-        return (string) static::getEloquentQuery()->count() ?: null;
+        return static::getModel()::where('key_type', ApiKey::TYPE_APPLICATION)->count() ?: null;
     }
 
-    public static function getEloquentQuery(): Builder
+    public static function canEdit(Model $record): bool
     {
-        $query = parent::getEloquentQuery();
-
-        return $query->where('key_type', ApiKey::TYPE_APPLICATION);
-    }
-
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.advanced');
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('key')
-                    ->label(trans('admin/apikey.table.key'))
-                    ->icon('tabler-clipboard-text')
-                    ->state(fn (ApiKey $key) => $key->identifier . $key->token)
-                    ->copyable(),
-                TextColumn::make('memo')
-                    ->label(trans('admin/apikey.table.description'))
-                    ->wrap()
-                    ->limit(50),
-                DateTimeColumn::make('last_used_at')
-                    ->label(trans('admin/apikey.table.last_used'))
-                    ->placeholder(trans('admin/apikey.table.never_used'))
-                    ->sortable(),
-                DateTimeColumn::make('created_at')
-                    ->label(trans('admin/apikey.table.created'))
-                    ->sortable(),
-                TextColumn::make('user.username')
-                    ->label(trans('admin/apikey.table.created_by'))
-                    ->icon('tabler-user')
-                    ->url(fn (ApiKey $apiKey) => auth()->user()->can('update user', $apiKey->user) ? EditUser::getUrl(['record' => $apiKey->user]) : null),
-            ])
-            ->actions([
-                DeleteAction::make(),
-            ])
-            ->emptyStateIcon('tabler-key')
-            ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/apikey.empty_table'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Fieldset::make('Permissions')
-                    ->columns([
-                        'default' => 1,
-                        'sm' => 1,
-                        'md' => 2,
-                    ])
-                    ->schema(
-                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
-                            ->label(str($resource)->replace('_', ' ')->title())->inline()
-                            ->options([
-                                0 => trans('admin/apikey.permissions.none'),
-                                1 => trans('admin/apikey.permissions.read'),
-                                3 => trans('admin/apikey.permissions.read_write'),
-                            ])
-                            ->icons([
-                                0 => 'tabler-book-off',
-                                1 => 'tabler-book',
-                                3 => 'tabler-writing',
-                            ])
-                            ->colors([
-                                0 => 'success',
-                                1 => 'warning',
-                                3 => 'danger',
-                            ])
-                            ->required()
-                            ->columnSpan([
-                                'default' => 1,
-                                'sm' => 1,
-                                'md' => 1,
-                            ])
-                            ->default(0),
-                        )->all(),
-                    ),
-                TagsInput::make('allowed_ips')
-                    ->placeholder(trans('admin/apikey.whitelist_placeholder'))
-                    ->label(trans('admin/apikey.whitelist'))
-                    ->helperText(trans('admin/apikey.whitelist_help'))
-                    ->columnSpanFull(),
-                Textarea::make('memo')
-                    ->required()
-                    ->label(trans('admin/apikey.description'))
-                    ->helperText(trans('admin/apikey.description_help'))
-                    ->columnSpanFull(),
-            ]);
+        return false;
     }
 
     public static function getPages(): array

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

@@ -4,6 +4,12 @@ namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Admin\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;
 
@@ -11,27 +17,80 @@ class CreateApiKey extends CreateRecord
 {
     protected static string $resource = ApiKeyResource::class;
 
-    protected static bool $canCreateAnother = false;
+    protected ?string $heading = 'Create Application API Key';
 
-    protected function getHeaderActions(): array
+    public function form(Form $form): Form
     {
-        return [
-            $this->getCreateFormAction()->formId('form'),
-        ];
-    }
+        return $form
+            ->schema([
+                Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
+                Hidden::make('token')->default(str_random(ApiKey::KEY_LENGTH)),
 
-    protected function getFormActions(): array
-    {
-        return [];
+                Hidden::make('user_id')
+                    ->default(auth()->user()->id)
+                    ->required(),
+
+                Hidden::make('key_type')
+                    ->inlineLabel()
+                    ->default(ApiKey::TYPE_APPLICATION)
+                    ->required(),
+
+                Fieldset::make('Permissions')
+                    ->columns([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 2,
+                    ])
+                    ->schema(
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
+                            ->label(str($resource)->replace('_', ' ')->title())->inline()
+                            ->options([
+                                0 => 'None',
+                                1 => 'Read',
+                                // 2 => 'Write',
+                                3 => 'Read & Write',
+                            ])
+                            ->icons([
+                                0 => 'tabler-book-off',
+                                1 => 'tabler-book',
+                                2 => 'tabler-writing',
+                                3 => 'tabler-writing',
+                            ])
+                            ->colors([
+                                0 => 'success',
+                                1 => 'warning',
+                                2 => 'danger',
+                                3 => 'danger',
+                            ])
+                            ->required()
+                            ->columnSpan([
+                                'default' => 1,
+                                'sm' => 1,
+                                'md' => 1,
+                            ])
+                            ->default(0),
+                        )->all(),
+                    ),
+
+                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(),
+
+                Textarea::make('memo')
+                    ->required()
+                    ->label('Description')
+                    ->helperText('
+                        Once you have assigned permissions and created this set of credentials you will be unable to come back and edit it.
+                        If you need to make changes down the road you will need to create a new set of credentials.
+                    ')
+                    ->columnSpanFull(),
+            ]);
     }
 
     protected function handleRecordCreation(array $data): Model
     {
-        $data['identifier'] = ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION);
-        $data['token'] = str_random(ApiKey::KEY_LENGTH);
-        $data['user_id'] = auth()->user()->id;
-        $data['key_type'] = ApiKey::TYPE_APPLICATION;
-
         $permissions = [];
 
         foreach (ApiKey::getPermissionList() as $permission) {

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

@@ -4,17 +4,69 @@ namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
 use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use Filament\Actions\CreateAction;
+use App\Tables\Columns\DateTimeColumn;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Actions\DeleteAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
 
 class ListApiKeys extends ListRecords
 {
     protected static string $resource = ApiKeyResource::class;
 
+    public function table(Table $table): Table
+    {
+        return $table
+            ->searchable(false)
+            ->modifyQueryUsing(fn ($query) => $query->where('key_type', ApiKey::TYPE_APPLICATION))
+            ->columns([
+                TextColumn::make('key')
+                    ->copyable()
+                    ->icon('tabler-clipboard-text')
+                    ->state(fn (ApiKey $key) => $key->identifier . $key->token),
+
+                TextColumn::make('memo')
+                    ->label('Description')
+                    ->wrap()
+                    ->limit(50),
+
+                TextColumn::make('identifier')
+                    ->hidden()
+                    ->searchable(),
+
+                DateTimeColumn::make('last_used_at')
+                    ->label('Last Used')
+                    ->placeholder('Not Used')
+                    ->sortable(),
+
+                DateTimeColumn::make('created_at')
+                    ->label('Created')
+                    ->sortable(),
+
+                TextColumn::make('user.username')
+                    ->label('Created By')
+                    ->url(fn (ApiKey $apiKey): string => route('filament.admin.resources.users.edit', ['record' => $apiKey->user])),
+            ])
+            ->actions([
+                DeleteAction::make(),
+            ])
+            ->emptyStateIcon('tabler-key')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('No API Keys')
+            ->emptyStateActions([
+                CreateAction::make('create')
+                    ->label('Create API Key')
+                    ->button(),
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
+                ->label('Create API Key')
                 ->hidden(fn () => ApiKey::where('key_type', ApiKey::TYPE_APPLICATION)->count() <= 0),
         ];
     }

app/Filament/Admin/Resources/DatabaseHostResource.php

@@ -4,157 +4,28 @@ namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 use App\Models\DatabaseHost;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Form;
-use Filament\Forms\Set;
 use Filament\Resources\Resource;
-use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Actions\ViewAction;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
 
 class DatabaseHostResource extends Resource
 {
     protected static ?string $model = DatabaseHost::class;
 
+    protected static ?string $label = 'Database Host';
+
     protected static ?string $navigationIcon = 'tabler-database';
 
-    protected static ?string $recordTitleAttribute = 'name';
+    protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;
     }
 
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/databasehost.nav_title');
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans('admin/databasehost.model_label');
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans('admin/databasehost.model_label_plural');
-    }
-
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.advanced');
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('name')
-                    ->label(trans('admin/databasehost.table.name')),
-                TextColumn::make('host')
-                    ->label(trans('admin/databasehost.table.host')),
-                TextColumn::make('port')
-                    ->label(trans('admin/databasehost.table.port')),
-                TextColumn::make('username')
-                    ->label(trans('admin/databasehost.table.username')),
-                TextColumn::make('databases_count')
-                    ->counts('databases')
-                    ->icon('tabler-database')
-                    ->label(trans('admin/databasehost.databases')),
-                TextColumn::make('nodes.name')
-                    ->icon('tabler-server-2')
-                    ->badge()
-                    ->placeholder(trans('admin/databasehost.no_nodes')),
-            ])
-            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
-            ->actions([
-                ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
-                EditAction::make(),
-            ])
-            ->groupedBulkActions([
-                DeleteBulkAction::make(),
-            ])
-            ->emptyStateIcon('tabler-database')
-            ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/databasehost.no_database_hosts'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
-    }
-
-    public static 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)
-                            ->label(trans('admin/databasehost.host'))
-                            ->helperText(trans('admin/databasehost.host_help'))
-                            ->required()
-                            ->live(onBlur: true)
-                            ->afterStateUpdated(fn ($state, Set $set) => $set('name', $state))
-                            ->maxLength(255),
-                        TextInput::make('port')
-                            ->columnSpan(1)
-                            ->label(trans('admin/databasehost.port'))
-                            ->helperText(trans('admin/databasehost.port_help'))
-                            ->required()
-                            ->numeric()
-                            ->default(3306)
-                            ->minValue(0)
-                            ->maxValue(65535),
-                        TextInput::make('max_databases')
-                            ->label(trans('admin/databasehost.max_database'))
-                            ->helpertext(trans('admin/databasehost.max_databases_help'))
-                            ->numeric(),
-                        TextInput::make('name')
-                            ->label(trans('admin/databasehost.display_name'))
-                            ->helperText(trans('admin/databasehost.display_name_help'))
-                            ->required()
-                            ->maxLength(60),
-                        TextInput::make('username')
-                            ->label(trans('admin/databasehost.username'))
-                            ->helperText(trans('admin/databasehost.username_help'))
-                            ->required()
-                            ->maxLength(255),
-                        TextInput::make('password')
-                            ->label(trans('admin/databasehost.password'))
-                            ->helperText(trans('admin/databasehost.password_help'))
-                            ->password()
-                            ->revealable()
-                            ->maxLength(255)
-                            ->required(fn ($operation) => $operation === 'create'),
-                        Select::make('node_ids')
-                            ->multiple()
-                            ->searchable()
-                            ->preload()
-                            ->helperText(trans('admin/databasehost.linked_nodes_help'))
-                            ->label(trans('admin/databasehost.linked_nodes'))
-                            ->relationship('nodes', 'name'),
-                    ]),
-            ]);
-    }
-
     public static function getPages(): array
     {
         return [
             'index' => Pages\ListDatabaseHosts::route('/'),
             'create' => Pages\CreateDatabaseHost::route('/create'),
-            'view' => Pages\ViewDatabaseHost::route('/{record}'),
             'edit' => Pages\EditDatabaseHost::route('/{record}/edit'),
         ];
     }

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

@@ -4,6 +4,11 @@ namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
+use Filament\Forms;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Exceptions\Halt;
@@ -12,17 +17,78 @@ use PDOException;
 
 class CreateDatabaseHost extends CreateRecord
 {
+    private HostCreationService $service;
+
     protected static string $resource = DatabaseHostResource::class;
 
+    protected ?string $heading = 'Database Hosts';
+
     protected static bool $canCreateAnother = false;
 
-    private HostCreationService $service;
+    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_ids')
+                            ->multiple()
+                            ->searchable()
+                            ->preload()
+                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
+                    ]),
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
@@ -41,7 +107,7 @@ class CreateDatabaseHost extends CreateRecord
             return $this->service->handle($data);
         } catch (PDOException $exception) {
             Notification::make()
-                ->title(trans('admin/databasehost.error'))
+                ->title('Error connecting to database host')
                 ->body($exception->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')

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

@@ -6,7 +6,12 @@ use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
 use App\Services\Databases\Hosts\HostUpdateService;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
+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 Filament\Support\Exceptions\Halt;
@@ -24,11 +29,66 @@ class EditDatabaseHost extends EditRecord
         $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('nodes')
+                            ->multiple()
+                            ->searchable()
+                            ->preload()
+                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
+                            ->label('Linked Nodes')
+                            ->relationship('nodes', 'name'),
+                    ]),
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
-                ->label(fn (DatabaseHost $databaseHost) => $databaseHost->databases()->count() > 0 ? trans('admin/databasehost.delete_help') : trans('filament-actions::delete.single.modal.actions.delete.label'))
+            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'),
         ];
@@ -60,7 +120,7 @@ class EditDatabaseHost extends EditRecord
             return $this->hostUpdateService->handle($record, $data);
         } catch (PDOException $exception) {
             Notification::make()
-                ->title(trans('admin/databasehost.error'))
+                ->title('Error connecting to database host')
                 ->body($exception->getMessage())
                 ->color('danger')
                 ->icon('tabler-database')

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

@@ -4,17 +4,69 @@ namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
 use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Models\DatabaseHost;
-use Filament\Actions\CreateAction;
+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\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')
+                    ->searchable(),
+                TextColumn::make('host')
+                    ->searchable(),
+                TextColumn::make('port')
+                    ->sortable(),
+                TextColumn::make('username')
+                    ->searchable(),
+                TextColumn::make('databases_count')
+                    ->counts('databases')
+                    ->icon('tabler-database')
+                    ->label('Databases'),
+                TextColumn::make('nodes.name')
+                    ->icon('tabler-server-2')
+                    ->badge()
+                    ->placeholder('No Nodes')
+                    ->sortable(),
+            ])
+            ->checkIfRecordIsSelectableUsing(fn (DatabaseHost $databaseHost) => !$databaseHost->databases_count)
+            ->actions([
+                EditAction::make(),
+            ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete databasehost')),
+                ]),
+            ])
+            ->emptyStateIcon('tabler-database')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('No Database Hosts')
+            ->emptyStateActions([
+                CreateAction::make('create')
+                    ->label('Create Database Host')
+                    ->button(),
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make('create')
+                ->label('Create Database Host')
                 ->hidden(fn () => DatabaseHost::count() <= 0),
         ];
     }

app/Filament/Admin/Resources/DatabaseHostResource/Pages/ViewDatabaseHost.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
-
-use App\Filament\Admin\Resources\DatabaseHostResource;
-use App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewDatabaseHost extends ViewRecord
-{
-    protected static string $resource = DatabaseHostResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make(),
-        ];
-    }
-
-    public function getRelationManagers(): array
-    {
-        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
-            return [
-                DatabasesRelationManager::class,
-            ];
-        }
-
-        return [];
-    }
-}

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

@@ -2,11 +2,14 @@
 
 namespace App\Filament\Admin\Resources\DatabaseHostResource\RelationManagers;
 
-use App\Filament\Components\Forms\Actions\RotateDatabasePasswordAction;
-use App\Filament\Components\Tables\Columns\DateTimeColumn;
 use App\Models\Database;
+use App\Services\Databases\DatabasePasswordService;
+use App\Tables\Columns\DateTimeColumn;
+use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables\Actions\DeleteAction;
 use Filament\Tables\Actions\ViewAction;
@@ -23,26 +26,29 @@ class DatabasesRelationManager extends RelationManager
             ->schema([
                 TextInput::make('database')
                     ->columnSpanFull(),
-                TextInput::make('username')
-                    ->label(trans('admin/databasehost.table.username')),
+                TextInput::make('username'),
                 TextInput::make('password')
-                    ->label(trans('admin/databasehost.table.password'))
                     ->password()
                     ->revealable()
-                    ->hintAction(RotateDatabasePasswordAction::make())
+                    ->hintAction(
+                        Action::make('rotate')
+                            ->icon('tabler-refresh')
+                            ->requiresConfirmation()
+                            ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
+                            ->authorize(fn (Database $database) => auth()->user()->can('update database', $database))
+                    )
                     ->formatStateUsing(fn (Database $database) => $database->password),
                 TextInput::make('remote')
-                    ->label(trans('admin/databasehost.table.remote'))
-                    ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? trans('admin/databasehost.anywhere'). ' ( % )' : $record->remote),
+                    ->label('Connections From')
+                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
                 TextInput::make('max_connections')
-                    ->label(trans('admin/databasehost.table.max_connections'))
-                    ->formatStateUsing(fn (Database $record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections),
-                TextInput::make('jdbc')
-                    ->label(trans('admin/databasehost.table.connection_string'))
+                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                TextInput::make('JDBC')
+                    ->label('JDBC Connection String')
                     ->columnSpanFull()
                     ->password()
                     ->revealable()
-                    ->formatStateUsing(fn (Database $database) => $database->jdbc),
+                    ->formatStateUsing(fn (Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
             ]);
     }
 
@@ -50,24 +56,19 @@ class DatabasesRelationManager extends RelationManager
     {
         return $table
             ->recordTitleAttribute('servers')
-            ->heading('')
             ->columns([
                 TextColumn::make('database')
                     ->icon('tabler-database'),
                 TextColumn::make('username')
-                    ->label(trans('admin/databasehost.table.username'))
                     ->icon('tabler-user'),
                 TextColumn::make('remote')
-                    ->label(trans('admin/databasehost.table.remote'))
-                    ->formatStateUsing(fn (Database $record) => $record->remote === '%' ? trans('admin/databasehost.anywhere'). ' ( % )' : $record->remote),
+                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
                 TextColumn::make('server.name')
                     ->icon('tabler-brand-docker')
                     ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
                 TextColumn::make('max_connections')
-                    ->label(trans('admin/databasehost.table.max_connections'))
-                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? trans('admin/databasehost.unlimited') : $record->max_connections),
-                DateTimeColumn::make('created_at')
-                    ->label(trans('admin/databasehost.table.created_at')),
+                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                DateTimeColumn::make('created_at'),
             ])
             ->actions([
                 DeleteAction::make()
@@ -77,4 +78,13 @@ class DatabasesRelationManager extends RelationManager
                     ->hidden(fn () => !auth()->user()->can('viewList database')),
             ]);
     }
+
+    protected function rotatePassword(DatabasePasswordService $service, Database $database, Set $set, Get $get): void
+    {
+        $newPassword = $service->handle($database);
+        $jdbcString = 'jdbc:mysql://' . $get('username') . ':' . urlencode($newPassword) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database');
+
+        $set('password', $newPassword);
+        $set('JDBC', $jdbcString);
+    }
 }

app/Filament/Admin/Resources/DatabaseResource.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Filament\Admin\Resources;
+
+use App\Filament\Admin\Resources\DatabaseResource\Pages;
+use App\Models\Database;
+use Filament\Resources\Resource;
+
+class DatabaseResource extends Resource
+{
+    protected static ?string $model = Database::class;
+
+    protected static ?string $navigationIcon = 'tabler-database';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected static ?string $navigationGroup = 'Advanced';
+
+    public static function getNavigationBadge(): ?string
+    {
+        return static::getModel()::count() ?: null;
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListDatabases::route('/'),
+            'create' => Pages\CreateDatabase::route('/create'),
+            'edit' => Pages\EditDatabase::route('/{record}/edit'),
+        ];
+    }
+}

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

@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
+
+use App\Filament\Admin\Resources\DatabaseResource;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateDatabase extends CreateRecord
+{
+    protected static string $resource = DatabaseResource::class;
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Select::make('server_id')
+                    ->relationship('server', 'name')
+                    ->searchable()
+                    ->preload()
+                    ->required(),
+                Select::make('database_host_id')
+                    ->relationship('host', 'name')
+                    ->searchable()
+                    ->selectablePlaceholder(false)
+                    ->preload()
+                    ->required(),
+                TextInput::make('database')
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('remote')
+                    ->required()
+                    ->maxLength(255)
+                    ->default('%'),
+                TextInput::make('username')
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('password')
+                    ->password()
+                    ->revealable()
+                    ->required(),
+                TextInput::make('max_connections')
+                    ->numeric()
+                    ->minValue(0)
+                    ->default(0),
+            ]);
+    }
+}

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

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
+
+use App\Filament\Admin\Resources\DatabaseResource;
+use Filament\Actions;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Resources\Pages\EditRecord;
+
+class EditDatabase extends EditRecord
+{
+    protected static string $resource = DatabaseResource::class;
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Select::make('server_id')
+                    ->relationship('server', 'name')
+                    ->searchable()
+                    ->preload()
+                    ->required(),
+                TextInput::make('database_host_id')
+                    ->required()
+                    ->numeric(),
+                TextInput::make('database')
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('remote')
+                    ->required()
+                    ->maxLength(255)
+                    ->default('%'),
+                TextInput::make('username')
+                    ->required()
+                    ->maxLength(255),
+                TextInput::make('password')
+                    ->password()
+                    ->revealable()
+                    ->required(),
+                TextInput::make('max_connections')
+                    ->numeric()
+                    ->minValue(0)
+                    ->default(0),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\DeleteAction::make(),
+        ];
+    }
+}

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

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Filament\Admin\Resources\DatabaseResource\Pages;
+
+use App\Filament\Admin\Resources\DatabaseResource;
+use App\Tables\Columns\DateTimeColumn;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\BulkActionGroup;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+
+class ListDatabases extends ListRecords
+{
+    protected static string $resource = DatabaseResource::class;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                TextColumn::make('server.name')
+                    ->numeric()
+                    ->sortable(),
+                TextColumn::make('database_host_id')
+                    ->numeric()
+                    ->sortable(),
+                TextColumn::make('database')
+                    ->searchable(),
+                TextColumn::make('username')
+                    ->searchable(),
+                TextColumn::make('remote')
+                    ->searchable(),
+                TextColumn::make('max_connections')
+                    ->numeric()
+                    ->sortable(),
+                DateTimeColumn::make('created_at')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                DateTimeColumn::make('updated_at')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->actions([
+                EditAction::make(),
+            ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete database')),
+                ]),
+            ]);
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\CreateAction::make(),
+        ];
+    }
+}

app/Filament/Admin/Resources/EggResource.php

@@ -14,31 +14,13 @@ class EggResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
+    protected static ?string $recordRouteKeyName = 'id';
+
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;
     }
 
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.server');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/egg.nav_title');
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans('admin/egg.model_label');
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans('admin/egg.model_label_plural');
-    }
-
     public static function getGloballySearchableAttributes(): array
     {
         return ['name', 'tags', 'uuid', 'id'];

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

@@ -4,8 +4,6 @@ namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Admin\Resources\EggResource;
-use App\Filament\Components\Forms\Fields\CopyFrom;
-use App\Models\EggVariable;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
@@ -19,12 +17,10 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
-use Illuminate\Validation\Rules\Unique;
 
 class CreateEgg extends CreateRecord
 {
@@ -32,118 +28,102 @@ class CreateEgg extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
-    protected function getHeaderActions(): array
-    {
-        return [
-            $this->getCreateFormAction()->formId('form'),
-        ];
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
-    }
-
     public function form(Form $form): Form
     {
         return $form
             ->schema([
                 Tabs::make()->tabs([
-                    Tab::make(trans('admin/egg.tabs.configuration'))
+                    Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->schema([
                             TextInput::make('name')
-                                ->label(trans('admin/egg.name'))
                                 ->required()
                                 ->maxLength(255)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->helperText(trans('admin/egg.name_help')),
+                                ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
                             TextInput::make('author')
-                                ->label(trans('admin/egg.author'))
                                 ->maxLength(255)
                                 ->required()
                                 ->email()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->helperText(trans('admin/egg.author_help')),
+                                ->helperText('The author of this version of the Egg.'),
                             Textarea::make('description')
-                                ->label(trans('admin/egg.description'))
-                                ->rows(2)
+                                ->rows(3)
                                 ->columnSpanFull()
-                                ->helperText(trans('admin/egg.description_help')),
+                                ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
                             Textarea::make('startup')
-                                ->label(trans('admin/egg.startup'))
                                 ->rows(3)
                                 ->columnSpanFull()
                                 ->required()
                                 ->placeholder(implode("\n", [
                                     'java -Xms128M -XX:MaxRAMPercentage=95.0 -jar {{SERVER_JARFILE}}',
                                 ]))
-                                ->helperText(trans('admin/egg.startup_help')),
-                            TagsInput::make('file_denylist')
-                                ->label(trans('admin/egg.file_denylist'))
-                                ->placeholder('denied-file.txt')
-                                ->helperText(trans('admin/egg.file_denylist_help'))
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
+                                ->helperText('The default startup command that should be used for new servers using this Egg.'),
                             TagsInput::make('features')
-                                ->label(trans('admin/egg.features'))
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1]),
+                                ->placeholder('Add Feature')
+                                ->helperText('')
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             Toggle::make('force_outgoing_ip')
-                                ->label(trans('admin/egg.force_ip'))
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/egg.force_ip_help')),
+                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
+                                    Required for certain games to work properly when the Node has multiple public IP addresses.
+                                    Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
                             Hidden::make('script_is_privileged')
                                 ->default(1),
                             TagsInput::make('tags')
-                                ->label(trans('admin/egg.tags'))
+                                ->placeholder('Add Tags')
+                                ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             TextInput::make('update_url')
-                                ->label(trans('admin/egg.update_url'))
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/egg.update_url_help'))
+                                ->hintIconTooltip('URLs must point directly to the raw .json file.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
                                 ->url(),
                             KeyValue::make('docker_images')
-                                ->label(trans('admin/egg.docker_images'))
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
-                                ->addActionLabel(trans('admin/egg.add_image'))
-                                ->keyLabel(trans('admin/egg.docker_name'))
+                                ->addActionLabel('Add Image')
+                                ->keyLabel('Name')
                                 ->keyPlaceholder('Java 21')
-                                ->valueLabel(trans('admin/egg.docker_uri'))
+                                ->valueLabel('Image URI')
                                 ->valuePlaceholder('ghcr.io/parkervcp/yolks:java_21')
-                                ->helperText(trans('admin/egg.docker_help')),
+                                ->helperText('The docker images available to servers using this egg.'),
                         ]),
 
-                    Tab::make(trans('admin/egg.tabs.process_management'))
+                    Tab::make('Process Management')
                         ->columns()
                         ->schema([
-                            CopyFrom::make('copy_process_from')
-                                ->process(),
+                            Hidden::make('config_from')
+                                ->default(null)
+                                ->label('Copy Settings From')
+                                // ->placeholder('None')
+                                // ->relationship('configFrom', 'name', ignoreRecord: true)
+                                ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
                             TextInput::make('config_stop')
-                                ->label(trans('admin/egg.stop_command'))
                                 ->required()
                                 ->maxLength(255)
-                                ->helperText(trans('admin/egg.stop_command_help')),
+                                ->label('Stop Command')
+                                ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
                             Textarea::make('config_startup')->rows(10)->json()
-                                ->label(trans('admin/egg.start_config'))
+                                ->label('Start Configuration')
                                 ->default('{}')
-                                ->helperText(trans('admin/egg.start_config_help')),
+                                ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
                             Textarea::make('config_files')->rows(10)->json()
-                                ->label(trans('admin/egg.config_files'))
+                                ->label('Configuration Files')
                                 ->default('{}')
-                                ->helperText(trans('admin/egg.config_files_help')),
+                                ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
                             Textarea::make('config_logs')->rows(10)->json()
-                                ->label(trans('admin/egg.log_config'))
+                                ->label('Log Configuration')
                                 ->default('{}')
-                                ->helperText(trans('admin/egg.log_config_help')),
+                                ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make(trans('admin/egg.tabs.egg_variables'))
+                    Tab::make('Egg Variables')
                         ->columnSpanFull()
                         ->schema([
                             Repeater::make('variables')
                                 ->label('')
-                                ->addActionLabel(trans('admin/egg.add_new_variable'))
+                                ->addActionLabel('Add New Egg Variable')
                                 ->grid()
                                 ->relationship('variables')
                                 ->name('name')
@@ -172,42 +152,31 @@ class CreateEgg extends CreateRecord
                                 })
                                 ->schema([
                                     TextInput::make('name')
-                                        ->label(trans('admin/egg.name'))
                                         ->live()
                                         ->debounce(750)
                                         ->maxLength(255)
                                         ->columnSpanFull()
-                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
-                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')), ignoreRecord: true)
-                                        ->validationMessages([
-                                            'unique' => trans('admin/egg.error_unique'),
-                                        ])
+                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
+                                        )
                                         ->required(),
-                                    Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
+                                    Textarea::make('description')->columnSpanFull(),
                                     TextInput::make('env_variable')
-                                        ->label(trans('admin/egg.environment_variable'))
+                                        ->label('Environment Variable')
                                         ->maxLength(255)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
-                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')), ignoreRecord: true)
-                                        ->rules(EggVariable::getRulesForField('env_variable'))
-                                        ->validationMessages([
-                                            'unique' => trans('admin/egg.error_unique'),
-                                            'required' => trans('admin/egg.error_required'),
-                                            '*' => trans('admin/egg.error_reserved'),
-                                        ])
                                         ->required(),
-                                    TextInput::make('default_value')->label(trans('admin/egg.default_value'))->maxLength(255),
-                                    Fieldset::make(trans('admin/egg.user_permissions'))
+                                    TextInput::make('default_value')->maxLength(255),
+                                    Fieldset::make('User Permissions')
                                         ->schema([
-                                            Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
-                                            Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
+                                            Checkbox::make('user_viewable')->label('Viewable'),
+                                            Checkbox::make('user_editable')->label('Editable'),
                                         ]),
                                     TagsInput::make('rules')
-                                        ->label(trans('admin/egg.rules'))
                                         ->columnSpanFull()
+                                        ->placeholder('Add Rule')
                                         ->reorderable()
                                         ->suggestions([
                                             'required',
@@ -231,24 +200,26 @@ class CreateEgg extends CreateRecord
                                         ]),
                                 ]),
                         ]),
-                    Tab::make(trans('admin/egg.tabs.install_script'))
+                    Tab::make('Install Script')
                         ->columns(3)
                         ->schema([
-                            CopyFrom::make('copy_script_from')
-                                ->script(),
+
+                            Hidden::make('copy_script_from'),
+                            //->placeholder('None')
+                            //->relationship('scriptFrom', 'name', ignoreRecord: true),
+
                             TextInput::make('script_container')
-                                ->label(trans('admin/egg.script_container'))
                                 ->required()
                                 ->maxLength(255)
                                 ->default('ghcr.io/pelican-eggs/installers:debian'),
+
                             Select::make('script_entry')
-                                ->label(trans('admin/egg.script_entry'))
                                 ->selectablePlaceholder(false)
                                 ->default('bash')
                                 ->options(['bash', 'ash', '/bin/bash'])
                                 ->required(),
+
                             MonacoEditor::make('script_install')
-                                ->label(trans('admin/egg.script_install'))
                                 ->columnSpanFull()
                                 ->fontSize('16px')
                                 ->language('shell')

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

@@ -5,16 +5,17 @@ namespace App\Filament\Admin\Resources\EggResource\Pages;
 use AbdelhamidErrahmouni\FilamentMonacoEditor\MonacoEditor;
 use App\Filament\Admin\Resources\EggResource;
 use App\Filament\Admin\Resources\EggResource\RelationManagers\ServersRelationManager;
-use App\Filament\Components\Actions\ExportEggAction;
-use App\Filament\Components\Actions\ImportEggAction;
-use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Models\Egg;
-use App\Models\EggVariable;
-use Filament\Actions\DeleteAction;
+use App\Services\Eggs\Sharing\EggExporterService;
+use App\Services\Eggs\Sharing\EggImporterService;
+use Exception;
+use Filament\Actions;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Fieldset;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Tabs;
@@ -24,10 +25,9 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Forms\Set;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
-use Illuminate\Validation\Rules\Unique;
 
 class EditEgg extends EditRecord
 {
@@ -38,98 +38,99 @@ class EditEgg extends EditRecord
         return $form
             ->schema([
                 Tabs::make()->tabs([
-                    Tab::make(trans('admin/egg.tabs.configuration'))
+                    Tab::make('Configuration')
                         ->columns(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 4])
                         ->icon('tabler-egg')
                         ->schema([
                             TextInput::make('name')
-                                ->label(trans('admin/egg.name'))
                                 ->required()
                                 ->maxLength(255)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
-                                ->helperText(trans('admin/egg.name_help')),
+                                ->helperText('A simple, human-readable name to use as an identifier for this Egg.'),
                             TextInput::make('uuid')
-                                ->label(trans('admin/egg.egg_uuid'))
+                                ->label('Egg UUID')
                                 ->disabled()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
-                                ->helperText(trans('admin/egg.uuid_help')),
+                                ->helperText('This is the globally unique identifier for this Egg which Wings uses as an identifier.'),
                             TextInput::make('id')
-                                ->label(trans('admin/egg.egg_id'))
+                                ->label('Egg ID')
                                 ->disabled(),
                             Textarea::make('description')
-                                ->label(trans('admin/egg.description'))
                                 ->rows(3)
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->helperText(trans('admin/egg.description_help')),
+                                ->helperText('A description of this Egg that will be displayed throughout the Panel as needed.'),
                             TextInput::make('author')
-                                ->label(trans('admin/egg.author'))
                                 ->required()
                                 ->maxLength(255)
                                 ->email()
                                 ->disabled()
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
-                                ->helperText(trans('admin/egg.author_help_edit')),
+                                ->helperText('The author of this version of the Egg. Uploading a new Egg configuration from a different author will change this.'),
                             Textarea::make('startup')
-                                ->label(trans('admin/egg.startup'))
-                                ->rows(3)
+                                ->rows(2)
                                 ->columnSpanFull()
                                 ->required()
-                                ->helperText(trans('admin/egg.startup_help')),
+                                ->helperText('The default startup command that should be used for new servers using this Egg.'),
                             TagsInput::make('file_denylist')
-                                ->label(trans('admin/egg.file_denylist'))
+                                ->hidden() // latest wings breaks it.
                                 ->placeholder('denied-file.txt')
-                                ->helperText(trans('admin/egg.file_denylist_help'))
+                                ->helperText('A list of files that the end user is not allowed to edit.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             TagsInput::make('features')
-                                ->label(trans('admin/egg.features'))
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 1]),
+                                ->placeholder('Add Feature')
+                                ->helperText('')
+                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             Toggle::make('force_outgoing_ip')
                                 ->inline(false)
-                                ->label(trans('admin/egg.force_ip'))
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/egg.force_ip_help')),
+                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
+                                    Required for certain games to work properly when the Node has multiple public IP addresses.
+                                    Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
                             Hidden::make('script_is_privileged')
                                 ->helperText('The docker images available to servers using this egg.'),
                             TagsInput::make('tags')
-                                ->label(trans('admin/egg.tags'))
+                                ->placeholder('Add Tags')
+                                ->helperText('')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             TextInput::make('update_url')
-                                ->label(trans('admin/egg.update_url'))
+                                ->label('Update URL')
                                 ->url()
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/egg.update_url_help'))
+                                ->hintIconTooltip('URLs must point directly to the raw .json file.')
                                 ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                             KeyValue::make('docker_images')
-                                ->label(trans('admin/egg.docker_images'))
                                 ->live()
                                 ->columnSpanFull()
                                 ->required()
-                                ->addActionLabel(trans('admin/egg.add_image'))
-                                ->keyLabel(trans('admin/egg.docker_name'))
-                                ->valueLabel(trans('admin/egg.docker_uri'))
-                                ->helperText(trans('admin/egg.docker_help')),
+                                ->addActionLabel('Add Image')
+                                ->keyLabel('Name')
+                                ->valueLabel('Image URI')
+                                ->helperText('The docker images available to servers using this egg.'),
                         ]),
-                    Tab::make(trans('admin/egg.tabs.process_management'))
+                    Tab::make('Process Management')
                         ->columns()
                         ->icon('tabler-server-cog')
                         ->schema([
-                            CopyFrom::make('copy_process_from')
-                                ->process(),
+                            Select::make('config_from')
+                                ->label('Copy Settings From')
+                                ->placeholder('None')
+                                ->relationship('configFrom', 'name', ignoreRecord: true)
+                                ->helperText('If you would like to default to settings from another Egg select it from the menu above.'),
                             TextInput::make('config_stop')
-                                ->label(trans('admin/egg.stop_command'))
                                 ->maxLength(255)
-                                ->helperText(trans('admin/egg.stop_command_help')),
+                                ->label('Stop Command')
+                                ->helperText('The command that should be sent to server processes to stop them gracefully. If you need to send a SIGINT you should enter ^C here.'),
                             Textarea::make('config_startup')->rows(10)->json()
-                                ->label(trans('admin/egg.start_config'))
-                                ->helperText(trans('admin/egg.start_config_help')),
+                                ->label('Start Configuration')
+                                ->helperText('List of values the daemon should be looking for when booting a server to determine completion.'),
                             Textarea::make('config_files')->rows(10)->json()
-                                ->label(trans('admin/egg.config_files'))
-                                ->helperText(trans('admin/egg.config_files_help')),
+                                ->label('Configuration Files')
+                                ->helperText('This should be a JSON representation of configuration files to modify and what parts should be changed.'),
                             Textarea::make('config_logs')->rows(10)->json()
-                                ->label(trans('admin/egg.log_config'))
-                                ->helperText(trans('admin/egg.log_config_help')),
+                                ->label('Log Configuration')
+                                ->helperText('This should be a JSON representation of where log files are stored, and whether or not the daemon should be creating custom logs.'),
                         ]),
-                    Tab::make(trans('admin/egg.tabs.egg_variables'))
+                    Tab::make('Egg Variables')
                         ->columnSpanFull()
                         ->icon('tabler-variable')
                         ->schema([
@@ -141,7 +142,7 @@ class EditEgg extends EditRecord
                                 ->reorderable()
                                 ->collapsible()->collapsed()
                                 ->orderColumn()
-                                ->addActionLabel(trans('admin/egg.add_new_variable'))
+                                ->addActionLabel('New Variable')
                                 ->itemLabel(fn (array $state) => $state['name'])
                                 ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
                                     $data['default_value'] ??= '';
@@ -163,42 +164,31 @@ class EditEgg extends EditRecord
                                 })
                                 ->schema([
                                     TextInput::make('name')
-                                        ->label(trans('admin/egg.name'))
                                         ->live()
                                         ->debounce(750)
                                         ->maxLength(255)
                                         ->columnSpanFull()
-                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString()))
-                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')), ignoreRecord: true)
-                                        ->validationMessages([
-                                            'unique' => trans('admin/egg.error_unique'),
-                                        ])
+                                        ->afterStateUpdated(fn (Set $set, $state) => $set('env_variable', str($state)->trim()->snake()->upper()->toString())
+                                        )
                                         ->required(),
-                                    Textarea::make('description')->label(trans('admin/egg.description'))->columnSpanFull(),
+                                    Textarea::make('description')->columnSpanFull(),
                                     TextInput::make('env_variable')
-                                        ->label(trans('admin/egg.environment_variable'))
+                                        ->label('Environment Variable')
                                         ->maxLength(255)
                                         ->prefix('{{')
                                         ->suffix('}}')
                                         ->hintIcon('tabler-code')
                                         ->hintIconTooltip(fn ($state) => "{{{$state}}}")
-                                        ->unique(modifyRuleUsing: fn (Unique $rule, Get $get) => $rule->where('egg_id', $get('../../id')), ignoreRecord: true)
-                                        ->rules(EggVariable::getRulesForField('env_variable'))
-                                        ->validationMessages([
-                                            'unique' => trans('admin/egg.error_unique'),
-                                            'required' => trans('admin/egg.error_required'),
-                                            '*' => trans('admin/egg.error_reserved'),
-                                        ])
                                         ->required(),
-                                    TextInput::make('default_value')->label(trans('admin/egg.default_value'))->maxLength(255),
-                                    Fieldset::make(trans('admin/egg.user_permissions'))
+                                    TextInput::make('default_value')->maxLength(255),
+                                    Fieldset::make('User Permissions')
                                         ->schema([
-                                            Checkbox::make('user_viewable')->label(trans('admin/egg.viewable')),
-                                            Checkbox::make('user_editable')->label(trans('admin/egg.editable')),
+                                            Checkbox::make('user_viewable')->label('Viewable'),
+                                            Checkbox::make('user_editable')->label('Editable'),
                                         ]),
                                     TagsInput::make('rules')
-                                        ->label(trans('admin/egg.rules'))
                                         ->columnSpanFull()
+                                        ->placeholder('Add Rule')
                                         ->reorderable()
                                         ->suggestions([
                                             'required',
@@ -222,24 +212,23 @@ class EditEgg extends EditRecord
                                         ]),
                                 ]),
                         ]),
-                    Tab::make(trans('admin/egg.tabs.install_script'))
+                    Tab::make('Install Script')
                         ->columns(3)
                         ->icon('tabler-file-download')
                         ->schema([
-                            CopyFrom::make('copy_script_from')
-                                ->script(),
+                            Select::make('copy_script_from')
+                                ->placeholder('None')
+                                ->relationship('scriptFrom', 'name', ignoreRecord: true),
                             TextInput::make('script_container')
-                                ->label(trans('admin/egg.script_container'))
                                 ->required()
                                 ->maxLength(255)
-                                ->placeholder('ghcr.io/pelican-eggs/installers:debian'),
-                            Select::make('script_entry')
-                                ->label(trans('admin/egg.script_entry'))
-                                ->selectablePlaceholder(false)
-                                ->options(['bash', 'ash', '/bin/bash'])
-                                ->required(),
+                                ->default('alpine:3.4'),
+                            TextInput::make('script_entry')
+                                ->required()
+                                ->maxLength(255)
+                                ->default('ash'),
                             MonacoEditor::make('script_install')
-                                ->label(trans('admin/egg.script_install'))
+                                ->label('Install Script')
                                 ->placeholderText('')
                                 ->columnSpanFull()
                                 ->fontSize('16px')
@@ -253,12 +242,83 @@ class EditEgg extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make()
+            Actions\DeleteAction::make('deleteEgg')
                 ->disabled(fn (Egg $egg): bool => $egg->servers()->count() > 0)
-                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? trans('filament-actions::delete.single.label') : trans('admin/egg.in_use')),
-            ExportEggAction::make(),
-            ImportEggAction::make()
-                ->multiple(false),
+                ->label(fn (Egg $egg): string => $egg->servers()->count() <= 0 ? 'Delete' : 'In Use'),
+            Actions\Action::make('exportEgg')
+                ->label('Export')
+                ->color('primary')
+                ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
+                    echo $service->handle($egg->id);
+                }, 'egg-' . $egg->getKebabName() . '.json'))
+                ->authorize(fn () => auth()->user()->can('export egg')),
+            Actions\Action::make('importEgg')
+                ->label('Import')
+                ->form([
+                    Placeholder::make('warning')
+                        ->label('This will overwrite the current egg to the one you upload.'),
+                    Tabs::make('Tabs')
+                        ->tabs([
+                            Tab::make('From File')
+                                ->icon('tabler-file-upload')
+                                ->schema([
+                                    FileUpload::make('egg')
+                                        ->label('Egg')
+                                        ->hint('eg. minecraft.json')
+                                        ->acceptedFileTypes(['application/json'])
+                                        ->storeFiles(false),
+                                ]),
+                            Tab::make('From URL')
+                                ->icon('tabler-world-upload')
+                                ->schema([
+                                    TextInput::make('url')
+                                        ->label('URL')
+                                        ->default(fn (Egg $egg): ?string => $egg->update_url)
+                                        ->hint('Link to the egg file (eg. minecraft.json)')
+                                        ->url(),
+                                ]),
+                        ])
+                        ->contained(false),
+
+                ])
+                ->action(function (array $data, Egg $egg, EggImporterService $eggImportService): void {
+                    if (!empty($data['egg'])) {
+                        try {
+                            $eggImportService->fromFile($data['egg'], $egg);
+                        } catch (Exception $exception) {
+                            Notification::make()
+                                ->title('Import Failed')
+                                ->body($exception->getMessage())
+                                ->danger() // Will Robinson
+                                ->send();
+
+                            report($exception);
+
+                            return;
+                        }
+                    } elseif (!empty($data['url'])) {
+                        try {
+                            $eggImportService->fromUrl($data['url'], $egg);
+                        } catch (Exception $exception) {
+                            Notification::make()
+                                ->title('Import Failed')
+                                ->body($exception->getMessage())
+                                ->danger()
+                                ->send();
+
+                            report($exception);
+
+                            return;
+                        }
+                    }
+
+                    $this->refreshForm();
+                    Notification::make()
+                        ->title('Import Success')
+                        ->success()
+                        ->send();
+                })
+                ->authorize(fn () => auth()->user()->can('import egg')),
             $this->getSaveFormAction()->formId('form'),
         ];
     }

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

@@ -3,20 +3,24 @@
 namespace App\Filament\Admin\Resources\EggResource\Pages;
 
 use App\Filament\Admin\Resources\EggResource;
-use App\Filament\Components\Actions\ImportEggAction as ImportEggHeaderAction;
-use App\Filament\Components\Tables\Actions\ExportEggAction;
-use App\Filament\Components\Tables\Actions\ImportEggAction;
-use App\Filament\Components\Tables\Actions\UpdateEggAction;
 use App\Models\Egg;
-use Filament\Actions\CreateAction as CreateHeaderAction;
+use App\Services\Eggs\Sharing\EggExporterService;
+use App\Services\Eggs\Sharing\EggImporterService;
+use Exception;
+use Filament\Actions;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Tabs;
+use Filament\Forms\Components\Tabs\Tab;
+use Filament\Forms\Components\TextInput;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Actions\Action;
+use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Actions\ReplicateAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
-use Illuminate\Support\Str;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class ListEggs extends ListRecords
 {
@@ -33,7 +37,6 @@ class ListEggs extends ListRecords
                     ->label('Id')
                     ->hidden(),
                 TextColumn::make('name')
-                    ->label(trans('admin/egg.name'))
                     ->icon('tabler-egg')
                     ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
                     ->wrap()
@@ -42,50 +45,136 @@ class ListEggs extends ListRecords
                 TextColumn::make('servers_count')
                     ->counts('servers')
                     ->icon('tabler-server')
-                    ->label(trans('admin/egg.servers')),
+                    ->label('Servers'),
             ])
             ->actions([
-                EditAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('filament-actions::edit.single.label')),
-                ExportEggAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('filament-actions::export.modal.actions.export.label')),
-                UpdateEggAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('admin/egg.update')),
-                ReplicateAction::make()
-                    ->iconButton()
-                    ->tooltip(trans('filament-actions::replicate.single.label'))
-                    ->modal(false)
-                    ->excludeAttributes(['author', 'uuid', 'update_url', 'servers_count', 'created_at', 'updated_at'])
-                    ->beforeReplicaSaved(function (Egg $replica) {
-                        $replica->author = auth()->user()->email;
-                        $replica->name .= ' Copy';
-                        $replica->uuid = Str::uuid()->toString();
+                EditAction::make(),
+                Action::make('export')
+                    ->icon('tabler-download')
+                    ->label('Export')
+                    ->color('primary')
+                    ->action(fn (EggExporterService $service, Egg $egg) => response()->streamDownload(function () use ($service, $egg) {
+                        echo $service->handle($egg->id);
+                    }, 'egg-' . $egg->getKebabName() . '.json'))
+                    ->authorize(fn () => auth()->user()->can('export egg')),
+                Action::make('update')
+                    ->icon('tabler-cloud-download')
+                    ->label('Update')
+                    ->color('success')
+                    ->requiresConfirmation()
+                    ->modalHeading('Are you sure you want to update this egg?')
+                    ->modalDescription('If you made any changes to the egg they will be overwritten!')
+                    ->modalIconColor('danger')
+                    ->modalSubmitAction(fn (Actions\StaticAction $action) => $action->color('danger'))
+                    ->action(function (Egg $egg, EggImporterService $eggImporterService) {
+                        try {
+                            $eggImporterService->fromUrl($egg->update_url, $egg);
+
+                            cache()->forget("eggs.{$egg->uuid}.update");
+                        } catch (Exception $exception) {
+                            Notification::make()
+                                ->title('Egg Update failed')
+                                ->body($exception->getMessage())
+                                ->danger()
+                                ->send();
+
+                            report($exception);
+
+                            return;
+                        }
+
+                        Notification::make()
+                            ->title('Egg updated')
+                            ->success()
+                            ->send();
                     })
-                    ->after(fn (Egg $record, Egg $replica) => $record->variables->each(fn ($variable) => $variable->replicate()->fill(['egg_id' => $replica->id])->save()))
-                    ->successRedirectUrl(fn (Egg $replica) => EditEgg::getUrl(['record' => $replica])),
+                    ->authorize(fn () => auth()->user()->can('import egg'))
+                    ->visible(fn (Egg $egg) => cache()->get("eggs.{$egg->uuid}.update", false)),
             ])
-            ->groupedBulkActions([
-                DeleteBulkAction::make(),
-            ])
-            ->emptyStateIcon('tabler-eggs')
-            ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/egg.no_eggs'))
-            ->emptyStateActions([
-                CreateAction::make(),
-                ImportEggAction::make()
-                    ->multiple(),
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete egg')),
+                ]),
             ]);
     }
 
     protected function getHeaderActions(): array
     {
         return [
-            ImportEggHeaderAction::make()
-                ->multiple(),
-            CreateHeaderAction::make(),
+            Actions\CreateAction::make('create')->label('Create Egg'),
+
+            Actions\Action::make('import')
+                ->label('Import')
+                ->form([
+                    Tabs::make('Tabs')
+                        ->tabs([
+                            Tab::make('From File')
+                                ->icon('tabler-file-upload')
+                                ->schema([
+                                    FileUpload::make('egg')
+                                        ->label('Egg')
+                                        ->hint('This should be the json file ( egg-minecraft.json )')
+                                        ->acceptedFileTypes(['application/json'])
+                                        ->storeFiles(false)
+                                        ->multiple(),
+                                ]),
+                            Tab::make('From URL')
+                                ->icon('tabler-world-upload')
+                                ->schema([
+                                    TextInput::make('url')
+                                        ->label('URL')
+                                        ->hint('This URL should point to a single json file')
+                                        ->url(),
+                                ]),
+                        ])
+                        ->contained(false),
+
+                ])
+                ->action(function (array $data, EggImporterService $eggImportService): void {
+                    if (!empty($data['egg'])) {
+                        /** @var TemporaryUploadedFile[] $eggFile */
+                        $eggFile = $data['egg'];
+
+                        foreach ($eggFile as $file) {
+                            try {
+                                $eggImportService->fromFile($file);
+                            } catch (Exception $exception) {
+                                Notification::make()
+                                    ->title('Import Failed')
+                                    ->body($exception->getMessage())
+                                    ->danger()
+                                    ->send();
+
+                                report($exception);
+
+                                return;
+                            }
+                        }
+                    }
+
+                    if (!empty($data['url'])) {
+                        try {
+                            $eggImportService->fromUrl($data['url']);
+                        } catch (Exception $exception) {
+                            Notification::make()
+                                ->title('Import Failed')
+                                ->body($exception->getMessage())
+                                ->danger()
+                                ->send();
+
+                            report($exception);
+
+                            return;
+                        }
+                    }
+
+                    Notification::make()
+                        ->title('Import Success')
+                        ->success()
+                        ->send();
+                })
+                ->authorize(fn () => auth()->user()->can('import egg')),
         ];
     }
 }

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

@@ -16,10 +16,8 @@ class ServersRelationManager extends RelationManager
     {
         return $table
             ->recordTitleAttribute('servers')
-            ->emptyStateDescription(trans('admin/egg.no_servers'))
-            ->emptyStateHeading(trans('admin/egg.no_servers_help'))
+            ->emptyStateDescription('No Servers')->emptyStateHeading('No servers are assigned to this Egg.')
             ->searchable(false)
-            ->heading(trans('admin/egg.servers'))
             ->columns([
                 TextColumn::make('user.username')
                     ->label('Owner')
@@ -27,7 +25,6 @@ class ServersRelationManager extends RelationManager
                     ->url(fn (Server $server): string => route('filament.admin.resources.users.edit', ['record' => $server->user]))
                     ->sortable(),
                 TextColumn::make('name')
-                    ->label(trans('admin/server.name'))
                     ->icon('tabler-brand-docker')
                     ->url(fn (Server $server): string => route('filament.admin.resources.servers.edit', ['record' => $server]))
                     ->sortable(),
@@ -35,9 +32,9 @@ class ServersRelationManager extends RelationManager
                     ->icon('tabler-server-2')
                     ->url(fn (Server $server): string => route('filament.admin.resources.nodes.edit', ['record' => $server->node])),
                 TextColumn::make('image')
-                    ->label(trans('admin/server.docker_image')),
+                    ->label('Docker Image'),
                 SelectColumn::make('allocation.id')
-                    ->label(trans('admin/server.primary_allocation'))
+                    ->label('Primary Allocation')
                     ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
                     ->selectablePlaceholder(false)
                     ->sortable(),

app/Filament/Admin/Resources/MountResource.php

@@ -4,20 +4,7 @@ namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\MountResource\Pages;
 use App\Models\Mount;
-use Filament\Forms\Components\Group;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
-use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteBulkAction;
-use Filament\Tables\Actions\EditAction;
-use Filament\Tables\Actions\ViewAction;
-use Filament\Tables\Columns\TextColumn;
-use Filament\Tables\Table;
 
 class MountResource extends Resource
 {
@@ -25,148 +12,18 @@ class MountResource extends Resource
 
     protected static ?string $navigationIcon = 'tabler-layers-linked';
 
-    protected static ?string $recordTitleAttribute = 'name';
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/mount.nav_title');
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans('admin/mount.model_label');
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans('admin/mount.model_label_plural');
-    }
+    protected static ?string $navigationGroup = 'Advanced';
 
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;
     }
 
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.advanced');
-    }
-
-    public static function table(Table $table): Table
-    {
-        return $table
-            ->columns([
-                TextColumn::make('name')
-                    ->label(trans('admin/mount.table.name'))
-                    ->description(fn (Mount $mount) => "$mount->source -> $mount->target")
-                    ->sortable(),
-                TextColumn::make('eggs.name')
-                    ->icon('tabler-eggs')
-                    ->label(trans('admin/mount.eggs'))
-                    ->badge()
-                    ->placeholder(trans('admin/mount.table.all_eggs')),
-                TextColumn::make('nodes.name')
-                    ->icon('tabler-server-2')
-                    ->label(trans('admin/mount.nodes'))
-                    ->badge()
-                    ->placeholder(trans('admin/mount.table.all_nodes')),
-                TextColumn::make('read_only')
-                    ->label(trans('admin/mount.table.read_only'))
-                    ->badge()
-                    ->icon(fn ($state) => $state ? 'tabler-writing-off' : 'tabler-writing')
-                    ->color(fn ($state) => $state ? 'success' : 'warning')
-                    ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writeable')),
-            ])
-            ->actions([
-                ViewAction::make()
-                    ->hidden(fn ($record) => static::canEdit($record)),
-                EditAction::make(),
-            ])
-            ->groupedBulkActions([
-                DeleteBulkAction::make(),
-            ])
-            ->emptyStateIcon('tabler-layers-linked')
-            ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/mount.no_mounts'))
-            ->emptyStateActions([
-                CreateAction::make(),
-            ]);
-    }
-
-    public static function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                Section::make()->schema([
-                    TextInput::make('name')
-                        ->label(trans('admin/mount.name'))
-                        ->required()
-                        ->helperText(trans('admin/mount.name_help'))
-                        ->maxLength(64),
-                    ToggleButtons::make('read_only')
-                        ->label(trans('admin/mount.read_only'))
-                        ->helperText(trans('admin/mount.read_only_help'))
-                        ->options([
-                            false => trans('admin/mount.toggles.writable'),
-                            true => trans('admin/mount.toggles.read_only'),
-                        ])
-                        ->icons([
-                            false => 'tabler-writing',
-                            true => 'tabler-writing-off',
-                        ])
-                        ->colors([
-                            false => 'warning',
-                            true => 'success',
-                        ])
-                        ->inline()
-                        ->default(false)
-                        ->required(),
-                    TextInput::make('source')
-                        ->label(trans('admin/mount.source'))
-                        ->required()
-                        ->helperText(trans('admin/mount.source_help'))
-                        ->maxLength(255),
-                    TextInput::make('target')
-                        ->label(trans('admin/mount.target'))
-                        ->required()
-                        ->helperText(trans('admin/mount.target_help'))
-                        ->maxLength(255),
-                    Textarea::make('description')
-                        ->label(trans('admin/mount.description'))
-                        ->helperText(trans('admin/mount.description_help'))
-                        ->columnSpanFull(),
-                ])->columnSpan(1)->columns([
-                    'default' => 1,
-                    'lg' => 2,
-                ]),
-                Group::make()->schema([
-                    Section::make()->schema([
-                        Select::make('eggs')->multiple()
-                            ->label(trans('admin/mount.eggs'))
-                            ->relationship('eggs', 'name')
-                            ->preload(),
-                        Select::make('nodes')->multiple()
-                            ->label(trans('admin/mount.nodes'))
-                            ->relationship('nodes', 'name')
-                            ->searchable(['name', 'fqdn'])
-                            ->preload(),
-                    ]),
-                ])->columns([
-                    'default' => 1,
-                    'lg' => 2,
-                ]),
-            ])->columns([
-                'default' => 1,
-                'lg' => 2,
-            ]);
-    }
-
     public static function getPages(): array
     {
         return [
             'index' => Pages\ListMounts::route('/'),
             'create' => Pages\CreateMount::route('/create'),
-            'view' => Pages\ViewMount::route('/{record}'),
             'edit' => Pages\EditMount::route('/{record}/edit'),
         ];
     }

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

@@ -3,6 +3,14 @@
 namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
@@ -13,22 +21,90 @@ class CreateMount extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
-    protected function getHeaderActions(): array
+    public function form(Form $form): Form
     {
-        return [
-            $this->getCreateFormAction()->formId('form'),
-        ];
-    }
-
-    protected function getFormActions(): array
-    {
-        return [];
+        return $form
+            ->schema([
+                Section::make()->schema([
+                    TextInput::make('name')
+                        ->required()
+                        ->helperText('Unique name used to separate this mount from another.')
+                        ->maxLength(64),
+                    ToggleButtons::make('read_only')
+                        ->label('Read only?')
+                        ->helperText('Is the mount read only inside the container?')
+                        ->options([
+                            false => 'Writeable',
+                            true => 'Read only',
+                        ])
+                        ->icons([
+                            false => 'tabler-writing',
+                            true => 'tabler-writing-off',
+                        ])
+                        ->colors([
+                            false => 'warning',
+                            true => 'success',
+                        ])
+                        ->inline()
+                        ->default(false)
+                        ->required(),
+                    TextInput::make('source')
+                        ->required()
+                        ->helperText('File path on the host system to mount to a container.')
+                        ->maxLength(255),
+                    TextInput::make('target')
+                        ->required()
+                        ->helperText('Where the mount will be accessible inside a container.')
+                        ->maxLength(255),
+                    ToggleButtons::make('user_mountable')
+                        ->hidden()
+                        ->label('User mountable?')
+                        ->options([
+                            false => 'No',
+                            true => 'Yes',
+                        ])
+                        ->icons([
+                            false => 'tabler-user-cancel',
+                            true => 'tabler-user-bolt',
+                        ])
+                        ->colors([
+                            false => 'success',
+                            true => 'warning',
+                        ])
+                        ->default(false)
+                        ->inline()
+                        ->required(),
+                    Textarea::make('description')
+                        ->helperText('A longer description for this mount.')
+                        ->columnSpanFull(),
+                    Hidden::make('user_mountable')->default(1),
+                ])->columnSpan(1)->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+                Group::make()->schema([
+                    Section::make()->schema([
+                        Select::make('eggs')->multiple()
+                            ->relationship('eggs', 'name')
+                            ->preload(),
+                        Select::make('nodes')->multiple()
+                            ->relationship('nodes', 'name')
+                            ->searchable(['name', 'fqdn'])
+                            ->preload(),
+                    ]),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+            ])->columns([
+                'default' => 1,
+                'lg' => 2,
+            ]);
     }
 
     protected function handleRecordCreation(array $data): Model
     {
         $data['uuid'] ??= Str::uuid()->toString();
-        $data['user_mountable'] = 1;
 
         return parent::handleRecordCreation($data);
     }

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

@@ -3,17 +3,104 @@
 namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
-use Filament\Actions\DeleteAction;
+use Filament\Actions;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Textarea;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Form;
 use Filament\Resources\Pages\EditRecord;
 
 class EditMount extends EditRecord
 {
     protected static string $resource = MountResource::class;
 
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                Section::make()->schema([
+                    TextInput::make('name')
+                        ->required()
+                        ->helperText('Unique name used to separate this mount from another.')
+                        ->maxLength(64),
+                    ToggleButtons::make('read_only')
+                        ->label('Read only?')
+                        ->helperText('Is the mount read only inside the container?')
+                        ->options([
+                            false => 'Writeable',
+                            true => 'Read only',
+                        ])
+                        ->icons([
+                            false => 'tabler-writing',
+                            true => 'tabler-writing-off',
+                        ])
+                        ->colors([
+                            false => 'warning',
+                            true => 'success',
+                        ])
+                        ->inline()
+                        ->default(false)
+                        ->required(),
+                    TextInput::make('source')
+                        ->required()
+                        ->helperText('File path on the host system to mount to a container.')
+                        ->maxLength(255),
+                    TextInput::make('target')
+                        ->required()
+                        ->helperText('Where the mount will be accessible inside a container.')
+                        ->maxLength(255),
+                    ToggleButtons::make('user_mountable')
+                        ->hidden()
+                        ->label('User mountable?')
+                        ->options([
+                            false => 'No',
+                            true => 'Yes',
+                        ])
+                        ->icons([
+                            false => 'tabler-user-cancel',
+                            true => 'tabler-user-bolt',
+                        ])
+                        ->colors([
+                            false => 'success',
+                            true => 'warning',
+                        ])
+                        ->default(false)
+                        ->inline()
+                        ->required(),
+                    Textarea::make('description')
+                        ->helperText('A longer description for this mount.')
+                        ->columnSpanFull(),
+                ])->columnSpan(1)->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+                Group::make()->schema([
+                    Section::make()->schema([
+                        Select::make('eggs')->multiple()
+                            ->relationship('eggs', 'name')
+                            ->preload(),
+                        Select::make('nodes')->multiple()
+                            ->relationship('nodes', 'name')
+                            ->searchable(['name', 'fqdn'])
+                            ->preload(),
+                    ]),
+                ])->columns([
+                    'default' => 1,
+                    'lg' => 2,
+                ]),
+            ])->columns([
+                'default' => 1,
+                'lg' => 2,
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
-            DeleteAction::make(),
+            Actions\DeleteAction::make(),
             $this->getSaveFormAction()->formId('form'),
         ];
     }

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

@@ -4,17 +4,65 @@ namespace App\Filament\Admin\Resources\MountResource\Pages;
 
 use App\Filament\Admin\Resources\MountResource;
 use App\Models\Mount;
-use Filament\Actions\CreateAction;
+use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Actions\BulkActionGroup;
+use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Actions\EditAction;
+use Filament\Tables\Columns\IconColumn;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
 
 class ListMounts extends ListRecords
 {
     protected static string $resource = MountResource::class;
 
+    public function table(Table $table): Table
+    {
+        return $table
+            ->searchable(false)
+            ->columns([
+                TextColumn::make('name')
+                    ->searchable(),
+                TextColumn::make('source')
+                    ->searchable(),
+                TextColumn::make('target')
+                    ->searchable(),
+                IconColumn::make('read_only')
+                    ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
+                    ->color(fn (bool $state) => $state ? 'success' : 'danger')
+                    ->sortable(),
+                IconColumn::make('user_mountable')
+                    ->hidden()
+                    ->icon(fn (bool $state) => $state ? 'tabler-circle-check-filled' : 'tabler-circle-x-filled')
+                    ->color(fn (bool $state) => $state ? 'success' : 'danger')
+                    ->sortable(),
+            ])
+            ->actions([
+                EditAction::make(),
+            ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete mount')),
+                ]),
+            ])
+            ->emptyStateIcon('tabler-layers-linked')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('No Mounts')
+            ->emptyStateActions([
+                CreateAction::make('create')
+                    ->label('Create Mount')
+                    ->button(),
+            ]);
+    }
+
     protected function getHeaderActions(): array
     {
         return [
-            CreateAction::make()
+            Actions\CreateAction::make()
+                ->label('Create Mount')
                 ->hidden(fn () => Mount::count() <= 0),
         ];
     }

app/Filament/Admin/Resources/MountResource/Pages/ViewMount.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\MountResource\Pages;
-
-use App\Filament\Admin\Resources\MountResource;
-use Filament\Actions\EditAction;
-use Filament\Resources\Pages\ViewRecord;
-
-class ViewMount extends ViewRecord
-{
-    protected static string $resource = MountResource::class;
-
-    protected function getHeaderActions(): array
-    {
-        return [
-            EditAction::make(),
-        ];
-    }
-}

app/Filament/Admin/Resources/NodeResource.php

@@ -15,26 +15,6 @@ class NodeResource extends Resource
 
     protected static ?string $recordTitleAttribute = 'name';
 
-    public static function getNavigationLabel(): string
-    {
-        return trans('admin/node.nav_title');
-    }
-
-    public static function getModelLabel(): string
-    {
-        return trans('admin/node.model_label');
-    }
-
-    public static function getPluralModelLabel(): string
-    {
-        return trans('admin/node.model_label_plural');
-    }
-
-    public static function getNavigationGroup(): ?string
-    {
-        return trans('admin/dashboard.server');
-    }
-
     public static function getNavigationBadge(): ?string
     {
         return static::getModel()::count() ?: null;

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

@@ -23,13 +23,15 @@ class CreateNode extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
+    protected ?string $subheading = 'which is a machine that runs your Servers';
+
     public function form(Forms\Form $form): Forms\Form
     {
         return $form
             ->schema([
                 Wizard::make([
                     Step::make('basic')
-                        ->label(trans('admin/node.tabs.basic_settings'))
+                        ->label('Basic Settings')
                         ->icon('tabler-server')
                         ->columnSpanFull()
                         ->columns([
@@ -45,23 +47,29 @@ class CreateNode extends CreateRecord
                                 ->autofocus()
                                 ->live(debounce: 1500)
                                 ->rule('prohibited', fn ($state) => is_ip($state) && request()->isSecure())
-                                ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
+                                ->label(fn ($state) => is_ip($state) ? 'IP Address' : 'Domain Name')
                                 ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
                                 ->helperText(function ($state) {
                                     if (is_ip($state)) {
                                         if (request()->isSecure()) {
-                                            return trans('admin/node.fqdn_help');
+                                            return '
+                                    Your panel is currently secured via an SSL certificate and that means your nodes require one too.
+                                    You must use a domain name, because you cannot get SSL certificates for IP Addresses
+                                ';
                                         }
 
                                         return '';
                                     }
 
-                                    return trans('admin/node.error');
+                                    return "
+                            This is the domain name that points to your node's IP Address.
+                            If you've already set up this, you can verify it by checking the next field!
+                            ";
                                 })
                                 ->hintColor('danger')
                                 ->hint(function ($state) {
                                     if (is_ip($state) && request()->isSecure()) {
-                                        return trans('admin/node.ssl_ip');
+                                        return 'You cannot connect to an IP Address over SSL';
                                     }
 
                                     return '';
@@ -99,16 +107,16 @@ class CreateNode extends CreateRecord
                                 ->hidden(),
 
                             ToggleButtons::make('dns')
-                                ->label(trans('admin/node.dns'))
-                                ->helperText(trans('admin/node.dns_help'))
+                                ->label('DNS Record Check')
+                                ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
                                 ->disabled()
                                 ->inline()
                                 ->default(null)
                                 ->hint(fn (Get $get) => $get('ip'))
                                 ->hintColor('success')
                                 ->options([
-                                    true => trans('admin/node.valid'),
-                                    false => trans('admin/node.invalid'),
+                                    true => 'Valid',
+                                    false => 'Invalid',
                                 ])
                                 ->colors([
                                     true => 'success',
@@ -128,8 +136,8 @@ class CreateNode extends CreateRecord
                                     'md' => 1,
                                     'lg' => 1,
                                 ])
-                                ->label(trans('admin/node.port'))
-                                ->helperText(trans('admin/node.port_help'))
+                                ->label(trans('strings.port'))
+                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(8080)
@@ -137,7 +145,7 @@ class CreateNode extends CreateRecord
                                 ->integer(),
 
                             TextInput::make('name')
-                                ->label(trans('admin/node.display_name'))
+                                ->label('Display Name')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -145,10 +153,11 @@ class CreateNode extends CreateRecord
                                     'lg' => 2,
                                 ])
                                 ->required()
+                                ->helperText('This name is for display only and can be changed later.')
                                 ->maxLength(100),
 
                             ToggleButtons::make('scheme')
-                                ->label(trans('admin/node.ssl'))
+                                ->label('Communicate over SSL')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -158,11 +167,11 @@ class CreateNode extends CreateRecord
                                 ->inline()
                                 ->helperText(function (Get $get) {
                                     if (request()->isSecure()) {
-                                        return new HtmlString(trans('admin/node.panel_on_ssl'));
+                                        return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
                                     }
 
                                     if (is_ip($get('fqdn'))) {
-                                        return trans('admin/node.ssl_help');
+                                        return 'An IP address cannot use SSL.';
                                     }
 
                                     return '';
@@ -183,7 +192,7 @@ class CreateNode extends CreateRecord
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'),
                         ]),
                     Step::make('advanced')
-                        ->label(trans('admin/node.tabs.advanced_settings'))
+                        ->label('Advanced Settings')
                         ->icon('tabler-server-cog')
                         ->columnSpanFull()
                         ->columns([
@@ -194,14 +203,14 @@ class CreateNode extends CreateRecord
                         ])
                         ->schema([
                             ToggleButtons::make('maintenance_mode')
-                                ->label(trans('admin/node.maintenance_mode'))->inline()
+                                ->label('Maintenance Mode')->inline()
                                 ->columnSpan(1)
                                 ->default(false)
                                 ->hinticon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/node.maintenance_mode_help'))
+                                ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
                                 ->options([
-                                    true => trans('admin/node.enabled'),
-                                    false => trans('admin/node.disabled'),
+                                    true => 'Enable',
+                                    false => 'Disable',
                                 ])
                                 ->colors([
                                     true => 'danger',
@@ -210,23 +219,21 @@ class CreateNode extends CreateRecord
                             ToggleButtons::make('public')
                                 ->default(true)
                                 ->columnSpan(1)
-                                ->label(trans('admin/node.use_for_deploy'))->inline()
+                                ->label('Use Node for deployment?')->inline()
                                 ->options([
-                                    true => trans('admin/node.yes'),
-                                    false => trans('admin/node.no'),
+                                    true => 'Yes',
+                                    false => 'No',
                                 ])
                                 ->colors([
                                     true => 'success',
                                     false => 'danger',
                                 ]),
                             TagsInput::make('tags')
-                                ->label(trans('admin/node.tags'))
+                                ->placeholder('Add Tags')
                                 ->columnSpan(2),
                             TextInput::make('upload_size')
-                                ->label(trans('admin/node.upload_limit'))
-                                ->helperText(trans('admin/node.upload_limit_help.0'))
-                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/node.upload_limit_help.1'))
+                                ->label('Upload Limit')
+                                ->helperText('Enter the maximum size of files that can be uploaded through the web-based file manager.')
                                 ->columnSpan(1)
                                 ->numeric()->required()
                                 ->default(256)
@@ -235,7 +242,7 @@ class CreateNode extends CreateRecord
                                 ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
                             TextInput::make('daemon_sftp')
                                 ->columnSpan(1)
-                                ->label(trans('admin/node.sftp_port'))
+                                ->label('SFTP Port')
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(2022)
@@ -243,22 +250,21 @@ class CreateNode extends CreateRecord
                                 ->integer(),
                             TextInput::make('daemon_sftp_alias')
                                 ->columnSpan(2)
-                                ->label(trans('admin/node.sftp_alias'))
-                                ->helperText(trans('admin/node.sftp_alias_help')),
+                                ->label('SFTP Alias')
+                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
                             Grid::make()
                                 ->columns(6)
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_mem')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.memory'))->inlineLabel()->inline()
+                                        ->label('Memory')->inlineLabel()->inline()
                                         ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
                                         ->live()
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -268,7 +274,7 @@ class CreateNode extends CreateRecord
                                     TextInput::make('memory')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->label(trans('admin/node.memory_limit'))->inlineLabel()
+                                        ->label('Memory Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->columnSpan(2)
                                         ->numeric()
@@ -277,8 +283,10 @@ class CreateNode extends CreateRecord
                                         ->required(),
                                     TextInput::make('memory_overallocate')
                                         ->dehydratedWhenHidden()
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(-1)
@@ -292,15 +300,14 @@ class CreateNode extends CreateRecord
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_disk')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.disk'))->inlineLabel()->inline()
+                                        ->label('Disk')->inlineLabel()->inline()
                                         ->live()
                                         ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -310,7 +317,7 @@ class CreateNode extends CreateRecord
                                     TextInput::make('disk')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label(trans('admin/node.disk_limit'))->inlineLabel()
+                                        ->label('Disk Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->columnSpan(2)
                                         ->numeric()
@@ -320,7 +327,9 @@ class CreateNode extends CreateRecord
                                     TextInput::make('disk_overallocate')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->minValue(-1)
@@ -334,15 +343,14 @@ class CreateNode extends CreateRecord
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_cpu')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.cpu'))->inlineLabel()->inline()
+                                        ->label('CPU')->inlineLabel()->inline()
                                         ->live()
                                         ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -352,7 +360,7 @@ class CreateNode extends CreateRecord
                                     TextInput::make('cpu')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label(trans('admin/node.cpu_limit'))->inlineLabel()
+                                        ->label('CPU Limit')->inlineLabel()
                                         ->suffix('%')
                                         ->columnSpan(2)
                                         ->numeric()
@@ -362,7 +370,9 @@ class CreateNode extends CreateRecord
                                     TextInput::make('cpu_overallocate')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
                                         ->numeric()
                                         ->default(0)
@@ -373,7 +383,7 @@ class CreateNode extends CreateRecord
                                 ]),
                         ]),
                 ])->columnSpanFull()
-                    ->nextAction(fn (Action $action) => $action->label(trans('admin/node.next_step')))
+                    ->nextAction(fn (Action $action) => $action->label('Next Step'))
                     ->submitAction(new HtmlString(Blade::render(<<<'BLADE'
                                         <x-filament::button
                                                 type="submit"

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

@@ -7,7 +7,6 @@ use App\Models\Node;
 use App\Services\Helpers\SoftwareVersionService;
 use App\Services\Nodes\NodeAutoDeployService;
 use App\Services\Nodes\NodeUpdateService;
-use Exception;
 use Filament\Actions;
 use Filament\Forms;
 use Filament\Forms\Components\Actions as FormActions;
@@ -26,7 +25,6 @@ use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Enums\Alignment;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
@@ -34,15 +32,6 @@ class EditNode extends EditRecord
 {
     protected static string $resource = NodeResource::class;
 
-    private bool $errored = false;
-
-    private NodeUpdateService $nodeUpdateService;
-
-    public function boot(NodeUpdateService $nodeUpdateService): void
-    {
-        $this->nodeUpdateService = $nodeUpdateService;
-    }
-
     public function form(Forms\Form $form): Forms\Form
     {
         return $form->schema([
@@ -57,7 +46,7 @@ class EditNode extends EditRecord
                 ->columnSpanFull()
                 ->tabs([
                     Tab::make('')
-                        ->label(trans('admin/node.tabs.overview'))
+                        ->label('Overview')
                         ->icon('tabler-chart-area-line-filled')
                         ->columns([
                             'default' => 4,
@@ -67,21 +56,21 @@ class EditNode extends EditRecord
                         ])
                         ->schema([
                             Fieldset::make()
-                                ->label(trans('admin/node.node_info'))
+                                ->label('Node Information')
                                 ->columns(4)
                                 ->schema([
                                     Placeholder::make('')
-                                        ->label(trans('admin/node.wings_version'))
-                                        ->content(fn (Node $node, SoftwareVersionService $versionService) => ($node->systemInformation()['version'] ?? trans('admin/node.unknown')) . ' (' . trans('admin/node.latest') . ': ' . $versionService->latestWingsVersion() . ')'),
+                                        ->label('Wings Version')
+                                        ->content(fn (Node $node, SoftwareVersionService $versionService) => ($node->systemInformation()['version'] ?? 'Unknown') . ' (Latest: ' . $versionService->latestWingsVersion() . ')'),
                                     Placeholder::make('')
-                                        ->label(trans('admin/node.cpu_threads'))
+                                        ->label('CPU Threads')
                                         ->content(fn (Node $node) => $node->systemInformation()['cpu_count'] ?? 0),
                                     Placeholder::make('')
-                                        ->label(trans('admin/node.architecture'))
-                                        ->content(fn (Node $node) => $node->systemInformation()['architecture'] ?? trans('admin/node.unknown')),
+                                        ->label('Architecture')
+                                        ->content(fn (Node $node) => $node->systemInformation()['architecture'] ?? 'Unknown'),
                                     Placeholder::make('')
-                                        ->label(trans('admin/node.kernel'))
-                                        ->content(fn (Node $node) => $node->systemInformation()['kernel_version'] ?? trans('admin/node.unknown')),
+                                        ->label('Kernel')
+                                        ->content(fn (Node $node) => $node->systemInformation()['kernel_version'] ?? 'Unknown'),
                                 ]),
                             View::make('filament.components.node-cpu-chart')
                                 ->columnSpan([
@@ -97,10 +86,9 @@ class EditNode extends EditRecord
                                     'md' => 2,
                                     'lg' => 2,
                                 ]),
-                            View::make('filament.components.node-storage-chart')
-                                ->columnSpanFull(),
+                            // TODO: Make purdy View::make('filament.components.node-storage-chart')->columnSpan(3),
                         ]),
-                    Tab::make(trans('admin/node.tabs.basic_settings'))
+                    Tab::make('Basic Settings')
                         ->icon('tabler-server')
                         ->schema([
                             TextInput::make('fqdn')
@@ -109,23 +97,29 @@ class EditNode extends EditRecord
                                 ->autofocus()
                                 ->live(debounce: 1500)
                                 ->rule('prohibited', fn ($state) => is_ip($state) && request()->isSecure())
-                                ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
+                                ->label(fn ($state) => is_ip($state) ? 'IP Address' : 'Domain Name')
                                 ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
                                 ->helperText(function ($state) {
                                     if (is_ip($state)) {
                                         if (request()->isSecure()) {
-                                            return trans('admin/node.fqdn_help');
+                                            return '
+                                    Your panel is currently secured via an SSL certificate and that means your nodes require one too.
+                                    You must use a domain name, because you cannot get SSL certificates for IP Addresses.
+                                ';
                                         }
 
                                         return '';
                                     }
 
-                                    return trans('admin/node.error');
+                                    return "
+                            This is the domain name that points to your node's IP Address.
+                            If you've already set up this, you can verify it by checking the next field!
+                        ";
                                 })
                                 ->hintColor('danger')
                                 ->hint(function ($state) {
                                     if (is_ip($state) && request()->isSecure()) {
-                                        return trans('admin/node.ssl_ip');
+                                        return 'You cannot connect to an IP Address over SSL!';
                                     }
 
                                     return '';
@@ -161,16 +155,16 @@ class EditNode extends EditRecord
                                 ->disabled()
                                 ->hidden(),
                             ToggleButtons::make('dns')
-                                ->label(trans('admin/node.dns'))
-                                ->helperText(trans('admin/node.dns_help'))
+                                ->label('DNS Record Check')
+                                ->helperText('This lets you know if your DNS record correctly points to an IP Address.')
                                 ->disabled()
                                 ->inline()
                                 ->default(null)
                                 ->hint(fn (Get $get) => $get('ip'))
                                 ->hintColor('success')
                                 ->options([
-                                    true => trans('admin/node.valid'),
-                                    false => trans('admin/node.invalid'),
+                                    true => 'Valid',
+                                    false => 'Invalid',
                                 ])
                                 ->colors([
                                     true => 'success',
@@ -179,15 +173,15 @@ class EditNode extends EditRecord
                                 ->columnSpan(1),
                             TextInput::make('daemon_listen')
                                 ->columnSpan(1)
-                                ->label(trans('admin/node.port'))
-                                ->helperText(trans('admin/node.port_help'))
+                                ->label(trans('strings.port'))
+                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(8080)
                                 ->required()
                                 ->integer(),
                             TextInput::make('name')
-                                ->label(trans('admin/node.display_name'))
+                                ->label('Display Name')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -195,18 +189,19 @@ class EditNode extends EditRecord
                                     'lg' => 2,
                                 ])
                                 ->required()
+                                ->helperText('This name is for display only and can be changed later.')
                                 ->maxLength(100),
                             ToggleButtons::make('scheme')
-                                ->label(trans('admin/node.ssl'))
+                                ->label('Communicate over SSL')
                                 ->columnSpan(1)
                                 ->inline()
                                 ->helperText(function (Get $get) {
                                     if (request()->isSecure()) {
-                                        return new HtmlString(trans('admin/node.panel_on_ssl'));
+                                        return new HtmlString('Your Panel is using a secure SSL connection,<br>so your Daemon must too.');
                                     }
 
                                     if (is_ip($get('fqdn'))) {
-                                        return trans('admin/node.ssl_help');
+                                        return 'An IP address cannot use SSL.';
                                     }
 
                                     return '';
@@ -225,8 +220,7 @@ class EditNode extends EditRecord
                                     'https' => 'tabler-lock',
                                 ])
                                 ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
-                    Tab::make('adv')
-                        ->label(trans('admin/node.tabs.advanced_settings'))
+                    Tab::make('Advanced Settings')
                         ->columns([
                             'default' => 1,
                             'sm' => 1,
@@ -236,7 +230,7 @@ class EditNode extends EditRecord
                         ->icon('tabler-server-cog')
                         ->schema([
                             TextInput::make('id')
-                                ->label(trans('admin/node.node_id'))
+                                ->label('Node ID')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
@@ -251,18 +245,17 @@ class EditNode extends EditRecord
                                     'md' => 2,
                                     'lg' => 2,
                                 ])
-                                ->label(trans('admin/node.node_uuid'))
-                                ->hintAction(fn () => request()->isSecure() ? CopyAction::make() : null)
+                                ->label('Node UUID')
+                                ->hintAction(CopyAction::make())
                                 ->disabled(),
                             TagsInput::make('tags')
-                                ->label(trans('admin/node.tags'))
-                                ->placeholder('')
                                 ->columnSpan([
                                     'default' => 1,
                                     'sm' => 1,
                                     'md' => 2,
                                     'lg' => 2,
-                                ]),
+                                ])
+                                ->placeholder('Add Tags'),
                             TextInput::make('upload_size')
                                 ->columnSpan([
                                     'default' => 1,
@@ -270,9 +263,9 @@ class EditNode extends EditRecord
                                     'md' => 2,
                                     'lg' => 1,
                                 ])
-                                ->label(trans('admin/node.upload_limit'))
+                                ->label('Upload Limit')
                                 ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/node.upload_limit_help.0') . trans('admin/node.upload_limit_help.1'))
+                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
                                 ->numeric()->required()
                                 ->minValue(1)
                                 ->maxValue(1024)
@@ -284,7 +277,7 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 3,
                                 ])
-                                ->label(trans('admin/node.sftp_port'))
+                                ->label('SFTP Port')
                                 ->minValue(1)
                                 ->maxValue(65535)
                                 ->default(2022)
@@ -297,8 +290,8 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 3,
                                 ])
-                                ->label(trans('admin/node.sftp_alias'))
-                                ->helperText(trans('admin/node.sftp_alias_help')),
+                                ->label('SFTP Alias')
+                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
                             ToggleButtons::make('public')
                                 ->columnSpan([
                                     'default' => 1,
@@ -306,10 +299,10 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 3,
                                 ])
-                                ->label(trans('admin/node.use_for_deploy'))->inline()
+                                ->label('Use Node for deployment?')->inline()
                                 ->options([
-                                    true => trans('admin/node.yes'),
-                                    false => trans('admin/node.no'),
+                                    true => 'Yes',
+                                    false => 'No',
                                 ])
                                 ->colors([
                                     true => 'success',
@@ -322,12 +315,12 @@ class EditNode extends EditRecord
                                     'md' => 1,
                                     'lg' => 3,
                                 ])
-                                ->label(trans('admin/node.maintenance_mode'))->inline()
+                                ->label('Maintenance Mode')->inline()
                                 ->hinticon('tabler-question-mark')
-                                ->hintIconTooltip(trans('admin/node.maintenance_mode_help'))
+                                ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
                                 ->options([
-                                    true => trans('admin/node.enabled'),
-                                    false => trans('admin/node.disabled'),
+                                    false => 'Disable',
+                                    true => 'Enable',
                                 ])
                                 ->colors([
                                     false => 'success',
@@ -343,15 +336,14 @@ class EditNode extends EditRecord
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_mem')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.memory'))->inlineLabel()->inline()
+                                        ->label('Memory')->inlineLabel()->inline()
                                         ->afterStateUpdated(fn (Set $set) => $set('memory', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('memory_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('memory') == 0)
                                         ->live()
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -366,7 +358,7 @@ class EditNode extends EditRecord
                                     TextInput::make('memory')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
-                                        ->label(trans('admin/node.memory_limit'))->inlineLabel()
+                                        ->label('Memory Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
                                         ->columnSpan([
@@ -379,9 +371,11 @@ class EditNode extends EditRecord
                                         ->minValue(0),
                                     TextInput::make('memory_overallocate')
                                         ->dehydratedWhenHidden()
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
                                         ->required()
                                         ->hidden(fn (Get $get) => $get('unlimited_mem'))
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan([
                                             'default' => 1,
                                             'sm' => 1,
@@ -402,15 +396,14 @@ class EditNode extends EditRecord
                                 ])
                                 ->schema([
                                     ToggleButtons::make('unlimited_disk')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.disk'))->inlineLabel()->inline()
+                                        ->label('Disk')->inlineLabel()->inline()
                                         ->live()
                                         ->afterStateUpdated(fn (Set $set) => $set('disk', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('disk_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('disk') == 0)
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -425,7 +418,7 @@ class EditNode extends EditRecord
                                     TextInput::make('disk')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label(trans('admin/node.disk_limit'))->inlineLabel()
+                                        ->label('Disk Limit')->inlineLabel()
                                         ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                         ->required()
                                         ->columnSpan([
@@ -439,7 +432,9 @@ class EditNode extends EditRecord
                                     TextInput::make('disk_overallocate')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_disk'))
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan([
                                             'default' => 1,
                                             'sm' => 1,
@@ -457,15 +452,14 @@ class EditNode extends EditRecord
                                 ->columnSpanFull()
                                 ->schema([
                                     ToggleButtons::make('unlimited_cpu')
-                                        ->dehydrated()
-                                        ->label(trans('admin/node.cpu'))->inlineLabel()->inline()
+                                        ->label('CPU')->inlineLabel()->inline()
                                         ->live()
                                         ->afterStateUpdated(fn (Set $set) => $set('cpu', 0))
                                         ->afterStateUpdated(fn (Set $set) => $set('cpu_overallocate', 0))
                                         ->formatStateUsing(fn (Get $get) => $get('cpu') == 0)
                                         ->options([
-                                            true => trans('admin/node.unlimited'),
-                                            false => trans('admin/node.limited'),
+                                            true => 'Unlimited',
+                                            false => 'Limited',
                                         ])
                                         ->colors([
                                             true => 'primary',
@@ -475,7 +469,7 @@ class EditNode extends EditRecord
                                     TextInput::make('cpu')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label(trans('admin/node.cpu_limit'))->inlineLabel()
+                                        ->label('CPU Limit')->inlineLabel()
                                         ->suffix('%')
                                         ->required()
                                         ->columnSpan(2)
@@ -484,7 +478,9 @@ class EditNode extends EditRecord
                                     TextInput::make('cpu_overallocate')
                                         ->dehydratedWhenHidden()
                                         ->hidden(fn (Get $get) => $get('unlimited_cpu'))
-                                        ->label(trans('admin/node.overallocate'))->inlineLabel()
+                                        ->label('Overallocate')->inlineLabel()
+                                        ->hintIcon('tabler-question-mark')
+                                        ->hintIconTooltip('The % allowable to go over the set limit.')
                                         ->columnSpan(2)
                                         ->required()
                                         ->numeric()
@@ -493,28 +489,28 @@ class EditNode extends EditRecord
                                         ->suffix('%'),
                                 ]),
                         ]),
-                    Tab::make('Config')
-                        ->label(trans('admin/node.tabs.config_file'))
+                    Tab::make('Configuration File')
                         ->icon('tabler-code')
                         ->schema([
                             Placeholder::make('instructions')
-                                ->label(trans('admin/node.instructions'))
                                 ->columnSpanFull()
-                                ->content(new HtmlString(trans('admin/node.instructions_help'))),
+                                ->content(new HtmlString('
+                                  Save this file to your <span title="usually /etc/pelican/">daemon\'s root directory</span>, named <code>config.yml</code>
+                            ')),
                             Textarea::make('config')
                                 ->label('/etc/pelican/config.yml')
                                 ->disabled()
                                 ->rows(19)
-                                ->hintAction(fn () => request()->isSecure() ? CopyAction::make() : null)
+                                ->hintAction(CopyAction::make())
                                 ->columnSpanFull(),
                             Grid::make()
                                 ->columns()
                                 ->schema([
                                     FormActions::make([
                                         FormActions\Action::make('autoDeploy')
-                                            ->label(trans('admin/node.auto_deploy'))
+                                            ->label('Auto Deploy Command')
                                             ->color('primary')
-                                            ->modalHeading(trans('admin/node.auto_deploy'))
+                                            ->modalHeading('Auto Deploy Command')
                                             ->icon('tabler-rocket')
                                             ->modalSubmitAction(false)
                                             ->modalCancelAction(false)
@@ -523,13 +519,13 @@ class EditNode extends EditRecord
                                                 ToggleButtons::make('docker')
                                                     ->label('Type')
                                                     ->live()
-                                                    ->helperText(trans('admin/node.auto_question'))
+                                                    ->helperText('Choose between Standalone and Docker install.')
                                                     ->inline()
                                                     ->default(false)
                                                     ->afterStateUpdated(fn (bool $state, NodeAutoDeployService $service, Node $node, Set $set) => $set('generatedToken', $service->handle(request(), $node, $state)))
                                                     ->options([
-                                                        false => trans('admin/node.standalone'),
-                                                        true => trans('admin/node.docker'),
+                                                        false => 'Standalone',
+                                                        true => 'Docker',
                                                     ])
                                                     ->colors([
                                                         false => 'primary',
@@ -537,26 +533,27 @@ class EditNode extends EditRecord
                                                     ])
                                                     ->columnSpan(1),
                                                 Textarea::make('generatedToken')
-                                                    ->label(trans('admin/node.auto_command'))
+                                                    ->label('To auto-configure your node run the following command:')
                                                     ->readOnly()
                                                     ->autosize()
-                                                    ->hintAction(fn (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
+                                                    ->hintAction(fn (string $state) => CopyAction::make()->copyable($state))
                                                     ->formatStateUsing(fn (NodeAutoDeployService $service, Node $node, Set $set, Get $get) => $set('generatedToken', $service->handle(request(), $node, $get('docker')))),
                                             ])
                                             ->mountUsing(function (Forms\Form $form) {
+                                                Notification::make()->success()->title('Autodeploy Generated')->send();
                                                 $form->fill();
                                             }),
                                     ])->fullWidth(),
                                     FormActions::make([
                                         FormActions\Action::make('resetKey')
-                                            ->label(trans('admin/node.reset_token'))
+                                            ->label('Reset Daemon Token')
                                             ->color('danger')
                                             ->requiresConfirmation()
-                                            ->modalHeading(trans('admin/node.reset_token'))
-                                            ->modalDescription(trans('admin/node.reset_help'))
-                                            ->action(function (Node $node) {
-                                                $this->nodeUpdateService->handle($node, [], true);
-                                                Notification::make()->success()->title(trans('admin/node.token_reset'))->send();
+                                            ->modalHeading('Reset Daemon Token?')
+                                            ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
+                                            ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
+                                                $nodeUpdateService->handle($node, [], true);
+                                                Notification::make()->success()->title('Daemon Key Reset')->send();
                                                 $this->fillForm();
                                             }),
                                     ])->fullWidth(),
@@ -585,39 +582,6 @@ class EditNode extends EditRecord
         return $data;
     }
 
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        if (!$record instanceof Node) {
-            return $record;
-        }
-
-        try {
-            $record = $this->nodeUpdateService->handle($record, $data);
-        } catch (Exception $exception) {
-            $this->errored = true;
-
-            Notification::make()
-                ->title(trans('admin/node.error_connecting', ['node' => $record->name]))
-                ->body(trans('admin/node.error_connecting_description'))
-                ->color('warning')
-                ->icon('tabler-database')
-                ->warning()
-                ->send();
-
-        }
-
-        return parent::handleRecordUpdate($record, $data);
-    }
-
-    protected function getSavedNotification(): ?Notification
-    {
-        if ($this->errored) {
-            return null;
-        }
-
-        return parent::getSavedNotification();
-    }
-
     protected function getFormActions(): array
     {
         return [];
@@ -628,7 +592,7 @@ class EditNode extends EditRecord
         return [
             Actions\DeleteAction::make()
                 ->disabled(fn (Node $node) => $node->servers()->count() > 0)
-                ->label(fn (Node $node) => $node->servers()->count() > 0 ? trans('admin/node.node_has_servers') : trans('filament-actions::delete.single.label')),
+                ->label(fn (Node $node) => $node->servers()->count() > 0 ? 'Node Has Servers' : 'Delete'),
             $this->getSaveFormAction()->formId('form'),
         ];
     }

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

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources\NodeResource\Pages;
 
 use App\Filament\Admin\Resources\NodeResource;
-use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Models\Node;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
@@ -12,6 +11,7 @@ use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
+use Illuminate\Support\Number;
 
 class ListNodes extends ListRecords
 {
@@ -27,18 +27,40 @@ class ListNodes extends ListRecords
                     ->label('UUID')
                     ->searchable()
                     ->hidden(),
-                NodeHealthColumn::make('health'),
+                IconColumn::make('health')
+                    ->alignCenter()
+                    ->state(fn (Node $node) => $node)
+                    ->view('livewire.columns.version-column'),
                 TextColumn::make('name')
-                    ->label(trans('admin/node.table.name'))
                     ->icon('tabler-server-2')
                     ->sortable()
                     ->searchable(),
                 TextColumn::make('fqdn')
                     ->visibleFrom('md')
-                    ->label(trans('admin/node.table.address'))
+                    ->label('Address')
                     ->icon('tabler-network')
                     ->sortable()
                     ->searchable(),
+                TextColumn::make('memory')
+                    ->visibleFrom('sm')
+                    ->icon('tabler-device-desktop-analytics')
+                    ->numeric()
+                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
+                    ->formatStateUsing(fn ($state) => Number::format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), maxPrecision: 2, locale: auth()->user()->language))
+                    ->sortable(),
+                TextColumn::make('disk')
+                    ->visibleFrom('sm')
+                    ->icon('tabler-file')
+                    ->numeric()
+                    ->suffix(config('panel.use_binary_prefix') ? ' GiB' : ' GB')
+                    ->formatStateUsing(fn ($state) => Number::format($state / (config('panel.use_binary_prefix') ? 1024 : 1000), maxPrecision: 2, locale: auth()->user()->language))
+                    ->sortable(),
+                TextColumn::make('cpu')
+                    ->visibleFrom('sm')
+                    ->icon('tabler-cpu')
+                    ->numeric()
+                    ->suffix(' %')
+                    ->sortable(),
                 IconColumn::make('scheme')
                     ->visibleFrom('xl')
                     ->label('SSL')
@@ -46,14 +68,13 @@ class ListNodes extends ListRecords
                     ->falseIcon('tabler-lock-open-off')
                     ->state(fn (Node $node) => $node->scheme === 'https'),
                 IconColumn::make('public')
-                    ->label(trans('admin/node.table.public'))
                     ->visibleFrom('lg')
                     ->trueIcon('tabler-eye-check')
                     ->falseIcon('tabler-eye-cancel'),
                 TextColumn::make('servers_count')
                     ->visibleFrom('sm')
                     ->counts('servers')
-                    ->label(trans('admin/node.table.servers'))
+                    ->label('Servers')
                     ->sortable()
                     ->icon('tabler-brand-docker'),
             ])
@@ -62,9 +83,11 @@ class ListNodes extends ListRecords
             ])
             ->emptyStateIcon('tabler-server-2')
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/node.no_nodes'))
+            ->emptyStateHeading('No Nodes')
             ->emptyStateActions([
-                CreateAction::make(),
+                CreateAction::make('create')
+                    ->label('Create Node')
+                    ->button(),
             ]);
     }
 
@@ -72,6 +95,7 @@ class ListNodes extends ListRecords
     {
         return [
             Actions\CreateAction::make()
+                ->label('Create Node')
                 ->hidden(fn () => Node::count() <= 0),
         ];
     }