From dea7cc65220f78c69df4b94d2e00bd03ef594f6a Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Mon, 6 Apr 2026 22:23:18 -0500 Subject: [PATCH] auth page udpate --- .../Dashboard/DashboardController.php | 53 ++----------------- routes/web.php | 3 +- 2 files changed, 4 insertions(+), 52 deletions(-) diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php index 06c89cb..cd67fac 100644 --- a/app/Http/Controllers/Dashboard/DashboardController.php +++ b/app/Http/Controllers/Dashboard/DashboardController.php @@ -45,11 +45,7 @@ class DashboardController extends Controller implements HasMiddleware ]; } - public function displayGuest() { - return view('dashboard.guest'); - } - - public function displayUser() { + public function display() { $altCount = null; $alts = null; $esiHelper = new Esi; @@ -58,51 +54,8 @@ class DashboardController extends Controller implements HasMiddleware $user = auth()->user(); $characterId = (int)$user->character_id; - $scopes = EsiScope::query() - ->where('character_id', $characterId) - ->orderBy('scope') - ->get(); - - $permissions = UserPermission::query() - ->where('character_id', $characterId) - ->orderBy('permission') - ->get(); - - $roles = UserRole::query() - ->where('character_id', $characterId) - ->orderBy('rank') - ->get(); - - $alts = UserAlt::query() - ->where('main_id', $characterId) - ->orderBy('name') - ->get(); - - $roleEntry = UserRole::where([ - 'character_id' => auth()->user()->character_id, - ])->first(); - $role = $roleEntry->role; - - /** - * Alt Counts - */ - $altCount = UserAlt::where([ - 'main_id' => auth()->user()->character_id, - ])->count(); - - - return view('dashboard.dashboard', [ - 'title' => 'User Dashboard', - 'user' => $user, - 'scopes' => $scopes, - 'scopeCount' => $scopes->count(); - 'permissions' => $permissions; - 'permissionCount' => $permissions->count(); - 'roles' => $roles; - 'roleCount' => $roles->count(); - 'role' => $roles->first()?->role, - 'alts' => $alts, - 'altCount' => $alts->count(), + return view('dashboard.dashboard')->with([ + 'authUser' => $user, ]); } diff --git a/routes/web.php b/routes/web.php index 60996c6..df3409f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,8 +17,7 @@ Route::group(['middleware' => ['auth']], function() { /** * Dashboard pages */ - Route::get('/dashboard', [DashboardController::class, 'displayGuest'])->middleware('role:Guest')->name('dashboard.guest'); - Route::get('/dashboard/user', [DashboardController::class, 'displayUser'])->middleware('role:User')->name('dashboard.user'); + Route::get('/dashboard', [DashboardController::class, 'display'])->name('dashboard'); }); /**