From 495c15464f120a333b31771c1fde5a67ef897f8f Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 11 Jan 2024 10:58:46 +0000 Subject: [PATCH] wip --- packages/panels/docs/09-configuration.md | 18 +++++------ packages/panels/routes/web.php | 4 +-- .../panels/src/Panel/Concerns/HasAuth.php | 32 +++++++++---------- tests/src/SlugsPanelProvider.php | 16 +++++----- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/packages/panels/docs/09-configuration.md b/packages/panels/docs/09-configuration.md index 5ef0d30512..229175283a 100644 --- a/packages/panels/docs/09-configuration.md +++ b/packages/panels/docs/09-configuration.md @@ -212,7 +212,7 @@ public function panel(Panel $panel): Panel ## Changing the default slugs -Filament uses sensible English slugs by default when registering its routes. These can be changed by setting them in the methods below. +Filament uses sensible English slugs by default when registering its routes. These can be changed by setting them in the methods below. ```php use Filament\Panel; @@ -222,13 +222,13 @@ public function panel(Panel $panel): Panel return $panel // ... ->tenantBillingSlug('abrechnung') - ->loginSlug('einloggen') - ->passwordResetRequestSlug('anfragen') - ->passwordResetSlug('zuruecksetzen') - ->passwordResetPrefix('passwort-ruecksetzung') - ->registrationSlug('registrieren') - ->emailVerificationPromptSlug('auffordern') - ->emailVerificationVerifySlug('verifizieren') - ->emailVerificationPrefix('email-verifizierung'); + ->loginRouteSlug('einloggen') + ->passwordResetRequestRouteSlug('anfragen') + ->passwordResetRouteSlug('zuruecksetzen') + ->passwordResetRoutesPrefix('passwort-ruecksetzung') + ->registrationRouteSlug('registrieren') + ->emailVerificationPromptRouteSlug('auffordern') + ->emailVerificationVerifyRouteSlug('verifizieren') + ->emailVerificationRoutesPrefix('email-verifizierung'); } ``` diff --git a/packages/panels/routes/web.php b/packages/panels/routes/web.php index 07d5393f5c..2d7dabeeb8 100644 --- a/packages/panels/routes/web.php +++ b/packages/panels/routes/web.php @@ -35,7 +35,7 @@ Route::name('filament.') if ($panel->hasPasswordReset()) { Route::name('password-reset.') - ->prefix($panel->getResetPasswordRoutePrefix()) + ->prefix($panel->getResetPasswordRoutesPrefix()) ->group(function () use ($panel) { Route::get($panel->getRequestPasswordResetRouteSlug(), $panel->getRequestPasswordResetRouteAction()) ->name('request'); @@ -72,7 +72,7 @@ Route::name('filament.') if ($panel->hasEmailVerification()) { Route::name('auth.email-verification.') - ->prefix($panel->getEmailVerificationRoutePrefix()) + ->prefix($panel->getEmailVerificationRoutesPrefix()) ->group(function () use ($panel) { Route::get($panel->getEmailVerificationPromptRouteSlug(), $panel->getEmailVerificationPromptRouteAction()) ->name('prompt'); diff --git a/packages/panels/src/Panel/Concerns/HasAuth.php b/packages/panels/src/Panel/Concerns/HasAuth.php index d3b3b6f807..22f4d035d5 100644 --- a/packages/panels/src/Panel/Concerns/HasAuth.php +++ b/packages/panels/src/Panel/Concerns/HasAuth.php @@ -30,7 +30,7 @@ trait HasAuth protected string $emailVerificationVerifyRouteSlug = 'verify'; - protected string $emailVerificationRoutePrefix = 'email-verification'; + protected string $emailVerificationRoutesPrefix = 'email-verification'; protected bool $isEmailVerificationRequired = false; @@ -62,7 +62,7 @@ trait HasAuth protected string $resetPasswordRouteSlug = 'reset'; - protected string $resetPasswordRoutePrefix = 'password-reset'; + protected string $resetPasswordRoutesPrefix = 'password-reset'; protected ?string $profilePage = null; @@ -81,23 +81,23 @@ trait HasAuth return $this; } - public function emailVerificationPromptSlug(string $slug): static + public function emailVerificationPromptRouteSlug(string $slug): static { $this->emailVerificationPromptRouteSlug = $slug; return $this; } - public function emailVerificationVerifySlug(string $slug): static + public function emailVerificationVerifyRouteSlug(string $slug): static { $this->emailVerificationVerifyRouteSlug = $slug; return $this; } - public function emailVerificationPrefix(string $prefix): static + public function emailVerificationRoutesPrefix(string $prefix): static { - $this->emailVerificationRoutePrefix = $prefix; + $this->emailVerificationRoutesPrefix = $prefix; return $this; } @@ -126,7 +126,7 @@ trait HasAuth return $this; } - public function loginSlug(string $slug): static + public function loginRouteSlug(string $slug): static { $this->loginRouteSlug = $slug; @@ -145,23 +145,23 @@ trait HasAuth return $this; } - public function passwordResetRequestSlug(string $slug): static + public function passwordResetRequestRouteSlug(string $slug): static { $this->requestPasswordResetRouteSlug = $slug; return $this; } - public function passwordResetSlug(string $slug): static + public function passwordResetRouteSlug(string $slug): static { $this->resetPasswordRouteSlug = $slug; return $this; } - public function passwordResetPrefix(string $prefix): static + public function passwordResetRoutesPrefix(string $prefix): static { - $this->resetPasswordRoutePrefix = $prefix; + $this->resetPasswordRoutesPrefix = $prefix; return $this; } @@ -176,7 +176,7 @@ trait HasAuth return $this; } - public function registrationSlug(string $slug): static + public function registrationRouteSlug(string $slug): static { $this->registrationRouteSlug = $slug; @@ -356,9 +356,9 @@ trait HasAuth return Str::start($this->emailVerificationVerifyRouteSlug, '/') . $suffix; } - public function getEmailVerificationRoutePrefix(): string + public function getEmailVerificationRoutesPrefix(): string { - return Str::start($this->emailVerificationRoutePrefix, '/'); + return Str::start($this->emailVerificationRoutesPrefix, '/'); } /** @@ -413,9 +413,9 @@ trait HasAuth return Str::start($this->resetPasswordRouteSlug, '/'); } - public function getResetPasswordRoutePrefix(): string + public function getResetPasswordRoutesPrefix(): string { - return Str::start($this->resetPasswordRoutePrefix, '/'); + return Str::start($this->resetPasswordRoutesPrefix, '/'); } public function hasEmailVerification(): bool diff --git a/tests/src/SlugsPanelProvider.php b/tests/src/SlugsPanelProvider.php index 773e31b756..ff7c4174cc 100644 --- a/tests/src/SlugsPanelProvider.php +++ b/tests/src/SlugsPanelProvider.php @@ -23,17 +23,17 @@ class SlugsPanelProvider extends PanelProvider ->id('slugs') ->path('slugs') ->login() - ->loginSlug('login-test') + ->loginRouteSlug('login-test') ->passwordReset() - ->passwordResetRequestSlug('request-test') - ->passwordResetSlug('reset-test') - ->passwordResetPrefix('password-reset-test') + ->passwordResetRequestRouteSlug('request-test') + ->passwordResetRouteSlug('reset-test') + ->passwordResetRoutesPrefix('password-reset-test') ->registration() - ->registrationSlug('register-test') + ->registrationRouteSlug('register-test') ->emailVerification() - ->emailVerificationPromptSlug('prompt-test') - ->emailVerificationVerifySlug('verify-test') - ->emailVerificationPrefix('email-verification-test') + ->emailVerificationPromptRouteSlug('prompt-test') + ->emailVerificationVerifyRouteSlug('verify-test') + ->emailVerificationRoutesPrefix('email-verification-test') ->resources([]) ->pages([]) ->middleware([