From 1c265427a786334820d88acf516feaf74f9afb14 Mon Sep 17 00:00:00 2001 From: drkthunder02 Date: Fri, 3 Apr 2020 01:12:52 -0500 Subject: [PATCH] new admin dashboard --- .../views/admin/dashboards/allowed_logins.blade.php | 2 +- resources/views/admin/dashboards/dashboard.blade.php | 8 ++++++-- .../views/admin/dashboards/purge_wiki.blade.php | 2 +- resources/views/admin/dashboards/taxes.blade.php | 2 +- .../views/admin/dashboards/userspaged.blade.php | 2 +- .../views/admin/dashboards/walletjournal.blade.php | 2 +- resources/views/admin/dashboards/wiki.blade.php | 2 +- resources/views/layouts/admin/b4.blade.php | 6 +++--- resources/views/layouts/admin/sidenavbar.blade.php | 12 +++++++----- resources/views/layouts/admin/topnavbar.blade.php | 1 + 10 files changed, 23 insertions(+), 16 deletions(-) diff --git a/resources/views/admin/dashboards/allowed_logins.blade.php b/resources/views/admin/dashboards/allowed_logins.blade.php index 51b64d986..2c85578ae 100644 --- a/resources/views/admin/dashboards/allowed_logins.blade.php +++ b/resources/views/admin/dashboards/allowed_logins.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/admin/dashboards/dashboard.blade.php b/resources/views/admin/dashboards/dashboard.blade.php index 7cf47edd1..1b93978ac 100644 --- a/resources/views/admin/dashboards/dashboard.blade.php +++ b/resources/views/admin/dashboards/dashboard.blade.php @@ -1,4 +1,8 @@ -@extends('layouts.b4') +@extends('layouts.admin.b4') @section('content') - +
+

Admin Dashboard


+ This will eventually house statistics and financial status of the alliance.
+ This page will house a graph at least of the financial statistics. +
@endsection \ No newline at end of file diff --git a/resources/views/admin/dashboards/purge_wiki.blade.php b/resources/views/admin/dashboards/purge_wiki.blade.php index 8b6e0527b..23690e8e7 100644 --- a/resources/views/admin/dashboards/purge_wiki.blade.php +++ b/resources/views/admin/dashboards/purge_wiki.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/admin/dashboards/taxes.blade.php b/resources/views/admin/dashboards/taxes.blade.php index caac0d226..6493f435b 100644 --- a/resources/views/admin/dashboards/taxes.blade.php +++ b/resources/views/admin/dashboards/taxes.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/admin/dashboards/userspaged.blade.php b/resources/views/admin/dashboards/userspaged.blade.php index b4f359560..2627a4f2c 100644 --- a/resources/views/admin/dashboards/userspaged.blade.php +++ b/resources/views/admin/dashboards/userspaged.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/admin/dashboards/walletjournal.blade.php b/resources/views/admin/dashboards/walletjournal.blade.php index 1833e4eeb..5c8cf1529 100644 --- a/resources/views/admin/dashboards/walletjournal.blade.php +++ b/resources/views/admin/dashboards/walletjournal.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/admin/dashboards/wiki.blade.php b/resources/views/admin/dashboards/wiki.blade.php index c275d5a83..9e15280a9 100644 --- a/resources/views/admin/dashboards/wiki.blade.php +++ b/resources/views/admin/dashboards/wiki.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layouts.b4') +@extends('layouts.admin.b4') @section('content')
diff --git a/resources/views/layouts/admin/b4.blade.php b/resources/views/layouts/admin/b4.blade.php index 97a2ab2ec..982f858c7 100644 --- a/resources/views/layouts/admin/b4.blade.php +++ b/resources/views/layouts/admin/b4.blade.php @@ -31,13 +31,13 @@ @include('layouts.admin.topnavbar') + + @include('layouts.admin.sidenavbar') +
@include('inc.messages')
- - - @include('layouts.admin.sidenavbar') @yield('content') diff --git a/resources/views/layouts/admin/sidenavbar.blade.php b/resources/views/layouts/admin/sidenavbar.blade.php index 336c117a3..538806a5e 100644 --- a/resources/views/layouts/admin/sidenavbar.blade.php +++ b/resources/views/layouts/admin/sidenavbar.blade.php @@ -12,11 +12,13 @@ Allowed Logins Wiki Wallet Journal - - +
+ + @endif diff --git a/resources/views/layouts/admin/topnavbar.blade.php b/resources/views/layouts/admin/topnavbar.blade.php index f71f8875a..3f12fba84 100644 --- a/resources/views/layouts/admin/topnavbar.blade.php +++ b/resources/views/layouts/admin/topnavbar.blade.php @@ -2,6 +2,7 @@ W4RP