diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 781b1b9..e4a86e7 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,7 +4,6 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Redirect; use Spatie\Permission\PermissionRegistrar; class AppServiceProvider extends ServiceProvider @@ -19,11 +18,11 @@ class AppServiceProvider extends ServiceProvider // Register Spatie permissions app(PermissionRegistrar::class)->setPermissionClass(\Spatie\Permission\Models\Permission::class); - // Redirect authenticated users to Filament lobby only for specific routes + // Redirect authenticated users to Filament lobby for specific routes $this->app['router']->middleware('web')->group(function () { - $currentRoute = request()->route() ? request()->route()->getName() : ''; - if (Auth::check() && in_array($currentRoute, ['home', 'login', 'register'])) { - Redirect::to(route('filament.user.pages.lobby'))->send(); + $currentRoute = request()->route()?->getName(); + if (Auth::check() && in_array($currentRoute, ['home', 'filament.user.auth.login', 'filament.user.auth.register'])) { + redirect()->route('filament.user.pages.lobby')->send(); } }); } diff --git a/app/Providers/Filament/UserPanelProvider.php b/app/Providers/Filament/UserPanelProvider.php index 775d018..170692a 100644 --- a/app/Providers/Filament/UserPanelProvider.php +++ b/app/Providers/Filament/UserPanelProvider.php @@ -24,8 +24,9 @@ class UserPanelProvider extends PanelProvider { return $panel ->id('user') - ->path('lobby') // Serve at root - ->login() + ->path('lobby') // Serve at /lobby + ->login() // Filament login UI + ->registration() // Filament registration UI ->colors([ 'primary' => Color::Purple, // Purple for user panel ]) @@ -52,7 +53,7 @@ class UserPanelProvider extends PanelProvider DispatchServingFilamentEvent::class, ]) ->authMiddleware([ - Authenticate::class, + Authenticate::class, // Enforce authentication ]) ->navigationGroups([ 'Casino' // Group for games, deposits, transactions diff --git a/resources/views/landing/index.blade.php b/resources/views/landing/index.blade.php index 7f95d4d..61fc9ff 100644 --- a/resources/views/landing/index.blade.php +++ b/resources/views/landing/index.blade.php @@ -32,8 +32,8 @@
- Login - Register + Login + Register
diff --git a/routes/auth.php b/routes/auth.php deleted file mode 100644 index 3926ecf..0000000 --- a/routes/auth.php +++ /dev/null @@ -1,59 +0,0 @@ -group(function () { - Route::get('register', [RegisteredUserController::class, 'create']) - ->name('register'); - - Route::post('register', [RegisteredUserController::class, 'store']); - - Route::get('login', [AuthenticatedSessionController::class, 'create']) - ->name('login'); - - Route::post('login', [AuthenticatedSessionController::class, 'store']); - - Route::get('forgot-password', [PasswordResetLinkController::class, 'create']) - ->name('password.request'); - - Route::post('forgot-password', [PasswordResetLinkController::class, 'store']) - ->name('password.email'); - - Route::get('reset-password/{token}', [NewPasswordController::class, 'create']) - ->name('password.reset'); - - Route::post('reset-password', [NewPasswordController::class, 'store']) - ->name('password.store'); -}); - -Route::middleware('auth')->group(function () { - Route::get('verify-email', EmailVerificationPromptController::class) - ->name('verification.notice'); - - Route::get('verify-email/{id}/{hash}', VerifyEmailController::class) - ->middleware(['signed', 'throttle:6,1']) - ->name('verification.verify'); - - Route::post('email/verification-notification', [EmailVerificationNotificationController::class, 'store']) - ->middleware('throttle:6,1') - ->name('verification.send'); - - Route::get('confirm-password', [ConfirmablePasswordController::class, 'show']) - ->name('password.confirm'); - - Route::post('confirm-password', [ConfirmablePasswordController::class, 'store']); - - Route::put('password', [PasswordController::class, 'update'])->name('password.update'); - - Route::post('logout', [AuthenticatedSessionController::class, 'destroy']) - ->name('logout'); -}); diff --git a/routes/web.php b/routes/web.php index 4ead47e..9c9e3ee 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,7 +14,4 @@ Route::get('/', function () { // Explicit logout route for Filament user panel Route::post('/logout', [AuthenticatedSessionController::class, 'destroy']) ->middleware('auth') - ->name('filament.user.auth.logout'); - -// Include Breeze auth routes -require __DIR__.'/auth.php'; \ No newline at end of file + ->name('filament.user.auth.logout'); \ No newline at end of file