From d45b9b44e68c8e9f8a14bdbe31162e7688714d6e Mon Sep 17 00:00:00 2001 From: Baspa Date: Tue, 17 Dec 2024 12:50:39 +0100 Subject: [PATCH 1/4] Fix password link --- src/Http/Livewire/Auth/Login.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php index a3449f4..4ac54bb 100644 --- a/src/Http/Livewire/Auth/Login.php +++ b/src/Http/Livewire/Auth/Login.php @@ -162,8 +162,7 @@ protected function getPasswordFormComponent(): Component { return TextInput::make('password') ->label(__('filament-panels::pages/auth/login.form.password.label')) - ->hint(Filament::hasPasswordReset() ? new HtmlString(Blade::render(' {{ __(\'filament-panels::pages/auth/login.actions.request_password_reset.label\') }}')) : null) - ->password() + ->hint(filament()->hasPasswordReset() ? new HtmlString(Blade::render(' {{ __(\'filament-panels::pages/auth/login.actions.request_password_reset.label\') }}')) : null)->password() ->revealable(Filament::arePasswordsRevealable()) ->autocomplete('current-password') ->required() @@ -186,4 +185,4 @@ protected function validateCredentials(array $credentials): bool return $user && $provider->validateCredentials($user, $credentials); } -} +} \ No newline at end of file From 46fba2c947bf113fffd1916b3b0b2aeb7f5c7051 Mon Sep 17 00:00:00 2001 From: Baspa Date: Tue, 17 Dec 2024 11:50:59 +0000 Subject: [PATCH 2/4] Fix styling --- src/Http/Livewire/Auth/Login.php | 2 +- src/Pages/TwoFactor.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php index 4ac54bb..de4bca8 100644 --- a/src/Http/Livewire/Auth/Login.php +++ b/src/Http/Livewire/Auth/Login.php @@ -185,4 +185,4 @@ protected function validateCredentials(array $credentials): bool return $user && $provider->validateCredentials($user, $credentials); } -} \ No newline at end of file +} diff --git a/src/Pages/TwoFactor.php b/src/Pages/TwoFactor.php index ad95e06..392b7b4 100644 --- a/src/Pages/TwoFactor.php +++ b/src/Pages/TwoFactor.php @@ -12,8 +12,8 @@ use Illuminate\Contracts\Support\Htmlable; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Auth; -use Illuminate\Validation\ValidationException; use Illuminate\Validation\Rule; +use Illuminate\Validation\ValidationException; use Laravel\Fortify\Actions\ConfirmTwoFactorAuthentication; use Laravel\Fortify\Actions\DisableTwoFactorAuthentication; use Laravel\Fortify\Actions\EnableTwoFactorAuthentication; From 715f4c61958466393402e25199a9df4e3f1f8f58 Mon Sep 17 00:00:00 2001 From: Baspa Date: Tue, 17 Dec 2024 12:52:56 +0100 Subject: [PATCH 3/4] Fix PHPStan --- src/Http/Livewire/Auth/Login.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php index de4bca8..7763393 100644 --- a/src/Http/Livewire/Auth/Login.php +++ b/src/Http/Livewire/Auth/Login.php @@ -162,7 +162,7 @@ protected function getPasswordFormComponent(): Component { return TextInput::make('password') ->label(__('filament-panels::pages/auth/login.form.password.label')) - ->hint(filament()->hasPasswordReset() ? new HtmlString(Blade::render(' {{ __(\'filament-panels::pages/auth/login.actions.request_password_reset.label\') }}')) : null)->password() + ->hint(Filament::hasPasswordReset() ? new HtmlString(Blade::render(' {{ __(\'filament-panels::pages/auth/login.actions.request_password_reset.label\') }}')) : null)->password() ->revealable(Filament::arePasswordsRevealable()) ->autocomplete('current-password') ->required() @@ -185,4 +185,4 @@ protected function validateCredentials(array $credentials): bool return $user && $provider->validateCredentials($user, $credentials); } -} +} \ No newline at end of file From 3527bbe80ea0831f4bd90862fba775fd43284722 Mon Sep 17 00:00:00 2001 From: Baspa Date: Tue, 17 Dec 2024 11:53:19 +0000 Subject: [PATCH 4/4] Fix styling --- src/Http/Livewire/Auth/Login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php index 7763393..c6c8176 100644 --- a/src/Http/Livewire/Auth/Login.php +++ b/src/Http/Livewire/Auth/Login.php @@ -185,4 +185,4 @@ protected function validateCredentials(array $credentials): bool return $user && $provider->validateCredentials($user, $credentials); } -} \ No newline at end of file +}