From e78c2a04fe1ab0968858b1174e6e49d4b7bc033c Mon Sep 17 00:00:00 2001 From: Ro Date: Fri, 18 Aug 2023 18:50:33 -0700 Subject: [PATCH] Added Layout to Admin Pages Plugged in the new layout to the admin pages --- .gitignore | 1 + app/Http/Controllers/DenController.php | 14 +++++++++++--- public/assets/css/global/typography.css | 2 +- resources/views/back/locations.blade.php | 12 +++++------- resources/views/back/member.blade.php | 15 +++++++++++---- resources/views/back/start.blade.php | 9 +++++---- resources/views/frame.blade.php | 18 +++++++++++++++--- resources/views/front/listing.blade.php | 5 ++--- 8 files changed, 51 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 25df27a..cc4914a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /public/build /public/hot /public/storage +/public/reference /storage/*.key /vendor .env diff --git a/app/Http/Controllers/DenController.php b/app/Http/Controllers/DenController.php index f97e707..7054e3b 100644 --- a/app/Http/Controllers/DenController.php +++ b/app/Http/Controllers/DenController.php @@ -11,18 +11,26 @@ class DenController extends Controller public function start(Request $request) { $member = Auth::user(); - return view('back.start', ['handle' => $member->handle]); + return view('back.start', [ + 'handle' => $member->handle, + 'title' => "This is The Den" + ]); } public function member(Request $request) { $member = Auth::user(); - return view('back.member', ['handle' => $member->handle]); + return view('back.member', [ + 'handle' => $member->handle, + 'title' => "Manage Members"]); } public function location(Request $request, string $action = "index") { $member = Auth::user(); - return view('back.locations', ['handle' => $member->handle, "action" => $action]); + return view('back.locations', [ + 'handle' => $member->handle, + 'title' => "Manage Locations", + "action" => $action]); } } diff --git a/public/assets/css/global/typography.css b/public/assets/css/global/typography.css index 96e9c3e..35465aa 100644 --- a/public/assets/css/global/typography.css +++ b/public/assets/css/global/typography.css @@ -50,7 +50,7 @@ h1 { margin: 0; position: absolute; bottom: 20px; - width: 70%; + width: 66%; } h2 { diff --git a/resources/views/back/locations.blade.php b/resources/views/back/locations.blade.php index 2b99109..69f37c0 100644 --- a/resources/views/back/locations.blade.php +++ b/resources/views/back/locations.blade.php @@ -1,14 +1,12 @@ @extends('frame') -@section('title', 'Den|Locations') +@section('title', 'Den | Location Admin') @section('main-content') @parent -
-
-

Locations

- Hey {{$handle}}
- +
+
+

Location Listings

@if($action === "add") @include('forms.add-location') @elseif($action === "edit") @@ -18,6 +16,6 @@ @else START @endif -
+
@endsection \ No newline at end of file diff --git a/resources/views/back/member.blade.php b/resources/views/back/member.blade.php index 017c4ec..3140d9b 100644 --- a/resources/views/back/member.blade.php +++ b/resources/views/back/member.blade.php @@ -1,4 +1,11 @@ -
-

Mmeber Stuff

- Hey {{$handle}} -
\ No newline at end of file +@extends('frame') + +@section('title', 'Den | Member Admin') + + @section('main-content') +
+
+

Member Listing

+
+
+ @endsection \ No newline at end of file diff --git a/resources/views/back/start.blade.php b/resources/views/back/start.blade.php index 01e47d5..7fb4c82 100644 --- a/resources/views/back/start.blade.php +++ b/resources/views/back/start.blade.php @@ -4,8 +4,9 @@ @section('main-content') -
-

The Den

- Hey {{$handle}} -
+
+
+

Hey {{$handle}}

+
+
@endsection \ No newline at end of file diff --git a/resources/views/frame.blade.php b/resources/views/frame.blade.php index 8fcb632..c6f7177 100644 --- a/resources/views/frame.blade.php +++ b/resources/views/frame.blade.php @@ -30,9 +30,21 @@ Listings
- - The Den - + @if(Auth::check()) + + Member +
+ + Locations +
+ + Logout +
+ @else + + The Den +
+ @endif diff --git a/resources/views/front/listing.blade.php b/resources/views/front/listing.blade.php index d985495..62cf4bb 100644 --- a/resources/views/front/listing.blade.php +++ b/resources/views/front/listing.blade.php @@ -3,14 +3,13 @@ @section('main-content') @parent
-