From 9b8ae6cd795d378fc4c7f9fbe11333c64a912490 Mon Sep 17 00:00:00 2001
From: Jordan Ramos <jordan.ramos@spectrum.com>
Date: Tue, 5 May 2026 11:21:59 -0600
Subject: [PATCH] fix: move AdminScopeToggle from NavDrawer to main header bar

Places the scope toggle next to the UserMenu avatar in the top-right
header area so it's always visible without opening the nav drawer.
---
 frontend/src/App.js                  | 2 ++
 frontend/src/components/NavDrawer.js | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 6ee10e3..cf72d82 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -7,6 +7,7 @@ import UserManagement from './components/UserManagement';
 import AuditLog from './components/AuditLog';
 import NvdSyncModal from './components/NvdSyncModal';
 import NavDrawer from './components/NavDrawer';
+import AdminScopeToggle from './components/AdminScopeToggle';
 import CalendarWidget from './components/CalendarWidget';
 import ConfirmModal from './components/ConfirmModal';
 import VulnerabilityTriagePage from './components/pages/ReportingPage';
@@ -1020,6 +1021,7 @@ export default function App() {
                   Add Entry
                 </button>
               )}
+              <AdminScopeToggle />
               <UserMenu onManageUsers={() => setShowUserManagement(true)} onAuditLog={() => setShowAuditLog(true)} />
             </div>
           </div>
diff --git a/frontend/src/components/NavDrawer.js b/frontend/src/components/NavDrawer.js
index 808862c..7816304 100644
--- a/frontend/src/components/NavDrawer.js
+++ b/frontend/src/components/NavDrawer.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { X, Home, BarChart2, BookOpen, Download, ShieldCheck, Settings, Ticket } from 'lucide-react';
 import { useAuth } from '../contexts/AuthContext';
-import AdminScopeToggle from './AdminScopeToggle';
 
 const NAV_ITEMS = [
   { id: 'home',           label: 'Home',           icon: Home,        color: '#0EA5E9', description: 'Main dashboard'            },
@@ -64,12 +63,6 @@ export default function NavDrawer({ isOpen, onClose, currentPage, onNavigate })
 
         {/* Nav items */}
         <nav style={{ display: 'flex', flexDirection: 'column', gap: '0.375rem' }}>
-
-          {/* Admin scope toggle — between header and nav items */}
-          <div style={{ marginBottom: '0.5rem' }}>
-            <AdminScopeToggle />
-          </div>
-
           {NAV_ITEMS.map(({ id, label, icon: Icon, color, description }) => {
             const active = currentPage === id;
             return (