From 035d2fd93a523c4cd539898dd55b88c536e638d6 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 31 Jan 2019 13:11:58 -0700
Subject: [PATCH] Update admin partials

---
 .../views/admin/partial/sidebar.blade.php     | 36 +---------
 .../admin/partial/template-full.blade.php     | 26 ++++++++
 .../views/admin/partial/template.blade.php    |  4 +-
 .../views/admin/partial/topnav.blade.php      | 65 +++++++++++++++++++
 4 files changed, 95 insertions(+), 36 deletions(-)
 create mode 100644 resources/views/admin/partial/template-full.blade.php
 create mode 100644 resources/views/admin/partial/topnav.blade.php

diff --git a/resources/views/admin/partial/sidebar.blade.php b/resources/views/admin/partial/sidebar.blade.php
index 7ccbd8ddf..e33075f23 100644
--- a/resources/views/admin/partial/sidebar.blade.php
+++ b/resources/views/admin/partial/sidebar.blade.php
@@ -1,37 +1,3 @@
   <div class="col-12 col-md-3 py-3" style="border-right:1px solid #ccc;">
-    <ul class="nav flex-column settings-nav">
-      <li class="nav-item pl-3 {{request()->is('dashboard')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="{{route('admin.home')}}">Dashboard</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('alerts*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="#">Alerts</a>
-      </li>
-      <li class="nav-item">
-        <hr>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('instances*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="#">Instances</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('media*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="{{route('admin.media')}}">Media</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('reports*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="{{route('admin.reports')}}">Reports</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('statuses*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="{{route('admin.statuses')}}">Statuses</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('users*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="{{route('admin.users')}}">Users</a>
-      </li>
-      <li class="nav-item">
-        <hr>
-      </li>
-      <li class="nav-item pl-3">
-        <a class="nav-link font-weight-bold text-muted" href="/horizon">Redis Queue</a>
-      </li>
-      <li class="nav-item pl-3 {{request()->is('settings*')?'active':''}}">
-        <a class="nav-link font-weight-bold text-muted" href="#">Settings</a>
-      </li>
-    </ul>
+    @yield('menu')
   </div>
\ No newline at end of file
diff --git a/resources/views/admin/partial/template-full.blade.php b/resources/views/admin/partial/template-full.blade.php
new file mode 100644
index 000000000..193f1a42d
--- /dev/null
+++ b/resources/views/admin/partial/template-full.blade.php
@@ -0,0 +1,26 @@
+@extends('layouts.app')
+
+@section('content')
+
+@include('admin.partial.topnav')
+
+<div class="container">
+  <div class="col-12 mt-5">
+    <div class="card">
+      <div class="card-body p-0">
+        <div class="row">
+          <div class="col-12 px-5 py-4">
+            @if (session('status'))
+                <div class="alert alert-success">
+                    {{ session('status')}}
+                </div>
+            @endif
+            @yield('section')
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/partial/template.blade.php b/resources/views/admin/partial/template.blade.php
index 3f93d88e8..4f8b0b959 100644
--- a/resources/views/admin/partial/template.blade.php
+++ b/resources/views/admin/partial/template.blade.php
@@ -1,7 +1,9 @@
 @extends('layouts.app')
 
 @section('content')
-@yield('header')
+
+@include('admin.partial.topnav')
+
 <div class="container">
   <div class="col-12 mt-5">
     <div class="card">
diff --git a/resources/views/admin/partial/topnav.blade.php b/resources/views/admin/partial/topnav.blade.php
new file mode 100644
index 000000000..29a76e283
--- /dev/null
+++ b/resources/views/admin/partial/topnav.blade.php
@@ -0,0 +1,65 @@
+<nav class="navbar navbar-expand-lg navbar-light bg-white">
+  <div class="container">
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#topbarNav" aria-controls="topbarNav" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="topbarNav">
+      <ul class="navbar-nav">
+        <li class="nav-item mx-2 {{request()->is('*admin/dashboard')?'active':''}}">
+          <a class="nav-link" href="{{route('admin.home')}}">Dashboard</a>
+        </li>
+        <li class="nav-item mx-2">
+          <a class="nav-link font-weight-lighter text-muted" href="#">Apps</a>
+        </li>
+        <li class="nav-item mx-2">
+          <a class="nav-link font-weight-lighter text-muted" href="#">Hashtags</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*instances*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.instances')}}">Instances</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*media*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.media')}}">Media</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*reports*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.reports')}}">Moderation</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*profiles*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.profiles')}}">Profiles</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*statuses*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.statuses')}}">Statuses</a>
+        </li>
+        <li class="nav-item mx-2 {{request()->is('*users*')?'active':''}}">
+          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.users')}}">Users</a>
+        </li>
+        <li class="nav-item dropdown mx-2 {{request()->is('*settings*')?'active':''}}">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            More
+          </a>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+            <a class="dropdown-item font-weight-bold" href="/horizon">Horizon</a>
+            <a class="dropdown-item font-weight-bold" href="#">Websockets</a>
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item font-weight-bold {{request()->is('*settings*')?'active':''}}" href="{{route('admin.settings')}}">Settings</a>
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</nav>
+
+@push('styles')
+<style type="text/css">
+  #topbarNav .nav-item:hover {
+    border-bottom: 2px solid #08d;
+    margin-bottom: -7px;
+  }
+  #topbarNav .nav-item.active {
+    border-bottom: 2px solid #08d;
+    margin-bottom: -7px;
+  }
+  #topbarNav .nav-item.active .nav-link {
+    font-weight: bold !important;
+  } 
+</style>
+@endpush
\ No newline at end of file