From 5355333d8db0079dac0cde269ee9312dd50d2853 Mon Sep 17 00:00:00 2001
From: adarshm11 <amlearning2023@gmail.com>
Date: Tue, 14 Jan 2025 16:58:49 -0800
Subject: [PATCH 1/2] Moved messaging feature to User Navbar, removed it from
 Admin Dashboard

---
 src/Components/Navbar/AdminNavbar.js | 18 +++++++++---------
 src/Components/Navbar/UserNavbar.js  |  6 ++++--
 src/Routing.js                       |  3 ++-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Components/Navbar/AdminNavbar.js b/src/Components/Navbar/AdminNavbar.js
index 80a4e0e0e..5e2306400 100644
--- a/src/Components/Navbar/AdminNavbar.js
+++ b/src/Components/Navbar/AdminNavbar.js
@@ -81,15 +81,15 @@ export default function UserNavBar(props) {
 
       ),
     },
-    {
-      title: 'Messaging',
-      route: '/messaging',
-      icon: (
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-square-text">
-          <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/><path d="M13 8H7"/><path d="M17 12H7"/>
-        </svg>
-      )
-    },
+    // {
+    //   title: 'Messaging',
+    //   route: '/messaging',
+    //   icon: (
+    //     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-square-text">
+    //       <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/><path d="M13 8H7"/><path d="M17 12H7"/>
+    //     </svg>
+    //   )
+    // },
     {
       title: 'Advertisement Admin',
       route: '/advertisement-admin',
diff --git a/src/Components/Navbar/UserNavbar.js b/src/Components/Navbar/UserNavbar.js
index ca3a6ac85..3b4b8475d 100644
--- a/src/Components/Navbar/UserNavbar.js
+++ b/src/Components/Navbar/UserNavbar.js
@@ -11,8 +11,10 @@ export default function UserNavBar(props) {
     { title: 'Projects', route: '/projects' },
   ];
 
-
-  const authedRoutes = [{ title: 'Printing', route: '/2DPrinting' }];
+  const authedRoutes = [
+    { title: 'Printing', route: '/2DPrinting' },
+    { title: 'Chat', route: '/messaging/:id?'}
+  ];
 
   const authentication = [
     { title: 'Sign Up', route: '/register' },
diff --git a/src/Routing.js b/src/Routing.js
index 479552e46..6d4e55879 100644
--- a/src/Routing.js
+++ b/src/Routing.js
@@ -130,7 +130,8 @@ export default function Routing({ appProps }) {
       Component: Messaging,
       path: '/messaging/:id?',
       allowedIf: userIsMember || userIsOfficerOrAdmin,
-      redirect: '/login'
+      redirect: '/login',
+      inAdminNavbar: false,
     },
     {
       Component: AdvertisementAdmin,

From 147d2a522cd2a5bf82f4b6abef8b74c56ea8401c Mon Sep 17 00:00:00 2001
From: adarshm11 <amlearning2023@gmail.com>
Date: Fri, 23 May 2025 18:44:41 -0700
Subject: [PATCH 2/2] removed unused commented lines

---
 src/Components/Navbar/AdminNavbar.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Components/Navbar/AdminNavbar.js b/src/Components/Navbar/AdminNavbar.js
index 5e2306400..5788d6d1b 100644
--- a/src/Components/Navbar/AdminNavbar.js
+++ b/src/Components/Navbar/AdminNavbar.js
@@ -81,15 +81,6 @@ export default function UserNavBar(props) {
 
       ),
     },
-    // {
-    //   title: 'Messaging',
-    //   route: '/messaging',
-    //   icon: (
-    //     <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-message-square-text">
-    //       <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z"/><path d="M13 8H7"/><path d="M17 12H7"/>
-    //     </svg>
-    //   )
-    // },
     {
       title: 'Advertisement Admin',
       route: '/advertisement-admin',