diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php index 613bcd9..4e7942b 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('tricks.index', absolute: false)); } /** diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php index 712394a..2213ef4 100644 --- a/app/Http/Controllers/Auth/ConfirmablePasswordController.php +++ b/app/Http/Controllers/Auth/ConfirmablePasswordController.php @@ -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('tricks.index', absolute: false)); } } diff --git a/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/app/Http/Controllers/Auth/EmailVerificationNotificationController.php index f64fa9b..a644b8c 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('tricks.index', absolute: false)); } $request->user()->sendEmailVerificationNotification(); diff --git a/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/app/Http/Controllers/Auth/EmailVerificationPromptController.php index ee3cb6f..22c902a 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)) + ? redirect()->intended(route('tricks.index', absolute: false)) : view('auth.verify-email'); } } diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index 590eabc..40f5689 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -45,6 +45,6 @@ public function store(Request $request): RedirectResponse Auth::login($user); - return redirect(route('dashboard', absolute: false)); + return redirect(route('tricks.index', absolute: false)); } } diff --git a/app/Http/Controllers/Auth/VerifyEmailController.php b/app/Http/Controllers/Auth/VerifyEmailController.php index aed2efd..0c4bfe8 100644 --- a/app/Http/Controllers/Auth/VerifyEmailController.php +++ b/app/Http/Controllers/Auth/VerifyEmailController.php @@ -15,13 +15,13 @@ class VerifyEmailController extends Controller public function __invoke(EmailVerificationRequest $request): RedirectResponse { if ($request->user()->hasVerifiedEmail()) { - return redirect()->intended(route('dashboard', absolute: false) . '?verified=1'); + return redirect()->intended(route('tricks.index', 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('tricks.index', absolute: false) . '?verified=1'); } } diff --git a/app/Http/Controllers/TrickController.php b/app/Http/Controllers/TrickController.php index f61e6b0..f33e17a 100644 --- a/app/Http/Controllers/TrickController.php +++ b/app/Http/Controllers/TrickController.php @@ -30,7 +30,7 @@ public function store(Request $request) auth()->user()->tricks()->create($data); - return redirect()->route('dashboard'); + return redirect()->route('tricks.index'); } public function show(Trick $trick) @@ -61,7 +61,7 @@ public function update(Request $request, Trick $trick) $trick->update($data); - return redirect()->route('dashboard'); + return redirect()->route('tricks.index'); } public function destroy(Trick $trick) @@ -70,6 +70,6 @@ public function destroy(Trick $trick) $trick->delete(); - return redirect()->route('dashboard'); + return redirect()->route('tricks.index'); } } diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php deleted file mode 100644 index 4024c64..0000000 --- a/resources/views/dashboard.blade.php +++ /dev/null @@ -1,17 +0,0 @@ - - -

- {{ __('Dashboard') }} -

-
- -
-
-
-
- {{ __("You're logged in!") }} -
-
-
-
-
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 157997e..397fecf 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -5,15 +5,15 @@
- +
@@ -53,6 +53,16 @@ @endauth + @guest + + @endguest
@@ -69,8 +79,8 @@
@endauth + @guest + + {{ __('Log In') }} + + + {{ __('Register') }} + + @endguest diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index a9898e3..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - Laravel - - - - - - - - - -
- -
- -
-
- - diff --git a/routes/web.php b/routes/web.php index 409c3f2..8d6ec4f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -6,10 +6,6 @@ Route::get('/', [TrickController::class, 'index'])->name('tricks.index'); -Route::get('dashboard', function () { - return view('dashboard'); -})->middleware(['auth', 'verified'])->name('dashboard'); - Route::middleware('auth')->group(function () { Route::get('tricks/create', [TrickController::class, 'create'])->name('tricks.create'); Route::post('tricks', [TrickController::class, 'store'])->name('tricks.store'); diff --git a/tests/Feature/Auth/AuthenticationTest.php b/tests/Feature/Auth/AuthenticationTest.php index a272b9d..e4f0f3b 100644 --- a/tests/Feature/Auth/AuthenticationTest.php +++ b/tests/Feature/Auth/AuthenticationTest.php @@ -17,7 +17,7 @@ ]); $this->assertAuthenticated(); - $response->assertRedirect(route('dashboard', absolute: false)); + $response->assertRedirect(route('tricks.index', absolute: false)); }); test('users can not authenticate with invalid password', function () { diff --git a/tests/Feature/Auth/EmailVerificationTest.php b/tests/Feature/Auth/EmailVerificationTest.php index e8799b9..b6753cd 100644 --- a/tests/Feature/Auth/EmailVerificationTest.php +++ b/tests/Feature/Auth/EmailVerificationTest.php @@ -28,7 +28,7 @@ Event::assertDispatched(Verified::class); expect($user->fresh()->hasVerifiedEmail())->toBeTrue(); - $response->assertRedirect(route('dashboard', absolute: false) . '?verified=1'); + $response->assertRedirect(route('tricks.index', absolute: false) . '?verified=1'); }); test('email is not verified with invalid hash', function () { diff --git a/tests/Feature/Auth/RegistrationTest.php b/tests/Feature/Auth/RegistrationTest.php index 352ca78..ac9d286 100644 --- a/tests/Feature/Auth/RegistrationTest.php +++ b/tests/Feature/Auth/RegistrationTest.php @@ -15,5 +15,5 @@ ]); $this->assertAuthenticated(); - $response->assertRedirect(route('dashboard', absolute: false)); + $response->assertRedirect(route('tricks.index', absolute: false)); });