From 795102457f30e75ebe1ff8273fb536299c4b7556 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 25 Apr 2025 13:10:17 -0400 Subject: [PATCH] wip --- app/Extensions/OAuth/Providers/OAuthProvider.php | 8 +++++--- app/Filament/Pages/Auth/EditProfile.php | 8 ++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Extensions/OAuth/Providers/OAuthProvider.php b/app/Extensions/OAuth/Providers/OAuthProvider.php index b409e8708..9af879a20 100644 --- a/app/Extensions/OAuth/Providers/OAuthProvider.php +++ b/app/Extensions/OAuth/Providers/OAuthProvider.php @@ -3,6 +3,8 @@ namespace App\Extensions\OAuth\Providers; use Filament\Forms\Components\TextInput; +use Filament\Schemas\Components\Component; +use Filament\Schemas\Components\Wizard\Step; use Illuminate\Foundation\Application; use Illuminate\Support\Facades\Event; use Illuminate\Support\Str; @@ -65,7 +67,7 @@ abstract class OAuthProvider } /** - * @return \Filament\Schemas\Components\Component[] + * @return Component[] */ public function getSettingsForm(): array { @@ -94,12 +96,12 @@ abstract class OAuthProvider } /** - * @return \Filament\Schemas\Components\Wizard\Step[] + * @return Step[] */ public function getSetupSteps(): array { return [ - \Filament\Schemas\Components\Wizard\Step::make('OAuth Config') + Step::make('OAuth Config') ->columns(4) ->schema($this->getSettingsForm()), ]; diff --git a/app/Filament/Pages/Auth/EditProfile.php b/app/Filament/Pages/Auth/EditProfile.php index 198fdaeb8..10dba78ef 100644 --- a/app/Filament/Pages/Auth/EditProfile.php +++ b/app/Filament/Pages/Auth/EditProfile.php @@ -17,6 +17,7 @@ use chillerlan\QRCode\Common\Version; use chillerlan\QRCode\QRCode; use chillerlan\QRCode\QROptions; use DateTimeZone; +use Exception; use Filament\Actions; use Filament\Actions\Action; use Filament\Forms\Components\FileUpload; @@ -60,6 +61,9 @@ class EditProfile extends \Filament\Auth\Pages\EditProfile return config('panel.filament.display-width', 'screen-2xl'); } + /** + * @throws Exception + */ protected function getForms(): array { $oauthProviders = collect(OAuthProvider::get())->filter(fn (OAuthProvider $provider) => $provider->isEnabled())->all(); @@ -243,7 +247,7 @@ class EditProfile extends \Filament\Auth\Pages\EditProfile return [ TextEntry::make('qr') ->label(trans('profile.scan_qr')) - ->state(fn () => new HtmlString(" + ->content(fn () => new HtmlString("
$image
")) ->helperText(trans('profile.setup_key') .': '. $secret), @@ -341,7 +345,7 @@ class EditProfile extends \Filament\Auth\Pages\EditProfile $query->orderBy('timestamp', 'desc'); }) ->schema([ - TextEntry::make('activity!')->label('')->state(fn (ActivityLog $log) => new HtmlString($log->htmlable())), + TextEntry::make('activity!')->label('')->content(fn (ActivityLog $log) => new HtmlString($log->htmlable())), ]), ]),