Merge branch 'main' into lance/cloud

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -64,9 +64,10 @@ body:
     label: Error Logs
     description: |
       Run the following command to collect logs on your system.
-      Wings: `sudo wings diagnostics --hastebin-url=https://logs.pelican.dev`
-      Panel: `tail -n 300 /var/www/pelican/storage/logs/laravel-$(date +%F).log | curl --data-binary @- https://logs.pelican.dev`
-    placeholder: "https://logs.pelican.dev/c17f750e"
+
+      Wings: `sudo wings diagnostics`
+      Panel: `tail -n 150 /var/www/pelican/storage/logs/laravel-$(date +%F).log | curl -X POST -F 'c=@-' paste.pelistuff.com`
+    placeholder: "https://pelipaste.com/a1h6z"
     render: bash
   validations:
     required: false

.github/workflows/build.yaml

@@ -11,9 +11,9 @@ jobs:
     name: UI
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        node-version: [20, 22]
+        node-version: [18, 20]
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4

.github/workflows/ci.yaml

@@ -6,75 +6,12 @@ on:
       - main
   pull_request:
 
-env:
-  APP_ENV: testing
-  APP_DEBUG: "false"
-  APP_KEY: ThisIsARandomStringForTests12345
-  APP_TIMEZONE: UTC
-  APP_URL: http://localhost/
-  CACHE_DRIVER: array
-  MAIL_MAILER: array
-  SESSION_DRIVER: array
-  QUEUE_CONNECTION: sync
-  GUZZLE_TIMEOUT: 60
-  GUZZLE_CONNECT_TIMEOUT: 60
-
 jobs:
-  sqlite:
-    name: SQLite
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [8.2, 8.3, 8.4]
-    env:
-      DB_CONNECTION: sqlite
-      DB_DATABASE: testing.sqlite
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
-
-      - name: Create SQLite file
-        run: touch database/testing.sqlite
-
-      - name: Unit tests
-        run: vendor/bin/pest tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/pest tests/Integration
-
   mysql:
     name: MySQL
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         php: [8.2, 8.3, 8.4]
         database: ["mysql:8"]
@@ -88,10 +25,21 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
       DB_CONNECTION: mysql
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: root
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -136,7 +84,7 @@ jobs:
     name: MariaDB
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         php: [8.2, 8.3, 8.4]
         database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
@@ -150,10 +98,21 @@ jobs:
           - 3306
         options: --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
       DB_CONNECTION: mariadb
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: root
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -194,11 +153,72 @@ jobs:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
 
+  sqlite:
+    name: SQLite
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.2, 8.3, 8.4]
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+      DB_CONNECTION: sqlite
+      DB_DATABASE: testing.sqlite
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
+    steps:
+      - name: Code Checkout
+        uses: actions/checkout@v4
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-composer-${{ matrix.php }}-
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+
+      - name: Create SQLite file
+        run: touch database/testing.sqlite
+
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
+      - name: Integration tests
+        run: vendor/bin/pest tests/Integration
+
   postgresql:
     name: PostgreSQL
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         php: [8.2, 8.3, 8.4]
         database: ["postgres:14"]
@@ -218,11 +238,22 @@ jobs:
           --health-timeout 5s
           --health-retries 5
     env:
+      APP_ENV: testing
+      APP_DEBUG: "false"
+      APP_KEY: ThisIsARandomStringForTests12345
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
       DB_CONNECTION: pgsql
       DB_HOST: 127.0.0.1
       DB_DATABASE: testing
       DB_USERNAME: postgres
       DB_PASSWORD: postgres
+      GUZZLE_TIMEOUT: 60
+      GUZZLE_CONNECT_TIMEOUT: 60
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4

.github/workflows/docker-publish.yml

@@ -66,6 +66,8 @@ jobs:
     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:
@@ -132,11 +134,6 @@ jobs:
           docker push localhost:5000/base-php:arm64
           rm base-php-arm64.tar base-php-amd64.tar
           
-      - name: Update version in config/app.php (tag)
-        if: "github.event_name == 'release' && github.event.action == 'published'"
-        run: |
-          sed -i "s/'version' => 'canary',/'version' => '${{ steps.build_info.outputs.version_tag }}',/" config/app.php
-              
       - name: Build and Push (tag)
         uses: docker/build-push-action@v6
         if: "github.event_name == 'release' && github.event.action == 'published'"

.github/workflows/lint.yaml

@@ -33,7 +33,7 @@ jobs:
     name: PHPStan
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         php: [ 8.2, 8.3, 8.4 ]
     steps:

.github/workflows/shift.yaml

@@ -1,20 +0,0 @@
-name: Shift
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 5"
-
-jobs:
-  shift:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Shift
-        run: |
-          curl -X POST -s -retry 5 -m 60 --fail-with-body \
-            https://laravelshift.com/api/run \
-            -H "Accept: application/json" \
-            -d "api_token=${{ secrets.SHIFT_TOKEN }}" \
-            -d "code=${{ secrets.SHIFT_CODE }}" \
-            -d "scs=github:${{ github.repository }}:${{ github.ref_name }}"

.gitignore

@@ -24,5 +24,6 @@ yarn-error.log
 
 public/assets/manifest.json
 /database/*.sqlite*
+filament-monaco-editor/
 _ide_helper*
 /.phpstorm.meta.php

Dockerfile

@@ -63,8 +63,8 @@ FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS fin
 WORKDIR /var/www/html
 
 # Install additional required libraries
-RUN apk add --no-cache \
-    caddy ca-certificates supervisor supercronic fcgi
+RUN apk update && apk add --no-cache \
+    caddy ca-certificates supervisor supercronic
 
 COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
@@ -85,8 +85,7 @@ RUN chown root:www-data ./ \
     && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
     # Allow www-data write permissions where necessary
     && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
 
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
@@ -94,11 +93,10 @@ COPY docker/Caddyfile /etc/caddy/Caddyfile
 # Add Laravel scheduler to crontab
 COPY docker/crontab /etc/supercronic/crontab
 
-COPY docker/entrypoint.sh /entrypoint.sh
-COPY docker/healthcheck.sh /healthcheck.sh
+COPY docker/entrypoint.sh ./docker/entrypoint.sh
 
 HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD /bin/ash /healthcheck.sh
+  CMD curl -f http://localhost/up || exit 1
 
 EXPOSE 80 443
 
@@ -106,5 +104,5 @@ VOLUME /pelican-data
 
 USER www-data
 
-ENTRYPOINT [ "/bin/ash", "/entrypoint.sh" ]
+ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

Dockerfile.dev

@@ -67,8 +67,8 @@ FROM --platform=$TARGETOS/$TARGETARCH base AS final
 WORKDIR /var/www/html
 
 # Install additional required libraries
-RUN apk add --no-cache \
-    caddy ca-certificates supervisor supercronic fcgi coreutils
+RUN apk update && apk add --no-cache \
+    caddy ca-certificates supervisor supercronic
 
 COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
@@ -89,8 +89,7 @@ RUN chown root:www-data ./ \
     && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
     # Allow www-data write permissions where necessary
     && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/
+    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord
 
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
@@ -98,11 +97,10 @@ COPY docker/Caddyfile /etc/caddy/Caddyfile
 # Add Laravel scheduler to crontab
 COPY docker/crontab /etc/supercronic/crontab
 
-COPY docker/entrypoint.sh /entrypoint.sh
-COPY docker/healthcheck.sh /healthcheck.sh
+COPY docker/entrypoint.sh ./docker/entrypoint.sh
 
 HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD /bin/ash /healthcheck.sh
+  CMD curl -f http://localhost/up || exit 1
 
 EXPOSE 80 443
 
@@ -110,5 +108,5 @@ VOLUME /pelican-data
 
 USER www-data
 
-ENTRYPOINT [ "/bin/ash", "/entrypoint.sh" ]
+ENTRYPOINT [ "/bin/ash", "docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -2,13 +2,10 @@
 
 namespace App\Console\Commands\Egg;
 
-use App\Enums\EggFormat;
 use App\Models\Egg;
 use App\Services\Eggs\Sharing\EggExporterService;
 use Exception;
 use Illuminate\Console\Command;
-use JsonException;
-use Symfony\Component\Yaml\Yaml;
 
 class CheckEggUpdatesCommand extends Command
 {
@@ -26,9 +23,6 @@ class CheckEggUpdatesCommand extends Command
         }
     }
 
-    /**
-     * @throws JsonException
-     */
     private function check(Egg $egg, EggExporterService $exporterService): void
     {
         if (is_null($egg->update_url)) {
@@ -37,26 +31,22 @@ class CheckEggUpdatesCommand extends Command
             return;
         }
 
-        $ext = strtolower(pathinfo(parse_url($egg->update_url, PHP_URL_PATH), PATHINFO_EXTENSION));
-        $isYaml = in_array($ext, ['yaml', 'yml']);
+        $currentJson = json_decode($exporterService->handle($egg->id));
+        unset($currentJson->exported_at);
 
-        $local = $isYaml
-            ? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
-            : json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
+        $updatedEgg = file_get_contents($egg->update_url);
+        assert($updatedEgg !== false);
+        $updatedJson = json_decode($updatedEgg);
+        unset($updatedJson->exported_at);
 
-        $remote = file_get_contents($egg->update_url);
-        assert($remote !== false);
+        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());
 
-        $remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
+            return;
+        }
 
-        unset($local['exported_at'], $remote['exported_at']);
-
-        $localHash = md5(json_encode($local, JSON_THROW_ON_ERROR));
-        $remoteHash = md5(json_encode($remote, JSON_THROW_ON_ERROR));
-
-        $status = $localHash === $remoteHash ? 'Up-to-date' : 'Found update';
-        $this->{($localHash === $remoteHash) ? 'info' : 'warn'}("$egg->name: $status");
-
-        cache()->put("eggs.$egg->uuid.update", $localHash !== $remoteHash, now()->addHour());
+        $this->warn("$egg->name: Found update");
+        cache()->put("eggs.$egg->uuid.update", true, now()->addHour());
     }
 }

app/Console/Commands/Egg/UpdateEggIndexCommand.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Egg;
-
-use Exception;
-use Illuminate\Console\Command;
-
-class UpdateEggIndexCommand extends Command
-{
-    protected $signature = 'p:egg:update-index';
-
-    public function handle(): int
-    {
-        try {
-            $data = file_get_contents('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json');
-            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-
-            return 1;
-        }
-
-        $index = [];
-        foreach ($data['nests'] as $nest) {
-            $nestName = $nest['nest_type'];
-
-            $this->info("Nest: $nestName");
-
-            $nestEggs = [];
-            foreach ($nest['Eggs'] as $egg) {
-                $eggName = $egg['egg']['name'];
-
-                $this->comment("Egg: $eggName");
-
-                $nestEggs[$egg['download_url']] = $eggName;
-            }
-            $index[$nestName] = $nestEggs;
-
-            $this->info('');
-        }
-
-        cache()->forever('eggs.index', $index);
-
-        return 0;
-    }
-}

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -6,7 +6,6 @@ use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
-use PDOException;
 
 class DatabaseSettingsCommand extends Command
 {
@@ -106,7 +105,7 @@ class DatabaseSettingsCommand extends Command
                 ]);
 
                 $this->database->connection('_panel_command_test')->getPdo();
-            } catch (PDOException $exception) {
+            } 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'));
 
@@ -166,7 +165,7 @@ class DatabaseSettingsCommand extends Command
                 ]);
 
                 $this->database->connection('_panel_command_test')->getPdo();
-            } catch (PDOException $exception) {
+            } 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'));
 

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands\Environment;
 
-use App\Exceptions\PanelException;
 use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 
@@ -29,7 +28,7 @@ class EmailSettingsCommand extends Command
     /**
      * Handle command execution.
      *
-     * @throws PanelException
+     * @throws \App\Exceptions\PanelException
      */
     public function handle(): void
     {

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -4,8 +4,8 @@ namespace App\Console\Commands\Maintenance;
 
 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 use Illuminate\Contracts\Filesystem\Filesystem;
+use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 use SplFileInfo;
 
 class CleanServiceBackupFilesCommand extends Command

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -5,7 +5,6 @@ namespace App\Console\Commands\Maintenance;
 use App\Models\Backup;
 use Carbon\CarbonImmutable;
 use Illuminate\Console\Command;
-use InvalidArgumentException;
 
 class PruneOrphanedBackupsCommand extends Command
 {
@@ -17,7 +16,7 @@ class PruneOrphanedBackupsCommand extends Command
     {
         $since = $this->option('prune-age') ?? config('backups.prune_age', 360);
         if (!$since || !is_digit($since)) {
-            throw new InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
+            throw new \InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
         }
 
         $query = Backup::query()

app/Console/Commands/Node/MakeNodeCommand.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands\Node;
 
-use App\Exceptions\Model\DataValidationException;
 use App\Models\Node;
 use Illuminate\Console\Command;
 
@@ -35,7 +34,7 @@ class MakeNodeCommand extends Command
     /**
      * Handle the command execution process.
      *
-     * @throws DataValidationException
+     * @throws \App\Exceptions\Model\DataValidationException
      */
     public function handle(): void
     {

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -17,7 +17,7 @@ class NodeConfigurationCommand extends Command
     {
         $column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
 
-        /** @var Node $node */
+        /** @var \App\Models\Node $node */
         $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
             $this->error(trans('commands.node_config.error_not_exist'));
 

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands\Schedule;
 
-use App\Models\Schedule;
-use App\Services\Schedules\ProcessScheduleService;
 use Illuminate\Console\Command;
+use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
+use App\Services\Schedules\ProcessScheduleService;
 use Throwable;
 
 class ProcessRunnableCommand extends Command
@@ -64,7 +64,7 @@ class ProcessRunnableCommand extends Command
         } catch (Throwable $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error(trans('commands.schedule.process.error_message', ['schedules' => " #$schedule->id: " . $exception->getMessage()]));
+            $this->error(trans('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -3,12 +3,12 @@
 namespace App\Console\Commands\Server;
 
 use App\Models\Server;
-use App\Repositories\Daemon\DaemonServerRepository;
-use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Validation\Factory as ValidatorFactory;
 use Illuminate\Validation\ValidationException;
+use Illuminate\Validation\Factory as ValidatorFactory;
+use App\Repositories\Daemon\DaemonPowerRepository;
+use Exception;
 
 class BulkPowerActionCommand extends Command
 {
@@ -19,7 +19,7 @@ class BulkPowerActionCommand extends Command
 
     protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
 
-    public function handle(DaemonServerRepository $serverRepository, ValidatorFactory $validator): void
+    public function handle(DaemonPowerRepository $powerRepository, ValidatorFactory $validator): void
     {
         $action = $this->argument('action');
         $nodes = empty($this->option('nodes')) ? [] : explode(',', $this->option('nodes'));
@@ -52,7 +52,7 @@ class BulkPowerActionCommand extends Command
 
         $bar = $this->output->createProgressBar($count);
 
-        $this->getQueryBuilder($servers, $nodes)->get()->each(function ($server, int $index) use ($action, $serverRepository, &$bar): mixed {
+        $this->getQueryBuilder($servers, $nodes)->get()->each(function ($server, int $index) use ($action, $powerRepository, &$bar): mixed {
             $bar->clear();
 
             if (!$server instanceof Server) {
@@ -60,7 +60,7 @@ class BulkPowerActionCommand extends Command
             }
 
             try {
-                $serverRepository->setServer($server)->power($action);
+                $powerRepository->setServer($server)->send($action);
             } catch (Exception $exception) {
                 $this->output->error(trans('command/messages.server.power.action_failed', [
                     'name' => $server->name,

app/Console/Commands/UpgradeCommand.php

@@ -2,13 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Console\Kernel;
-use Closure;
-use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Foundation\Application;
-use Symfony\Component\Console\Helper\ProgressBar;
+use App\Console\Kernel;
 use Symfony\Component\Process\Process;
+use Symfony\Component\Console\Helper\ProgressBar;
 
 class UpgradeCommand extends Command
 {
@@ -31,7 +28,7 @@ class UpgradeCommand extends Command
      * This places the application in maintenance mode as well while the commands
      * are being executed.
      *
-     * @throws Exception
+     * @throws \Exception
      */
     public function handle(): void
     {
@@ -132,9 +129,9 @@ class UpgradeCommand extends Command
             });
         });
 
-        /** @var Application $app */
+        /** @var \Illuminate\Foundation\Application $app */
         $app = require __DIR__ . '/../../../bootstrap/app.php';
-        /** @var Kernel $kernel */
+        /** @var \App\Console\Kernel $kernel */
         $kernel = $app->make(Kernel::class);
         $kernel->bootstrap();
         $this->setLaravel($app);
@@ -177,7 +174,7 @@ class UpgradeCommand extends Command
         $this->info(trans('commands.upgrade.success'));
     }
 
-    protected function withProgress(ProgressBar $bar, Closure $callback): void
+    protected function withProgress(ProgressBar $bar, \Closure $callback): void
     {
         $bar->clear();
         $callback();

app/Console/Commands/User/DeleteUserCommand.php

@@ -3,8 +3,8 @@
 namespace App\Console\Commands\User;
 
 use App\Models\User;
-use Illuminate\Console\Command;
 use Webmozart\Assert\Assert;
+use Illuminate\Console\Command;
 
 class DeleteUserCommand extends Command
 {

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -2,7 +2,6 @@
 
 namespace App\Console\Commands\User;
 
-use App\Exceptions\Model\DataValidationException;
 use App\Models\User;
 use Illuminate\Console\Command;
 
@@ -15,22 +14,20 @@ class DisableTwoFactorCommand extends Command
     /**
      * Handle command execution process.
      *
-     * @throws DataValidationException
+     * @throws \App\Exceptions\Model\DataValidationException
      */
     public function handle(): void
     {
         if ($this->input->isInteractive()) {
-            $this->output->warning(trans('command/messages.user.2fa_help_text'));
+            $this->output->warning(trans('command/messages.user.2fa_help_text.0') . trans('command/messages.user.2fa_help_text.1'));
         }
 
         $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
 
-        $user = User::where('email', $email)->firstOrFail();
-        $user->update([
-            'mfa_app_secret' => null,
-            'mfa_app_recovery_codes' => null,
-            'mfa_email_enabled' => false,
-        ]);
+        $user = User::query()->where('email', $email)->firstOrFail();
+        $user->use_totp = false;
+        $user->totp_secret = null;
+        $user->save();
 
         $this->info(trans('command/messages.user.2fa_disabled', ['email' => $user->email]));
     }

app/Console/Commands/User/MakeUserCommand.php

@@ -2,10 +2,9 @@
 
 namespace App\Console\Commands\User;
 
-use App\Exceptions\Model\DataValidationException;
-use App\Services\Users\UserCreationService;
 use Exception;
 use Illuminate\Console\Command;
+use App\Services\Users\UserCreationService;
 use Illuminate\Support\Facades\DB;
 
 class MakeUserCommand extends Command
@@ -26,7 +25,7 @@ class MakeUserCommand extends Command
      * Handle command request to create a new user.
      *
      * @throws Exception
-     * @throws DataValidationException
+     * @throws \App\Exceptions\Model\DataValidationException
      */
     public function handle(): int
     {

app/Console/Kernel.php

@@ -3,7 +3,6 @@
 namespace App\Console;
 
 use App\Console\Commands\Egg\CheckEggUpdatesCommand;
-use App\Console\Commands\Egg\UpdateEggIndexCommand;
 use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
 use App\Console\Commands\Maintenance\PruneImagesCommand;
 use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
@@ -42,9 +41,7 @@ class Kernel extends ConsoleKernel
 
         $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
         $schedule->command(PruneImagesCommand::class)->daily();
-
-        $schedule->command(CheckEggUpdatesCommand::class)->daily();
-        $schedule->command(UpdateEggIndexCommand::class)->daily();
+        $schedule->command(CheckEggUpdatesCommand::class)->hourly();
 
         if (config('backups.prune_age')) {
             // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.

app/Enums/BackupStatus.php

@@ -32,6 +32,6 @@ enum BackupStatus: string implements HasColor, HasIcon, HasLabel
 
     public function getLabel(): string
     {
-        return trans('server/backup.backup_status.' . $this->value);
+        return str($this->value)->headline();
     }
 }

app/Enums/ContainerStatus.php

@@ -68,7 +68,7 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
 
     public function getLabel(): string
     {
-        return trans('server/console.status.' . $this->value);
+        return str($this->value)->title();
     }
 
     public function isOffline(): bool
@@ -88,7 +88,7 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
 
     public function isStartable(): bool
     {
-        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Running, ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting]);
     }
 
     public function isRestartable(): bool
@@ -97,16 +97,18 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
             return true;
         }
 
-        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Offline]);
     }
 
     public function isStoppable(): bool
     {
-        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline, ContainerStatus::Missing]);
+        return !in_array($this, [ContainerStatus::Starting, ContainerStatus::Stopping, ContainerStatus::Restarting, ContainerStatus::Exited, ContainerStatus::Offline]);
     }
 
     public function isKillable(): bool
     {
-        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited, ContainerStatus::Missing]);
+        // [ContainerStatus::Restarting, ContainerStatus::Removing, ContainerStatus::Dead, ContainerStatus::Created]
+
+        return !in_array($this, [ContainerStatus::Offline, ContainerStatus::Running, ContainerStatus::Exited]);
     }
 }

app/Enums/CustomizationKey.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum CustomizationKey: string
-{
-    case ConsoleRows = 'console_rows';
-    case ConsoleFont = 'console_font';
-    case ConsoleFontSize = 'console_font_size';
-    case ConsoleGraphPeriod = 'console_graph_period';
-    case TopNavigation = 'top_navigation';
-    case DashboardLayout = 'dashboard_layout';
-
-    public function getDefaultValue(): string|int|bool
-    {
-        return match ($this) {
-            self::ConsoleRows => 30,
-            self::ConsoleFont => 'monospace',
-            self::ConsoleFontSize => 14,
-            self::ConsoleGraphPeriod => 30,
-            self::TopNavigation => false,
-            self::DashboardLayout => 'grid',
-        };
-    }
-
-    /** @return array<string, string|int|bool> */
-    public static function getDefaultCustomization(): array
-    {
-        $default = [];
-
-        foreach (self::cases() as $key) {
-            $default[$key->value] = $key->getDefaultValue();
-        }
-
-        return $default;
-    }
-}

app/Enums/EditorLanguages.php

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

app/Enums/EggFormat.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum EggFormat: string
-{
-    case YAML = 'yaml';
-    case JSON = 'json';
-}

app/Enums/HeaderActionPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum HeaderActionPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/HeaderWidgetPosition.php

@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum HeaderWidgetPosition: string
-{
-    case Before = 'before';
-    case After = 'after';
-}

app/Enums/ScheduleStatus.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasLabel;
-
-enum ScheduleStatus: string implements HasColor, HasLabel
-{
-    case Inactive = 'inactive';
-    case Processing = 'processing';
-    case Active = 'active';
-
-    public function getColor(): string
-    {
-        return match ($this) {
-            self::Inactive => 'danger',
-            self::Processing => 'warning',
-            self::Active => 'success',
-        };
-    }
-
-    public function getLabel(): string
-    {
-        return trans('server/schedule.schedule_status.' . $this->value);
-    }
-}

app/Enums/ServerResourceType.php

@@ -2,50 +2,9 @@
 
 namespace App\Enums;
 
-use App\Models\Server;
-
-enum ServerResourceType: string
+enum ServerResourceType
 {
-    case Uptime = 'uptime';
-    case CPU = 'cpu_absolute';
-    case Memory = 'memory_bytes';
-    case Disk = 'disk_bytes';
-
-    case CPULimit = 'cpu';
-    case MemoryLimit = 'memory';
-    case DiskLimit = 'disk';
-
-    /**
-     * @return int resource amount in bytes
-     */
-    public function getResourceAmount(Server $server): int
-    {
-        if ($this->isLimit()) {
-            $resourceAmount = $server->{$this->value} ?? 0;
-
-            if (!$this->isPercentage()) {
-                // Our limits are entered as MiB/ MB so we need to convert them to bytes
-                $resourceAmount *= config('panel.use_binary_prefix') ? 1024 * 1024 : 1000 * 1000;
-            }
-
-            return $resourceAmount;
-        }
-
-        return $server->retrieveResources()[$this->value] ?? 0;
-    }
-
-    public function isLimit(): bool
-    {
-        return $this === ServerResourceType::CPULimit || $this === ServerResourceType::MemoryLimit || $this === ServerResourceType::DiskLimit;
-    }
-
-    public function isTime(): bool
-    {
-        return $this === ServerResourceType::Uptime;
-    }
-
-    public function isPercentage(): bool
-    {
-        return $this === ServerResourceType::CPU || $this === ServerResourceType::CPULimit;
-    }
+    case Unit;
+    case Percentage;
+    case Time;
 }

app/Enums/ServerState.php

@@ -8,6 +8,7 @@ use Filament\Support\Contracts\HasLabel;
 
 enum ServerState: string implements HasColor, HasIcon, HasLabel
 {
+    case Normal = 'normal';
     case Installing = 'installing';
     case InstallFailed = 'install_failed';
     case ReinstallFailed = 'reinstall_failed';
@@ -17,6 +18,7 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
     public function getIcon(): string
     {
         return match ($this) {
+            self::Normal => 'tabler-heart',
             self::Installing => 'tabler-heart-bolt',
             self::InstallFailed => 'tabler-heart-x',
             self::ReinstallFailed => 'tabler-heart-x',
@@ -25,17 +27,10 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(bool $hex = false): string
+    public function getColor(): string
     {
-        if ($hex) {
-            return match ($this) {
-                self::Installing, self::RestoringBackup => '#2563EB',
-                self::Suspended => '#D97706',
-                self::InstallFailed, self::ReinstallFailed => '#EF4444',
-            };
-        }
-
         return match ($this) {
+            self::Normal => 'primary',
             self::Installing => 'primary',
             self::InstallFailed => 'danger',
             self::ReinstallFailed => 'danger',

app/Enums/StartupVariableType.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-enum StartupVariableType: string
-{
-    case Text = 'text';
-    case Number = 'number';
-    case Select = 'select';
-    case Toggle = 'toggle';
-}

app/Enums/WebhookType.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Enums;
-
-use Filament\Support\Contracts\HasColor;
-use Filament\Support\Contracts\HasIcon;
-use Filament\Support\Contracts\HasLabel;
-
-enum WebhookType: string implements HasColor, HasIcon, HasLabel
-{
-    case Regular = 'regular';
-    case Discord = 'discord';
-
-    public function getLabel(): string
-    {
-        return trans('admin/webhook.' . $this->value);
-    }
-
-    public function getColor(): ?string
-    {
-        return match ($this) {
-            self::Regular => null,
-            self::Discord => 'blurple',
-        };
-    }
-
-    public function getIcon(): string
-    {
-        return match ($this) {
-            self::Regular => 'tabler-world-www',
-            self::Discord => 'tabler-brand-discord',
-        };
-    }
-}

app/Events/ActivityLogged.php

@@ -2,9 +2,9 @@
 
 namespace App\Events;
 
+use Illuminate\Support\Str;
 use App\Models\ActivityLog;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
 
 class ActivityLogged extends Event
 {

app/Events/Auth/ProvidedAuthenticationToken.php

@@ -2,8 +2,8 @@
 
 namespace App\Events\Auth;
 
-use App\Events\Event;
 use App\Models\User;
+use App\Events\Event;
 
 class ProvidedAuthenticationToken extends Event
 {

app/Exceptions/DisplayException.php

@@ -4,14 +4,13 @@ namespace App\Exceptions;
 
 use Exception;
 use Filament\Notifications\Notification;
-use Illuminate\Container\Container;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Http\Response;
 use Psr\Log\LoggerInterface;
+use Illuminate\Http\Response;
+use Illuminate\Container\Container;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-use Throwable;
 
 /**
  * @deprecated
@@ -29,7 +28,7 @@ class DisplayException extends PanelException implements HttpExceptionInterface
     /**
      * DisplayException constructor.
      */
-    public function __construct(string $message, ?Throwable $previous = null, protected string $level = self::LEVEL_ERROR, int $code = 0)
+    public function __construct(string $message, ?\Throwable $previous = null, protected string $level = self::LEVEL_ERROR, int $code = 0)
     {
         parent::__construct($message, $code, $previous);
     }
@@ -80,11 +79,11 @@ class DisplayException extends PanelException implements HttpExceptionInterface
      * Log the exception to the logs using the defined error level only if the previous
      * exception is set.
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
     public function report(): void
     {
-        if (!$this->getPrevious() instanceof Exception || !Handler::isReportable($this->getPrevious())) {
+        if (!$this->getPrevious() instanceof \Exception || !Handler::isReportable($this->getPrevious())) {
             return;
         }
 

app/Exceptions/Handler.php

@@ -2,27 +2,24 @@
 
 namespace App\Exceptions;
 
-use Exception;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Auth\AuthenticationException;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
 use Illuminate\Database\Connection;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Foundation\Application;
-use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Http\Request;
+use Illuminate\Foundation\Application;
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Session\TokenMismatchException;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
-use PDOException;
 use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 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
@@ -82,7 +79,7 @@ class Handler extends ExceptionHandler
             $this->dontReport = [];
         }
 
-        $this->reportable(function (PDOException $ex) {
+        $this->reportable(function (\PDOException $ex) {
             $ex = $this->generateCleanedExceptionStack($ex);
         });
 
@@ -91,7 +88,7 @@ class Handler extends ExceptionHandler
         });
     }
 
-    private function generateCleanedExceptionStack(Throwable $exception): string
+    private function generateCleanedExceptionStack(\Throwable $exception): string
     {
         $cleanedStack = '';
         foreach ($exception->getTrace() as $index => $item) {
@@ -120,11 +117,11 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      *
-     * @throws Throwable
+     * @throws \Throwable
      */
-    public function render($request, Throwable $e): Response
+    public function render($request, \Throwable $e): Response
     {
         $connections = $this->container->make(Connection::class);
 
@@ -146,7 +143,7 @@ class Handler extends ExceptionHandler
      * Transform a validation exception into a consistent format to be returned for
      * calls to the API.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      */
     public function invalidJson($request, ValidationException $exception): JsonResponse
     {
@@ -252,7 +249,7 @@ class Handler extends ExceptionHandler
     /**
      * Return an array of exceptions that should not be reported.
      */
-    public static function isReportable(Exception $exception): bool
+    public static function isReportable(\Exception $exception): bool
     {
         return (new self(Container::getInstance()))->shouldReport($exception);
     }
@@ -260,7 +257,7 @@ class Handler extends ExceptionHandler
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
-     * @param  Request  $request
+     * @param  \Illuminate\Http\Request  $request
      */
     protected function unauthenticated($request, AuthenticationException $exception): JsonResponse|RedirectResponse
     {
@@ -294,7 +291,7 @@ class Handler extends ExceptionHandler
      *
      * @return array<mixed>
      */
-    public static function toArray(Throwable $e): array
+    public static function toArray(\Throwable $e): array
     {
         return self::exceptionToArray($e);
     }

app/Exceptions/Http/HttpForbiddenException.php

@@ -4,14 +4,13 @@ namespace App\Exceptions\Http;
 
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
-use Throwable;
 
 class HttpForbiddenException extends HttpException
 {
     /**
      * HttpForbiddenException constructor.
      */
-    public function __construct(?string $message = null, ?Throwable $previous = null)
+    public function __construct(?string $message = null, ?\Throwable $previous = null)
     {
         parent::__construct(Response::HTTP_FORBIDDEN, $message, $previous);
     }

app/Exceptions/Http/Server/ServerStateConflictException.php

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

app/Exceptions/Http/TwoFactorAuthRequiredException.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Http;
+
+use Illuminate\Http\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+
+class TwoFactorAuthRequiredException extends HttpException implements HttpExceptionInterface
+{
+    /**
+     * TwoFactorAuthRequiredException constructor.
+     */
+    public function __construct(?\Throwable $previous = null)
+    {
+        parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
+    }
+}

app/Exceptions/ManifestDoesNotExistException.php

@@ -2,15 +2,13 @@
 
 namespace App\Exceptions;
 
-use App\Exceptions\Solutions\ManifestDoesNotExistSolution;
-use Exception;
-use Spatie\Ignition\Contracts\ProvidesSolution;
 use Spatie\Ignition\Contracts\Solution;
+use Spatie\Ignition\Contracts\ProvidesSolution;
 
-class ManifestDoesNotExistException extends Exception implements ProvidesSolution
+class ManifestDoesNotExistException extends \Exception implements ProvidesSolution
 {
     public function getSolution(): Solution
     {
-        return new ManifestDoesNotExistSolution();
+        return new Solutions\ManifestDoesNotExistSolution();
     }
 }

app/Exceptions/Model/DataValidationException.php

@@ -2,11 +2,11 @@
 
 namespace App\Exceptions\Model;
 
+use Illuminate\Support\MessageBag;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Validation\Validator;
 use App\Exceptions\PanelException;
 use Illuminate\Contracts\Support\MessageProvider;
-use Illuminate\Contracts\Validation\Validator;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\MessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class DataValidationException extends PanelException implements HttpExceptionInterface, MessageProvider

app/Exceptions/PanelException.php

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

app/Exceptions/Repository/FileExistsException.php

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

app/Exceptions/Service/Deployment/NoViableNodeException.php

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

app/Exceptions/Service/HasActiveServersException.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions\Service;
 
-use App\Exceptions\DisplayException;
 use Illuminate\Http\Response;
+use App\Exceptions\DisplayException;
 
 class HasActiveServersException extends DisplayException
 {

app/Exceptions/Service/ServiceLimitExceededException.php

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

app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Exceptions\Service\User;
+
+use App\Exceptions\DisplayException;
+
+class TwoFactorAuthenticationTokenInvalid extends DisplayException
+{
+    public string $title = 'Invalid 2FA Code';
+
+    public string $icon = 'tabler-2fa';
+
+    public function __construct()
+    {
+        parent::__construct('The provided two-factor authentication token was not valid.');
+    }
+}

app/Extensions/Avatar/AvatarProvider.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Extensions\Avatar;
+
+use App\Models\User;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
+
+abstract class AvatarProvider
+{
+    /**
+     * @var array<string, static>
+     */
+    protected static array $providers = [];
+
+    public static function getProvider(string $id): ?self
+    {
+        return Arr::get(static::$providers, $id);
+    }
+
+    /**
+     * @return array<string, static>
+     */
+    public static function getAll(): array
+    {
+        return static::$providers;
+    }
+
+    public function __construct()
+    {
+        static::$providers[$this->getId()] = $this;
+    }
+
+    abstract public function getId(): string;
+
+    abstract public function get(User $user): ?string;
+
+    public function getName(): string
+    {
+        return Str::title($this->getId());
+    }
+}

app/Extensions/Avatar/AvatarSchemaInterface.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar;
-
-use App\Models\User;
-
-interface AvatarSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    public function get(User $user): ?string;
-}

app/Extensions/Avatar/AvatarService.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Extensions\Avatar;
-
-use App\Models\User;
-use Illuminate\Support\Facades\Storage;
-
-class AvatarService
-{
-    /** @var AvatarSchemaInterface[] */
-    private array $schemas = [];
-
-    public function __construct(
-        private readonly bool $allowUploadedAvatars,
-        private readonly string $activeSchema,
-    ) {}
-
-    public function get(string $id): ?AvatarSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    public function getActiveSchema(): ?AvatarSchemaInterface
-    {
-        return $this->get($this->activeSchema);
-    }
-
-    public function getAvatarUrl(User $user): ?string
-    {
-        if ($this->allowUploadedAvatars) {
-            $path = "avatars/$user->id.png";
-
-            if (Storage::disk('public')->exists($path)) {
-                return Storage::url($path);
-            }
-        }
-
-        return $this->getActiveSchema()?->get($user);
-    }
-
-    public function register(AvatarSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /** @return array<string, string> */
-    public function getMappings(): array
-    {
-        return collect($this->schemas)->mapWithKeys(fn ($schema) => [$schema->getId() => $schema->getName()])->all();
-    }
-}

app/Extensions/Avatar/Providers/GravatarProvider.php

@@ -1,24 +1,24 @@
 <?php
 
-namespace App\Extensions\Avatar\Schemas;
+namespace App\Extensions\Avatar\Providers;
 
-use App\Extensions\Avatar\AvatarSchemaInterface;
+use App\Extensions\Avatar\AvatarProvider;
 use App\Models\User;
 
-class GravatarSchema implements AvatarSchemaInterface
+class GravatarProvider extends AvatarProvider
 {
     public function getId(): string
     {
         return 'gravatar';
     }
 
-    public function getName(): string
-    {
-        return 'Gravatar';
-    }
-
     public function get(User $user): string
     {
         return 'https://gravatar.com/avatar/' . md5($user->email);
     }
+
+    public static function register(): self
+    {
+        return new self();
+    }
 }

app/Extensions/Avatar/Providers/UiAvatarsProvider.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Extensions\Avatar\Schemas;
+namespace App\Extensions\Avatar\Providers;
 
-use App\Extensions\Avatar\AvatarSchemaInterface;
+use App\Extensions\Avatar\AvatarProvider;
 use App\Models\User;
 
-class UiAvatarsSchema implements AvatarSchemaInterface
+class UiAvatarsProvider extends AvatarProvider
 {
     public function getId(): string
     {
@@ -22,4 +22,9 @@ class UiAvatarsSchema implements AvatarSchemaInterface
         // UI Avatars is the default of filament so just return null here
         return null;
     }
+
+    public static function register(): self
+    {
+        return new self();
+    }
 }

app/Extensions/Backups/BackupManager.php

@@ -2,16 +2,15 @@
 
 namespace App\Extensions\Backups;
 
-use App\Extensions\Filesystem\S3Filesystem;
-use Aws\S3\S3Client;
 use Closure;
-use Illuminate\Foundation\Application;
+use Aws\S3\S3Client;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
-use League\Flysystem\FilesystemAdapter;
-use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
 use Webmozart\Assert\Assert;
+use Illuminate\Foundation\Application;
+use League\Flysystem\FilesystemAdapter;
+use App\Extensions\Filesystem\S3Filesystem;
+use League\Flysystem\InMemory\InMemoryFilesystemAdapter;
 
 class BackupManager
 {
@@ -65,7 +64,7 @@ class BackupManager
         $config = $this->getConfig($name);
 
         if (empty($config['adapter'])) {
-            throw new InvalidArgumentException("Backup disk [$name] does not have a configured adapter.");
+            throw new \InvalidArgumentException("Backup disk [$name] does not have a configured adapter.");
         }
 
         $adapter = $config['adapter'];
@@ -83,7 +82,7 @@ class BackupManager
             return $instance;
         }
 
-        throw new InvalidArgumentException("Adapter [$adapter] is not supported.");
+        throw new \InvalidArgumentException("Adapter [$adapter] is not supported.");
     }
 
     /**

app/Extensions/Captcha/CaptchaService.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha;
-
-use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
-
-class CaptchaService
-{
-    /** @var array<string, CaptchaSchemaInterface> */
-    private array $schemas = [];
-
-    /**
-     * @return CaptchaSchemaInterface[]
-     */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?CaptchaSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    public function register(CaptchaSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        config()->set('captcha.' . Str::lower($schema->getId()), $schema->getConfig());
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /** @return Collection<CaptchaSchemaInterface> */
-    public function getActiveSchemas(): Collection
-    {
-        return collect($this->schemas)
-            ->filter(fn (CaptchaSchemaInterface $schema) => $schema->isEnabled());
-    }
-
-    public function getActiveSchema(): ?CaptchaSchemaInterface
-    {
-        return $this->getActiveSchemas()->first();
-    }
-}

app/Extensions/Captcha/Providers/CaptchaProvider.php

@@ -0,0 +1,118 @@
+<?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

@@ -0,0 +1,106 @@
+<?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/Captcha/Schemas/BaseSchema.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas;
-
-use Filament\Forms\Components\TextInput;
-use Filament\Schemas\Components\Component;
-use Illuminate\Support\Str;
-
-abstract class BaseSchema
-{
-    abstract public function getId(): string;
-
-    public function getName(): string
-    {
-        return Str::upper($this->getId());
-    }
-
-    /**
-     * @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")),
-        ];
-    }
-}

app/Extensions/Captcha/Schemas/CaptchaSchemaInterface.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas;
-
-use Filament\Schemas\Components\Component;
-
-interface CaptchaSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getConfig(): array;
-
-    public function isEnabled(): bool;
-
-    public function getFormComponent(): Component;
-
-    /**
-     * @return Component[]
-     */
-    public function getSettingsForm(): array;
-
-    public function getIcon(): ?string;
-
-    public function validateResponse(?string $captchaResponse = null): void;
-}

app/Extensions/Captcha/Schemas/Turnstile/Rule.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas\Turnstile;
-
-use App\Extensions\Captcha\CaptchaService;
-use Closure;
-use Exception;
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Support\Facades\App;
-
-class Rule implements ValidationRule
-{
-    public function validate(string $attribute, mixed $value, Closure $fail): void
-    {
-        try {
-            App::call(fn (CaptchaService $service) => $service->get('turnstile')->validateResponse($value));
-        } catch (Exception $exception) {
-            report($exception);
-
-            $fail('Captcha validation failed: ' . $exception->getMessage());
-        }
-    }
-}

app/Extensions/Captcha/Schemas/Turnstile/TurnstileSchema.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace App\Extensions\Captcha\Schemas\Turnstile;
-
-use App\Extensions\Captcha\Schemas\BaseSchema;
-use App\Extensions\Captcha\Schemas\CaptchaSchemaInterface;
-use Exception;
-use Filament\Forms\Components\Toggle;
-use Filament\Infolists\Components\TextEntry;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\HtmlString;
-
-class TurnstileSchema extends BaseSchema implements CaptchaSchemaInterface
-{
-    public function getId(): string
-    {
-        return 'turnstile';
-    }
-
-    public function isEnabled(): bool
-    {
-        return env('CAPTCHA_TURNSTILE_ENABLED', false);
-    }
-
-    public function getFormComponent(): Component
-    {
-        return Component::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 \Filament\Support\Components\Component[]
-     *
-     * @throws Exception
-     */
-    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)),
-            TextEntry::make('info')
-                ->label(trans('admin/setting.captcha.info_label'))
-                ->columnSpan(2)
-                ->state(new HtmlString(trans('admin/setting.captcha.info'))),
-        ]);
-    }
-
-    public function getIcon(): ?string
-    {
-        return 'tabler-brand-cloudflare';
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function validateResponse(?string $captchaResponse = null): void
-    {
-        $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,
-            ])
-            ->json();
-
-        if (!$response['success']) {
-            match ($response['error-codes'][0] ?? null) {
-                'missing-input-secret' => throw new Exception('The secret parameter was not passed.'),
-                'invalid-input-secret' => throw new Exception('The secret parameter was invalid, did not exist, or is a testing secret key with a non-testing response.'),
-                'missing-input-response' => throw new Exception('The response parameter (token) was not passed.'),
-                'invalid-input-response' => throw new Exception('The response parameter (token) is invalid or has expired.'),
-                'bad-request' => throw new Exception('The request was rejected because it was malformed.'),
-                'timeout-or-duplicate' => throw new Exception('The response parameter (token) has already been validated before.'),
-                default => throw new Exception('An internal error happened while validating the response.'),
-            };
-        }
-
-        if (!$this->verifyDomain($response['hostname'] ?? '')) {
-            throw new Exception('Domain verification failed.');
-        }
-    }
-
-    private function verifyDomain(string $hostname): bool
-    {
-        if (!env('CAPTCHA_TURNSTILE_VERIFY_DOMAIN', true)) {
-            return true;
-        }
-
-        $requestUrl = parse_url(request()->url());
-
-        return $hostname === array_get($requestUrl, 'host');
-    }
-}

app/Extensions/Features/FeatureProvider.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Extensions\Features;
+
+use Filament\Actions\Action;
+use Illuminate\Foundation\Application;
+
+abstract class FeatureProvider
+{
+    /**
+     * @var array<string, static>
+     */
+    protected static array $providers = [];
+
+    /**
+     * @param  string[]  $id
+     * @return self|static[]
+     */
+    public static function getProviders(string|array|null $id = null): array|self
+    {
+        if (is_array($id)) {
+            return array_intersect_key(static::$providers, array_flip($id));
+        }
+
+        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 Feature provider with id '{$this->getId()}'");
+            }
+
+            return;
+        }
+
+        static::$providers[$this->getId()] = $this;
+    }
+
+    abstract public function getId(): string;
+
+    /**
+     * A matching subset string (case-insensitive) from the console output
+     *
+     * @return array<string>
+     */
+    abstract public function getListeners(): array;
+
+    abstract public function getAction(): Action;
+}

app/Extensions/Features/FeatureSchemaInterface.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Extensions\Features;
-
-use Filament\Actions\Action;
-
-interface FeatureSchemaInterface
-{
-    /** @return string[] */
-    public function getListeners(): array;
-
-    public function getId(): string;
-
-    public function getAction(): Action;
-}

app/Extensions/Features/FeatureService.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Extensions\Features;
-
-class FeatureService
-{
-    /** @var FeatureSchemaInterface[] */
-    private array $schemas = [];
-
-    /**
-     * @return FeatureSchemaInterface[]
-     */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?FeatureSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    /**
-     * @param  ?string[]  $features
-     * @return FeatureSchemaInterface[]
-     */
-    public function getActiveSchemas(?array $features = []): array
-    {
-        return collect($this->schemas)->only($features)->all();
-    }
-
-    public function register(FeatureSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-
-    /**
-     * @param  ?string[]  $features
-     * @return array<string, array<string>>
-     */
-    public function getMappings(?array $features = []): array
-    {
-        return collect($this->getActiveSchemas($features))
-            ->mapWithKeys(fn (FeatureSchemaInterface $schema) => [
-                $schema->getId() => $schema->getListeners(),
-            ])->all();
-    }
-}

app/Extensions/Features/GSLToken.php

@@ -1,27 +1,32 @@
 <?php
 
-namespace App\Extensions\Features\Schemas;
+namespace App\Extensions\Features;
 
-use App\Extensions\Features\FeatureSchemaInterface;
 use App\Facades\Activity;
 use App\Models\Permission;
 use App\Models\Server;
 use App\Models\ServerVariable;
-use App\Repositories\Daemon\DaemonServerRepository;
+use App\Repositories\Daemon\DaemonPowerRepository;
 use Closure;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\HtmlString;
 
-class GSLTokenSchema implements FeatureSchemaInterface
+class GSLToken extends FeatureProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     /** @return array<string> */
     public function getListeners(): array
     {
@@ -36,9 +41,6 @@ class GSLTokenSchema implements FeatureSchemaInterface
         return 'gsl_token';
     }
 
-    /**
-     * @throws Exception
-     */
     public function getAction(): Action
     {
         /** @var Server $server */
@@ -54,9 +56,9 @@ class GSLTokenSchema implements FeatureSchemaInterface
             ->modalHeading('Invalid GSL token')
             ->modalDescription('It seems like your Gameserver Login Token (GSL token) is invalid or has expired.')
             ->modalSubmitActionLabel('Update GSL Token')
-            ->disabledSchema(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_UPDATE, $server))
-            ->schema([
-                TextEntry::make('info')
+            ->disabledForm(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_UPDATE, $server))
+            ->form([
+                Placeholder::make('info')
                     ->label(new HtmlString(Blade::render('You can either <x-filament::link href="https://steamcommunity.com/dev/managegameservers" target="_blank">generate a new one</x-filament::link> and enter it below or leave the field blank to remove it completely.'))),
                 TextInput::make('gsltoken')
                     ->label('GSL Token')
@@ -73,12 +75,13 @@ class GSLTokenSchema implements FeatureSchemaInterface
                             }
                         },
                     ])
-                    ->hintIcon('tabler-code', fn () => implode('|', $serverVariable->variable->rules))
+                    ->hintIcon('tabler-code')
                     ->label(fn () => $serverVariable->variable->name)
+                    ->hintIconTooltip(fn () => implode('|', $serverVariable->variable->rules))
                     ->prefix(fn () => '{{' . $serverVariable->variable->env_variable . '}}')
                     ->helperText(fn () => empty($serverVariable->variable->description) ? '—' : $serverVariable->variable->description),
             ])
-            ->action(function (array $data, DaemonServerRepository $serverRepository) use ($server, $serverVariable) {
+            ->action(function (array $data, DaemonPowerRepository $powerRepository) use ($server, $serverVariable) {
                 /** @var Server $server */
                 $server = Filament::getTenant();
                 try {
@@ -100,7 +103,7 @@ class GSLTokenSchema implements FeatureSchemaInterface
                             ->log();
                     }
 
-                    $serverRepository->setServer($server)->power('restart');
+                    $powerRepository->setServer($server)->send('restart');
 
                     Notification::make()
                         ->title('GSL Token updated')
@@ -116,4 +119,9 @@ class GSLTokenSchema implements FeatureSchemaInterface
                 }
             });
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/Features/JavaVersion.php

@@ -1,21 +1,26 @@
 <?php
 
-namespace App\Extensions\Features\Schemas;
+namespace App\Extensions\Features;
 
-use App\Extensions\Features\FeatureSchemaInterface;
 use App\Facades\Activity;
 use App\Models\Permission;
 use App\Models\Server;
-use App\Repositories\Daemon\DaemonServerRepository;
+use App\Repositories\Daemon\DaemonPowerRepository;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Select;
-use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
+use Illuminate\Foundation\Application;
 
-class JavaVersionSchema implements FeatureSchemaInterface
+class JavaVersion extends FeatureProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     /** @return array<string> */
     public function getListeners(): array
     {
@@ -44,9 +49,9 @@ class JavaVersionSchema implements FeatureSchemaInterface
             ->modalHeading('Unsupported Java Version')
             ->modalDescription('This server is currently running an unsupported version of Java and cannot be started.')
             ->modalSubmitActionLabel('Update Docker Image')
-            ->disabledSchema(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_DOCKER_IMAGE, $server))
-            ->schema([
-                TextEntry::make('java')
+            ->disabledForm(fn () => !auth()->user()->can(Permission::ACTION_STARTUP_DOCKER_IMAGE, $server))
+            ->form([
+                Placeholder::make('java')
                     ->label('Please select a supported version from the list below to continue starting the server.'),
                 Select::make('image')
                     ->label('Docker Image')
@@ -59,7 +64,7 @@ class JavaVersionSchema implements FeatureSchemaInterface
                     ->preload()
                     ->native(false),
             ])
-            ->action(function (array $data, DaemonServerRepository $serverRepository) use ($server) {
+            ->action(function (array $data, DaemonPowerRepository $powerRepository) use ($server) {
                 try {
                     $new = $data['image'];
                     $original = $server->image;
@@ -71,7 +76,7 @@ class JavaVersionSchema implements FeatureSchemaInterface
                             ->log();
                     }
 
-                    $serverRepository->setServer($server)->power('restart');
+                    $powerRepository->setServer($server)->send('restart');
 
                     Notification::make()
                         ->title('Docker image updated')
@@ -87,4 +92,9 @@ class JavaVersionSchema implements FeatureSchemaInterface
                 }
             });
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/Features/MinecraftEula.php

@@ -1,20 +1,25 @@
 <?php
 
-namespace App\Extensions\Features\Schemas;
+namespace App\Extensions\Features;
 
-use App\Extensions\Features\FeatureSchemaInterface;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonFileRepository;
-use App\Repositories\Daemon\DaemonServerRepository;
+use App\Repositories\Daemon\DaemonPowerRepository;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Notifications\Notification;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
-class MinecraftEulaSchema implements FeatureSchemaInterface
+class MinecraftEula extends FeatureProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     /** @return array<string> */
     public function getListeners(): array
     {
@@ -35,14 +40,14 @@ class MinecraftEulaSchema implements FeatureSchemaInterface
             ->modalHeading('Minecraft EULA')
             ->modalDescription(new HtmlString(Blade::render('By pressing "I Accept" below you are indicating your agreement to the <x-filament::link href="https://minecraft.net/eula" target="_blank">Minecraft EULA </x-filament::link>.')))
             ->modalSubmitActionLabel('I Accept')
-            ->action(function (DaemonFileRepository $fileRepository, DaemonServerRepository $serverRepository) {
+            ->action(function (DaemonFileRepository $fileRepository, DaemonPowerRepository $powerRepository) {
                 try {
                     /** @var Server $server */
                     $server = Filament::getTenant();
 
                     $fileRepository->setServer($server)->putContent('eula.txt', 'eula=true');
 
-                    $serverRepository->setServer($server)->power('restart');
+                    $powerRepository->setServer($server)->send('restart');
 
                     Notification::make()
                         ->title('Minecraft EULA accepted')
@@ -58,4 +63,9 @@ class MinecraftEulaSchema implements FeatureSchemaInterface
                 }
             });
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/Features/PIDLimit.php

@@ -1,14 +1,19 @@
 <?php
 
-namespace App\Extensions\Features\Schemas;
+namespace App\Extensions\Features;
 
-use App\Extensions\Features\FeatureSchemaInterface;
 use Filament\Actions\Action;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
-class PIDLimitSchema implements FeatureSchemaInterface
+class PIDLimit extends FeatureProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     /** @return array<string> */
     public function getListeners(): array
     {
@@ -63,4 +68,9 @@ class PIDLimitSchema implements FeatureSchemaInterface
             ->modalCancelActionLabel('Close')
             ->action(fn () => null);
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/Features/SteamDiskSpace.php

@@ -1,14 +1,19 @@
 <?php
 
-namespace App\Extensions\Features\Schemas;
+namespace App\Extensions\Features;
 
-use App\Extensions\Features\FeatureSchemaInterface;
 use Filament\Actions\Action;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 
-class SteamDiskSpaceSchema implements FeatureSchemaInterface
+class SteamDiskSpace extends FeatureProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     /** @return array<string> */
     public function getListeners(): array
     {
@@ -51,4 +56,9 @@ class SteamDiskSpaceSchema implements FeatureSchemaInterface
             ->modalCancelActionLabel('Close')
             ->action(fn () => null);
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/Laravel/Sanctum/NewAccessToken.php

@@ -6,7 +6,7 @@ use App\Models\ApiKey;
 use Laravel\Sanctum\NewAccessToken as SanctumAccessToken;
 
 /**
- * @property ApiKey $accessToken
+ * @property \App\Models\ApiKey $accessToken
  */
 class NewAccessToken extends SanctumAccessToken
 {

app/Extensions/Lcobucci/JWT/Encoding/TimestampDates.php

@@ -2,7 +2,6 @@
 
 namespace App\Extensions\Lcobucci\JWT\Encoding;
 
-use DateTimeImmutable;
 use Lcobucci\JWT\ClaimsFormatter;
 use Lcobucci\JWT\Token\RegisteredClaims;
 
@@ -21,7 +20,7 @@ final class TimestampDates implements ClaimsFormatter
                 continue;
             }
 
-            assert($claims[$claim] instanceof DateTimeImmutable);
+            assert($claims[$claim] instanceof \DateTimeImmutable);
             $claims[$claim] = $claims[$claim]->getTimestamp();
         }
 

app/Extensions/OAuth/OAuthSchemaInterface.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth;
-
-use Filament\Schemas\Components\Component;
-use Filament\Schemas\Components\Wizard\Step;
-
-interface OAuthSchemaInterface
-{
-    public function getId(): string;
-
-    public function getName(): string;
-
-    public function getConfigKey(): string;
-
-    /** @return ?class-string */
-    public function getSocialiteProvider(): ?string;
-
-    /**
-     * @return array<string, string|string[]|bool|null>
-     */
-    public function getServiceConfig(): array;
-
-    /** @return Component[] */
-    public function getSettingsForm(): array;
-
-    /** @return Step[] */
-    public function getSetupSteps(): array;
-
-    public function getIcon(): ?string;
-
-    public function getHexColor(): ?string;
-
-    public function isEnabled(): bool;
-
-    public function shouldCreateMissingUsers(): bool;
-
-    public function shouldLinkMissingUsers(): bool;
-}

app/Extensions/OAuth/OAuthService.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth;
-
-use Illuminate\Support\Facades\Event;
-use SocialiteProviders\Manager\SocialiteWasCalled;
-
-class OAuthService
-{
-    /** @var OAuthSchemaInterface[] */
-    private array $schemas = [];
-
-    /** @return OAuthSchemaInterface[] */
-    public function getAll(): array
-    {
-        return $this->schemas;
-    }
-
-    public function get(string $id): ?OAuthSchemaInterface
-    {
-        return array_get($this->schemas, $id);
-    }
-
-    /** @return OAuthSchemaInterface[] */
-    public function getEnabled(): array
-    {
-        return collect($this->schemas)
-            ->filter(fn (OAuthSchemaInterface $schema) => $schema->isEnabled())
-            ->all();
-    }
-
-    public function register(OAuthSchemaInterface $schema): void
-    {
-        if (array_key_exists($schema->getId(), $this->schemas)) {
-            return;
-        }
-
-        config()->set('services.' . $schema->getId(), array_merge($schema->getServiceConfig(), ['redirect' => '/auth/oauth/callback/' . $schema->getId()]));
-
-        if ($schema->getSocialiteProvider()) {
-            Event::listen(fn (SocialiteWasCalled $event) => $event->extendSocialite($schema->getId(), $schema->getSocialiteProvider()));
-        }
-
-        $this->schemas[$schema->getId()] = $schema;
-    }
-}

app/Extensions/OAuth/Providers/AuthentikProvider.php

@@ -1,19 +1,25 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+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 AuthentikSchema extends OAuthSchema
+final class AuthentikProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'authentik';
     }
 
-    public function getSocialiteProvider(): string
+    public function getProviderClass(): string
     {
         return Provider::class;
     }
@@ -60,4 +66,9 @@ final class AuthentikSchema extends OAuthSchema
     {
         return env('OAUTH_AUTHENTIK_DISPLAY_COLOR', '#fd4b2d');
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/CommonProvider.php

@@ -0,0 +1,38 @@
+<?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

@@ -0,0 +1,64 @@
+<?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\Facades\Blade;
+use Illuminate\Support\HtmlString;
+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(Blade::render('<p>Visit the <x-filament::link href="https://discord.com/developers/applications" target="_blank">Discord Developer Portal</x-filament::link> 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> from the OAuth2 tab, 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 (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
+                        ->formatStateUsing(fn () => 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

@@ -0,0 +1,63 @@
+<?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\Facades\Blade;
+use Illuminate\Support\HtmlString;
+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(Blade::render('<p>Visit the <x-filament::link href="https://github.com/settings/developers" target="_blank">Github Developer Dashboard</x-filament::link>, 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 (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
+                        ->default(fn () => 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/GitlabProvider.php

@@ -1,15 +1,22 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Schemas\Components\Wizard\Step;
+use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
+use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
-final class GitlabSchema extends OAuthSchema
+final class GitlabProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'gitlab';
@@ -40,14 +47,13 @@ final class GitlabSchema extends OAuthSchema
         return array_merge([
             Step::make('Register new Gitlab OAuth App')
                 ->schema([
-                    TextEntry::make('register_application')
-                        ->hiddenLabel()
-                        ->state(new HtmlString(Blade::render('Check out the <x-filament::link href="https://docs.gitlab.com/integration/oauth_provider/" target="_blank">Gitlab docs</x-filament::link> on how to create the oauth app.'))),
+                    Placeholder::make('')
+                        ->content(new HtmlString(Blade::render('Check out the <x-filament::link href="https://docs.gitlab.com/integration/oauth_provider/" target="_blank">Gitlab docs</x-filament::link> on how to create the oauth app.'))),
                     TextInput::make('_noenv_callback')
                         ->label('Redirect URI')
                         ->dehydrated()
                         ->disabled()
-                        ->hintCopy()
+                        ->hintAction(fn (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
                         ->default(fn () => url('/auth/oauth/callback/gitlab')),
                 ]),
         ], parent::getSetupSteps());
@@ -62,4 +68,9 @@ final class GitlabSchema extends OAuthSchema
     {
         return '#fca326';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Providers/OAuthProvider.php

@@ -0,0 +1,131 @@
+<?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,22 +1,28 @@
 <?php
 
-namespace App\Extensions\OAuth\Schemas;
+namespace App\Extensions\OAuth\Providers;
 
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Schemas\Components\Wizard\Step;
+use Filament\Forms\Components\Wizard\Step;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
 use SocialiteProviders\Steam\Provider;
 
-final class SteamSchema extends OAuthSchema
+final class SteamProvider extends OAuthProvider
 {
+    public function __construct(protected Application $app)
+    {
+        parent::__construct($app);
+    }
+
     public function getId(): string
     {
         return 'steam';
     }
 
-    public function getSocialiteProvider(): string
+    public function getProviderClass(): string
     {
         return Provider::class;
     }
@@ -52,9 +58,8 @@ final class SteamSchema extends OAuthSchema
         return array_merge([
             Step::make('Create API Key')
                 ->schema([
-                    TextEntry::make('create_api_key')
-                        ->hiddenLabel()
-                        ->state(new HtmlString(Blade::render('Visit <x-filament::link href="https://steamcommunity.com/dev/apikey" target="_blank">https://steamcommunity.com/dev/apikey</x-filament::link> to generate an API key.'))),
+                    Placeholder::make('')
+                        ->content(new HtmlString(Blade::render('Visit <x-filament::link href="https://steamcommunity.com/dev/apikey" target="_blank">https://steamcommunity.com/dev/apikey</x-filament::link> to generate an API key.'))),
                 ]),
         ], parent::getSetupSteps());
     }
@@ -68,4 +73,9 @@ final class SteamSchema extends OAuthSchema
     {
         return '#00adee';
     }
+
+    public static function register(Application $app): self
+    {
+        return new self($app);
+    }
 }

app/Extensions/OAuth/Schemas/CommonSchema.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Schemas;
-
-final class CommonSchema extends OAuthSchema
-{
-    public function __construct(
-        private readonly string $id,
-        private readonly ?string $name = null,
-        private readonly ?string $configName = null,
-        private readonly ?string $icon = null,
-        private readonly ?string $hexColor = null,
-    ) {}
-
-    public function getId(): string
-    {
-        return $this->id;
-    }
-
-    public function getName(): string
-    {
-        return $this->name ?? parent::getName();
-    }
-
-    public function getConfigKey(): string
-    {
-        return $this->configName ?? parent::getConfigKey();
-    }
-
-    public function getIcon(): ?string
-    {
-        return $this->icon;
-    }
-
-    public function getHexColor(): ?string
-    {
-        return $this->hexColor;
-    }
-}

app/Extensions/OAuth/Schemas/DiscordSchema.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Schemas;
-
-use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Schemas\Components\Wizard\Step;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-use SocialiteProviders\Discord\Provider;
-
-final class DiscordSchema extends OAuthSchema
-{
-    public function getId(): string
-    {
-        return 'discord';
-    }
-
-    public function getSocialiteProvider(): string
-    {
-        return Provider::class;
-    }
-
-    public function getSetupSteps(): array
-    {
-        return array_merge([
-            Step::make('Register new Discord OAuth App')
-                ->schema([
-                    TextEntry::make('create_application')
-                        ->hiddenLabel()
-                        ->state(new HtmlString(Blade::render('<p>Visit the <x-filament::link href="https://discord.com/developers/applications" target="_blank">Discord Developer Portal</x-filament::link> 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> from the OAuth2 tab, you will need them in the final step.</p>'))),
-                    TextEntry::make('set_redirect')
-                        ->hiddenLabel()
-                        ->state(new HtmlString('<p>Under <b>Redirects</b> add the below URL.</p>')),
-                    TextInput::make('_noenv_callback')
-                        ->label('Redirect URL')
-                        ->dehydrated()
-                        ->disabled()
-                        ->hintCopy()
-                        ->formatStateUsing(fn () => url('/auth/oauth/callback/discord')),
-                ]),
-        ], parent::getSetupSteps());
-    }
-
-    public function getIcon(): string
-    {
-        return 'tabler-brand-discord-f';
-    }
-
-    public function getHexColor(): string
-    {
-        return '#5865F2';
-    }
-}

app/Extensions/OAuth/Schemas/GithubSchema.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Schemas;
-
-use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Schemas\Components\Wizard\Step;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Support\HtmlString;
-
-final class GithubSchema extends OAuthSchema
-{
-    public function getId(): string
-    {
-        return 'github';
-    }
-
-    public function getSetupSteps(): array
-    {
-        return array_merge([
-            Step::make('Register new Github OAuth App')
-                ->schema([
-                    TextEntry::make('create_application')
-                        ->hiddenLabel()
-                        ->state(new HtmlString(Blade::render('<p>Visit the <x-filament::link href="https://github.com/settings/developers" target="_blank">Github Developer Dashboard</x-filament::link>, 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()
-                        ->hintCopy()
-                        ->default(fn () => url('/auth/oauth/callback/github')),
-                    TextEntry::make('register_application')
-                        ->hiddenLabel()
-                        ->state(new HtmlString('<p>When you filled all fields click on <b>Register application</b>.</p>')),
-                ]),
-            Step::make('Create Client Secret')
-                ->schema([
-                    TextEntry::make('create_client_secret')
-                        ->hiddenLabel()
-                        ->state(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';
-    }
-}

app/Extensions/OAuth/Schemas/OAuthSchema.php

@@ -1,137 +0,0 @@
-<?php
-
-namespace App\Extensions\OAuth\Schemas;
-
-use App\Extensions\OAuth\OAuthSchemaInterface;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Toggle;
-use Filament\Schemas\Components\Component;
-use Filament\Schemas\Components\Utilities\Set;
-use Filament\Schemas\Components\Wizard\Step;
-use Illuminate\Support\Str;
-
-abstract class OAuthSchema implements OAuthSchemaInterface
-{
-    abstract public function getId(): string;
-
-    public function getSocialiteProvider(): ?string
-    {
-        return 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")),
-            Toggle::make("OAUTH_{$id}_SHOULD_CREATE_MISSING_USERS")
-                ->label(trans('admin/setting.oauth.create_missing_users'))
-                ->columnSpan(2)
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->formatStateUsing(fn ($state) => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set("OAUTH_{$id}_SHOULD_CREATE_MISSING_USERS", (bool) $state))
-                ->default(env("OAUTH_{$id}_SHOULD_CREATE_MISSING_USERS")),
-            Toggle::make("OAUTH_{$id}_SHOULD_LINK_MISSING_USERS")
-                ->label(trans('admin/setting.oauth.link_missing_users'))
-                ->columnSpan(2)
-                ->inline(false)
-                ->onIcon('tabler-check')
-                ->offIcon('tabler-x')
-                ->onColor('success')
-                ->offColor('danger')
-                ->formatStateUsing(fn ($state) => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set("OAUTH_{$id}_SHOULD_LINK_MISSING_USERS", (bool) $state))
-                ->default(env("OAUTH_{$id}_SHOULD_LINK_MISSING_USERS")),
-        ];
-    }
-
-    /**
-     * @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 getConfigKey(): string
-    {
-        $id = Str::upper($this->getId());
-
-        return "OAUTH_{$id}_ENABLED";
-    }
-
-    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);
-    }
-
-    public function shouldCreateMissingUsers(): bool
-    {
-        $id = Str::upper($this->getId());
-
-        return env("OAUTH_{$id}_SHOULD_CREATE_MISSING_USERS", false);
-    }
-
-    public function shouldLinkMissingUsers(): bool
-    {
-        $id = Str::upper($this->getId());
-
-        return env("OAUTH_{$id}_SHOULD_LINK_MISSING_USERS", false);
-    }
-}

app/Extensions/Spatie/Fractalistic/Fractal.php

@@ -2,22 +2,20 @@
 
 namespace App\Extensions\Spatie\Fractalistic;
 
-use App\Extensions\League\Fractal\Serializers\PanelSerializer;
-use Illuminate\Contracts\Pagination\LengthAwarePaginator;
-use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Scope;
 use League\Fractal\TransformerAbstract;
 use Spatie\Fractal\Fractal as SpatieFractal;
-use Spatie\Fractalistic\Exceptions\InvalidTransformation;
-use Spatie\Fractalistic\Exceptions\NoTransformerSpecified;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use App\Extensions\League\Fractal\Serializers\PanelSerializer;
 
 class Fractal extends SpatieFractal
 {
     /**
      * Create fractal data.
      *
-     * @throws InvalidTransformation
-     * @throws NoTransformerSpecified
+     * @throws \Spatie\Fractalistic\Exceptions\InvalidTransformation
+     * @throws \Spatie\Fractalistic\Exceptions\NoTransformerSpecified
      */
     public function createData(): Scope
     {

app/Facades/Activity.php

@@ -2,8 +2,8 @@
 
 namespace App\Facades;
 
-use App\Services\Activity\ActivityLogService;
 use Illuminate\Support\Facades\Facade;
+use App\Services\Activity\ActivityLogService;
 
 class Activity extends Facade
 {

app/Facades/LogTarget.php

@@ -2,8 +2,8 @@
 
 namespace App\Facades;
 
-use App\Services\Activity\ActivityLogTargetableService;
 use Illuminate\Support\Facades\Facade;
+use App\Services\Activity\ActivityLogTargetableService;
 
 class LogTarget extends Facade
 {

app/Filament/Admin/Pages/Dashboard.php

@@ -7,7 +7,7 @@ use Filament\Pages\Dashboard as BaseDashboard;
 
 class Dashboard extends BaseDashboard
 {
-    protected static string|\BackedEnum|null $navigationIcon = 'tabler-layout-dashboard';
+    protected static ?string $navigationIcon = 'tabler-layout-dashboard';
 
     private SoftwareVersionService $softwareVersionService;
 
@@ -16,7 +16,7 @@ class Dashboard extends BaseDashboard
         $this->softwareVersionService = $softwareVersionService;
     }
 
-    public function getColumns(): int|array
+    public function getColumns(): int
     {
         return 1;
     }

app/Filament/Admin/Pages/Health.php

@@ -13,9 +13,9 @@ use Spatie\Health\ResultStores\ResultStore;
 
 class Health extends Page
 {
-    protected static string|\BackedEnum|null $navigationIcon = 'tabler-heart';
+    protected static ?string $navigationIcon = 'tabler-heart';
 
-    protected string $view = 'filament.pages.health';
+    protected static string $view = 'filament.pages.health';
 
     /** @var array<string, string> */
     protected $listeners = [
@@ -123,7 +123,7 @@ class Health extends Page
             return $carry;
         }, []);
 
-        return trans('admin/health.checks.failed', ['checks' => implode(', ', $failedNames)]);
+        return trans('admin/health.checks.failed') . implode(', ', $failedNames);
     }
 
     public static function getNavigationIcon(): string

app/Filament/Admin/Pages/Settings.php

@@ -2,41 +2,37 @@
 
 namespace App\Filament\Admin\Pages;
 
-use App\Extensions\Avatar\AvatarService;
-use App\Extensions\Captcha\CaptchaService;
-use App\Extensions\OAuth\OAuthService;
+use App\Extensions\Avatar\AvatarProvider;
+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 App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\Actions;
+use Filament\Forms\Components\Actions\Action as FormAction;
+use Filament\Forms\Components\Component;
 use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Group;
 use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
+use Filament\Forms\Components\Tabs;
+use Filament\Forms\Components\Tabs\Tab;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Concerns\InteractsWithForms;
+use Filament\Forms\Contracts\HasForms;
+use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
-use Filament\Schemas\Components\Actions;
-use Filament\Schemas\Components\Component;
-use Filament\Schemas\Components\Group;
-use Filament\Schemas\Components\Section;
-use Filament\Schemas\Components\StateCasts\BooleanStateCast;
-use Filament\Schemas\Components\Tabs;
-use Filament\Schemas\Components\Tabs\Tab;
-use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Components\Utilities\Set;
-use Filament\Schemas\Contracts\HasSchemas;
-use Filament\Schemas\Schema;
-use Filament\Support\Enums\Width;
+use Filament\Support\Enums\MaxWidth;
 use Illuminate\Http\Client\Factory;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Artisan;
@@ -44,26 +40,17 @@ use Illuminate\Support\Facades\Notification as MailNotification;
 use Illuminate\Support\Str;
 
 /**
- * @property Schema $form
+ * @property Form $form
  */
-class Settings extends Page implements HasSchemas
+class Settings extends Page implements HasForms
 {
-    use CanCustomizeHeaderActions, InteractsWithHeaderActions {
-        CanCustomizeHeaderActions::getHeaderActions insteadof InteractsWithHeaderActions;
-    }
-    use CanCustomizeHeaderWidgets;
     use EnvironmentWriterTrait;
     use InteractsWithForms;
+    use InteractsWithHeaderActions;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'tabler-settings';
+    protected static ?string $navigationIcon = 'tabler-settings';
 
-    protected string $view = 'filament.pages.settings';
-
-    protected OAuthService $oauthService;
-
-    protected AvatarService $avatarService;
-
-    protected CaptchaService $captchaService;
+    protected static string $view = 'filament.pages.settings';
 
     /** @var array<mixed>|null */
     public ?array $data = [];
@@ -73,13 +60,6 @@ class Settings extends Page implements HasSchemas
         $this->form->fill();
     }
 
-    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService): void
-    {
-        $this->oauthService = $oauthService;
-        $this->avatarService = $avatarService;
-        $this->captchaService = $captchaService;
-    }
-
     public static function canAccess(): bool
     {
         return auth()->user()->can('view settings');
@@ -95,11 +75,6 @@ class Settings extends Page implements HasSchemas
         return trans('admin/setting.title');
     }
 
-    /**
-     * @return array<Component>
-     *
-     * @throws Exception
-     */
     protected function getFormSchema(): array
     {
         return [
@@ -116,7 +91,7 @@ class Settings extends Page implements HasSchemas
                         ->label(trans('admin/setting.navigation.captcha'))
                         ->icon('tabler-shield')
                         ->schema($this->captchaSettings())
-                        ->columns(1),
+                        ->columns(3),
                     Tab::make('mail')
                         ->label(trans('admin/setting.navigation.mail'))
                         ->icon('tabler-mail')
@@ -125,11 +100,10 @@ class Settings extends Page implements HasSchemas
                         ->label(trans('admin/setting.navigation.backup'))
                         ->icon('tabler-box')
                         ->schema($this->backupSettings()),
-                    Tab::make('oauth')
+                    Tab::make('OAuth')
                         ->label(trans('admin/setting.navigation.oauth'))
                         ->icon('tabler-brand-oauth')
-                        ->schema($this->oauthSettings())
-                        ->columns(1),
+                        ->schema($this->oauthSettings()),
                     Tab::make('misc')
                         ->label(trans('admin/setting.navigation.misc'))
                         ->icon('tabler-tool')
@@ -138,9 +112,7 @@ class Settings extends Page implements HasSchemas
         ];
     }
 
-    /** @return Component[]
-     * @throws Exception
-     */
+    /** @return Component[] */
     private function generalSettings(): array
     {
         return [
@@ -153,12 +125,14 @@ class Settings extends Page implements HasSchemas
                 ->schema([
                     TextInput::make('APP_LOGO')
                         ->label(trans('admin/setting.general.app_logo'))
-                        ->hintIcon('tabler-question-mark', trans('admin/setting.general.app_logo_help'))
+                        ->hintIcon('tabler-question-mark')
+                        ->hintIconTooltip(trans('admin/setting.general.app_logo_help'))
                         ->default(env('APP_LOGO'))
                         ->placeholder('/pelican.svg'),
                     TextInput::make('APP_FAVICON')
                         ->label(trans('admin/setting.general.app_favicon'))
-                        ->hintIcon('tabler-question-mark', trans('admin/setting.general.app_favicon_help'))
+                        ->hintIcon('tabler-question-mark')
+                        ->hintIconTooltip(trans('admin/setting.general.app_favicon_help'))
                         ->required()
                         ->default(env('APP_FAVICON', '/pelican.ico'))
                         ->placeholder('/pelican.ico'),
@@ -173,8 +147,19 @@ class Settings extends Page implements HasSchemas
                         ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
-                        ->stateCast(new BooleanStateCast(false))
+                        ->formatStateUsing(fn ($state): bool => (bool) $state)
+                        ->afterStateUpdated(fn ($state, Set $set) => $set('APP_DEBUG', (bool) $state))
                         ->default(env('APP_DEBUG', config('app.debug'))),
+                    ToggleButtons::make('FILAMENT_TOP_NAVIGATION')
+                        ->label(trans('admin/setting.general.navigation'))
+                        ->inline()
+                        ->options([
+                            false => trans('admin/setting.general.sidebar'),
+                            true => trans('admin/setting.general.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'))),
                 ]),
             Group::make()
                 ->columns(2)
@@ -182,7 +167,7 @@ class Settings extends Page implements HasSchemas
                     Select::make('FILAMENT_AVATAR_PROVIDER')
                         ->label(trans('admin/setting.general.avatar_provider'))
                         ->native(false)
-                        ->options($this->avatarService->getMappings())
+                        ->options(collect(AvatarProvider::getAll())->mapWithKeys(fn ($provider) => [$provider->getId() => $provider->getName()]))
                         ->selectablePlaceholder(false)
                         ->default(env('FILAMENT_AVATAR_PROVIDER', config('panel.filament.avatar-provider'))),
                     Toggle::make('FILAMENT_UPLOADABLE_AVATARS')
@@ -192,17 +177,19 @@ class Settings extends Page implements HasSchemas
                         ->offIcon('tabler-x')
                         ->onColor('success')
                         ->offColor('danger')
-                        ->stateCast(new BooleanStateCast(false))
+                        ->formatStateUsing(fn ($state) => (bool) $state)
+                        ->afterStateUpdated(fn ($state, Set $set) => $set('FILAMENT_UPLOADABLE_AVATARS', (bool) $state))
                         ->default(env('FILAMENT_UPLOADABLE_AVATARS', config('panel.filament.uploadable-avatars'))),
                 ]),
             ToggleButtons::make('PANEL_USE_BINARY_PREFIX')
                 ->label(trans('admin/setting.general.unit_prefix'))
                 ->inline()
                 ->options([
-                    0 => trans('admin/setting.general.decimal_prefix'),
-                    1 => trans('admin/setting.general.binary_prefix'),
+                    false => trans('admin/setting.general.decimal_prefix'),
+                    true => trans('admin/setting.general.binary_prefix'),
                 ])
-                ->stateCast(new BooleanStateCast(false, true))
+                ->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'))
@@ -218,7 +205,7 @@ class Settings extends Page implements HasSchemas
             Select::make('FILAMENT_WIDTH')
                 ->label(trans('admin/setting.general.display_width'))
                 ->native(false)
-                ->options(Width::class)
+                ->options(MaxWidth::class)
                 ->selectablePlaceholder(false)
                 ->default(env('FILAMENT_WIDTH', config('panel.filament.display-width'))),
             TagsInput::make('TRUSTED_PROXIES')
@@ -228,14 +215,14 @@ class Settings extends Page implements HasSchemas
                 ->placeholder(trans('admin/setting.general.trusted_proxies_help'))
                 ->default(env('TRUSTED_PROXIES', implode(',', Arr::wrap(config('trustedproxy.proxies')))))
                 ->hintActions([
-                    Action::make('clear')
+                    FormAction::make('clear')
                         ->label(trans('admin/setting.general.clear'))
                         ->color('danger')
                         ->icon('tabler-trash')
                         ->requiresConfirmation()
                         ->authorize(fn () => auth()->user()->can('update settings'))
                         ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [])),
-                    Action::make('cloudflare')
+                    FormAction::make('cloudflare')
                         ->label(trans('admin/setting.general.set_to_cf'))
                         ->icon('tabler-brand-cloudflare')
                         ->authorize(fn () => auth()->user()->can('update settings'))
@@ -266,39 +253,45 @@ class Settings extends Page implements HasSchemas
 
     /**
      * @return Component[]
-     *
-     * @throws Exception
      */
     private function captchaSettings(): array
     {
         $formFields = [];
 
-        $captchaSchemas = $this->captchaService->getAll();
-        foreach ($captchaSchemas as $schema) {
-            $id = Str::upper($schema->getId());
+        $captchaProviders = CaptchaProvider::get();
+        foreach ($captchaProviders as $captchaProvider) {
+            $id = Str::upper($captchaProvider->getId());
+            $name = Str::title($captchaProvider->getId());
 
-            $formFields[] = Section::make($schema->getName())
+            $formFields[] = Section::make($name)
                 ->columns(5)
-                ->icon($schema->getIcon() ?? 'tabler-shield')
-                ->collapsed(fn () => !$schema->isEnabled())
+                ->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([
-                        Action::make("disable_captcha_$id")
+                        FormAction::make("disable_captcha_$id")
                             ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
                             ->label(trans('admin/setting.captcha.disable'))
                             ->color('danger')
-                            ->action(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", false)),
-                        Action::make("enable_captcha_$id")
+                            ->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(fn (Set $set) => $set("CAPTCHA_{$id}_ENABLED", true)),
+                            ->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($schema->getSettingsForm())
+                    Group::make($captchaProvider->getSettingsForm())
                         ->visible(fn (Get $get) => $get("CAPTCHA_{$id}_ENABLED"))
                         ->columns(4)
                         ->columnSpan(4),
@@ -310,8 +303,6 @@ class Settings extends Page implements HasSchemas
 
     /**
      * @return Component[]
-     *
-     * @throws Exception
      */
     private function mailSettings(): array
     {
@@ -331,7 +322,7 @@ class Settings extends Page implements HasSchemas
                 ->live()
                 ->default(env('MAIL_MAILER', config('mail.default')))
                 ->hintAction(
-                    Action::make('test')
+                    FormAction::make('test')
                         ->label(trans('admin/setting.mail.test_mail'))
                         ->icon('tabler-send')
                         ->hidden(fn (Get $get) => $get('MAIL_MAILER') === 'log')
@@ -389,7 +380,6 @@ class Settings extends Page implements HasSchemas
             Section::make(trans('admin/setting.mail.from_settings'))
                 ->description(trans('admin/setting.mail.from_settings_help'))
                 ->columns()
-                ->columnSpanFull()
                 ->schema([
                     TextInput::make('MAIL_FROM_ADDRESS')
                         ->label(trans('admin/setting.mail.from_address'))
@@ -403,7 +393,6 @@ class Settings extends Page implements HasSchemas
                 ]),
             Section::make(trans('admin/setting.mail.smtp.smtp_title'))
                 ->columns()
-                ->columnSpanFull()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp')
                 ->schema([
                     TextInput::make('MAIL_HOST')
@@ -440,7 +429,6 @@ class Settings extends Page implements HasSchemas
                 ]),
             Section::make(trans('admin/setting.mail.mailgun.mailgun_title'))
                 ->columns()
-                ->columnSpanFull()
                 ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun')
                 ->schema([
                     TextInput::make('MAILGUN_DOMAIN')
@@ -461,8 +449,6 @@ class Settings extends Page implements HasSchemas
 
     /**
      * @return Component[]
-     *
-     * @throws Exception
      */
     private function backupSettings(): array
     {
@@ -480,7 +466,6 @@ class Settings extends Page implements HasSchemas
             Section::make(trans('admin/setting.backup.throttle'))
                 ->description(trans('admin/setting.backup.throttle_help'))
                 ->columns()
-                ->columnSpanFull()
                 ->schema([
                     TextInput::make('BACKUP_THROTTLE_LIMIT')
                         ->label(trans('admin/setting.backup.limit'))
@@ -528,7 +513,8 @@ class Settings extends Page implements HasSchemas
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
-                        ->stateCast(new BooleanStateCast(false))
+                        ->formatStateUsing(fn ($state): bool => (bool) $state)
+                        ->afterStateUpdated(fn ($state, Set $set) => $set('AWS_USE_PATH_STYLE_ENDPOINT', (bool) $state))
                         ->default(env('AWS_USE_PATH_STYLE_ENDPOINT', config('backups.disks.s3.use_path_style_endpoint'))),
                 ]),
         ];
@@ -536,44 +522,44 @@ class Settings extends Page implements HasSchemas
 
     /**
      * @return Component[]
-     *
-     * @throws Exception
      */
     private function oauthSettings(): array
     {
         $formFields = [];
 
-        $oauthSchemas = $this->oauthService->getAll();
-        foreach ($oauthSchemas as $schema) {
-            $id = Str::upper($schema->getId());
-            $key = $schema->getConfigKey();
+        $oauthProviders = OAuthProvider::get();
+        foreach ($oauthProviders as $oauthProvider) {
+            $id = Str::upper($oauthProvider->getId());
+            $name = Str::title($oauthProvider->getId());
 
-            $formFields[] = Section::make($schema->getName())
+            $formFields[] = Section::make($name)
                 ->columns(5)
-                ->icon($schema->getIcon() ?? 'tabler-brand-oauth')
-                ->collapsed(fn () => !env($key, false))
+                ->icon($oauthProvider->getIcon() ?? 'tabler-brand-oauth')
+                ->collapsed(fn () => !env("OAUTH_{$id}_ENABLED", false))
                 ->collapsible()
                 ->schema([
-                    Hidden::make($key)
+                    Hidden::make("OAUTH_{$id}_ENABLED")
                         ->live()
-                        ->default(env($key)),
+                        ->default(env("OAUTH_{$id}_ENABLED")),
                     Actions::make([
-                        Action::make("disable_oauth_$id")
-                            ->visible(fn (Get $get) => $get($key))
+                        FormAction::make("disable_oauth_$id")
+                            ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
                             ->label(trans('admin/setting.oauth.disable'))
                             ->color('danger')
-                            ->action(fn (Set $set) => $set($key, false)),
-                        Action::make("enable_oauth_$id")
-                            ->visible(fn (Get $get) => !$get($key))
+                            ->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($schema->getSetupSteps())
-                            ->modalHeading(trans('admin/setting.oauth.enable_schema', ['schema' => $schema->getName()]))
+                            ->steps($oauthProvider->getSetupSteps())
+                            ->modalHeading(trans('admin/setting.oauth.enable') . ' ' . $name)
                             ->modalSubmitActionLabel(trans('admin/setting.oauth.enable'))
                             ->modalCancelAction(false)
-                            ->action(function ($data, Set $set) use ($key) {
+                            ->action(function ($data, Set $set) use ($id) {
                                 $data = array_merge([
-                                    $key => 'true',
+                                    "OAUTH_{$id}_ENABLED" => 'true',
                                 ], $data);
 
                                 foreach ($data as $key => $value) {
@@ -581,8 +567,8 @@ class Settings extends Page implements HasSchemas
                                 }
                             }),
                     ])->columnSpan(1),
-                    Group::make($schema->getSettingsForm())
-                        ->visible(fn (Get $get) => $get($key))
+                    Group::make($oauthProvider->getSettingsForm())
+                        ->visible(fn (Get $get) => $get("OAUTH_{$id}_ENABLED"))
                         ->columns(4)
                         ->columnSpan(4),
                 ]);
@@ -593,8 +579,6 @@ class Settings extends Page implements HasSchemas
 
     /**
      * @return Component[]
-     *
-     * @throws Exception
      */
     private function miscSettings(): array
     {
@@ -613,7 +597,8 @@ class Settings extends Page implements HasSchemas
                         ->offColor('danger')
                         ->live()
                         ->columnSpanFull()
-                        ->stateCast(new BooleanStateCast(false))
+                        ->formatStateUsing(fn ($state): bool => (bool) $state)
+                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_CLIENT_ALLOCATIONS_ENABLED', (bool) $state))
                         ->default(env('PANEL_CLIENT_ALLOCATIONS_ENABLED', config('panel.client_features.allocations.enabled'))),
                     TextInput::make('PANEL_CLIENT_ALLOCATIONS_RANGE_START')
                         ->label(trans('admin/setting.misc.auto_allocation.start'))
@@ -704,7 +689,8 @@ class Settings extends Page implements HasSchemas
                         ->onColor('success')
                         ->offColor('danger')
                         ->live()
-                        ->stateCast(new BooleanStateCast(false))
+                        ->formatStateUsing(fn ($state): bool => (bool) $state)
+                        ->afterStateUpdated(fn ($state, Set $set) => $set('APP_ACTIVITY_HIDE_ADMIN', (bool) $state))
                         ->default(env('APP_ACTIVITY_HIDE_ADMIN', config('activity.hide_admin_activity'))),
                 ]),
             Section::make(trans('admin/setting.misc.api.title'))
@@ -782,19 +768,8 @@ class Settings extends Page implements HasSchemas
             $data = $this->form->getState();
             unset($data['ConsoleFonts']);
 
-            $data = array_map(function ($value) {
-                // Convert bools to a string, so they are correctly written to the .env file
-                if (is_bool($value)) {
-                    return $value ? 'true' : 'false';
-                }
-
-                // Convert enum to its value
-                if ($value instanceof BackedEnum) {
-                    return $value->value;
-                }
-
-                return $value;
-            }, $data);
+            // Convert bools to a string, so they are correctly written to the .env file
+            $data = array_map(fn ($value) => is_bool($value) ? ($value ? 'true' : 'false') : $value, $data);
 
             $this->writeToEnvironment($data);
 
@@ -816,8 +791,7 @@ class Settings extends Page implements HasSchemas
         }
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             Action::make('save')

app/Filament/Admin/Resources/ApiKeyResource.php

@@ -1,40 +1,28 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeys;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Admin\Resources\ApiKeys\Pages\CreateApiKey;
-use App\Filament\Admin\Resources\ApiKeys\Pages\ListApiKeys;
-use App\Filament\Admin\Resources\Users\Pages\EditUser;
+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 App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
-use Exception;
-use Filament\Actions\CreateAction;
-use Filament\Actions\DeleteAction;
+use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\ToggleButtons;
-use Filament\Resources\Pages\PageRegistration;
+use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Schemas\Components\Fieldset;
-use Filament\Schemas\Schema;
+use Filament\Tables\Actions\CreateAction;
+use Filament\Tables\Actions\DeleteAction;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 
 class ApiKeyResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = ApiKey::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'tabler-key';
+    protected static ?string $navigationIcon = 'tabler-key';
 
     public static function getNavigationLabel(): string
     {
@@ -68,10 +56,7 @@ class ApiKeyResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    /**
-     * @throws Exception
-     */
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -93,28 +78,30 @@ class ApiKeyResource extends Resource
                     ->sortable(),
                 TextColumn::make('user.username')
                     ->label(trans('admin/apikey.table.created_by'))
+                    ->icon('tabler-user')
                     ->url(fn (ApiKey $apiKey) => auth()->user()->can('update', $apiKey->user) ? EditUser::getUrl(['record' => $apiKey->user]) : null),
             ])
-            ->recordActions([
+            ->actions([
                 DeleteAction::make(),
             ])
             ->emptyStateIcon('tabler-key')
             ->emptyStateDescription('')
-            ->emptyStateHeading(trans('admin/apikey.empty'))
+            ->emptyStateHeading(trans('admin/apikey.empty_table'))
             ->emptyStateActions([
                 CreateAction::make(),
             ]);
     }
 
-    /**
-     * @throws Exception
-     */
-    public static function defaultForm(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 Fieldset::make('Permissions')
-                    ->columnSpanFull()
+                    ->columns([
+                        'default' => 1,
+                        'sm' => 1,
+                        'md' => 2,
+                    ])
                     ->schema(
                         collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
@@ -155,12 +142,11 @@ class ApiKeyResource extends Resource
             ]);
     }
 
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
+    public static function getPages(): array
     {
         return [
-            'index' => ListApiKeys::route('/'),
-            'create' => CreateApiKey::route('/create'),
+            'index' => Pages\ListApiKeys::route('/'),
+            'create' => Pages\CreateApiKey::route('/create'),
         ];
     }
 }

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

@@ -1,28 +1,19 @@
 <?php
 
-namespace App\Filament\Admin\Resources\ApiKeys\Pages;
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
 
-use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
+use App\Filament\Admin\Resources\ApiKeyResource;
 use App\Models\ApiKey;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Resources\Pages\CreateRecord;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Str;
 
 class CreateApiKey extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = ApiKeyResource::class;
 
     protected static bool $canCreateAnother = false;
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             $this->getCreateFormAction()->formId('form'),
@@ -37,7 +28,7 @@ class CreateApiKey extends CreateRecord
     protected function handleRecordCreation(array $data): Model
     {
         $data['identifier'] = ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION);
-        $data['token'] = Str::random(ApiKey::KEY_LENGTH);
+        $data['token'] = str_random(ApiKey::KEY_LENGTH);
         $data['user_id'] = auth()->user()->id;
         $data['key_type'] = ApiKey::TYPE_APPLICATION;
 

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\Admin\Resources\ApiKeyResource\Pages;
+
+use App\Filament\Admin\Resources\ApiKeyResource;
+use App\Models\ApiKey;
+use Filament\Actions\CreateAction;
+use Filament\Resources\Pages\ListRecords;
+
+class ListApiKeys extends ListRecords
+{
+    protected static string $resource = ApiKeyResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            CreateAction::make()
+                ->hidden(fn () => ApiKey::where('key_type', ApiKey::TYPE_APPLICATION)->count() <= 0),
+        ];
+    }
+}

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

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Filament\Admin\Resources\ApiKeys\Pages;
-
-use App\Filament\Admin\Resources\ApiKeys\ApiKeyResource;
-use App\Models\ApiKey;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Actions\CreateAction;
-use Filament\Resources\Pages\ListRecords;
-
-class ListApiKeys extends ListRecords
-{
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
-    protected static string $resource = ApiKeyResource::class;
-
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
-    {
-        return [
-            CreateAction::make()
-                ->hidden(fn () => ApiKey::where('key_type', ApiKey::TYPE_APPLICATION)->count() <= 0),
-        ];
-    }
-}

app/Filament/Admin/Resources/DatabaseHostResource.php

@@ -1,44 +1,28 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHosts;
+namespace App\Filament\Admin\Resources;
 
-use App\Filament\Admin\Resources\DatabaseHosts\Pages\CreateDatabaseHost;
-use App\Filament\Admin\Resources\DatabaseHosts\Pages\EditDatabaseHost;
-use App\Filament\Admin\Resources\DatabaseHosts\Pages\ListDatabaseHosts;
-use App\Filament\Admin\Resources\DatabaseHosts\Pages\ViewDatabaseHost;
-use App\Filament\Admin\Resources\DatabaseHosts\RelationManagers\DatabasesRelationManager;
+use App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 use App\Models\DatabaseHost;
-use App\Traits\Filament\CanCustomizePages;
-use App\Traits\Filament\CanCustomizeRelations;
-use App\Traits\Filament\CanModifyForm;
-use App\Traits\Filament\CanModifyTable;
-use Exception;
-use Filament\Actions\CreateAction;
-use Filament\Actions\DeleteBulkAction;
-use Filament\Actions\EditAction;
-use Filament\Actions\ViewAction;
+use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
-use Filament\Resources\Pages\PageRegistration;
-use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Forms\Form;
+use Filament\Forms\Set;
 use Filament\Resources\Resource;
-use Filament\Schemas\Components\Section;
-use Filament\Schemas\Components\Utilities\Set;
-use Filament\Schemas\Schema;
+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;
 use Illuminate\Database\Eloquent\Builder;
 
 class DatabaseHostResource extends Resource
 {
-    use CanCustomizePages;
-    use CanCustomizeRelations;
-    use CanModifyForm;
-    use CanModifyTable;
-
     protected static ?string $model = DatabaseHost::class;
 
-    protected static string|\BackedEnum|null $navigationIcon = 'tabler-database';
+    protected static ?string $navigationIcon = 'tabler-database';
 
     protected static ?string $recordTitleAttribute = 'name';
 
@@ -67,10 +51,7 @@ class DatabaseHostResource extends Resource
         return trans('admin/dashboard.advanced');
     }
 
-    /**
-     * @throws Exception
-     */
-    public static function defaultTable(Table $table): Table
+    public static function table(Table $table): Table
     {
         return $table
             ->columns([
@@ -84,13 +65,15 @@ class DatabaseHostResource extends Resource
                     ->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)
-            ->recordActions([
+            ->actions([
                 ViewAction::make()
                     ->hidden(fn ($record) => static::canEdit($record)),
                 EditAction::make(),
@@ -106,15 +89,11 @@ class DatabaseHostResource extends Resource
             ]);
     }
 
-    /**
-     * @throws Exception
-     */
-    public static function defaultForm(Schema $schema): Schema
+    public static function form(Form $form): Form
     {
-        return $schema
-            ->components([
+        return $form
+            ->schema([
                 Section::make()
-                    ->columnSpanFull()
                     ->columns([
                         'default' => 2,
                         'sm' => 3,
@@ -141,7 +120,7 @@ class DatabaseHostResource extends Resource
                             ->maxValue(65535),
                         TextInput::make('max_databases')
                             ->label(trans('admin/databasehost.max_database'))
-                            ->helperText(trans('admin/databasehost.max_databases_help'))
+                            ->helpertext(trans('admin/databasehost.max_databases_help'))
                             ->numeric(),
                         TextInput::make('name')
                             ->label(trans('admin/databasehost.display_name'))
@@ -171,22 +150,13 @@ class DatabaseHostResource extends Resource
             ]);
     }
 
-    /** @return class-string<RelationManager>[] */
-    public static function getDefaultRelations(): array
+    public static function getPages(): array
     {
         return [
-            DatabasesRelationManager::class,
-        ];
-    }
-
-    /** @return array<string, PageRegistration> */
-    public static function getDefaultPages(): array
-    {
-        return [
-            'index' => ListDatabaseHosts::route('/'),
-            'create' => CreateDatabaseHost::route('/create'),
-            'view' => ViewDatabaseHost::route('/{record}'),
-            'edit' => EditDatabaseHost::route('/{record}/edit'),
+            '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

@@ -1,36 +1,31 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
+use App\Filament\Admin\Resources\DatabaseHostResource;
 use App\Services\Databases\Hosts\HostCreationService;
-use App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Exception;
+use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Hidden;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
-use Filament\Infolists\Components\TextEntry;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Resources\Pages\CreateRecord\Concerns\HasWizard;
-use Filament\Schemas\Components\Fieldset;
-use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Components\Utilities\Set;
-use Filament\Schemas\Components\Wizard\Step;
 use Filament\Support\Exceptions\Halt;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use PDOException;
-use Throwable;
+use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
 
 class CreateDatabaseHost extends CreateRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
     use HasWizard;
 
     protected static string $resource = DatabaseHostResource::class;
@@ -44,18 +39,15 @@ class CreateDatabaseHost extends CreateRecord
         $this->service = $service;
     }
 
-    /** @return Step[]
-     * @throws Exception
-     */
+    /** @return Step[] */
     public function getSteps(): array
     {
         return [
             Step::make(trans('admin/databasehost.setup.preparations'))
                 ->columns()
                 ->schema([
-                    TextEntry::make('setup')
-                        ->hiddenLabel()
-                        ->state(trans('admin/databasehost.setup.note')),
+                    Placeholder::make('')
+                        ->content(trans('admin/databasehost.setup.note')),
                     Toggle::make('different_server')
                         ->label(new HtmlString(trans('admin/databasehost.setup.different_server')))
                         ->dehydrated(false)
@@ -88,34 +80,31 @@ class CreateDatabaseHost extends CreateRecord
                 ->schema([
                     Fieldset::make(trans('admin/databasehost.setup.database_user'))
                         ->schema([
-                            TextEntry::make('cli_login')
-                                ->hiddenLabel()
-                                ->state(new HtmlString(trans('admin/databasehost.setup.cli_login')))
+                            Placeholder::make('')
+                                ->content(new HtmlString(trans('admin/databasehost.setup.cli_login')))
                                 ->columnSpanFull(),
                             TextInput::make('create_user')
                                 ->label(trans('admin/databasehost.setup.command_create_user'))
                                 ->default(fn (Get $get) => "CREATE USER '{$get('username')}'@'{$get('panel_ip')}' IDENTIFIED BY '{$get('password')}';")
                                 ->disabled()
                                 ->dehydrated(false)
-                                ->copyable()
+                                ->suffixAction(fn (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
                                 ->columnSpanFull(),
                             TextInput::make('assign_permissions')
                                 ->label(trans('admin/databasehost.setup.command_assign_permissions'))
                                 ->default(fn (Get $get) => "GRANT ALL PRIVILEGES ON *.* TO '{$get('username')}'@'{$get('panel_ip')}' WITH GRANT OPTION;")
                                 ->disabled()
                                 ->dehydrated(false)
-                                ->copyable()
+                                ->suffixAction(fn (string $state) => request()->isSecure() ? CopyAction::make()->copyable($state) : null)
                                 ->columnSpanFull(),
-                            TextEntry::make('cli_exit')
-                                ->hiddenLabel()
-                                ->state(new HtmlString(trans('admin/databasehost.setup.cli_exit')))
+                            Placeholder::make('')
+                                ->content(new HtmlString(trans('admin/databasehost.setup.cli_exit')))
                                 ->columnSpanFull(),
                         ]),
                     Fieldset::make(trans('admin/databasehost.setup.external_access'))
                         ->schema([
-                            TextEntry::make('allow_external_access')
-                                ->hiddenLabel()
-                                ->state(new HtmlString(trans('admin/databasehost.setup.allow_external_access')))
+                            Placeholder::make('')
+                                ->content(new HtmlString(trans('admin/databasehost.setup.allow_external_access')))
                                 ->columnSpanFull(),
                         ]),
                 ]),
@@ -143,7 +132,7 @@ class CreateDatabaseHost extends CreateRecord
                         ->maxValue(65535),
                     TextInput::make('max_databases')
                         ->label(trans('admin/databasehost.max_database'))
-                        ->helperText(trans('admin/databasehost.max_databases_help'))
+                        ->helpertext(trans('admin/databasehost.max_databases_help'))
                         ->placeholder(trans('admin/databasehost.unlimited'))
                         ->numeric(),
                     TextInput::make('name')
@@ -162,10 +151,6 @@ class CreateDatabaseHost extends CreateRecord
         ];
     }
 
-    /**
-     * @throws Halt
-     * @throws Throwable
-     */
     protected function handleRecordCreation(array $data): Model
     {
         try {

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

@@ -1,14 +1,11 @@
 <?php
 
-namespace App\Filament\Admin\Resources\DatabaseHosts\Pages;
+namespace App\Filament\Admin\Resources\DatabaseHostResource\Pages;
 
-use App\Filament\Admin\Resources\DatabaseHosts\DatabaseHostResource;
+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 App\Traits\Filament\CanCustomizeHeaderActions;
-use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
@@ -18,9 +15,6 @@ use PDOException;
 
 class EditDatabaseHost extends EditRecord
 {
-    use CanCustomizeHeaderActions;
-    use CanCustomizeHeaderWidgets;
-
     protected static string $resource = DatabaseHostResource::class;
 
     private HostUpdateService $hostUpdateService;
@@ -30,8 +24,7 @@ class EditDatabaseHost extends EditRecord
         $this->hostUpdateService = $hostUpdateService;
     }
 
-    /** @return array<Action|ActionGroup> */
-    protected function getDefaultHeaderActions(): array
+    protected function getHeaderActions(): array
     {
         return [
             DeleteAction::make()
@@ -46,6 +39,17 @@ class EditDatabaseHost extends EditRecord
         return [];
     }
 
+    public function getRelationManagers(): array
+    {
+        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
+            return [
+                DatabasesRelationManager::class,
+            ];
+        }
+
+        return [];
+    }
+
     protected function handleRecordUpdate(Model $record, array $data): Model
     {
         if (!$record instanceof DatabaseHost) {