From 813648cfbb00afba0d1b10809a3588b3cf1cf6ee Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Tue, 11 May 2021 22:11:10 -0600
Subject: [PATCH] Update admin settings views

---
 .../views/admin/partial/topnav.blade.php      | 147 ++++++++++--------
 .../views/admin/settings/sidebar.blade.php    |  25 +--
 2 files changed, 100 insertions(+), 72 deletions(-)

diff --git a/resources/views/admin/partial/topnav.blade.php b/resources/views/admin/partial/topnav.blade.php
index bbc92ff1..13ca2151 100644
--- a/resources/views/admin/partial/topnav.blade.php
+++ b/resources/views/admin/partial/topnav.blade.php
@@ -1,67 +1,92 @@
 <nav class="navbar navbar-expand-lg navbar-light">
-  <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 {{request()->is('*messages*')?'active':''}}">
-          <a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Messages</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-3 {{request()->is(['*settings*','*discover*', '*site-news*'])?'active':''}}">
-          <a class="nav-link dropdown-toggle px-4" 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 {{request()->is('*apps*')?'active':''}}" href="{{route('admin.apps')}}">Apps</a>
-            <a class="dropdown-item font-weight-bold {{request()->is('*discover*')?'active':''}}" href="{{route('admin.discover')}}">Discover</a>
-            <a class="dropdown-item font-weight-bold {{request()->is('*hashtags*')?'active':''}}" href="{{route('admin.hashtags')}}">Hashtags</a>
-            <a class="dropdown-item font-weight-bold {{request()->is('*site-news*')?'active':''}}" href="/i/admin/site-news">Newsroom</a>
-            <div class="dropdown-divider"></div>
-            <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>
+	<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-4 {{request()->is('*admin/dashboard')?'active':''}}">
+					<a class="nav-link" href="{{route('admin.home')}}">Dashboard</a>
+				</li>
+				{{--<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Configuration</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Content</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Federation</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Moderation</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Platform</a>
+				</li>
+				<li class="nav-item mx-2 align-self-center text-lighter">|</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Media</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Profiles</a>
+				</li>
+				<li class="nav-item mx-2 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Statuses</a>
+				</li> --}}
+				<li class="nav-item mx-4 {{request()->is('*messages*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.messages')}}">Messages</a>
+				</li>
+				{{-- <li class="nav-item mx-4 {{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-4 {{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-4 {{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-4 {{request()->is('*users*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.users')}}">Users</a>
+				</li>
+				<li class="nav-item mx-4 {{request()->is('*settings*')?'active':''}}">
+					<a class="nav-link font-weight-lighter text-muted" href="{{route('admin.settings')}}">Settings</a>
+				</li>
+				<li class="nav-item dropdown ml-3 {{request()->is(['*discover*', '*site-news*'])?'active':''}}">
+					<a class="nav-link dropdown-toggle px-4" 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 {{request()->is('*apps*')?'active':''}}" href="{{route('admin.apps')}}">Apps</a>
+						{{-- <a class="dropdown-item font-weight-bold {{request()->is('*discover*')?'active':''}}" href="{{route('admin.discover')}}">Discover</a> --}}
+						<a class="dropdown-item font-weight-bold {{request()->is('*hashtags*')?'active':''}}" href="{{route('admin.hashtags')}}">Hashtags</a>
+						<a class="dropdown-item font-weight-bold {{request()->is('*instances*')?'active':''}}" href="{{route('admin.instances')}}">Instances</a>
+						<a class="dropdown-item font-weight-bold {{request()->is('*media*')?'active':''}}" href="{{route('admin.media')}}">Media</a>
+						<a class="dropdown-item font-weight-bold {{request()->is('*site-news*')?'active':''}}" href="/i/admin/site-news">Newsroom</a>
+						<a class="dropdown-item font-weight-bold {{request()->is('*profiles*')?'active':''}}" href="/i/admin/profiles">Profiles</a>
+						<div class="dropdown-divider"></div>
+						<a class="dropdown-item font-weight-bold" href="/horizon">Horizon</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;
-  } 
+	#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
+@endpush
diff --git a/resources/views/admin/settings/sidebar.blade.php b/resources/views/admin/settings/sidebar.blade.php
index a5e60f80..b6f83bd0 100644
--- a/resources/views/admin/settings/sidebar.blade.php
+++ b/resources/views/admin/settings/sidebar.blade.php
@@ -3,26 +3,29 @@
   <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings') ? 'font-weight-bold':''}}" href="{{route('admin.settings')}}">Home</a>
   </li>
-  <li class="nav-item pl-3">
+{{--   <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/backups') ? 'font-weight-bold':''}}" href="{{route('admin.settings.backups')}}">Backups</a>
-  </li>
-  <li class="nav-item pl-3">
+  </li> --}}
+  {{-- <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/config') ? 'font-weight-bold':''}}" href="{{route('admin.settings.config')}}">Configuration</a>
-  </li>
-  <li class="nav-item pl-3">
+  </li> --}}
+  {{-- <li class="nav-item pl-3">
+    <a class="nav-link text-muted {{request()->is('*settings/customize') ? 'font-weight-bold':''}}" href="{{route('admin.settings.customize')}}">Customize</a>
+  </li> --}}
+  {{-- <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/features') ? 'font-weight-bold':''}}" href="{{route('admin.settings.features')}}">Features</a>
-  </li>
-  <li class="nav-item pl-3">
+  </li> --}}
+  {{-- <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/maintenance') ? 'font-weight-bold':''}}" href="{{route('admin.settings.maintenance')}}">Maintenance</a>
-  </li>
+  </li> --}}
   <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/page*') ? 'font-weight-bold':''}}" href="{{route('admin.settings.pages')}}">Pages</a>
   </li>
-  <li class="nav-item pl-3">
+  {{-- <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/storage') ? 'font-weight-bold':''}}" href="{{route('admin.settings.storage')}}">Storage</a>
-  </li>
+  </li> --}}
   <li class="nav-item pl-3">
     <a class="nav-link text-muted {{request()->is('*settings/system') ? 'font-weight-bold':''}}" href="{{route('admin.settings.system')}}">System</a>
   </li>
     </ul>
-@endsection
\ No newline at end of file
+@endsection