From 608bcc16826b9c725697070db9b132a4d3f1405d Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 8 Apr 2026 04:50:17 -0500
Subject: [PATCH] update sidebar

---
 resources/views/dashboard/dashboard.blade.php |  1 +
 resources/views/layouts/dashb5.blade.php      |  5 +-
 resources/views/layouts/navbar.blade.php      | 81 +++++++------------
 resources/views/layouts/sidebar.blade.php     |  5 +-
 4 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/resources/views/dashboard/dashboard.blade.php b/resources/views/dashboard/dashboard.blade.php
index 15d5409..49fa291 100644
--- a/resources/views/dashboard/dashboard.blade.php
+++ b/resources/views/dashboard/dashboard.blade.php
@@ -1,5 +1,6 @@
 @extends('layouts.dashb5')
 @section('title', 'Alliance Services - Dashboard')
+@section('top-navbar')
 
 @section('content')
     <div class="space-y-6">
diff --git a/resources/views/layouts/dashb5.blade.php b/resources/views/layouts/dashb5.blade.php
index 0c31196..961862d 100644
--- a/resources/views/layouts/dashb5.blade.php
+++ b/resources/views/layouts/dashb5.blade.php
@@ -90,9 +90,6 @@
             <nav class="main-header navbar navbar-expand navbar-white navbar-light">
                 <!-- Left navbar links -->
                 <ul class="navbar-nav">
-                    <li class="nav-item">
-                    <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
-                    </li>
                     <li class="nav-item d-none d-sm-inline-block">
                     <a href="/dashboard" class="nav-link">Dashboard</a>
                     </li>
@@ -120,6 +117,8 @@
                     </li>
                 </ul>
             </nav>
+        </div>
+        <div class="wrapper">
             <!-- /.navbar -->
             <div class="flex-shrink-0 p-3 bg-white" style="width: 280px;">
                 <ul class="list-unstyled ps-0">
diff --git a/resources/views/layouts/navbar.blade.php b/resources/views/layouts/navbar.blade.php
index 43028b6..223a246 100644
--- a/resources/views/layouts/navbar.blade.php
+++ b/resources/views/layouts/navbar.blade.php
@@ -1,53 +1,34 @@
+@section('top-navbar')
 <!-- Navbar -->
 <nav class="main-header navbar navbar-expand navbar-white navbar-light">
-  <!-- Left navbar links -->
-  <ul class="navbar-nav">
-    <li class="nav-item">
-      <a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
-    </li>
-    <li class="nav-item d-none d-sm-inline-block">
-      <a href="/dashboard" class="nav-link">Dashboard</a>
-    </li>
-    @if(auth()->user()->hasRole('Admin'))
-    <li class="nav-item d-non d-sm-inline-block">
-      <a class="nav-link" href="/admin/dashboard">Admin Dashboard</a>
-    </li>
-    @endif
-  </ul>
-  @hasSection('navbar-upper-left')
-  @yield('navbar-upper-left')
-  @endif
-
-  <!-- Right navbar links -->
-  <ul class="navbar-nav ms-auto">
-    <!-- Notifications Dropdown Menu -->
-    <li class="nav-item dropdown">
-      <a class="nav-link" href="#">
-        <i class="fas fa-fighter-jet"></i>
-        <span class="badge badge-warning navbar-badge">{{ auth()->user()->srpOpen() ?? 0 }}</span>
-      </a>
-    </li>
-    <li class="nav-item dropdown">
-      <a class="nav-link" href="#">
-          <i class="fas fa-plane-slash"></i>
-          <span class="badge badge-danger navbar-badge">{{ auth()->user()->srpDenied() ?? 0 }}</span>
-      </a>
-    </li>
-    <li class="nav-item dropdown">
-      <a class="nav-link" href="#">
-          <i class="fas fa-space-shuttle"></i>
-          <span class="badge badge-success navbar-badge">{{ auth()->user()->srpApproved() ?? 0 }}</span>
-      </a>
-    </li>
-    <li class="nav-item dropdown">
-      <form method="POST" action="{{ route('logout') }}">
-        @csrf
-        <button type="submit">Logout</button>
-      </form>
-    </li>
-  </ul>
-  @hasSection('navbar-upper-right')
-  @yeild('navbar-upper-right')
-  @endif
+    <!-- Left navbar links -->
+    <ul class="navbar-nav">
+        <li class="nav-item d-none d-sm-inline-block">
+        <a href="/dashboard" class="nav-link">Dashboard</a>
+        </li>
+    </ul>
+    <!-- Right navbar links -->
+    <ul class="navbar-nav ms-auto">
+        <!-- Notifications Dropdown Menu -->
+        <li class="nav-item dropdown">
+        <a class="nav-link" href="#">
+            <i class="fas fa-fighter-jet"></i>
+            <span class="badge badge-warning navbar-badge">{{ auth()->user()->srpOpen() ?? 0 }}</span>
+        </a>
+        </li>
+        <li class="nav-item dropdown">
+        <a class="nav-link" href="#">
+            <i class="fas fa-plane-slash"></i>
+            <span class="badge badge-danger navbar-badge">{{ auth()->user()->srpDenied() ?? 0 }}</span>
+        </a>
+        </li>
+        <li class="nav-item dropdown">
+        <a class="nav-link" href="#">
+            <i class="fas fa-space-shuttle"></i>
+            <span class="badge badge-success navbar-badge">{{ auth()->user()->srpApproved() ?? 0 }}</span>
+        </a>
+        </li>
+    </ul>
 </nav>
-<!-- /.navbar -->
\ No newline at end of file
+<!-- /.navbar -->
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php
index 5de2da2..a78b8ab 100644
--- a/resources/views/layouts/sidebar.blade.php
+++ b/resources/views/layouts/sidebar.blade.php
@@ -67,7 +67,4 @@
       </ul>
     </div>
   </div>
-  <!-- Sidebar -->
-  @hasSection('sidebar')
-  @yield('sidebar')
-  @endif
\ No newline at end of file
+  <!-- Sidebar -->
\ No newline at end of file