From 1e3801bf6eb017107a9a5b9e70899ab35c92903a Mon Sep 17 00:00:00 2001 From: punkfairie Date: Thu, 20 Feb 2025 20:44:59 -0800 Subject: [PATCH] dashboard -> admin --- .../Auth/AuthenticatedSessionController.php | 2 +- .../Auth/ConfirmablePasswordController.php | 6 +++--- .../EmailVerificationNotificationController.php | 2 +- .../Auth/EmailVerificationPromptController.php | 4 ++-- .../Auth/RegisteredUserController.php | 17 ++++++++++++----- .../Controllers/Auth/VerifyEmailController.php | 10 ++++++---- .../{dashboard.blade.php => admin.blade.php} | 2 +- resources/views/welcome.blade.php | 2 +- routes/web.php | 15 +++++++++------ tests/Feature/Auth/AuthenticationTest.php | 6 +++--- tests/Feature/Auth/EmailVerificationTest.php | 2 +- tests/Feature/Auth/RegistrationTest.php | 8 ++++---- 12 files changed, 44 insertions(+), 32 deletions(-) rename resources/views/{dashboard.blade.php => admin.blade.php} (80%) diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php index 613bcd9..1c62f31 100644 --- a/app/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/app/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -28,7 +28,7 @@ public function store(LoginRequest $request): RedirectResponse $request->session()->regenerate(); - return redirect()->intended(route('dashboard', absolute: false)); + return redirect()->intended(route('admin', absolute: false)); } /** diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php index 712394a..7cfae33 100644 --- a/app/Http/Controllers/Auth/ConfirmablePasswordController.php +++ b/app/Http/Controllers/Auth/ConfirmablePasswordController.php @@ -24,8 +24,8 @@ public function show(): View */ public function store(Request $request): RedirectResponse { - if (! Auth::guard('web')->validate([ - 'email' => $request->user()->email, + if (!Auth::guard('web')->validate([ + 'email' => $request->user()->email, 'password' => $request->password, ])) { throw ValidationException::withMessages([ @@ -35,6 +35,6 @@ public function store(Request $request): RedirectResponse $request->session()->put('auth.password_confirmed_at', time()); - return redirect()->intended(route('dashboard', absolute: false)); + return redirect()->intended(route('admin', absolute: false)); } } diff --git a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php index f64fa9b..3faf7d3 100644 --- a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php +++ b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php @@ -14,7 +14,7 @@ class EmailVerificationNotificationController extends Controller public function store(Request $request): RedirectResponse { if ($request->user()->hasVerifiedEmail()) { - return redirect()->intended(route('dashboard', absolute: false)); + return redirect()->intended(route('admin', absolute: false)); } $request->user()->sendEmailVerificationNotification(); diff --git a/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/app/Http/Controllers/Auth/EmailVerificationPromptController.php index ee3cb6f..49078bd 100644 --- a/app/Http/Controllers/Auth/EmailVerificationPromptController.php +++ b/app/Http/Controllers/Auth/EmailVerificationPromptController.php @@ -15,7 +15,7 @@ class EmailVerificationPromptController extends Controller public function __invoke(Request $request): RedirectResponse|View { return $request->user()->hasVerifiedEmail() - ? redirect()->intended(route('dashboard', absolute: false)) - : view('auth.verify-email'); + ? redirect()->intended(route('admin', absolute: false)) + : view('auth.verify-email'); } } diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 0739e2e..424ff3b 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -30,14 +30,21 @@ public function create(): View public function store(Request $request): RedirectResponse { $request->validate([ - 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class], + 'name' => ['required', 'string', 'max:255'], + 'email' => [ + 'required', + 'string', + 'lowercase', + 'email', + 'max:255', + 'unique:'.User::class + ], 'password' => ['required', 'confirmed', Rules\Password::defaults()], ]); $user = User::create([ - 'name' => $request->name, - 'email' => $request->email, + 'name' => $request->name, + 'email' => $request->email, 'password' => Hash::make($request->password), ]); @@ -45,6 +52,6 @@ public function store(Request $request): RedirectResponse Auth::login($user); - return redirect(route('dashboard', absolute: false)); + return redirect(route('admin', absolute: false)); } } diff --git a/app/Http/Controllers/Auth/VerifyEmailController.php b/app/Http/Controllers/Auth/VerifyEmailController.php index 784765e..7333d20 100644 --- a/app/Http/Controllers/Auth/VerifyEmailController.php +++ b/app/Http/Controllers/Auth/VerifyEmailController.php @@ -12,16 +12,18 @@ class VerifyEmailController extends Controller /** * Mark the authenticated user's email address as verified. */ - public function __invoke(EmailVerificationRequest $request): RedirectResponse - { + public function __invoke(EmailVerificationRequest $request + ): RedirectResponse { if ($request->user()->hasVerifiedEmail()) { - return redirect()->intended(route('dashboard', absolute: false).'?verified=1'); + return redirect()->intended(route('admin', absolute: false) + .'?verified=1'); } if ($request->user()->markEmailAsVerified()) { event(new Verified($request->user())); } - return redirect()->intended(route('dashboard', absolute: false).'?verified=1'); + return redirect()->intended(route('admin', absolute: false) + .'?verified=1'); } } diff --git a/resources/views/dashboard.blade.php b/resources/views/admin.blade.php similarity index 80% rename from resources/views/dashboard.blade.php rename to resources/views/admin.blade.php index 6b92633..f655f46 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/admin.blade.php @@ -1,6 +1,6 @@ -

Dashboard

+

Admin

You're logged in!
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 3bcd16b..f2d15c7 100755 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -1,7 +1,7 @@ @if (Route::has('login'))