From 1944f651e52ec786adbf02844f4b695ff96c1c5e Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 3 Apr 2020 02:27:18 -0500 Subject: [PATCH] admin dashboard in the dashboard controller --- .../Dashboard/DashboardController.php | 7 +++ resources/views/layouts/navbar.blade.php | 48 ++----------------- routes/web.php | 1 + 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/app/Http/Controllers/Dashboard/DashboardController.php b/app/Http/Controllers/Dashboard/DashboardController.php index f1b09b065..19267adf6 100644 --- a/app/Http/Controllers/Dashboard/DashboardController.php +++ b/app/Http/Controllers/Dashboard/DashboardController.php @@ -30,6 +30,13 @@ class DashboardController extends Controller $this->middleware('role:Guest'); } + /** + * Show the administration dashboard. + */ + public function displayAdminDashboard() { + return view('admin.dashboards.dashboard'); + } + /** * Show the application dashboard. * diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php index 280dc12e4..fd3a6f7ba 100644 --- a/resources/views/layouts/navbar.blade.php +++ b/resources/views/layouts/navbar.blade.php @@ -90,51 +90,9 @@
  • Add Esi Scopes
    • - @if(auth()->user()->hasRole('Admin')) -
  • - -
    - Users - Taxes - Allowed Logins - Wiki - Wallet Journal - -
    - Display - Add -
    -
    -
    • - @endif - @if(auth()->user()->hasPermission('moon.admin')) -
  • - -
    - Display Moons - Update Moon - Moon Request -
    -
    • - @endif - @if(auth()->user()->hasPermission('srp.admin')) -
  • - -
    - SRP Admin Dashboard - SRP Statistics - SRP Admin Cost Codes - SRP History -
    -
    • - @endif - @if(auth()->user()->hasPermission('contract.admin')) -
  • - -
    - Admin Dashboard - New Contract -
    + @if(auth()->user()->hasRole('Admin') || auth()->user()->hasPermission('contract.admin') || auth()->user()->hasPermission('srp.admin') || auth()->user()->hasPermission('moon.admin')) +
  • + Admin Dashboard
    • @endif
  • diff --git a/routes/web.php b/routes/web.php index f99afbebf..6545a490b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -51,6 +51,7 @@ Route::group(['middleware' => ['auth']], function(){ Route::post('/admin/dashboard/wiki/newgroup', 'Dashboard\AdminController@insertNewWikiUserGroup'); Route::post('/admin/dashboard/wiki/purge', 'Dashboard\AdminController@purgeWikiUsers'); Route::get('/admin/dashboard/test', 'Dashboard\AdminController@displayTestAdminDashboard'); + Route::get('/admin/dashboard', 'Dashboard\DashboardController@displayAdminDashboard'); /** * Blacklist Controller display pages