feat: Client UI translate to Filament (from React) (#416 )

* Add new panel * Add some basic resource pages * Wip * Wip terminal * Wip * Add new panel * Add some basic resource pages * Wip * [Sub-Users] Add Invite TODO: The logic with permissions * [Sub-Users] Fix Creation * [Cron] Add basics * Add basic auth and messages * Add basic buttons * WIP on issue/353 * WIP on issue/353 * Add Database page * Update Database Page * Start of Backup Page * Composer Update * Changes * Send input * Remove this includes * Better offline handling * Consolidate top nav config * Update Backups Page * Update Backups * Change name * Add Assign All, Layout Fixes. * conflict * update schedule pages * fix phpstan * update pint.json * add cron presets to schedule * fix tests * fix task creation * schedules: disable task creation if limit is reached & disable backup action if backup limit is 0 * update activity pages * update resources * Update Edit User TODO: actually save permissions when they're changed. TODO: Figure out why Control does not update it's state... but the rest do... * .... Sure it works. TODO: Update permissions when you save editing a sub user. * user: update canAccessPanel & canAccessTenant * add helper to convert bytes into readable format * very basic file explorer * files: fix some stuff & remove dummy data * files: better error handling * files: basic file editor * files: add some actions * File manager updates * files: fix paths * Revery Composer Upgrade, Fixes SQLite * fix: Pint (#517) feat: MenuItems to and from admin * Update File Editing Updated File Editing to its own page, Added Permission checks for file manager. Co-authored-by: Boy132 <Boy132@users.noreply.github.com> * add enum for editor langs * files: add upload & pull actions * fix build * files: handle images * Update to Filament v3.2.98 * files: add remaining actions * use `authorize` instead of `hidden` * fix canAccessTenant * update date columns * files: testing & fixes * Fix File Names Co-authored-by: lancepioch <git@lance.sh> * Combine Pull/Upload * Fix BulkDelete * Uncontained tabs * Hide Lang Selection, Move Actions * Update Monaco, more custom * Add livewire config livewire limits uploads to 12MB... who knows why... Fixed uploading a single files failing * files: fix record url * basic setup for settings & startup page * make abstract class for simple app pages * Basic Startup Page * Update nav sort * small cleanup * startup: fix shouldHideComponent & getSelectOptionsFromRules * startup: fix non editable fields & set default value * startup: add todo for save button * Save Variables after update & off click Variables update when the user clicks off the input. * Notifications are cool * Add rule validation * Sort variables by sortid * pint * Settings Page + Startup Changes * settings: cleanup * refactor: use server model for ServerFormPage (formerly known as SimplePage) * Use Repeater for variables * Add Network, Remove breadcrumbs * Add paginated to file explorer * Fix updating variables * Add link to go to new client area * fix after merge * Add graphs to console page Graphs still need to get the data from the web socket. * fix pint & phpstan * fix authorizeAccess for EditFiles and Startup page * Fix rules on startup page * Update console size * Fix node name * add "global search" to files list requires https://github.com/pelican-dev/wings/pull/44 * remove debug dummy data * update view action on ListServers * enable SPA mode for app panel * remove colors from app panel they are defined globally in AppServiceProvider * update global search ui a bit (to be replaced with a custom page that is similar to the list files table) * add own page for global search untested - and route needs cleanup (if possible) * fix File getRows * remove "path" from SearchFiles (for now) * fix caching for searched files * add title and breadcrumbs to global search page * make cpu & memory charts on console page working * fix phpstan * add missing import * cleanup console views & widgets * add overview stats to console * don't be so lazy, console! * make history working * decode data to get array * add missing On * fix json_decode * change polling to 1 sec * hide "0" cpu/ memory * add data to network chart * Remove data labels * fix data on network chart * fix data on network chart (2nd try) * WIP Network Stats * Remove test * Change MaxWidth * run pint * fix phpstan * Fix storeStats cast * make $data a string this time for real * update visible check for "admin" menu item * remove account widget * rebrand "Dashboard" to "Server List" WIP - doesn't look good but is somewhat working * fix canAccessPanel * separate server list into own panel * change path to avoid conflicts with old client area (and remove sidebar width) * display correct icon and color on server list entries * show total memory if server is offline * replace custom server list page with ListRecords page * fix tests * fix namespace * remove "open" button and make whole column clickable * Update EditProfile * run pint * fix access to server list * add new login page to panels * fix next_run_at for new schedules * use new DateTimeColumn * add own column for file bytes * return to server list when clicking title * fix console loading * handle server with "conflict state" * add banner if server is in "conflict state" * fix phpstan * update docker image select * fix permission checks on Settings & Startup pages * fix query for activity log page * fix activity log not being logged * adjust ListActivities * fix phpstan * fix pint * fix profile menu item link on server panel * add ip tooltip to activity logs (and role permission) * change backup icon * update navigation sort * general code cleanup * more cleanup * Disable Restart/Stop if server is offline * Change rename notification * Remove negation on abort_unless * Add notification on save * Single disabled closure & comment unused import * Add required to Server Name & Nullable to description * mutateFormDataBeforeSave doesn't work since we use forceFill * Fix web socket connection not existing. * Fix some subuser permissions * add permission checks to resources * do not allow self-deletion * Update editing file permissions * Fix of the previous fix * add service for subuser updating * Only allow save if they have file_update * Remove unused import * Update backup delete button * Add Delete, remove bulks * Update Database page * Use Allocation Permissions * add canAccess check to startup * Add Permission checks to Settings page * add service for subuser deletion * Remove Kill permission * Updates * fix move files * add redirects * fix phpstan * activity: remove properties from tans for now * If alias, use that, else ip --------- Co-authored-by: notCharles <charles@pelican.dev> Co-authored-by: Boy132 <mail@boy132.de> Co-authored-by: Senna <62171904+Poseidon281@users.noreply.github.com> Co-authored-by: Boy132 <Boy132@users.noreply.github.com> Co-authored-by: RMartinOscar <40749467+RMartinOscar@users.noreply.github.com>
Installer: Shows errors on submit & move runMigrations (#722 )
2026-02-24 11:20:41 +03:00 · 2024-12-01 04:13:45 +01:00 · 2024-12-01 04:04:40 +01:00 · 2024-11-30 22:04:10 -05:00 · 2024-11-30 17:38:38 +01:00 · 2024-11-27 09:02:41 +01:00
630 changed files with 12602 additions and 24177 deletions
--- a/.github/docker/entrypoint.sh
+++ b/.github/docker/entrypoint.sh
@@ -28,6 +28,7 @@ fi

 mkdir /pelican-data/database
 ln -s /pelican-data/.env /var/www/html/
+chown -h www-data:www-data /var/www/html/.env
 ln -s /pelican-data/database/database.sqlite /var/www/html/database/

 if ! grep -q "APP_KEY=" .env || grep -q "APP_KEY=$" .env; then
@@ -51,14 +52,14 @@ crond -L /var/log/crond -l 5
 export SUPERVISORD_CADDY=false

 ## disable caddy if SKIP_CADDY is set
-if [[ -z $SKIP_CADDY ]]; then
+if [[ "${SKIP_CADDY:-}" == "true" ]]; then
+  echo "Starting PHP-FPM only"
+else
  echo "Starting PHP-FPM and Caddy"
  export SUPERVISORD_CADDY=true
-else
-  echo "Starting PHP-FPM only"
 fi

-chown -R www-data:www-data . /pelican-data/.env /pelican-data/database
+chown -R www-data:www-data /pelican-data/.env /pelican-data/database

 echo "Starting Supervisord"
 exec "$@"
--- a/.github/docker/supervisord.conf
+++ b/.github/docker/supervisord.conf
@@ -1,5 +1,7 @@
 [unix_http_server]
 file=/tmp/supervisor.sock                       ; path to your socket file
+username=dummy
+password=dummy

 [supervisord]
 logfile=/var/log/supervisord/supervisord.log    ; supervisord log file
@@ -18,6 +20,8 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

 [supervisorctl]
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
+username=dummy
+password=dummy

 [program:php-fpm]
 command=/usr/local/sbin/php-fpm -F
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -87,7 +87,7 @@ jobs:
      fail-fast: false
      matrix:
        php: [8.2, 8.3]
-        database: ["mariadb:10.3", "mariadb:10.11", "mariadb:11.4"]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
    services:
      database:
        image: ${{ matrix.database }}
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -9,6 +9,10 @@ on:
    types:
      - published

+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
  build-and-push:
    name: Build and Push
@@ -26,7 +30,7 @@ jobs:
        id: docker_meta
        uses: docker/metadata-action@v5
        with:
-          images: ghcr.io/pelican-dev/panel
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          flavor: |
            latest=false
          tags: |
--- a/3
+++ b/3
@@ -38,7 +38,8 @@ RUN touch .env
 RUN composer install --no-dev --optimize-autoloader

 # Set file permissions
-RUN chmod -R 755 storage bootstrap/cache
+RUN chmod -R 755 storage bootstrap/cache \
+    && chown -R www-data:www-data ./

 # Add scheduler to cron
 RUN echo "* * * * * php /var/www/html/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data -
--- a/app/Casts/EndpointCollection.php
+++ b/app/Casts/EndpointCollection.php
@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Casts;
-
-use App\Models\Objects\Endpoint;
-use Illuminate\Contracts\Database\Eloquent\Castable;
-use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
-use Illuminate\Support\Collection;
-
-class EndpointCollection implements Castable
-{
-    public static function castUsing(array $arguments)
-    {
-        return new class() implements CastsAttributes
-        {
-            public function get($model, $key, $value, $attributes)
-            {
-                if (!isset($attributes[$key])) {
-                    return new Collection();
-                }
-
-                $data = json_decode($attributes[$key], true);
-
-                return (new Collection($data))->map(function ($value) {
-                    return new Endpoint($value);
-                });
-            }
-
-            public function set($model, $key, $value, $attributes)
-            {
-                if (!is_array($value) && !$value instanceof Collection) {
-                    return new Collection();
-                }
-
-                if (!$value instanceof Collection) {
-                    $value = new Collection($value);
-                }
-
-                return [
-                    'ports' => $value->toJson(),
-                ];
-            }
-        };
-    }
-}
--- a/app/Console/Commands/InfoCommand.php
+++ b/app/Console/Commands/InfoCommand.php
@@ -26,8 +26,8 @@ class InfoCommand extends Command
    {
        $this->output->title('Version Information');
        $this->table([], [
-            ['Panel Version', $this->versionService->versionData()['version']],
-            ['Latest Version', $this->versionService->getPanel()],
+            ['Panel Version', $this->versionService->currentPanelVersion()],
+            ['Latest Version', $this->versionService->latestPanelVersion()],
            ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
        ], 'compact');

--- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php
+++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php
@@ -6,7 +6,6 @@ use Illuminate\Console\Command;
 use App\Models\Schedule;
 use Illuminate\Database\Eloquent\Builder;
 use App\Services\Schedules\ProcessScheduleService;
-use Carbon\Carbon;

 class ProcessRunnableCommand extends Command
 {
@@ -24,7 +23,7 @@ class ProcessRunnableCommand extends Command
            ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
            ->where('is_active', true)
            ->where('is_processing', false)
-            ->where('next_run_at', '<=', Carbon::now()->toDateTimeString())
+            ->where('next_run_at', '<=', now('UTC')->toDateTimeString())
            ->get();

        if ($schedules->count() < 1) {
--- a/app/Console/Commands/Server/BulkPowerActionCommand.php
+++ b/app/Console/Commands/Server/BulkPowerActionCommand.php
@@ -65,6 +65,7 @@ class BulkPowerActionCommand extends Command

        $bar = $this->output->createProgressBar($count);
        $powerRepository = $this->powerRepository;
+        // @phpstan-ignore-next-line
        $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
            $bar->clear();

--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -9,6 +9,7 @@ use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
 use App\Console\Commands\Schedule\ProcessRunnableCommand;
 use App\Jobs\NodeStatistics;
 use App\Models\ActivityLog;
+use App\Models\Webhook;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -48,5 +49,9 @@ class Kernel extends ConsoleKernel
        if (config('activity.prune_days')) {
            $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
        }
+
+        if (config('panel.webhook.prune_days')) {
+            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
+        }
    }
 }
--- a/app/Enums/EditorLanguages.php
+++ b/app/Enums/EditorLanguages.php
@@ -0,0 +1,98 @@
+<?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 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';
+    case json = 'json';
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+}
--- a/app/Events/ActivityLogged.php
+++ b/app/Events/ActivityLogged.php
@@ -8,9 +8,7 @@ use Illuminate\Database\Eloquent\Model;

 class ActivityLogged extends Event
 {
-    public function __construct(public ActivityLog $model)
-    {
-    }
+    public function __construct(public ActivityLog $model) {}

    public function is(string $event): bool
    {
--- a/app/Events/Auth/DirectLogin.php
+++ b/app/Events/Auth/DirectLogin.php
@@ -7,7 +7,5 @@ use App\Events\Event;

 class DirectLogin extends Event
 {
-    public function __construct(public User $user, public bool $remember)
-    {
-    }
+    public function __construct(public User $user, public bool $remember) {}
 }
--- a/app/Events/Auth/FailedCaptcha.php
+++ b/app/Events/Auth/FailedCaptcha.php
@@ -12,7 +12,5 @@ class FailedCaptcha extends Event
    /**
     * Create a new event instance.
     */
-    public function __construct(public string $ip, public string $domain)
-    {
-    }
+    public function __construct(public string $ip, public ?string $message) {}
 }
--- a/app/Events/Auth/FailedPasswordReset.php
+++ b/app/Events/Auth/FailedPasswordReset.php
@@ -12,7 +12,5 @@ class FailedPasswordReset extends Event
    /**
     * Create a new event instance.
     */
-    public function __construct(public string $ip, public string $email)
-    {
-    }
+    public function __construct(public string $ip, public string $email) {}
 }
--- a/app/Events/Auth/ProvidedAuthenticationToken.php
+++ b/app/Events/Auth/ProvidedAuthenticationToken.php
@@ -7,7 +7,5 @@ use App\Events\Event;

 class ProvidedAuthenticationToken extends Event
 {
-    public function __construct(public User $user, public bool $recovery = false)
-    {
-    }
+    public function __construct(public User $user, public bool $recovery = false) {}
 }
--- a/app/Events/Event.php
+++ b/app/Events/Event.php
@@ -2,6 +2,4 @@

 namespace App\Events;

-abstract class Event
-{
-}
+abstract class Event {}
--- a/app/Events/Server/Created.php
+++ b/app/Events/Server/Created.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Created extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Creating.php
+++ b/app/Events/Server/Creating.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Creating extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Deleted.php
+++ b/app/Events/Server/Deleted.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Deleted extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Deleting.php
+++ b/app/Events/Server/Deleting.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Deleting extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Installed.php
+++ b/app/Events/Server/Installed.php
@@ -13,7 +13,5 @@ class Installed extends Event
    /**
     * Create a new event instance.
     */
-    public function __construct(public Server $server)
-    {
-    }
+    public function __construct(public Server $server) {}
 }
--- a/app/Events/Server/Saved.php
+++ b/app/Events/Server/Saved.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Saved extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Saving.php
+++ b/app/Events/Server/Saving.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Saving extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Updated.php
+++ b/app/Events/Server/Updated.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Updated extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Server/Updating.php
+++ b/app/Events/Server/Updating.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Server;
-use Illuminate\Queue\SerializesModels;
-
-class Updating extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Server $server)
-    {
-    }
-}
--- a/app/Events/Subuser/Created.php
+++ b/app/Events/Subuser/Created.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Subuser;
-
-use App\Events\Event;
-use App\Models\Subuser;
-use Illuminate\Queue\SerializesModels;
-
-class Created extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Subuser $subuser)
-    {
-    }
-}
--- a/app/Events/Subuser/Creating.php
+++ b/app/Events/Subuser/Creating.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Subuser;
-
-use App\Events\Event;
-use App\Models\Subuser;
-use Illuminate\Queue\SerializesModels;
-
-class Creating extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Subuser $subuser)
-    {
-    }
-}
--- a/app/Events/Subuser/Deleted.php
+++ b/app/Events/Subuser/Deleted.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Subuser;
-
-use App\Events\Event;
-use App\Models\Subuser;
-use Illuminate\Queue\SerializesModels;
-
-class Deleted extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Subuser $subuser)
-    {
-    }
-}
--- a/app/Events/Subuser/Deleting.php
+++ b/app/Events/Subuser/Deleting.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\Subuser;
-
-use App\Events\Event;
-use App\Models\Subuser;
-use Illuminate\Queue\SerializesModels;
-
-class Deleting extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Subuser $subuser)
-    {
-    }
-}
--- a/app/Events/User/Created.php
+++ b/app/Events/User/Created.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use App\Events\Event;
-use Illuminate\Queue\SerializesModels;
-
-class Created extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public User $user)
-    {
-    }
-}
--- a/app/Events/User/Creating.php
+++ b/app/Events/User/Creating.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use App\Events\Event;
-use Illuminate\Queue\SerializesModels;
-
-class Creating extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public User $user)
-    {
-    }
-}
--- a/app/Events/User/Deleted.php
+++ b/app/Events/User/Deleted.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use App\Events\Event;
-use Illuminate\Queue\SerializesModels;
-
-class Deleted extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public User $user)
-    {
-    }
-}
--- a/app/Events/User/Deleting.php
+++ b/app/Events/User/Deleting.php
@@ -1,19 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use App\Events\Event;
-use Illuminate\Queue\SerializesModels;
-
-class Deleting extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public User $user)
-    {
-    }
-}
--- a/app/Exceptions/AccountNotFoundException.php
+++ b/app/Exceptions/AccountNotFoundException.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class AccountNotFoundException extends \Exception
-{
-}
--- a/app/Exceptions/AutoDeploymentException.php
+++ b/app/Exceptions/AutoDeploymentException.php
@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-class AutoDeploymentException extends \Exception
-{
-}
--- a/app/Exceptions/DisplayException.php
+++ b/app/Exceptions/DisplayException.php
@@ -10,7 +10,6 @@ use Illuminate\Http\Request;
 use Psr\Log\LoggerInterface;
 use Illuminate\Http\Response;
 use Illuminate\Container\Container;
-use Prologue\Alerts\AlertsMessageBag;
 use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;

 class DisplayException extends PanelException implements HttpExceptionInterface
@@ -67,9 +66,6 @@ class DisplayException extends PanelException implements HttpExceptionInterface
            return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
        }

-        // @phpstan-ignore-next-line
-        app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
-
        return redirect()->back()->withInput();
    }

--- a/app/Exceptions/Http/Base/InvalidPasswordProvidedException.php
+++ b/app/Exceptions/Http/Base/InvalidPasswordProvidedException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Http\Base;

 use App\Exceptions\DisplayException;

-class InvalidPasswordProvidedException extends DisplayException
-{
-}
+class InvalidPasswordProvidedException extends DisplayException {}
--- a/app/Exceptions/Http/Connection/DaemonConnectionException.php
+++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php
@@ -7,9 +7,6 @@ use GuzzleHttp\Exception\GuzzleException;
 use App\Exceptions\DisplayException;
 use Illuminate\Support\Facades\Context;

-/**
- * @method \GuzzleHttp\Exception\GuzzleException getPrevious()
- */
 class DaemonConnectionException extends DisplayException
 {
    private int $statusCode = Response::HTTP_GATEWAY_TIMEOUT;
--- a/app/Exceptions/Http/Server/FileTypeNotEditableException.php
+++ b/app/Exceptions/Http/Server/FileTypeNotEditableException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Http\Server;
-
-use App\Exceptions\DisplayException;
-
-class FileTypeNotEditableException extends DisplayException
-{
-}
--- a/app/Exceptions/PanelException.php
+++ b/app/Exceptions/PanelException.php
@@ -2,6 +2,4 @@

 namespace App\Exceptions;

-class PanelException extends \Exception
-{
-}
+class PanelException extends \Exception {}
--- a/app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php
+++ b/app/Exceptions/Repository/Daemon/InvalidPowerSignalException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Repository\Daemon;
-
-use App\Exceptions\Repository\RepositoryException;
-
-class InvalidPowerSignalException extends RepositoryException
-{
-}
--- a/app/Exceptions/Repository/DuplicateDatabaseNameException.php
+++ b/app/Exceptions/Repository/DuplicateDatabaseNameException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Repository;

 use App\Exceptions\DisplayException;

-class DuplicateDatabaseNameException extends DisplayException
-{
-}
+class DuplicateDatabaseNameException extends DisplayException {}
--- a/app/Exceptions/Repository/RepositoryException.php
+++ b/app/Exceptions/Repository/RepositoryException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Repository;
-
-use App\Exceptions\PanelException;
-
-class RepositoryException extends PanelException
-{
-}
--- a/app/Exceptions/Service/Allocation/AutoAllocationNotEnabledException.php
+++ b/app/Exceptions/Service/Allocation/AutoAllocationNotEnabledException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class AutoAllocationNotEnabledException extends DisplayException
+{
+    /**
+     * AutoAllocationNotEnabledException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(
+            'Server auto-allocation is not enabled for this instance.'
+        );
+    }
+}
--- a/app/Exceptions/Service/Allocation/CidrOutOfRangeException.php
+++ b/app/Exceptions/Service/Allocation/CidrOutOfRangeException.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class CidrOutOfRangeException extends DisplayException
+{
+    /**
+     * CidrOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.cidr_out_of_range'));
+    }
+}
--- a/app/Exceptions/Service/Allocation/InvalidPortMappingException.php
+++ b/app/Exceptions/Service/Allocation/InvalidPortMappingException.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class InvalidPortMappingException extends DisplayException
+{
+    /**
+     * InvalidPortMappingException constructor.
+     */
+    public function __construct(mixed $port)
+    {
+        parent::__construct(trans('exceptions.allocations.invalid_mapping', ['port' => $port]));
+    }
+}
--- a/app/Exceptions/Service/Allocation/NoAutoAllocationSpaceAvailableException.php
+++ b/app/Exceptions/Service/Allocation/NoAutoAllocationSpaceAvailableException.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class NoAutoAllocationSpaceAvailableException extends DisplayException
+{
+    /**
+     * NoAutoAllocationSpaceAvailableException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(
+            'Cannot assign additional allocation: no more space available on node.'
+        );
+    }
+}
--- a/app/Exceptions/Service/Allocation/PortOutOfRangeException.php
+++ b/app/Exceptions/Service/Allocation/PortOutOfRangeException.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class PortOutOfRangeException extends DisplayException
+{
+    /**
+     * PortOutOfRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.port_out_of_range'));
+    }
+}
--- a/app/Exceptions/Service/Allocation/ServerUsingAllocationException.php
+++ b/app/Exceptions/Service/Allocation/ServerUsingAllocationException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class ServerUsingAllocationException extends DisplayException {}
--- a/app/Exceptions/Service/Allocation/TooManyPortsInRangeException.php
+++ b/app/Exceptions/Service/Allocation/TooManyPortsInRangeException.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions\Service\Allocation;
+
+use App\Exceptions\DisplayException;
+
+class TooManyPortsInRangeException extends DisplayException
+{
+    /**
+     * TooManyPortsInRangeException constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(trans('exceptions.allocations.too_many_ports'));
+    }
+}
--- a/app/Exceptions/Service/Deployment/NoViableAllocationException.php
+++ b/app/Exceptions/Service/Deployment/NoViableAllocationException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Exceptions\Service\Deployment;
+
+use App\Exceptions\DisplayException;
+
+class NoViableAllocationException extends DisplayException {}
--- a/app/Exceptions/Service/Egg/BadJsonFormatException.php
+++ b/app/Exceptions/Service/Egg/BadJsonFormatException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Egg;
-
-use App\Exceptions\DisplayException;
-
-class BadJsonFormatException extends DisplayException
-{
-}
--- a/app/Exceptions/Service/Egg/HasChildrenException.php
+++ b/app/Exceptions/Service/Egg/HasChildrenException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg;

 use App\Exceptions\DisplayException;

-class HasChildrenException extends DisplayException
-{
-}
+class HasChildrenException extends DisplayException {}
--- a/app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php
+++ b/app/Exceptions/Service/Egg/NoParentConfigurationFoundException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Egg;
-
-use App\Exceptions\DisplayException;
-
-class NoParentConfigurationFoundException extends DisplayException
-{
-}
--- a/app/Exceptions/Service/Egg/Variable/BadValidationRuleException.php
+++ b/app/Exceptions/Service/Egg/Variable/BadValidationRuleException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg\Variable;

 use App\Exceptions\DisplayException;

-class BadValidationRuleException extends DisplayException
-{
-}
+class BadValidationRuleException extends DisplayException {}
--- a/app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php
+++ b/app/Exceptions/Service/Egg/Variable/ReservedVariableNameException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Egg\Variable;

 use App\Exceptions\DisplayException;

-class ReservedVariableNameException extends DisplayException
-{
-}
+class ReservedVariableNameException extends DisplayException {}
--- a/app/Exceptions/Service/InvalidFileUploadException.php
+++ b/app/Exceptions/Service/InvalidFileUploadException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service;

 use App\Exceptions\DisplayException;

-class InvalidFileUploadException extends DisplayException
-{
-}
+class InvalidFileUploadException extends DisplayException {}
--- a/app/Exceptions/Service/Node/ConfigurationNotPersistedException.php
+++ b/app/Exceptions/Service/Node/ConfigurationNotPersistedException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Node;

 use App\Exceptions\DisplayException;

-class ConfigurationNotPersistedException extends DisplayException
-{
-}
+class ConfigurationNotPersistedException extends DisplayException {}
--- a/app/Exceptions/Service/Schedule/Task/TaskIntervalTooLongException.php
+++ b/app/Exceptions/Service/Schedule/Task/TaskIntervalTooLongException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Schedule\Task;
-
-use App\Exceptions\DisplayException;
-
-class TaskIntervalTooLongException extends DisplayException
-{
-}
--- a/app/Exceptions/Service/Server/RequiredVariableMissingException.php
+++ b/app/Exceptions/Service/Server/RequiredVariableMissingException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Service\Server;
-
-use App\Exceptions\PanelException;
-
-class RequiredVariableMissingException extends PanelException
-{
-}
--- a/app/Exceptions/Service/Subuser/ServerSubuserExistsException.php
+++ b/app/Exceptions/Service/Subuser/ServerSubuserExistsException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Subuser;

 use App\Exceptions\DisplayException;

-class ServerSubuserExistsException extends DisplayException
-{
-}
+class ServerSubuserExistsException extends DisplayException {}
--- a/app/Exceptions/Service/Subuser/UserIsServerOwnerException.php
+++ b/app/Exceptions/Service/Subuser/UserIsServerOwnerException.php
@@ -4,6 +4,4 @@ namespace App\Exceptions\Service\Subuser;

 use App\Exceptions\DisplayException;

-class UserIsServerOwnerException extends DisplayException
-{
-}
+class UserIsServerOwnerException extends DisplayException {}
--- a/app/Exceptions/Transformer/InvalidTransformerLevelException.php
+++ b/app/Exceptions/Transformer/InvalidTransformerLevelException.php
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Exceptions\Transformer;
-
-use App\Exceptions\PanelException;
-
-class InvalidTransformerLevelException extends PanelException
-{
-}
--- a/app/Extensions/Backups/BackupManager.php
+++ b/app/Extensions/Backups/BackupManager.php
@@ -27,9 +27,7 @@ class BackupManager
    /**
     * BackupManager constructor.
     */
-    public function __construct(protected Application $app)
-    {
-    }
+    public function __construct(protected Application $app) {}

    /**
     * Returns a backup adapter instance.
--- a/app/Extensions/Facades/Theme.php
+++ b/app/Extensions/Facades/Theme.php
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Extensions\Facades;
-
-use Illuminate\Support\Facades\Facade;
-
-class Theme extends Facade
-{
-    protected static function getFacadeAccessor(): string
-    {
-        return 'extensions.themes';
-    }
-}
--- a/app/Extensions/Themes/Theme.php
+++ b/app/Extensions/Themes/Theme.php
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Extensions\Themes;
-
-class Theme
-{
-    public function js(string $path): string
-    {
-        return sprintf('<script src="%s"></script>' . PHP_EOL, $this->getUrl($path));
-    }
-
-    public function css(string $path): string
-    {
-        return sprintf('<link media="all" type="text/css" rel="stylesheet" href="%s"/>' . PHP_EOL, $this->getUrl($path));
-    }
-
-    protected function getUrl(string $path): string
-    {
-        return '/themes/panel/' . ltrim($path, '/');
-    }
-}
--- a/app/Facades/LogBatch.php
+++ b/app/Facades/LogBatch.php
@@ -1,14 +0,0 @@
-<?php
-
-namespace App\Facades;
-
-use Illuminate\Support\Facades\Facade;
-use App\Services\Activity\ActivityLogBatchService;
-
-class LogBatch extends Facade
-{
-    protected static function getFacadeAccessor(): string
-    {
-        return ActivityLogBatchService::class;
-    }
-}
--- a/app/Filament/App/Resources/ServerResource.php
+++ b/app/Filament/App/Resources/ServerResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Filament\App\Resources;
+
+use App\Filament\App\Resources\ServerResource\Pages;
+use App\Models\Server;
+use Filament\Resources\Resource;
+
+class ServerResource extends Resource
+{
+    protected static ?string $model = Server::class;
+
+    protected static ?string $slug = '/';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    public static function canAccess(): bool
+    {
+        return true;
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListServers::route('/'),
+        ];
+    }
+}
--- a/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
+++ b/app/Filament/App/Resources/ServerResource/Pages/ListServers.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Filament\App\Resources\ServerResource\Pages;
+
+use App\Filament\App\Resources\ServerResource;
+use App\Filament\Server\Pages\Console;
+use App\Models\Server;
+use App\Tables\Columns\ServerEntryColumn;
+use Carbon\CarbonInterface;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Tables\Columns\Layout\Stack;
+use Filament\Tables\Table;
+use Illuminate\Support\Number;
+
+class ListServers extends ListRecords
+{
+    protected static string $resource = ServerResource::class;
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->paginated(false)
+            ->query(fn () => auth()->user()->can('viewList server') ? Server::query() : auth()->user()->accessibleServers())
+            ->columns([
+                Stack::make([
+                    ServerEntryColumn::make('server_entry')
+                        ->searchable(['name']),
+                ]),
+            ])
+            ->contentGrid([
+                'default' => 1,
+                'xl' => 2,
+            ])
+            ->recordUrl(fn (Server $server) => Console::getUrl(panel: 'server', tenant: $server))
+            ->emptyStateIcon('tabler-brand-docker')
+            ->emptyStateDescription('')
+            ->emptyStateHeading('You don\'t have access to any servers!');
+    }
+
+    // @phpstan-ignore-next-line
+    private function uptime(Server $server): string
+    {
+        $uptime = collect(cache()->get("servers.{$server->id}.uptime"))->last() ?? 0;
+
+        if ($uptime === 0) {
+            return 'Offline';
+        }
+
+        return now()->subMillis($uptime)->diffForHumans(syntax: CarbonInterface::DIFF_ABSOLUTE, short: true, parts: 2);
+    }
+
+    // @phpstan-ignore-next-line
+    private function cpu(Server $server): string
+    {
+        $cpu = Number::format(collect(cache()->get("servers.{$server->id}.cpu_absolute"))->last() ?? 0, maxPrecision: 2, locale: auth()->user()->language) . '%';
+        $max = Number::format($server->cpu, locale: auth()->user()->language) . '%';
+
+        return $cpu . ($server->cpu > 0 ? ' Of ' . $max : '');
+    }
+
+    // @phpstan-ignore-next-line
+    private function memory(Server $server): string
+    {
+        $latestMemoryUsed = collect(cache()->get("servers.{$server->id}.memory_bytes"))->last() ?? 0;
+        $totalMemory = collect(cache()->get("servers.{$server->id}.memory_limit_bytes"))->last() ?? 0;
+
+        $used = config('panel.use_binary_prefix')
+            ? Number::format($latestMemoryUsed / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+            : Number::format($latestMemoryUsed / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+
+        if ($totalMemory === 0) {
+            $total = config('panel.use_binary_prefix')
+                ? Number::format($server->memory / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+                : Number::format($server->memory / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+        } else {
+            $total = config('panel.use_binary_prefix')
+                ? Number::format($totalMemory / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+                : Number::format($totalMemory / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+        }
+
+        return $used . ($server->memory > 0 ? ' Of ' . $total : '');
+    }
+
+    // @phpstan-ignore-next-line
+    private function disk(Server $server): string
+    {
+        $usedDisk = collect(cache()->get("servers.{$server->id}.disk_bytes"))->last() ?? 0;
+
+        $used = config('panel.use_binary_prefix')
+            ? Number::format($usedDisk / 1024 / 1024 / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+            : Number::format($usedDisk / 1000 / 1000 / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+
+        $total = config('panel.use_binary_prefix')
+            ? Number::format($server->disk / 1024, maxPrecision: 2, locale: auth()->user()->language) .' GiB'
+            : Number::format($server->disk / 1000, maxPrecision: 2, locale: auth()->user()->language) . ' GB';
+
+        return $used . ($server->disk > 0 ? ' Of ' . $total : '');
+    }
+}
--- a/app/Filament/Pages/Auth/Login.php
+++ b/app/Filament/Pages/Auth/Login.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Filament\Pages\Auth;
+
+use Coderflex\FilamentTurnstile\Forms\Components\Turnstile;
+use Filament\Forms\Components\Actions;
+use Filament\Forms\Components\Actions\Action;
+use Filament\Forms\Components\Component;
+use Filament\Forms\Components\TextInput;
+use Filament\Pages\Auth\Login as BaseLogin;
+use Illuminate\Support\Str;
+use Illuminate\Validation\ValidationException;
+
+class Login extends BaseLogin
+{
+    protected function getForms(): array
+    {
+        return [
+            'form' => $this->form(
+                $this->makeForm()
+                    ->schema([
+                        $this->getLoginFormComponent(),
+                        $this->getPasswordFormComponent(),
+                        $this->getRememberFormComponent(),
+                        $this->getOAuthFormComponent(),
+                        Turnstile::make('captcha')
+                            ->hidden(!config('turnstile.turnstile_enabled'))
+                            ->validationMessages([
+                                'required' => config('turnstile.error_messages.turnstile_check_message'),
+                            ]),
+                    ])
+                    ->statePath('data'),
+            ),
+        ];
+    }
+
+    protected function throwFailureValidationException(): never
+    {
+        $this->dispatch('reset-captcha');
+
+        throw ValidationException::withMessages([
+            'data.login' => __('filament-panels::pages/auth/login.messages.failed'),
+        ]);
+    }
+
+    protected function getLoginFormComponent(): Component
+    {
+        return TextInput::make('login')
+            ->label('Login')
+            ->required()
+            ->autocomplete()
+            ->autofocus()
+            ->extraInputAttributes(['tabindex' => 1]);
+    }
+
+    protected function getOAuthFormComponent(): Component
+    {
+        $actions = [];
+
+        foreach (config('auth.oauth') as $name => $data) {
+            if (!$data['enabled']) {
+                continue;
+            }
+
+            $actions[] = Action::make("oauth_$name")
+                ->label(Str::title($name))
+                ->icon($data['icon'])
+                ->color($data['color'])
+                ->url(route('auth.oauth.redirect', ['driver' => $name], false));
+        }
+
+        return Actions::make($actions);
+    }
+
+    protected function getCredentialsFromFormData(array $data): array
+    {
+        $loginType = filter_var($data['login'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
+
+        return [
+            $loginType => mb_strtolower($data['login']),
+            'password' => $data['password'],
+        ];
+    }
+}
--- a/app/Filament/Pages/Dashboard.php
+++ b/app/Filament/Pages/Dashboard.php
@@ -2,6 +2,7 @@

 namespace App\Filament\Pages;

+use App\Filament\Resources\NodeResource\Pages\CreateNode;
 use App\Filament\Resources\NodeResource\Pages\ListNodes;
 use App\Models\Egg;
 use App\Models\Node;
@@ -39,8 +40,8 @@ class Dashboard extends Page
    {
        return [
            'inDevelopment' => config('app.version') === 'canary',
-            'version' => $this->softwareVersionService->versionData()['version'],
-            'latestVersion' => $this->softwareVersionService->getPanel(),
+            'version' => $this->softwareVersionService->currentPanelVersion(),
+            'latestVersion' => $this->softwareVersionService->latestPanelVersion(),
            'isLatest' => $this->softwareVersionService->isLatestPanel(),
            'eggsCount' => Egg::query()->count(),
            'nodesList' => ListNodes::getUrl(),
@@ -65,13 +66,13 @@ class Dashboard extends Page
                CreateAction::make()
                    ->label(trans('dashboard/index.sections.intro-first-node.button_label'))
                    ->icon('tabler-server-2')
-                    ->url(route('filament.admin.resources.nodes.create')),
+                    ->url(CreateNode::getUrl()),
            ],
            'supportActions' => [
                CreateAction::make()
                    ->label(trans('dashboard/index.sections.intro-support.button_donate'))
                    ->icon('tabler-cash')
-                    ->url($this->softwareVersionService->getDonations(), true)
+                    ->url('https://pelican.dev/donate', true)
                    ->color('success'),
            ],
            'helpActions' => [
--- a/app/Filament/Pages/Installer/PanelInstaller.php
+++ b/app/Filament/Pages/Installer/PanelInstaller.php
@@ -3,12 +3,12 @@
 namespace App\Filament\Pages\Installer;

 use App\Filament\Pages\Dashboard;
-use App\Filament\Pages\Installer\Steps\AdminUserStep;
-use App\Filament\Pages\Installer\Steps\CompletedStep;
+use App\Filament\Pages\Installer\Steps\CacheStep;
 use App\Filament\Pages\Installer\Steps\DatabaseStep;
 use App\Filament\Pages\Installer\Steps\EnvironmentStep;
-use App\Filament\Pages\Installer\Steps\RedisStep;
+use App\Filament\Pages\Installer\Steps\QueueStep;
 use App\Filament\Pages\Installer\Steps\RequirementsStep;
+use App\Filament\Pages\Installer\Steps\SessionStep;
 use App\Models\User;
 use App\Services\Users\UserCreationService;
 use App\Traits\CheckMigrationsTrait;
@@ -19,12 +19,10 @@ use Filament\Forms\Components\Wizard;
 use Filament\Forms\Concerns\InteractsWithForms;
 use Filament\Forms\Contracts\HasForms;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
 use Filament\Notifications\Notification;
 use Filament\Pages\SimplePage;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Support\Exceptions\Halt;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\HtmlString;
@@ -42,8 +40,6 @@ class PanelInstaller extends SimplePage implements HasForms

    protected static string $view = 'filament.pages.installer';

-    private User $user;
-
    public function getMaxWidth(): MaxWidth|string
    {
        return MaxWidth::SevenExtraLarge;
@@ -69,10 +65,9 @@ class PanelInstaller extends SimplePage implements HasForms
                RequirementsStep::make(),
                EnvironmentStep::make($this),
                DatabaseStep::make($this),
-                RedisStep::make($this)
-                    ->hidden(fn (Get $get) => $get('env_general.SESSION_DRIVER') != 'redis' && $get('env_general.QUEUE_CONNECTION') != 'redis' && $get('env_general.CACHE_STORE') != 'redis'),
-                AdminUserStep::make($this),
-                CompletedStep::make(),
+                CacheStep::make($this),
+                QueueStep::make($this),
+                SessionStep::make(),
            ])
                ->persistStepInQueryString()
                ->nextAction(fn (Action $action) => $action->keyBindings('enter'))
@@ -94,23 +89,33 @@ class PanelInstaller extends SimplePage implements HasForms
        return 'data';
    }

-    public function submit(): RedirectResponse
+    public function submit(UserCreationService $userCreationService): void
    {
-        // Disable installer
-        $this->writeToEnvironment(['APP_INSTALLED' => 'true']);
+        try {
+            // Disable installer
+            $this->writeToEnvironment(['APP_INSTALLED' => 'true']);

-        // Login user
-        $this->user ??= User::all()->filter(fn ($user) => $user->isRootAdmin())->first();
-        auth()->guard()->login($this->user, true);
+            // Run migrations
+            $this->runMigrations();

-        // Redirect to admin panel
-        return redirect(Dashboard::getUrl());
+            // Create admin user & login
+            $user = $this->createAdminUser($userCreationService);
+            auth()->guard()->login($user, true);
+
+            // Write session data at the very end to avoid "page expired" errors
+            $this->writeToEnv('env_session');
+
+            // Redirect to admin panel
+            $this->redirect(Dashboard::getUrl());
+        } catch (Halt) {
+        }
    }

    public function writeToEnv(string $key): void
    {
        try {
            $variables = array_get($this->data, $key);
+            $variables = array_filter($variables); // Filter array to remove NULL values
            $this->writeToEnvironment($variables);
        } catch (Exception $exception) {
            report($exception);
@@ -128,13 +133,12 @@ class PanelInstaller extends SimplePage implements HasForms
        Artisan::call('config:clear');
    }

-    public function runMigrations(string $driver): void
+    public function runMigrations(): void
    {
        try {
            Artisan::call('migrate', [
                '--force' => true,
                '--seed' => true,
-                '--database' => $driver,
            ]);
        } catch (Exception $exception) {
            report($exception);
@@ -160,12 +164,13 @@ class PanelInstaller extends SimplePage implements HasForms
        }
    }

-    public function createAdminUser(UserCreationService $userCreationService): void
+    public function createAdminUser(UserCreationService $userCreationService): User
    {
        try {
            $userData = array_get($this->data, 'user');
            $userData['root_admin'] = true;
-            $this->user = $userCreationService->handle($userData);
+
+            return $userCreationService->handle($userData);
        } catch (Exception $exception) {
            report($exception);

--- a/app/Filament/Pages/Installer/Steps/AdminUserStep.php
+++ b/app/Filament/Pages/Installer/Steps/AdminUserStep.php
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use App\Services\Users\UserCreationService;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-
-class AdminUserStep
-{
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('user')
-            ->label('Admin User')
-            ->schema([
-                TextInput::make('user.email')
-                    ->label('Admin E-Mail')
-                    ->required()
-                    ->email()
-                    ->placeholder('admin@example.com'),
-                TextInput::make('user.username')
-                    ->label('Admin Username')
-                    ->required()
-                    ->placeholder('admin'),
-                TextInput::make('user.password')
-                    ->label('Admin Password')
-                    ->required()
-                    ->password()
-                    ->revealable(),
-            ])
-            ->afterValidation(fn (UserCreationService $service) => $installer->createAdminUser($service));
-    }
-}
--- a/app/Filament/Pages/Installer/Steps/CacheStep.php
+++ b/app/Filament/Pages/Installer/Steps/CacheStep.php
@@ -0,0 +1,123 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use App\Filament\Pages\Installer\PanelInstaller;
+use Exception;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
+use Filament\Notifications\Notification;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Foundation\Application;
+use Illuminate\Redis\RedisManager;
+
+class CacheStep
+{
+    public const CACHE_DRIVERS = [
+        'file' => 'Filesystem',
+        'redis' => 'Redis',
+    ];
+
+    public static function make(PanelInstaller $installer): Step
+    {
+        return Step::make('cache')
+            ->label('Cache')
+            ->columns()
+            ->schema([
+                ToggleButtons::make('env_cache.CACHE_STORE')
+                    ->label('Cache Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for caching. We recommend "Filesystem".')
+                    ->required()
+                    ->inline()
+                    ->options(self::CACHE_DRIVERS)
+                    ->default(config('cache.default'))
+                    ->columnSpanFull()
+                    ->live()
+                    ->afterStateUpdated(function ($state, Set $set, Get $get) {
+                        if ($state !== 'redis') {
+                            $set('env_cache.REDIS_HOST', null);
+                            $set('env_cache.REDIS_PORT', null);
+                            $set('env_cache.REDIS_USERNAME', null);
+                            $set('env_cache.REDIS_PASSWORD', null);
+                        } else {
+                            $set('env_cache.REDIS_HOST', $get('env_cache.REDIS_HOST') ?? '127.0.0.1');
+                            $set('env_cache.REDIS_PORT', $get('env_cache.REDIS_PORT') ?? '6379');
+                            $set('env_cache.REDIS_USERNAME', null);
+                        }
+                    }),
+                TextInput::make('env_cache.REDIS_HOST')
+                    ->label('Redis Host')
+                    ->placeholder('127.0.0.1')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The host of your redis server. Make sure it is reachable.')
+                    ->required(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis')
+                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.host') : null)
+                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
+                TextInput::make('env_cache.REDIS_PORT')
+                    ->label('Redis Port')
+                    ->placeholder('6379')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The port of your redis server.')
+                    ->required(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis')
+                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.port') : null)
+                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
+                TextInput::make('env_cache.REDIS_USERNAME')
+                    ->label('Redis Username')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The name of your redis user. Can be empty')
+                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.username') : null)
+                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
+                TextInput::make('env_cache.REDIS_PASSWORD')
+                    ->label('Redis Password')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The password for your redis user. Can be empty.')
+                    ->password()
+                    ->revealable()
+                    ->default(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis' ? config('database.redis.default.password') : null)
+                    ->visible(fn (Get $get) => $get('env_cache.CACHE_STORE') === 'redis'),
+            ])
+            ->afterValidation(function (Get $get, Application $app) use ($installer) {
+                $driver = $get('env_cache.CACHE_STORE');
+
+                if (!self::testConnection($app, $driver, $get('env_cache.REDIS_HOST'), $get('env_cache.REDIS_PORT'), $get('env_cache.REDIS_USERNAME'), $get('env_cache.REDIS_PASSWORD'))) {
+                    throw new Halt('Redis connection failed');
+                }
+
+                $installer->writeToEnv('env_cache');
+            });
+    }
+
+    private static function testConnection(Application $app, string $driver, ?string $host, null|string|int $port, ?string $username, ?string $password): bool
+    {
+        if ($driver !== 'redis') {
+            return true;
+        }
+
+        try {
+            $redis = new RedisManager($app, 'predis', [
+                'default' => [
+                    'host' => $host,
+                    'port' => $port,
+                    'username' => $username,
+                    'password' => $password,
+                ],
+            ]);
+
+            $redis->connection()->command('ping');
+        } catch (Exception $exception) {
+            Notification::make()
+                ->title('Redis connection failed')
+                ->body($exception->getMessage())
+                ->danger()
+                ->send();
+
+            return false;
+        }
+
+        return true;
+    }
+}
--- a/app/Filament/Pages/Installer/Steps/CompletedStep.php
+++ b/app/Filament/Pages/Installer/Steps/CompletedStep.php
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use Filament\Forms\Components\Placeholder;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Illuminate\Support\HtmlString;
-use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
-
-class CompletedStep
-{
-    public static function make(): Step
-    {
-        return Step::make('complete')
-            ->label('Setup complete')
-            ->schema([
-                Placeholder::make('')
-                    ->content(new HtmlString('The setup is nearly complete!<br>As last step you need to create a new cronjob that runs every minute to process specific tasks, such as session cleanup and scheduled tasks, and also create a queue worker.')),
-                TextInput::make('crontab')
-                    ->label(new HtmlString('Run the following command to setup your crontab. Note that <code>www-data</code> is your webserver user. On some systems this username might be different!'))
-                    ->disabled()
-                    ->hintAction(CopyAction::make())
-                    ->default('(crontab -l -u www-data 2>/dev/null; echo "* * * * * php ' . base_path() . '/artisan schedule:run >> /dev/null 2>&1") | crontab -u www-data -'),
-                TextInput::make('queueService')
-                    ->label(new HtmlString('To setup the queue worker service you simply have to run the following command.'))
-                    ->disabled()
-                    ->hintAction(CopyAction::make())
-                    ->default('sudo php ' . base_path() . '/artisan p:environment:queue-service'),
-                Placeholder::make('')
-                    ->content('After you finished these two last tasks you can click on "Finish" and use your new panel! Have fun!'),
-            ]);
-    }
-}
--- a/app/Filament/Pages/Installer/Steps/DatabaseStep.php
+++ b/app/Filament/Pages/Installer/Steps/DatabaseStep.php
@@ -5,74 +5,102 @@ namespace App\Filament\Pages\Installer\Steps;
 use App\Filament\Pages\Installer\PanelInstaller;
 use Exception;
 use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Components\Wizard\Step;
 use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Support\Exceptions\Halt;
 use Illuminate\Support\Facades\DB;

 class DatabaseStep
 {
+    public const DATABASE_DRIVERS = [
+        'sqlite' => 'SQLite',
+        'mariadb' => 'MariaDB',
+        'mysql' => 'MySQL',
+    ];
+
    public static function make(PanelInstaller $installer): Step
    {
        return Step::make('database')
            ->label('Database')
            ->columns()
            ->schema([
-                TextInput::make('env_database.DB_DATABASE')
-                    ->label(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite' ? 'Database Path' : 'Database Name')
-                    ->columnSpanFull()
+                ToggleButtons::make('env_database.DB_CONNECTION')
+                    ->label('Database Driver')
                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite' ? 'The path of your .sqlite file relative to the database folder.' : 'The name of the panel database.')
+                    ->hintIconTooltip('The driver used for the panel database. We recommend "SQLite".')
                    ->required()
-                    ->default(fn (Get $get) => env('DB_DATABASE', $get('env_general.DB_CONNECTION') === 'sqlite' ? 'database.sqlite' : 'panel')),
+                    ->inline()
+                    ->options(self::DATABASE_DRIVERS)
+                    ->default(config('database.default'))
+                    ->live()
+                    ->afterStateUpdated(function ($state, Set $set, Get $get) {
+                        $set('env_database.DB_DATABASE', $state === 'sqlite' ? 'database.sqlite' : 'panel');
+
+                        if ($state === 'sqlite') {
+                            $set('env_database.DB_HOST', null);
+                            $set('env_database.DB_PORT', null);
+                            $set('env_database.DB_USERNAME', null);
+                            $set('env_database.DB_PASSWORD', null);
+                        } else {
+                            $set('env_database.DB_HOST', $get('env_database.DB_HOST') ?? '127.0.0.1');
+                            $set('env_database.DB_PORT', $get('env_database.DB_PORT') ?? '3306');
+                            $set('env_database.DB_USERNAME', $get('env_database.DB_USERNAME') ?? 'pelican');
+                        }
+                    }),
+                TextInput::make('env_database.DB_DATABASE')
+                    ->label(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'Database Path' : 'Database Name')
+                    ->placeholder(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'database.sqlite' : 'panel')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite' ? 'The path of your .sqlite file relative to the database folder.' : 'The name of the panel database.')
+                    ->required()
+                    ->default('database.sqlite'),
                TextInput::make('env_database.DB_HOST')
                    ->label('Database Host')
+                    ->placeholder('127.0.0.1')
                    ->hintIcon('tabler-question-mark')
                    ->hintIconTooltip('The host of your database. Make sure it is reachable.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_HOST', '127.0.0.1') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
+                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
+                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
                TextInput::make('env_database.DB_PORT')
                    ->label('Database Port')
+                    ->placeholder('3306')
                    ->hintIcon('tabler-question-mark')
                    ->hintIconTooltip('The port of your database.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
                    ->numeric()
                    ->minValue(1)
                    ->maxValue(65535)
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_PORT', 3306) : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
+                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
+                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
                TextInput::make('env_database.DB_USERNAME')
                    ->label('Database Username')
+                    ->placeholder('pelican')
                    ->hintIcon('tabler-question-mark')
                    ->hintIconTooltip('The name of your database user.')
-                    ->required(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite')
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_USERNAME', 'pelican') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
+                    ->required(fn (Get $get) => $get('env_database.DB_CONNECTION') !== 'sqlite')
+                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
                TextInput::make('env_database.DB_PASSWORD')
                    ->label('Database Password')
                    ->hintIcon('tabler-question-mark')
                    ->hintIconTooltip('The password of your database user. Can be empty.')
                    ->password()
                    ->revealable()
-                    ->default(fn (Get $get) => $get('env_general.DB_CONNECTION') !== 'sqlite' ? env('DB_PASSWORD') : null)
-                    ->hidden(fn (Get $get) => $get('env_general.DB_CONNECTION') === 'sqlite'),
+                    ->hidden(fn (Get $get) => $get('env_database.DB_CONNECTION') === 'sqlite'),
            ])
            ->afterValidation(function (Get $get) use ($installer) {
-                $driver = $get('env_general.DB_CONNECTION');
+                $driver = $get('env_database.DB_CONNECTION');

                if (!self::testConnection($driver, $get('env_database.DB_HOST'), $get('env_database.DB_PORT'), $get('env_database.DB_DATABASE'), $get('env_database.DB_USERNAME'), $get('env_database.DB_PASSWORD'))) {
                    throw new Halt('Database connection failed');
                }

                $installer->writeToEnv('env_database');
-
-                $installer->runMigrations($driver);
            });
    }

-    private static function testConnection(string $driver, string $host, string $port, string $database, string $username, string $password): bool
+    private static function testConnection(string $driver, ?string $host, null|string|int $port, ?string $database, ?string $username, ?string $password): bool
    {
        if ($driver === 'sqlite') {
            return true;
--- a/app/Filament/Pages/Installer/Steps/EnvironmentStep.php
+++ b/app/Filament/Pages/Installer/Steps/EnvironmentStep.php
@@ -3,40 +3,12 @@
 namespace App\Filament\Pages\Installer\Steps;

 use App\Filament\Pages\Installer\PanelInstaller;
-use App\Traits\EnvironmentWriterTrait;
+use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Set;

 class EnvironmentStep
 {
-    use EnvironmentWriterTrait;
-
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem',
-        'redis' => 'Redis',
-    ];
-
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-        'redis' => 'Redis',
-    ];
-
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database',
-        'sync' => 'Sync',
-        'redis' => 'Redis',
-    ];
-
-    public const DATABASE_DRIVERS = [
-        'sqlite' => 'SQLite',
-        'mariadb' => 'MariaDB',
-        'mysql' => 'MySQL',
-    ];
-
    public static function make(PanelInstaller $installer): Step
    {
        return Step::make('environment')
@@ -54,44 +26,26 @@ class EnvironmentStep
                    ->hintIcon('tabler-question-mark')
                    ->hintIconTooltip('This will be the URL you access your Panel from.')
                    ->required()
-                    ->default(url(''))
-                    ->live()
-                    ->afterStateUpdated(fn ($state, Set $set) => $set('env_general.SESSION_SECURE_COOKIE', str_starts_with($state, 'https://') ? 'true' : 'false')),
-                TextInput::make('env_general.SESSION_SECURE_COOKIE')
-                    ->hidden()
-                    ->default(str_starts_with(url(''), 'https://') ? 'true' : 'false'),
-                ToggleButtons::make('env_general.CACHE_STORE')
-                    ->label('Cache Driver')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The driver used for caching. We recommend "Filesystem".')
-                    ->required()
-                    ->inline()
-                    ->options(self::CACHE_DRIVERS)
-                    ->default(config('cache.default', 'file')),
-                ToggleButtons::make('env_general.SESSION_DRIVER')
-                    ->label('Session Driver')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The driver used for storing sessions. We recommend "Filesystem" or "Database".')
-                    ->required()
-                    ->inline()
-                    ->options(self::SESSION_DRIVERS)
-                    ->default(config('session.driver', 'file')),
-                ToggleButtons::make('env_general.QUEUE_CONNECTION')
-                    ->label('Queue Driver')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The driver used for handling queues. We recommend "Database".')
-                    ->required()
-                    ->inline()
-                    ->options(self::QUEUE_DRIVERS)
-                    ->default(config('queue.default', 'database')),
-                ToggleButtons::make('env_general.DB_CONNECTION')
-                    ->label('Database Driver')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The driver used for the panel database. We recommend "SQLite".')
-                    ->required()
-                    ->inline()
-                    ->options(self::DATABASE_DRIVERS)
-                    ->default(config('database.default', 'sqlite')),
+                    ->default(url('')),
+                Fieldset::make('adminuser')
+                    ->label('Admin User')
+                    ->columns(3)
+                    ->schema([
+                        TextInput::make('user.email')
+                            ->label('E-Mail')
+                            ->required()
+                            ->email()
+                            ->placeholder('admin@example.com'),
+                        TextInput::make('user.username')
+                            ->label('Username')
+                            ->required()
+                            ->placeholder('admin'),
+                        TextInput::make('user.password')
+                            ->label('Password')
+                            ->required()
+                            ->password()
+                            ->revealable(),
+                    ]),
            ])
            ->afterValidation(fn () => $installer->writeToEnv('env_general'));
    }
--- a/app/Filament/Pages/Installer/Steps/QueueStep.php
+++ b/app/Filament/Pages/Installer/Steps/QueueStep.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use App\Filament\Pages\Installer\PanelInstaller;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\Toggle;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+use Illuminate\Support\HtmlString;
+use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;
+
+class QueueStep
+{
+    public const QUEUE_DRIVERS = [
+        'database' => 'Database',
+        'redis' => 'Redis',
+        'sync' => 'Sync',
+    ];
+
+    public static function make(PanelInstaller $installer): Step
+    {
+        return Step::make('queue')
+            ->label('Queue')
+            ->columns()
+            ->schema([
+                ToggleButtons::make('env_queue.QUEUE_CONNECTION')
+                    ->label('Queue Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for handling queues. We recommend "Database".')
+                    ->required()
+                    ->inline()
+                    ->options(self::QUEUE_DRIVERS)
+                    ->disableOptionWhen(fn ($value, Get $get) => $value === 'redis' && $get('env_cache.CACHE_STORE') !== 'redis')
+                    ->default(config('queue.default')),
+                Toggle::make('done')
+                    ->label('I have done both steps below.')
+                    ->accepted(fn () => !file_exists('/.dockerenv'))
+                    ->inline(false)
+                    ->validationMessages([
+                        'accepted' => 'You need to do both steps before continuing!',
+                    ])
+                    ->hidden(fn () => file_exists('/.dockerenv')),
+                TextInput::make('crontab')
+                    ->label(new HtmlString('Run the following command to set up your crontab. Note that <code>www-data</code> is your webserver user. On some systems this username might be different!'))
+                    ->disabled()
+                    ->hintAction(CopyAction::make())
+                    ->default('(crontab -l -u www-data 2>/dev/null; echo "* * * * * php ' . base_path() . '/artisan schedule:run >> /dev/null 2>&1") | crontab -u www-data -')
+                    ->hidden(fn () => file_exists('/.dockerenv'))
+                    ->columnSpanFull(),
+                TextInput::make('queueService')
+                    ->label(new HtmlString('To setup the queue worker service you simply have to run the following command.'))
+                    ->disabled()
+                    ->hintAction(CopyAction::make())
+                    ->default('sudo php ' . base_path() . '/artisan p:environment:queue-service')
+                    ->hidden(fn () => file_exists('/.dockerenv'))
+                    ->columnSpanFull(),
+            ])
+            ->afterValidation(fn () => $installer->writeToEnv('env_queue'));
+    }
+}
--- a/app/Filament/Pages/Installer/Steps/RedisStep.php
+++ b/app/Filament/Pages/Installer/Steps/RedisStep.php
@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Filament\Pages\Installer\Steps;
-
-use App\Filament\Pages\Installer\PanelInstaller;
-use App\Traits\EnvironmentWriterTrait;
-use Exception;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\Wizard\Step;
-use Filament\Forms\Get;
-use Filament\Notifications\Notification;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Support\Facades\Redis;
-
-class RedisStep
-{
-    use EnvironmentWriterTrait;
-
-    public static function make(PanelInstaller $installer): Step
-    {
-        return Step::make('redis')
-            ->label('Redis')
-            ->columns()
-            ->schema([
-                TextInput::make('env_redis.REDIS_HOST')
-                    ->label('Redis Host')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The host of your redis server. Make sure it is reachable.')
-                    ->required()
-                    ->default(config('database.redis.default.host')),
-                TextInput::make('env_redis.REDIS_PORT')
-                    ->label('Redis Port')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The port of your redis server.')
-                    ->required()
-                    ->default(config('database.redis.default.port')),
-                TextInput::make('env_redis.REDIS_USERNAME')
-                    ->label('Redis Username')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The name of your redis user. Can be empty')
-                    ->default(config('database.redis.default.username')),
-                TextInput::make('env_redis.REDIS_PASSWORD')
-                    ->label('Redis Password')
-                    ->hintIcon('tabler-question-mark')
-                    ->hintIconTooltip('The password for your redis user. Can be empty.')
-                    ->password()
-                    ->revealable()
-                    ->default(config('database.redis.default.password')),
-            ])
-            ->afterValidation(function (Get $get) use ($installer) {
-                if (!self::testConnection($get('env_redis.REDIS_HOST'), $get('env_redis.REDIS_PORT'), $get('env_redis.REDIS_USERNAME'), $get('env_redis.REDIS_PASSWORD'))) {
-                    throw new Halt('Redis connection failed');
-                }
-
-                $installer->writeToEnv('env_redis');
-            });
-    }
-
-    private static function testConnection(string $host, string $port, string $username, string $password): bool
-    {
-        try {
-            config()->set('database.redis._panel_install_test', [
-                'host' => $host,
-                'port' => $port,
-                'username' => $username,
-                'password' => $password,
-            ]);
-
-            Redis::connection('_panel_install_test')->command('ping');
-        } catch (Exception $exception) {
-            Notification::make()
-                ->title('Redis connection failed')
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-
-            return false;
-        }
-
-        return true;
-    }
-}
--- a/app/Filament/Pages/Installer/Steps/SessionStep.php
+++ b/app/Filament/Pages/Installer/Steps/SessionStep.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Filament\Pages\Installer\Steps;
+
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\ToggleButtons;
+use Filament\Forms\Components\Wizard\Step;
+use Filament\Forms\Get;
+
+class SessionStep
+{
+    public const SESSION_DRIVERS = [
+        'file' => 'Filesystem',
+        'database' => 'Database',
+        'cookie' => 'Cookie',
+        'redis' => 'Redis',
+    ];
+
+    public static function make(): Step
+    {
+        return Step::make('session')
+            ->label('Session')
+            ->schema([
+                ToggleButtons::make('env_session.SESSION_DRIVER')
+                    ->label('Session Driver')
+                    ->hintIcon('tabler-question-mark')
+                    ->hintIconTooltip('The driver used for storing sessions. We recommend "Filesystem" or "Database".')
+                    ->required()
+                    ->inline()
+                    ->options(self::SESSION_DRIVERS)
+                    ->disableOptionWhen(fn ($value, Get $get) => $value === 'redis' && $get('env_cache.CACHE_STORE') !== 'redis')
+                    ->default(config('session.driver')),
+                TextInput::make('env_session.SESSION_SECURE_COOKIE')
+                    ->hidden()
+                    ->default(request()->isSecure()),
+            ]);
+    }
+}
--- a/app/Filament/Pages/Settings.php
+++ b/app/Filament/Pages/Settings.php
@@ -8,6 +8,7 @@ use App\Traits\EnvironmentWriterTrait;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Forms\Components\Actions\Action as FormAction;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Tabs;
 use Filament\Forms\Components\Tabs\Tab;
@@ -24,8 +25,11 @@ use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\HasUnsavedDataChangesAlert;
 use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Notification as MailNotification;
+use Illuminate\Support\HtmlString;

 /**
 * @property Form $form
@@ -67,10 +71,11 @@ class Settings extends Page implements HasForms
                        ->label('General')
                        ->icon('tabler-home')
                        ->schema($this->generalSettings()),
-                    Tab::make('recaptcha')
-                        ->label('reCAPTCHA')
+                    Tab::make('captcha')
+                        ->label('Captcha')
                        ->icon('tabler-shield')
-                        ->schema($this->recaptchaSettings()),
+                        ->schema($this->captchaSettings())
+                        ->columns(3),
                    Tab::make('mail')
                        ->label('Mail')
                        ->icon('tabler-mail')
@@ -146,7 +151,7 @@ class Settings extends Page implements HasForms
                ->separator()
                ->splitKeys(['Tab', ' '])
                ->placeholder('New IP or IP Range')
-                ->default(env('TRUSTED_PROXIES', config('trustedproxy.proxies')))
+                ->default(env('TRUSTED_PROXIES', implode(',', config('trustedproxy.proxies'))))
                ->hintActions([
                    FormAction::make('clear')
                        ->label('Clear')
@@ -159,56 +164,71 @@ class Settings extends Page implements HasForms
                        ->label('Set to Cloudflare IPs')
                        ->icon('tabler-brand-cloudflare')
                        ->authorize(fn () => auth()->user()->can('update settings'))
-                        ->action(fn (Set $set) => $set('TRUSTED_PROXIES', [
-                            '173.245.48.0/20',
-                            '103.21.244.0/22',
-                            '103.22.200.0/22',
-                            '103.31.4.0/22',
-                            '141.101.64.0/18',
-                            '108.162.192.0/18',
-                            '190.93.240.0/20',
-                            '188.114.96.0/20',
-                            '197.234.240.0/22',
-                            '198.41.128.0/17',
-                            '162.158.0.0/15',
-                            '104.16.0.0/13',
-                            '104.24.0.0/14',
-                            '172.64.0.0/13',
-                            '131.0.72.0/22',
-                        ])),
+                        ->action(function (Client $client, Set $set) {
+                            $ips = collect();
+                            try {
+                                $response = $client->request(
+                                    'GET',
+                                    'https://api.cloudflare.com/client/v4/ips',
+                                    config('panel.guzzle')
+                                );
+                                if ($response->getStatusCode() === 200) {
+                                    $result = json_decode($response->getBody(), true)['result'];
+                                    foreach (['ipv4_cidrs', 'ipv6_cidrs'] as $value) {
+                                        $ips->push(...data_get($result, $value));
+                                    }
+                                    $ips->unique();
+                                }
+                            } catch (GuzzleException $e) {
+                            }
+
+                            $set('TRUSTED_PROXIES', $ips->values()->all());
+                        }),
                ]),
        ];
    }

-    private function recaptchaSettings(): array
+    private function captchaSettings(): array
    {
        return [
-            Toggle::make('RECAPTCHA_ENABLED')
-                ->label('Enable reCAPTCHA?')
+            Toggle::make('TURNSTILE_ENABLED')
+                ->label('Enable Turnstile Captcha?')
                ->inline(false)
+                ->columnSpan(1)
                ->onIcon('tabler-check')
                ->offIcon('tabler-x')
                ->onColor('success')
                ->offColor('danger')
                ->live()
                ->formatStateUsing(fn ($state): bool => (bool) $state)
-                ->afterStateUpdated(fn ($state, Set $set) => $set('RECAPTCHA_ENABLED', (bool) $state))
-                ->default(env('RECAPTCHA_ENABLED', config('recaptcha.enabled'))),
-            TextInput::make('RECAPTCHA_DOMAIN')
-                ->label('Domain')
+                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_ENABLED', (bool) $state))
+                ->default(env('TURNSTILE_ENABLED', config('turnstile.turnstile_enabled'))),
+            Placeholder::make('info')
+                ->columnSpan(2)
+                ->content(new HtmlString('<p>You can generate the keys on your <u><a href="https://developers.cloudflare.com/turnstile/get-started/#get-a-sitekey-and-secret-key" target="_blank">Cloudflare Dashboard</a></u>. A Cloudflare account is required.</p>')),
+            TextInput::make('TURNSTILE_SITE_KEY')
+                ->label('Site Key')
                ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_DOMAIN', config('recaptcha.domain'))),
-            TextInput::make('RECAPTCHA_WEBSITE_KEY')
-                ->label('Website Key')
-                ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_WEBSITE_KEY', config('recaptcha.website_key'))),
-            TextInput::make('RECAPTCHA_SECRET_KEY')
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->default(env('TURNSTILE_SITE_KEY', config('turnstile.turnstile_site_key')))
+                ->placeholder('1x00000000000000000000AA'),
+            TextInput::make('TURNSTILE_SECRET_KEY')
                ->label('Secret Key')
                ->required()
-                ->visible(fn (Get $get) => $get('RECAPTCHA_ENABLED'))
-                ->default(env('RECAPTCHA_SECRET_KEY', config('recaptcha.secret_key'))),
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->default(env('TURNSTILE_SECRET_KEY', config('turnstile.secret_key')))
+                ->placeholder('1x0000000000000000000000000000000AA'),
+            Toggle::make('TURNSTILE_VERIFY_DOMAIN')
+                ->label('Verify domain?')
+                ->inline(false)
+                ->onIcon('tabler-check')
+                ->offIcon('tabler-x')
+                ->onColor('success')
+                ->offColor('danger')
+                ->visible(fn (Get $get) => $get('TURNSTILE_ENABLED'))
+                ->formatStateUsing(fn ($state): bool => (bool) $state)
+                ->afterStateUpdated(fn ($state, Set $set) => $set('TURNSTILE_VERIFY_DOMAIN', (bool) $state))
+                ->default(env('TURNSTILE_VERIFY_DOMAIN', config('turnstile.turnstile_verify_domain'))),
        ];
    }

@@ -540,7 +560,21 @@ class Settings extends Page implements HasForms
                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
                        ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
                ]),
-
+            Section::make('Webhook')
+                ->description('Configure how often old webhook logs should be pruned.')
+                ->columns()
+                ->collapsible()
+                ->collapsed()
+                ->schema([
+                    TextInput::make('APP_WEBHOOK_PRUNE_DAYS')
+                        ->label('Prune age')
+                        ->required()
+                        ->numeric()
+                        ->minValue(1)
+                        ->maxValue(365)
+                        ->suffix('Days')
+                        ->default(env('APP_WEBHOOK_PRUNE_DAYS', config('panel.webhook.prune_days'))),
+                ]),
        ];
    }

--- a/app/Filament/Resources/ApiKeyResource.php
+++ b/app/Filament/Resources/ApiKeyResource.php
@@ -19,7 +19,7 @@ class ApiKeyResource extends Resource

    public static function getNavigationBadge(): ?string
    {
-        return static::getModel()::where('key_type', '2')->count() ?: null;
+        return static::getModel()::where('key_type', ApiKey::TYPE_APPLICATION)->count() ?: null;
    }

    public static function canEdit(Model $record): bool
--- a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
@@ -11,6 +11,7 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Model;

 class CreateApiKey extends CreateRecord
 {
@@ -41,7 +42,7 @@ class CreateApiKey extends CreateRecord
                        'md' => 2,
                    ])
                    ->schema(
-                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                            ->label(str($resource)->replace('_', ' ')->title())->inline()
                            ->options([
                                0 => 'None',
@@ -87,4 +88,20 @@ class CreateApiKey extends CreateRecord
                    ->columnSpanFull(),
            ]);
    }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        $permissions = [];
+
+        foreach (ApiKey::getPermissionList() as $permission) {
+            if (isset($data['permissions_' . $permission])) {
+                $permissions[$permission] = intval($data['permissions_' . $permission]);
+                unset($data['permissions_' . $permission]);
+            }
+        }
+
+        $data['permissions'] = $permissions;
+
+        return parent::handleRecordCreation($data);
+    }
 }
--- a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\ApiKeyResource\Pages;

 use App\Filament\Resources\ApiKeyResource;
 use App\Models\ApiKey;
+use App\Tables\Columns\DateTimeColumn;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\CreateAction;
@@ -35,15 +36,13 @@ class ListApiKeys extends ListRecords
                    ->hidden()
                    ->searchable(),

-                TextColumn::make('last_used_at')
+                DateTimeColumn::make('last_used_at')
                    ->label('Last Used')
                    ->placeholder('Not Used')
-                    ->dateTime()
                    ->sortable(),

-                TextColumn::make('created_at')
+                DateTimeColumn::make('created_at')
                    ->label('Created')
-                    ->dateTime()
                    ->sortable(),

                TextColumn::make('user.username')
--- a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php
@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\DatabaseHostResource\Pages;

 use App\Filament\Resources\DatabaseHostResource;
-use App\Models\Objects\Endpoint;
 use App\Services\Databases\Hosts\HostCreationService;
 use Closure;
 use Exception;
@@ -60,7 +59,7 @@ class CreateDatabaseHost extends CreateRecord
                            ->numeric()
                            ->default(3306)
                            ->minValue(0)
-                            ->maxValue(Endpoint::PORT_CEIL),
+                            ->maxValue(65535),
                        TextInput::make('max_databases')
                            ->label('Max databases')
                            ->helpertext('Blank is unlimited.')
@@ -83,6 +82,7 @@ class CreateDatabaseHost extends CreateRecord
                        Select::make('node_id')
                            ->searchable()
                            ->preload()
+                            ->unique()
                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
                            ->label('Linked Node')
                            ->relationship('node', 'name'),
--- a/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
+++ b/app/Filament/Resources/DatabaseHostResource/Pages/EditDatabaseHost.php
@@ -5,7 +5,6 @@ namespace App\Filament\Resources\DatabaseHostResource\Pages;
 use App\Filament\Resources\DatabaseHostResource;
 use App\Filament\Resources\DatabaseHostResource\RelationManagers\DatabasesRelationManager;
 use App\Models\DatabaseHost;
-use App\Models\Objects\Endpoint;
 use App\Services\Databases\Hosts\HostUpdateService;
 use Closure;
 use Exception;
@@ -56,7 +55,7 @@ class EditDatabaseHost extends EditRecord
                            ->required()
                            ->numeric()
                            ->minValue(0)
-                            ->maxValue(Endpoint::PORT_CEIL),
+                            ->maxValue(65535),
                        TextInput::make('max_databases')
                            ->label('Max databases')
                            ->helpertext('Blank is unlimited.')
@@ -78,6 +77,7 @@ class EditDatabaseHost extends EditRecord
                        Select::make('node_id')
                            ->searchable()
                            ->preload()
+                            ->unique()
                            ->helperText('This setting only defaults to this database host when adding a database to a server on the selected node.')
                            ->label('Linked Node')
                            ->relationship('node', 'name'),
@@ -102,9 +102,13 @@ class EditDatabaseHost extends EditRecord

    public function getRelationManagers(): array
    {
-        return [
-            DatabasesRelationManager::class,
-        ];
+        if (DatabasesRelationManager::canViewForRecord($this->getRecord(), static::class)) {
+            return [
+                DatabasesRelationManager::class,
+            ];
+        }
+
+        return [];
    }

    protected function handleRecordUpdate(Model $record, array $data): Model
--- a/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php
+++ b/app/Filament/Resources/DatabaseHostResource/RelationManagers/DatabasesRelationManager.php
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\DatabaseHostResource\RelationManagers;

 use App\Models\Database;
 use App\Services\Databases\DatabasePasswordService;
+use App\Tables\Columns\DateTimeColumn;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
@@ -23,21 +24,30 @@ class DatabasesRelationManager extends RelationManager
    {
        return $form
            ->schema([
-                TextInput::make('database')->columnSpanFull(),
+                TextInput::make('database')
+                    ->columnSpanFull(),
                TextInput::make('username'),
                TextInput::make('password')
+                    ->password()
+                    ->revealable()
                    ->hintAction(
                        Action::make('rotate')
                            ->icon('tabler-refresh')
                            ->requiresConfirmation()
                            ->action(fn (DatabasePasswordService $service, Database $database, $set, $get) => $this->rotatePassword($service, $database, $set, $get))
+                            ->authorize(fn (Database $database) => auth()->user()->can('update database', $database))
                    )
                    ->formatStateUsing(fn (Database $database) => $database->password),
-                TextInput::make('remote')->label('Connections From'),
-                TextInput::make('max_connections'),
+                TextInput::make('remote')
+                    ->label('Connections From')
+                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
+                TextInput::make('max_connections')
+                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
                TextInput::make('JDBC')
                    ->label('JDBC Connection String')
                    ->columnSpanFull()
+                    ->password()
+                    ->revealable()
                    ->formatStateUsing(fn (Get $get, Database $database) => 'jdbc:mysql://' . $get('username') . ':' . urlencode($database->password) . '@' . $database->host->host . ':' . $database->host->port . '/' . $get('database')),
            ]);
    }
@@ -47,18 +57,25 @@ class DatabasesRelationManager extends RelationManager
        return $table
            ->recordTitleAttribute('servers')
            ->columns([
-                TextColumn::make('database')->icon('tabler-database'),
-                TextColumn::make('username')->icon('tabler-user'),
-                TextColumn::make('remote'),
+                TextColumn::make('database')
+                    ->icon('tabler-database'),
+                TextColumn::make('username')
+                    ->icon('tabler-user'),
+                TextColumn::make('remote')
+                    ->formatStateUsing(fn ($record) => $record->remote === '%' ? 'Anywhere ( % )' : $record->remote),
                TextColumn::make('server.name')
                    ->icon('tabler-brand-docker')
                    ->url(fn (Database $database) => route('filament.admin.resources.servers.edit', ['record' => $database->server_id])),
-                TextColumn::make('max_connections'),
-                TextColumn::make('created_at')->dateTime(),
+                TextColumn::make('max_connections')
+                    ->formatStateUsing(fn ($record) => $record->max_connections === 0 ? 'Unlimited' : $record->max_connections),
+                DateTimeColumn::make('created_at'),
            ])
            ->actions([
-                DeleteAction::make(),
-                ViewAction::make()->color('primary'),
+                DeleteAction::make()
+                    ->authorize(fn (Database $database) => auth()->user()->can('delete database', $database)),
+                ViewAction::make()
+                    ->color('primary')
+                    ->hidden(fn () => !auth()->user()->can('viewList database')),
            ]);
    }

--- a/app/Filament/Resources/DatabaseResource/Pages/ListDatabases.php
+++ b/app/Filament/Resources/DatabaseResource/Pages/ListDatabases.php
@@ -3,6 +3,7 @@
 namespace App\Filament\Resources\DatabaseResource\Pages;

 use App\Filament\Resources\DatabaseResource;
+use App\Tables\Columns\DateTimeColumn;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
 use Filament\Tables\Actions\BulkActionGroup;
@@ -34,12 +35,10 @@ class ListDatabases extends ListRecords
                TextColumn::make('max_connections')
                    ->numeric()
                    ->sortable(),
-                TextColumn::make('created_at')
-                    ->dateTime()
+                DateTimeColumn::make('created_at')
                    ->sortable()
                    ->toggleable(isToggledHiddenByDefault: true),
-                TextColumn::make('updated_at')
-                    ->dateTime()
+                DateTimeColumn::make('updated_at')
                    ->sortable()
                    ->toggleable(isToggledHiddenByDefault: true),
            ])
--- a/app/Filament/Resources/EggResource/Pages/CreateEgg.php
+++ b/app/Filament/Resources/EggResource/Pages/CreateEgg.php
@@ -65,7 +65,7 @@ class CreateEgg extends CreateRecord
                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2]),
                            Toggle::make('force_outgoing_ip')
                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary endpoint.
+                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
                                    Required for certain games to work properly when the Node has multiple public IP addresses.
                                    Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
                            Hidden::make('script_is_privileged')
--- a/app/Filament/Resources/EggResource/Pages/EditEgg.php
+++ b/app/Filament/Resources/EggResource/Pages/EditEgg.php
@@ -83,7 +83,7 @@ class EditEgg extends EditRecord
                            Toggle::make('force_outgoing_ip')
                                ->inline(false)
                                ->hintIcon('tabler-question-mark')
-                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's endpoint.
+                                ->hintIconTooltip("Forces all outgoing network traffic to have its Source IP NATed to the IP of the server's primary allocation IP.
                                    Required for certain games to work properly when the Node has multiple public IP addresses.
                                    Enabling this option will disable internal networking for any servers using this egg, causing them to be unable to internally access other servers on the same node."),
                            Hidden::make('script_is_privileged')
--- a/app/Filament/Resources/EggResource/Pages/ListEggs.php
+++ b/app/Filament/Resources/EggResource/Pages/ListEggs.php
@@ -142,6 +142,7 @@ class ListEggs extends ListRecords
                            } catch (Exception $exception) {
                                Notification::make()
                                    ->title('Import Failed')
+                                    ->body($exception->getMessage())
                                    ->danger()
                                    ->send();

@@ -158,6 +159,7 @@ class ListEggs extends ListRecords
                        } catch (Exception $exception) {
                            Notification::make()
                                ->title('Import Failed')
+                                ->body($exception->getMessage())
                                ->danger()
                                ->send();

--- a/app/Filament/Resources/EggResource/RelationManagers/ServersRelationManager.php
+++ b/app/Filament/Resources/EggResource/RelationManagers/ServersRelationManager.php
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\EggResource\RelationManagers;

 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;

@@ -32,6 +33,11 @@ class ServersRelationManager extends RelationManager
                    ->url(fn (Server $server): string => route('filament.admin.resources.nodes.edit', ['record' => $server->node])),
                TextColumn::make('image')
                    ->label('Docker Image'),
+                SelectColumn::make('allocation.id')
+                    ->label('Primary Allocation')
+                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
+                    ->sortable(),
            ]);
    }
 }
--- a/app/Filament/Resources/NodeResource.php
+++ b/app/Filament/Resources/NodeResource.php
@@ -3,6 +3,7 @@
 namespace App\Filament\Resources;

 use App\Filament\Resources\NodeResource\Pages;
+use App\Filament\Resources\NodeResource\RelationManagers\AllocationsRelationManager;
 use App\Filament\Resources\NodeResource\RelationManagers\NodesRelationManager;
 use App\Models\Node;
 use Filament\Resources\Resource;
@@ -23,6 +24,7 @@ class NodeResource extends Resource
    public static function getRelations(): array
    {
        return [
+            AllocationsRelationManager::class,
            NodesRelationManager::class,
        ];
    }
--- a/app/Filament/Resources/NodeResource/Pages/CreateNode.php
+++ b/app/Filament/Resources/NodeResource/Pages/CreateNode.php
@@ -3,7 +3,6 @@
 namespace App\Filament\Resources\NodeResource\Pages;

 use App\Filament\Resources\NodeResource;
-use App\Models\Objects\Endpoint;
 use Filament\Forms;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Grid;
@@ -140,7 +139,7 @@ class CreateNode extends CreateRecord
                                ->label(trans('strings.port'))
                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->maxValue(65535)
                                ->default(8080)
                                ->required()
                                ->integer(),
@@ -245,7 +244,7 @@ class CreateNode extends CreateRecord
                                ->columnSpan(1)
                                ->label('SFTP Port')
                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->maxValue(65535)
                                ->default(2022)
                                ->required()
                                ->integer(),
--- a/app/Filament/Resources/NodeResource/Pages/EditNode.php
+++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php
@@ -4,10 +4,12 @@ namespace App\Filament\Resources\NodeResource\Pages;

 use App\Filament\Resources\NodeResource;
 use App\Models\Node;
-use App\Models\Objects\Endpoint;
+use App\Services\Helpers\SoftwareVersionService;
+use App\Services\Nodes\NodeAutoDeployService;
 use App\Services\Nodes\NodeUpdateService;
 use Filament\Actions;
 use Filament\Forms;
+use Filament\Forms\Components\Actions as FormActions;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Grid;
 use Filament\Forms\Components\Placeholder;
@@ -22,6 +24,7 @@ use Filament\Forms\Get;
 use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Enums\Alignment;
 use Illuminate\Support\HtmlString;
 use Webbingbrasil\FilamentCopyActions\Forms\Actions\CopyAction;

@@ -53,7 +56,7 @@ class EditNode extends EditRecord
                                ->schema([
                                    Placeholder::make('')
                                        ->label('Wings Version')
-                                        ->content(fn (Node $node) => $node->systemInformation()['version'] ?? 'Unknown'),
+                                        ->content(fn (Node $node, SoftwareVersionService $versionService) => ($node->systemInformation()['version'] ?? 'Unknown') . ' (Latest: ' . $versionService->latestWingsVersion() . ')'),
                                    Placeholder::make('')
                                        ->label('CPU Threads')
                                        ->content(fn (Node $node) => $node->systemInformation()['cpu_count'] ?? 0),
@@ -150,23 +153,13 @@ class EditNode extends EditRecord
                                    true => 'success',
                                    false => 'danger',
                                ])
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ]),
+                                ->columnSpan(1),
                            TextInput::make('daemon_listen')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
+                                ->columnSpan(1)
                                ->label(trans('strings.port'))
                                ->helperText('If you are running the daemon behind Cloudflare you should set the daemon port to 8443 to allow websocket proxying over SSL.')
                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->maxValue(65535)
                                ->default(8080)
                                ->required()
                                ->integer(),
@@ -183,12 +176,7 @@ class EditNode extends EditRecord
                                ->maxLength(100),
                            ToggleButtons::make('scheme')
                                ->label('Communicate over SSL')
-                                ->columnSpan([
-                                    'default' => 1,
-                                    'sm' => 1,
-                                    'md' => 1,
-                                    'lg' => 1,
-                                ])
+                                ->columnSpan(1)
                                ->inline()
                                ->helperText(function (Get $get) {
                                    if (request()->isSecure()) {
@@ -216,23 +204,48 @@ class EditNode extends EditRecord
                                ])
                                ->default(fn () => request()->isSecure() ? 'https' : 'http'), ]),
                    Tab::make('Advanced Settings')
-                        ->columns(['default' => 1, 'sm' => 1, 'md' => 4, 'lg' => 6])
+                        ->columns([
+                            'default' => 1,
+                            'sm' => 1,
+                            'md' => 4,
+                            'lg' => 6,
+                        ])
                        ->icon('tabler-server-cog')
                        ->schema([
                            TextInput::make('id')
                                ->label('Node ID')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 1,
+                                ])
                                ->disabled(),
                            TextInput::make('uuid')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 2,
+                                ])
                                ->label('Node UUID')
                                ->hintAction(CopyAction::make())
                                ->disabled(),
                            TagsInput::make('tags')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 2])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 2,
+                                ])
                                ->placeholder('Add Tags'),
                            TextInput::make('upload_size')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 2, 'lg' => 1])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 2,
+                                    'lg' => 1,
+                                ])
                                ->label('Upload Limit')
                                ->hintIcon('tabler-question-mark')
                                ->hintIconTooltip('Enter the maximum size of files that can be uploaded through the web-based file manager.')
@@ -241,19 +254,34 @@ class EditNode extends EditRecord
                                ->maxValue(1024)
                                ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB'),
                            TextInput::make('daemon_sftp')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 3,
+                                ])
                                ->label('SFTP Port')
                                ->minValue(1)
-                                ->maxValue(Endpoint::PORT_CEIL)
+                                ->maxValue(65535)
                                ->default(2022)
                                ->required()
                                ->integer(),
                            TextInput::make('daemon_sftp_alias')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 3,
+                                ])
                                ->label('SFTP Alias')
                                ->helperText('Display alias for the SFTP address. Leave empty to use the Node FQDN.'),
                            ToggleButtons::make('public')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 3,
+                                ])
                                ->label('Use Node for deployment?')->inline()
                                ->options([
                                    true => 'Yes',
@@ -264,7 +292,12 @@ class EditNode extends EditRecord
                                    false => 'danger',
                                ]),
                            ToggleButtons::make('maintenance_mode')
-                                ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 3])
+                                ->columnSpan([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 1,
+                                    'lg' => 3,
+                                ])
                                ->label('Maintenance Mode')->inline()
                                ->hinticon('tabler-question-mark')
                                ->hintIconTooltip("If the node is marked 'Under Maintenance' users won't be able to access servers that are on this node.")
@@ -277,7 +310,12 @@ class EditNode extends EditRecord
                                    true => 'danger',
                                ]),
                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
+                                ->columns([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 3,
+                                    'lg' => 6,
+                                ])
                                ->columnSpanFull()
                                ->schema([
                                    ToggleButtons::make('unlimited_mem')
@@ -294,14 +332,24 @@ class EditNode extends EditRecord
                                            true => 'primary',
                                            false => 'warning',
                                        ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ]),
                                    TextInput::make('memory')
                                        ->dehydratedWhenHidden()
                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
                                        ->label('Memory Limit')->inlineLabel()
                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                        ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ])
                                        ->numeric()
                                        ->minValue(0),
                                    TextInput::make('memory_overallocate')
@@ -311,14 +359,24 @@ class EditNode extends EditRecord
                                        ->hidden(fn (Get $get) => $get('unlimited_mem'))
                                        ->hintIcon('tabler-question-mark')
                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ])
                                        ->numeric()
                                        ->minValue(-1)
                                        ->maxValue(100)
                                        ->suffix('%'),
                                ]),
                            Grid::make()
-                                ->columns(['default' => 1, 'sm' => 1, 'md' => 3, 'lg' => 6])
+                                ->columns([
+                                    'default' => 1,
+                                    'sm' => 1,
+                                    'md' => 3,
+                                    'lg' => 6,
+                                ])
                                ->schema([
                                    ToggleButtons::make('unlimited_disk')
                                        ->label('Disk')->inlineLabel()->inline()
@@ -334,14 +392,24 @@ class EditNode extends EditRecord
                                            true => 'primary',
                                            false => 'warning',
                                        ])
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2]),
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ]),
                                    TextInput::make('disk')
                                        ->dehydratedWhenHidden()
                                        ->hidden(fn (Get $get) => $get('unlimited_disk'))
                                        ->label('Disk Limit')->inlineLabel()
                                        ->suffix(config('panel.use_binary_prefix') ? 'MiB' : 'MB')
                                        ->required()
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ])
                                        ->numeric()
                                        ->minValue(0),
                                    TextInput::make('disk_overallocate')
@@ -350,7 +418,12 @@ class EditNode extends EditRecord
                                        ->label('Overallocate')->inlineLabel()
                                        ->hintIcon('tabler-question-mark')
                                        ->hintIconTooltip('The % allowable to go over the set limit.')
-                                        ->columnSpan(['default' => 1, 'sm' => 1, 'md' => 1, 'lg' => 2])
+                                        ->columnSpan([
+                                            'default' => 1,
+                                            'sm' => 1,
+                                            'md' => 1,
+                                            'lg' => 2,
+                                        ])
                                        ->required()
                                        ->numeric()
                                        ->minValue(-1)
@@ -413,19 +486,61 @@ class EditNode extends EditRecord
                                ->rows(19)
                                ->hintAction(CopyAction::make())
                                ->columnSpanFull(),
-                            Forms\Components\Actions::make([
-                                Forms\Components\Actions\Action::make('resetKey')
-                                    ->label('Reset Daemon Token')
-                                    ->color('danger')
-                                    ->requiresConfirmation()
-                                    ->modalHeading('Reset Daemon Token?')
-                                    ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
-                                    ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
-                                        $nodeUpdateService->handle($node, [], true);
-                                        Notification::make()->success()->title('Daemon Key Reset')->send();
-                                        $this->fillForm();
-                                    }),
-                            ]),
+                            Grid::make()
+                                ->columns()
+                                ->schema([
+                                    FormActions::make([
+                                        FormActions\Action::make('autoDeploy')
+                                            ->label('Auto Deploy Command')
+                                            ->color('primary')
+                                            ->modalHeading('Auto Deploy Command')
+                                            ->icon('tabler-rocket')
+                                            ->modalSubmitAction(false)
+                                            ->modalCancelAction(false)
+                                            ->modalFooterActionsAlignment(Alignment::Center)
+                                            ->form([
+                                                ToggleButtons::make('docker')
+                                                    ->label('Type')
+                                                    ->live()
+                                                    ->helperText('Choose between Standalone and Docker install.')
+                                                    ->inline()
+                                                    ->default(false)
+                                                    ->afterStateUpdated(fn (bool $state, NodeAutoDeployService $service, Node $node, Set $set) => $set('generatedToken', $service->handle(request(), $node, $state)))
+                                                    ->options([
+                                                        false => 'Standalone',
+                                                        true => 'Docker',
+                                                    ])
+                                                    ->colors([
+                                                        false => 'primary',
+                                                        true => 'success',
+                                                    ])
+                                                    ->columnSpan(1),
+                                                Textarea::make('generatedToken')
+                                                    ->label('To auto-configure your node run the following command:')
+                                                    ->readOnly()
+                                                    ->autosize()
+                                                    ->hintAction(fn (string $state) => CopyAction::make()->copyable($state))
+                                                    ->formatStateUsing(fn (NodeAutoDeployService $service, Node $node, Set $set, Get $get) => $set('generatedToken', $service->handle(request(), $node, $get('docker')))),
+                                            ])
+                                            ->mountUsing(function (Forms\Form $form) {
+                                                Notification::make()->success()->title('Autodeploy Generated')->send();
+                                                $form->fill();
+                                            }),
+                                    ])->fullWidth(),
+                                    FormActions::make([
+                                        FormActions\Action::make('resetKey')
+                                            ->label('Reset Daemon Token')
+                                            ->color('danger')
+                                            ->requiresConfirmation()
+                                            ->modalHeading('Reset Daemon Token?')
+                                            ->modalDescription('Resetting the daemon token will void any request coming from the old token. This token is used for all sensitive operations on the daemon including server creation and deletion. We suggest changing this token regularly for security.')
+                                            ->action(function (NodeUpdateService $nodeUpdateService, Node $node) {
+                                                $nodeUpdateService->handle($node, [], true);
+                                                Notification::make()->success()->title('Daemon Key Reset')->send();
+                                                $this->fillForm();
+                                            }),
+                                    ])->fullWidth(),
+                                ]),
                        ]),
                ]),
        ]);
--- a/app/Filament/Resources/NodeResource/Pages/ListNodes.php
+++ b/app/Filament/Resources/NodeResource/Pages/ListNodes.php
@@ -6,9 +6,7 @@ use App\Filament\Resources\NodeResource;
 use App\Models\Node;
 use Filament\Actions;
 use Filament\Resources\Pages\ListRecords;
-use Filament\Tables\Actions\BulkActionGroup;
 use Filament\Tables\Actions\CreateAction;
-use Filament\Tables\Actions\DeleteBulkAction;
 use Filament\Tables\Actions\EditAction;
 use Filament\Tables\Columns\IconColumn;
 use Filament\Tables\Columns\TextColumn;
@@ -83,12 +81,6 @@ class ListNodes extends ListRecords
            ->actions([
                EditAction::make(),
            ])
-            ->bulkActions([
-                BulkActionGroup::make([
-                    DeleteBulkAction::make()
-                        ->authorize(fn () => auth()->user()->can('delete node')),
-                ]),
-            ])
            ->emptyStateIcon('tabler-server-2')
            ->emptyStateDescription('')
            ->emptyStateHeading('No Nodes')
--- a/app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
+++ b/app/Filament/Resources/NodeResource/RelationManagers/AllocationsRelationManager.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace App\Filament\Resources\NodeResource\RelationManagers;
+
+use App\Models\Allocation;
+use App\Models\Node;
+use App\Services\Allocations\AssignmentService;
+use Filament\Forms\Components\TagsInput;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Form;
+use Filament\Forms\Set;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Actions\BulkActionGroup;
+use Filament\Tables\Actions\DeleteBulkAction;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Columns\TextInputColumn;
+use Filament\Tables\Table;
+use Illuminate\Support\HtmlString;
+
+/**
+ * @method Node getOwnerRecord()
+ */
+class AllocationsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'allocations';
+
+    protected static ?string $icon = 'tabler-plug-connected';
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->schema([
+                TextInput::make('ip')
+                    ->required()
+                    ->maxLength(255),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('ip')
+
+            // Non Primary Allocations
+            // ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->id !== $allocation->server?->allocation_id)
+
+            // All assigned allocations
+            ->checkIfRecordIsSelectableUsing(fn (Allocation $allocation) => $allocation->server_id === null)
+            ->searchable()
+            ->selectCurrentPageOnly() //Prevent people from trying to nuke 30,000 ports at once.... -,-
+            ->columns([
+                TextColumn::make('id'),
+                TextColumn::make('port')
+                    ->searchable()
+                    ->label('Port'),
+                TextColumn::make('server.name')
+                    ->label('Server')
+                    ->icon('tabler-brand-docker')
+                    ->searchable()
+                    ->url(fn (Allocation $allocation): string => $allocation->server ? route('filament.admin.resources.servers.edit', ['record' => $allocation->server]) : ''),
+                TextInputColumn::make('ip_alias')
+                    ->searchable()
+                    ->label('Alias'),
+                TextInputColumn::make('ip')
+                    ->searchable()
+                    ->label('IP'),
+            ])
+            ->headerActions([
+                Tables\Actions\Action::make('create new allocation')->label('Create Allocations')
+                    ->form(fn () => [
+                        TextInput::make('allocation_ip')
+                            ->datalist($this->getOwnerRecord()->ipAddresses())
+                            ->label('IP Address')
+                            ->inlineLabel()
+                            ->ipv4()
+                            ->helperText("Usually your machine's public IP unless you are port forwarding.")
+                            ->required(),
+                        TextInput::make('allocation_alias')
+                            ->label('Alias')
+                            ->inlineLabel()
+                            ->default(null)
+                            ->helperText('Optional display name to help you remember what these are.')
+                            ->required(false),
+                        TagsInput::make('allocation_ports')
+                            ->placeholder('Examples: 27015, 27017-27019')
+                            ->helperText(new HtmlString('
+                                These are the ports that users can connect to this Server through.
+                                <br />
+                                You would have to port forward these on your home network.
+                            '))
+                            ->label('Ports')
+                            ->inlineLabel()
+                            ->live()
+                            ->afterStateUpdated(function ($state, Set $set) {
+                                $ports = collect();
+                                $update = false;
+                                foreach ($state as $portEntry) {
+                                    if (!str_contains($portEntry, '-')) {
+                                        if (is_numeric($portEntry)) {
+                                            $ports->push((int) $portEntry);
+
+                                            continue;
+                                        }
+
+                                        // Do not add non numerical ports
+                                        $update = true;
+
+                                        continue;
+                                    }
+
+                                    $update = true;
+                                    [$start, $end] = explode('-', $portEntry);
+                                    if (!is_numeric($start) || !is_numeric($end)) {
+                                        continue;
+                                    }
+
+                                    $start = max((int) $start, 0);
+                                    $end = min((int) $end, 2 ** 16 - 1);
+                                    foreach (range($start, $end) as $i) {
+                                        $ports->push($i);
+                                    }
+                                }
+
+                                $uniquePorts = $ports->unique()->values();
+                                if ($ports->count() > $uniquePorts->count()) {
+                                    $update = true;
+                                    $ports = $uniquePorts;
+                                }
+
+                                $sortedPorts = $ports->sort()->values();
+                                if ($sortedPorts->all() !== $ports->all()) {
+                                    $update = true;
+                                    $ports = $sortedPorts;
+                                }
+
+                                $ports = $ports->filter(fn ($port) => $port > 1024 && $port < 65535)->values();
+
+                                if ($update) {
+                                    $set('allocation_ports', $ports->all());
+                                }
+                            })
+                            ->splitKeys(['Tab', ' ', ','])
+                            ->required(),
+                    ])
+                    ->action(fn (array $data, AssignmentService $service) => $service->handle($this->getOwnerRecord(), $data)),
+            ])
+            ->bulkActions([
+                BulkActionGroup::make([
+                    DeleteBulkAction::make()
+                        ->authorize(fn () => auth()->user()->can('delete allocation')),
+                ]),
+            ]);
+    }
+}
--- a/app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php
+++ b/app/Filament/Resources/NodeResource/RelationManagers/NodesRelationManager.php
@@ -4,6 +4,7 @@ namespace App\Filament\Resources\NodeResource\RelationManagers;

 use App\Models\Server;
 use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables\Columns\SelectColumn;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;

@@ -32,6 +33,11 @@ class NodesRelationManager extends RelationManager
                    ->icon('tabler-egg')
                    ->url(fn (Server $server): string => route('filament.admin.resources.eggs.edit', ['record' => $server->user]))
                    ->sortable(),
+                SelectColumn::make('allocation.id')
+                    ->label('Primary Allocation')
+                    ->options(fn (Server $server) => [$server->allocation->id => $server->allocation->address])
+                    ->selectablePlaceholder(false)
+                    ->sortable(),
                TextColumn::make('memory')->icon('tabler-device-desktop-analytics'),
                TextColumn::make('cpu')->icon('tabler-cpu'),
                TextColumn::make('databases_count')
--- a/app/Filament/Resources/RoleResource.php
+++ b/app/Filament/Resources/RoleResource.php
@@ -6,7 +6,6 @@ use App\Enums\RolePermissionModels;
 use App\Enums\RolePermissionPrefixes;
 use App\Filament\Resources\RoleResource\Pages;
 use App\Models\Role;
-use Filament\Facades\Filament;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\CheckboxList;
 use Filament\Forms\Components\Component;
@@ -71,7 +70,7 @@ class RoleResource extends Resource
                    ->disabled(fn (Get $get) => $get('name') === Role::ROOT_ADMIN),
                TextInput::make('guard_name')
                    ->label('Guard Name')
-                    ->default(Filament::getCurrentPanel()?->getAuthGuard() ?? '')
+                    ->default(Role::DEFAULT_GUARD_NAME)
                    ->nullable()
                    ->hidden(),
                Fieldset::make('Permissions')
@@ -92,6 +91,8 @@ class RoleResource extends Resource
            $icon = ('\App\Filament\Resources\\' . $model . 'Resource')::getNavigationIcon();
        } elseif (class_exists('\App\Filament\Pages\\' . $model)) {
            $icon = ('\App\Filament\Pages\\' . $model)::getNavigationIcon();
+        } elseif (class_exists('\App\Filament\Server\Resources\\' . $model . 'Resource')) {
+            $icon = ('\App\Filament\Server\Resources\\' . $model . 'Resource')::getNavigationIcon();
        }

        return Section::make(Str::headline(Str::plural($model)))
--- a/Show More
+++ b/Show More