From 346fcd746f69ed49f3a910da4fbb14a7b8673110 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Wed, 29 Apr 2020 02:37:14 -0500 Subject: [PATCH] added new functions to the user model for srp created new admin lte dashboard for regular users created sub files to break up the admin lte dashboard for regular users if the dashboard is fully utilized. --- app/Models/User/User.php | 23 + resources/views/admin/layouts/b4.blade.php | 40 -- .../views/layouts/user/content.blade.php | 9 + .../views/layouts/user/control.blade.php | 11 + resources/views/layouts/user/dashb4.blade.php | 408 ++++++++++++++++++ resources/views/layouts/user/footer.blade.php | 9 + resources/views/layouts/user/head.blade.php | 28 ++ resources/views/layouts/user/main.blade.php | 275 ++++++++++++ resources/views/layouts/user/nvabar.blade.php | 54 +++ .../views/layouts/user/scripts.blade.php | 8 + 10 files changed, 825 insertions(+), 40 deletions(-) delete mode 100644 resources/views/admin/layouts/b4.blade.php create mode 100644 resources/views/layouts/user/content.blade.php create mode 100644 resources/views/layouts/user/control.blade.php create mode 100644 resources/views/layouts/user/dashb4.blade.php create mode 100644 resources/views/layouts/user/footer.blade.php create mode 100644 resources/views/layouts/user/head.blade.php create mode 100644 resources/views/layouts/user/main.blade.php create mode 100644 resources/views/layouts/user/nvabar.blade.php create mode 100644 resources/views/layouts/user/scripts.blade.php diff --git a/app/Models/User/User.php b/app/Models/User/User.php index 3f51580dd..76847fd32 100644 --- a/app/Models/User/User.php +++ b/app/Models/User/User.php @@ -11,6 +11,7 @@ use App\Models\User\UserPermission; use App\Models\Esi\EsiScope; use App\Models\Esi\EsiToken; use App\Models\MoonRent\MoonRental; +use App\Models\SRP\SRPShip; class User extends Authenticatable { @@ -130,4 +131,26 @@ class User extends Authenticatable return false; } } + + public function srpOpen() { + + return SRPShip::where([ + 'character_id' => $this->character_id, + 'approved' => 'Under Review', + ])->count(); + } + + public function srpDenied() { + return SRPShip::where([ + 'character_id' => $this->character_id, + 'approved' => 'Denied', + ])->count(); + } + + public function srpAccepted() { + return SRPShip::where([ + 'character_id' => $this->character_id, + 'approved' => 'Approved', + ])->count(); + } } diff --git a/resources/views/admin/layouts/b4.blade.php b/resources/views/admin/layouts/b4.blade.php deleted file mode 100644 index 94bc4b15a..000000000 --- a/resources/views/admin/layouts/b4.blade.php +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - {{ config('app.name', 'W4RP Services') }} - - - - - - - - - - - - - @include('layouts.navbar') -
- @include('inc.messages') -
- @yield('content') - - - - - - - \ No newline at end of file diff --git a/resources/views/layouts/user/content.blade.php b/resources/views/layouts/user/content.blade.php new file mode 100644 index 000000000..cbcf7d64c --- /dev/null +++ b/resources/views/layouts/user/content.blade.php @@ -0,0 +1,9 @@ + +
+ +
+ @yield('content') +
+ +
+ \ No newline at end of file diff --git a/resources/views/layouts/user/control.blade.php b/resources/views/layouts/user/control.blade.php new file mode 100644 index 000000000..2a2fdd5af --- /dev/null +++ b/resources/views/layouts/user/control.blade.php @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/resources/views/layouts/user/dashb4.blade.php b/resources/views/layouts/user/dashb4.blade.php new file mode 100644 index 000000000..87bf5c54b --- /dev/null +++ b/resources/views/layouts/user/dashb4.blade.php @@ -0,0 +1,408 @@ + + + + + + + + {{ config('app.name', 'W4RP Services') }} + + + + + + + + + + + + + + + + + +
+ + + + + + + + + +
+ +
+ @yield('content') +
+ +
+ + + + + + + + +
+ + + + + + + + + + + + diff --git a/resources/views/layouts/user/footer.blade.php b/resources/views/layouts/user/footer.blade.php new file mode 100644 index 000000000..1e13483f9 --- /dev/null +++ b/resources/views/layouts/user/footer.blade.php @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/resources/views/layouts/user/head.blade.php b/resources/views/layouts/user/head.blade.php new file mode 100644 index 000000000..db714d848 --- /dev/null +++ b/resources/views/layouts/user/head.blade.php @@ -0,0 +1,28 @@ + + + + + + {{ config('app.name', 'W4RP Services') }} + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/layouts/user/main.blade.php b/resources/views/layouts/user/main.blade.php new file mode 100644 index 000000000..29ea222a5 --- /dev/null +++ b/resources/views/layouts/user/main.blade.php @@ -0,0 +1,275 @@ + + \ No newline at end of file diff --git a/resources/views/layouts/user/nvabar.blade.php b/resources/views/layouts/user/nvabar.blade.php new file mode 100644 index 000000000..892ec4b86 --- /dev/null +++ b/resources/views/layouts/user/nvabar.blade.php @@ -0,0 +1,54 @@ + + + \ No newline at end of file diff --git a/resources/views/layouts/user/scripts.blade.php b/resources/views/layouts/user/scripts.blade.php new file mode 100644 index 000000000..3185214ac --- /dev/null +++ b/resources/views/layouts/user/scripts.blade.php @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file