diff --git a/app/Filament/Resources/UserResource/Pages/EditProfile.php b/app/Filament/Resources/UserResource/Pages/EditProfile.php index 0e96f7a04..e04179ba8 100644 --- a/app/Filament/Resources/UserResource/Pages/EditProfile.php +++ b/app/Filament/Resources/UserResource/Pages/EditProfile.php @@ -31,6 +31,9 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\HtmlString; use Illuminate\Validation\Rules\Password; +/** + * @method User getUser() + */ class EditProfile extends \Filament\Pages\Auth\EditProfile { protected function getForms(): array @@ -117,6 +120,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile ->helperText('Enter your current 2FA code to disable Two Factor Authentication'), ]; } + /** @var TwoFactorSetupService */ $setupService = app(TwoFactorSetupService::class); ['image_url_data' => $url, 'secret' => $secret] = cache()->remember( @@ -126,6 +130,7 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile $options = new QROptions([ 'svgLogo' => public_path('pelican.svg'), + 'svgLogoScale' => 0.05, 'addLogoSpace' => true, 'logoSpaceWidth' => 13, 'logoSpaceHeight' => 13, @@ -133,22 +138,24 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile // https://github.com/chillerlan/php-qrcode/blob/main/examples/svgWithLogo.php - // SVG logo options (see extended class) - $options->svgLogo = public_path('pelican.svg'); // logo from: https://github.com/simple-icons/simple-icons - $options->svgLogoScale = 0.05; - // $options->svgLogoCssClass = 'dark'; - // QROptions + // @phpstan-ignore property.protected $options->version = Version::AUTO; // $options->outputInterface = QRSvgWithLogo::class; + // @phpstan-ignore property.protected $options->outputBase64 = false; + // @phpstan-ignore property.protected $options->eccLevel = EccLevel::H; // ECC level H is necessary when using logos + // @phpstan-ignore property.protected $options->addQuietzone = true; // $options->drawLightModules = true; + // @phpstan-ignore property.protected $options->connectPaths = true; + // @phpstan-ignore property.protected $options->drawCircularModules = true; // $options->circleRadius = 0.45; + // @phpstan-ignore property.protected $options->svgDefs = ' @@ -196,8 +203,8 @@ class EditProfile extends \Filament\Pages\Auth\EditProfile ])->headerActions([ Action::make('Create') ->successRedirectUrl(route('filament.admin.auth.profile', ['tab' => '-api-keys-tab'])) - ->action(function (Get $get, Action $action) { - $token = auth()->user()->createToken( + ->action(function (Get $get, Action $action, $user) { + $token = $user->createToken( $get('description'), $get('allowed_ips'), ); diff --git a/app/Models/Node.php b/app/Models/Node.php index 7fa89f511..4a44e6f57 100644 --- a/app/Models/Node.php +++ b/app/Models/Node.php @@ -35,6 +35,7 @@ use Illuminate\Database\Eloquent\Relations\HasManyThrough; * @property int $daemon_sftp * @property string|null $daemon_sftp_alias * @property string $daemon_base + * @property array $tags * @property \Carbon\Carbon $created_at * @property \Carbon\Carbon $updated_at * @property \App\Models\Mount[]|\Illuminate\Database\Eloquent\Collection $mounts @@ -133,6 +134,10 @@ class Node extends Model ]; } + public int $servers_sum_memory = 0; + public int $servers_sum_disk = 0; + public int $servers_sum_cpu = 0; + public function getRouteKeyName(): string { return 'id';