diff --git a/app/Filament/Resources/ApiKeyResource.php b/app/Filament/Resources/ApiKeyResource.php index 8ca749614..307799221 100644 --- a/app/Filament/Resources/ApiKeyResource.php +++ b/app/Filament/Resources/ApiKeyResource.php @@ -33,7 +33,7 @@ class ApiKeyResource extends Resource ]; } - public function getDefaultActiveTab(): string | int | null + public function getDefaultActiveTab(): string|int|null { return 'application'; } @@ -73,32 +73,31 @@ class ApiKeyResource extends Resource ->default(ApiKey::TYPE_APPLICATION), Forms\Components\Fieldset::make('Permissions')->schema( - collect(ApiKey::RESOURCES)->map(fn ($resource) => - Forms\Components\ToggleButtons::make("r_$resource") - ->label(str($resource)->replace('_', ' ')->title()) - ->options([ - 0 => 'None', - 1 => 'Read', - // 2 => 'Write', - 3 => 'Read & Write', - ]) - ->icons([ - 0 => 'tabler-book-off', - 1 => 'tabler-book', - 2 => 'tabler-writing', - 3 => 'tabler-writing', - ]) - ->colors([ - 0 => 'success', - 1 => 'warning', - 2 => 'danger', - 3 => 'danger', - ]) - ->inline() - ->required() - ->disabledOn('edit') - ->default(0), - )->all(), + collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource") + ->label(str($resource)->replace('_', ' ')->title()) + ->options([ + 0 => 'None', + 1 => 'Read', + // 2 => 'Write', + 3 => 'Read & Write', + ]) + ->icons([ + 0 => 'tabler-book-off', + 1 => 'tabler-book', + 2 => 'tabler-writing', + 3 => 'tabler-writing', + ]) + ->colors([ + 0 => 'success', + 1 => 'warning', + 2 => 'danger', + 3 => 'danger', + ]) + ->inline() + ->required() + ->disabledOn('edit') + ->default(0), + )->all(), ), Forms\Components\TagsInput::make('allowed_ips') diff --git a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php index 04712736e..6dfaf6335 100644 --- a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php +++ b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\ApiKeyResource\Pages; use App\Filament\Resources\ApiKeyResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateApiKey extends CreateRecord diff --git a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php index 441f74c04..61ba51100 100644 --- a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php +++ b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php @@ -25,17 +25,15 @@ class ListApiKeys extends ListRecords return [ 'all' => Tab::make('All Keys'), 'application' => Tab::make('Application Keys') - ->modifyQueryUsing(fn (Builder $query) => - $query->where('key_type', ApiKey::TYPE_APPLICATION) + ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_APPLICATION) ), 'account' => Tab::make('Account Keys') - ->modifyQueryUsing(fn (Builder $query) => - $query->where('key_type', ApiKey::TYPE_ACCOUNT) + ->modifyQueryUsing(fn (Builder $query) => $query->where('key_type', ApiKey::TYPE_ACCOUNT) ), ]; } - public function getDefaultActiveTab(): string | int | null + public function getDefaultActiveTab(): string|int|null { return 'application'; } diff --git a/app/Filament/Resources/DatabaseHostResource.php b/app/Filament/Resources/DatabaseHostResource.php index 85e349eb8..abfcc2ce9 100644 --- a/app/Filament/Resources/DatabaseHostResource.php +++ b/app/Filament/Resources/DatabaseHostResource.php @@ -3,15 +3,12 @@ namespace App\Filament\Resources; use App\Filament\Resources\DatabaseHostResource\Pages; -use App\Filament\Resources\DatabaseHostResource\RelationManagers; use App\Models\DatabaseHost; use Filament\Forms; use Filament\Forms\Form; use Filament\Resources\Resource; use Filament\Tables; use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; class DatabaseHostResource extends Resource { diff --git a/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php b/app/Filament/Resources/DatabaseHostResource/Pages/CreateDatabaseHost.php index 023245a62..b5dbf3e5b 100644 --- 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 Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateDatabaseHost extends CreateRecord diff --git a/app/Filament/Resources/DatabaseResource.php b/app/Filament/Resources/DatabaseResource.php index 39bffa486..b80901d7f 100644 --- a/app/Filament/Resources/DatabaseResource.php +++ b/app/Filament/Resources/DatabaseResource.php @@ -3,15 +3,12 @@ namespace App\Filament\Resources; use App\Filament\Resources\DatabaseResource\Pages; -use App\Filament\Resources\DatabaseResource\RelationManagers; use App\Models\Database; use Filament\Forms; use Filament\Forms\Form; use Filament\Resources\Resource; use Filament\Tables; use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; class DatabaseResource extends Resource { diff --git a/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php b/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php index 3608e2a6e..4f7dd312a 100644 --- a/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php +++ b/app/Filament/Resources/DatabaseResource/Pages/CreateDatabase.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\DatabaseResource\Pages; use App\Filament\Resources\DatabaseResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateDatabase extends CreateRecord diff --git a/app/Filament/Resources/EggResource.php b/app/Filament/Resources/EggResource.php index 61d5f95d4..ceea46121 100644 --- a/app/Filament/Resources/EggResource.php +++ b/app/Filament/Resources/EggResource.php @@ -20,7 +20,6 @@ class EggResource extends Resource protected static ?string $recordRouteKeyName = 'id'; - public static function form(Form $form): Form { return $form @@ -94,7 +93,7 @@ class EggResource extends Resource Forms\Components\TextInput::make('env_variable')->maxLength(191), Forms\Components\TextInput::make('default_value')->maxLength(191), Forms\Components\Textarea::make('rules')->rows(3)->columnSpanFull()->required(), - ]) + ]), ]), Forms\Components\Tabs\Tab::make('Install Script') ->columns(3) diff --git a/app/Filament/Resources/EggResource/Pages/CreateEgg.php b/app/Filament/Resources/EggResource/Pages/CreateEgg.php index 4ad3fa691..1cdd576b8 100644 --- a/app/Filament/Resources/EggResource/Pages/CreateEgg.php +++ b/app/Filament/Resources/EggResource/Pages/CreateEgg.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\EggResource\Pages; use App\Filament\Resources\EggResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateEgg extends CreateRecord diff --git a/app/Filament/Resources/EggResource/Pages/ListEggs.php b/app/Filament/Resources/EggResource/Pages/ListEggs.php index 8f87d9fe6..534b48389 100644 --- a/app/Filament/Resources/EggResource/Pages/ListEggs.php +++ b/app/Filament/Resources/EggResource/Pages/ListEggs.php @@ -53,7 +53,7 @@ class ListEggs extends ListRecords ->send(); redirect()->route('filament.admin.resources.eggs.edit', [$newEgg]); - }) + }), ]; } } diff --git a/app/Filament/Resources/MountResource.php b/app/Filament/Resources/MountResource.php index dcf1be8ca..c415e753a 100644 --- a/app/Filament/Resources/MountResource.php +++ b/app/Filament/Resources/MountResource.php @@ -88,7 +88,7 @@ class MountResource extends Resource ->relationship('nodes', 'name') ->searchable(['name', 'fqdn']) ->preload(), - ]) + ]), ])->columns([ 'default' => 1, ]), diff --git a/app/Filament/Resources/MountResource/Pages/CreateMount.php b/app/Filament/Resources/MountResource/Pages/CreateMount.php index c0cc78371..54ac86c4d 100644 --- a/app/Filament/Resources/MountResource/Pages/CreateMount.php +++ b/app/Filament/Resources/MountResource/Pages/CreateMount.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\MountResource\Pages; use App\Filament\Resources\MountResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateMount extends CreateRecord diff --git a/app/Filament/Resources/NodeResource/Pages/CreateNode.php b/app/Filament/Resources/NodeResource/Pages/CreateNode.php index 181d69895..4f83ea126 100644 --- a/app/Filament/Resources/NodeResource/Pages/CreateNode.php +++ b/app/Filament/Resources/NodeResource/Pages/CreateNode.php @@ -3,10 +3,7 @@ namespace App\Filament\Resources\NodeResource\Pages; use App\Filament\Resources\NodeResource; -use App\Models\Node; -use Filament\Actions\Action; use Filament\Forms; -use Filament\Notifications\Notification; use Filament\Resources\Pages\CreateRecord; use Illuminate\Support\HtmlString; @@ -98,11 +95,11 @@ class CreateNode extends CreateRecord ->hintColor('success') ->options([ true => 'Valid', - false => 'Invalid' + false => 'Invalid', ]) ->colors([ true => 'success', - false => 'danger' + false => 'danger', ]), Forms\Components\TextInput::make('daemonListen') @@ -115,8 +112,6 @@ class CreateNode extends CreateRecord ->required() ->integer(), - - Forms\Components\TextInput::make('name') ->label('Display Name') ->columnSpan(2) diff --git a/app/Filament/Resources/NodeResource/Pages/EditNode.php b/app/Filament/Resources/NodeResource/Pages/EditNode.php index 1a1dba35c..8a6cdacf6 100644 --- a/app/Filament/Resources/NodeResource/Pages/EditNode.php +++ b/app/Filament/Resources/NodeResource/Pages/EditNode.php @@ -64,9 +64,9 @@ class EditNode extends EditRecord ->maxValue(65535) ->numeric(), Forms\Components\Select::make('server_id')->relationship('server', 'name'), - ]) + ]), ]), - ]) + ]), ]); } diff --git a/app/Filament/Resources/ServerResource.php b/app/Filament/Resources/ServerResource.php index 044610891..3b41b1b05 100644 --- a/app/Filament/Resources/ServerResource.php +++ b/app/Filament/Resources/ServerResource.php @@ -16,7 +16,6 @@ use Filament\Tables; use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Facades\Validator; -use Illuminate\Support\HtmlString; class ServerResource extends Resource { @@ -359,7 +358,7 @@ class ServerResource extends Resource ->helperText(fn (Forms\Get $get) => empty($get('description')) ? '—' : $get('description')) ->maxLength(191), - Forms\Components\Hidden::make('variable_id')->default(0) + Forms\Components\Hidden::make('variable_id')->default(0), ]) ->columnSpanFull(), ]), diff --git a/app/Filament/Resources/ServerResource/Pages/CreateServer.php b/app/Filament/Resources/ServerResource/Pages/CreateServer.php index f5cfd3bbc..9fcfccbb3 100644 --- a/app/Filament/Resources/ServerResource/Pages/CreateServer.php +++ b/app/Filament/Resources/ServerResource/Pages/CreateServer.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\ServerResource\Pages; use App\Filament\Resources\ServerResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateServer extends CreateRecord diff --git a/app/Filament/Resources/ServerResource/Pages/EditServer.php b/app/Filament/Resources/ServerResource/Pages/EditServer.php index af104ef17..856aa1026 100644 --- a/app/Filament/Resources/ServerResource/Pages/EditServer.php +++ b/app/Filament/Resources/ServerResource/Pages/EditServer.php @@ -3,9 +3,7 @@ namespace App\Filament\Resources\ServerResource\Pages; use App\Filament\Resources\ServerResource; -use App\Models\Allocation; use Filament\Actions; -use Filament\Forms; use Filament\Resources\Pages\EditRecord; class EditServer extends EditRecord diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php index 824928a88..f6655ae98 100644 --- a/app/Filament/Resources/UserResource.php +++ b/app/Filament/Resources/UserResource.php @@ -3,15 +3,12 @@ namespace App\Filament\Resources; use App\Filament\Resources\UserResource\Pages; -use App\Filament\Resources\UserResource\RelationManagers; use App\Models\User; use Filament\Forms; use Filament\Forms\Form; use Filament\Resources\Resource; use Filament\Tables; use Filament\Tables\Table; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Support\Facades\Hash; class UserResource extends Resource diff --git a/app/Filament/Resources/UserResource/Pages/CreateUser.php b/app/Filament/Resources/UserResource/Pages/CreateUser.php index 73aa46d00..78a389490 100644 --- a/app/Filament/Resources/UserResource/Pages/CreateUser.php +++ b/app/Filament/Resources/UserResource/Pages/CreateUser.php @@ -3,7 +3,6 @@ namespace App\Filament\Resources\UserResource\Pages; use App\Filament\Resources\UserResource; -use Filament\Actions; use Filament\Resources\Pages\CreateRecord; class CreateUser extends CreateRecord diff --git a/app/Filament/Resources/UserResource/Pages/EditProfile.php b/app/Filament/Resources/UserResource/Pages/EditProfile.php index d13714484..3fd4c8388 100644 --- a/app/Filament/Resources/UserResource/Pages/EditProfile.php +++ b/app/Filament/Resources/UserResource/Pages/EditProfile.php @@ -8,7 +8,6 @@ use Filament\Forms\Components\Repeater; use Filament\Forms\Components\Tabs; use Filament\Forms\Components\Tabs\Tab; use Filament\Forms\Components\TextInput; -use Filament\Forms\Form; use Filament\Forms\Get; use Illuminate\Support\Facades\Hash; use Illuminate\Support\HtmlString; @@ -85,14 +84,14 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile ->schema([ Placeholder::make('activity!')->label('')->content(fn (ActivityLog $log) => new HtmlString($log->htmlable())), - ]) + ]), ]), ]), ]) ->operation('edit') ->model($this->getUser()) ->statePath('data') - ->inlineLabel(! static::isSimple()), + ->inlineLabel(!static::isSimple()), ), ]; } diff --git a/app/Models/Node.php b/app/Models/Node.php index a83fd6170..cb3362be0 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -126,7 +126,6 @@ class Node extends Model return 'id'; } - protected static function booted(): void { static::creating(function (self $node) { diff --git a/app/Models/User.php b/app/Models/User.php index 2b52676a9..33905ae55 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -83,7 +83,7 @@ use App\Notifications\SendPasswordReset as ResetPasswordNotification; * * @mixin \Eloquent */ -class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasName, HasAvatar +class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, FilamentUser, HasAvatar, HasName { use Authenticatable; use Authorizable {can as protected canned; } @@ -340,7 +340,7 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac { $rootAdmins = User::query()->where('root_admin', true)->limit(2)->get(); - return once(fn() => $rootAdmins->count() === 1 && $rootAdmins->first()->is($this)); + return once(fn () => $rootAdmins->count() === 1 && $rootAdmins->first()->is($this)); } public function canAccessPanel(Panel $panel): bool diff --git a/app/Services/Eggs/EggParserService.php b/app/Services/Eggs/EggParserService.php index 60054ef15..dfb2e2631 100644 --- a/app/Services/Eggs/EggParserService.php +++ b/app/Services/Eggs/EggParserService.php @@ -25,6 +25,7 @@ class EggParserService $parsed = json_decode($file->getContent(), true, 512, JSON_THROW_ON_ERROR); $version = $parsed['meta']['version'] ?? ''; + return match ($version) { 'PTDL_v1' => $this->convertToV2($parsed), 'PTDL_v2' => $parsed,