From 50c93251287ed5230928ba20ec84bf31f9d85ce5 Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Fri, 20 Dec 2024 14:23:38 +0100
Subject: [PATCH 1/7] remove menu

---
 components/SideNavbar.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index 816a706..43b30ac 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -134,11 +134,6 @@ export default function SideNavbar() {
           )}
           {dataLinks.length > 0 && (
             <div>
-              {!isCollapsed && !mobileWidth && (
-                <h2 className="text-lg text-gray-600 font-seibold text-center">
-                  {t("menu.data")} {/* Translated heading */}
-                </h2>
-              )}
               <Nav
                 isCollapsed={mobileWidth ? true : isCollapsed}
                 links={dataLinks}

From 5810ed6a41c8ab95d053b2485159df86195f5ccb Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Mon, 23 Dec 2024 12:50:25 +0100
Subject: [PATCH 2/7] Update SideNavbar.tsx

Removed the "Settings" tab as it was not having any functionality.
---
 components/SideNavbar.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index 43b30ac..f85553f 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -145,11 +145,6 @@ export default function SideNavbar() {
         <div>
           {settingsLinks.length > 0 && (
             <div>
-              {!isCollapsed && !mobileWidth && (
-                <h2 className="text-lg text-gray-600 font-seibold text-center">
-                  {t("menu.settings")} {/* Translated heading */}
-                </h2>
-              )}
               <Nav
                 isCollapsed={mobileWidth ? true : isCollapsed}
                 links={settingsLinks}

From 67d3a4e93b6c6c9112a618ca0198c335f4a989f0 Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Mon, 23 Dec 2024 13:26:44 +0100
Subject: [PATCH 3/7] Update en.json

Made "Project" to "Project Settings"
---
 lib/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/locales/en.json b/lib/locales/en.json
index d90b954..4a72eef 100644
--- a/lib/locales/en.json
+++ b/lib/locales/en.json
@@ -33,7 +33,7 @@
       "data": "Data",
       "settings": "Settings",
       "trashbins": "Trashbins",
-      "project": "Project",
+      "project": "Project Settings",
       "account": "Account",
       "location": "Location",
       "last_emptied": "Last Emptied",

From 58d6a02a98936c1eaf541d8be759aaea72e5e7a0 Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Mon, 23 Dec 2024 13:45:15 +0100
Subject: [PATCH 4/7] Added new menu item for "Project Settings" in the
 Navigation Bar

Added new menu item for "Project Settings" in the Navigation Bar
---
 components/SideNavbar.tsx | 2 +-
 lib/locales/en.json       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index f85553f..8a641d6 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -80,7 +80,7 @@ export default function SideNavbar() {
 
   const settingsLinks = [
     {
-      title: t("menu.project"), // Translated text
+      title: t("menu.project_setting"), // Translated text
       href: `/projects/${city}/${type}/settings`,
       icon: Settings2,
       variant: "ghost" as "default" | "ghost",
diff --git a/lib/locales/en.json b/lib/locales/en.json
index 4a72eef..544ac41 100644
--- a/lib/locales/en.json
+++ b/lib/locales/en.json
@@ -33,7 +33,8 @@
       "data": "Data",
       "settings": "Settings",
       "trashbins": "Trashbins",
-      "project": "Project Settings",
+      "project": "Project",
+      "project_setting": "Project Settings",
       "account": "Account",
       "location": "Location",
       "last_emptied": "Last Emptied",

From 83e44ae15129e65e0a6ca44ed0adea87fc978d2e Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Tue, 24 Dec 2024 12:34:42 +0100
Subject: [PATCH 5/7] Update SideNavbar.tsx

Removed "Overview" tab from the Navigation bar.
---
 components/SideNavbar.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index 8a641d6..55cacc4 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -120,12 +120,7 @@ export default function SideNavbar() {
       <div className="flex flex-col gap-4 flex-grow justify-between h-full pb-6">
         <div>
           {overviewLinks.length > 0 && (
-            <div>
-              {!isCollapsed && !mobileWidth && (
-                <h2 className="text-lg text-gray-600 font-seibold text-center">
-                  {t("menu.overview")} {/* Translated heading */}
-                </h2>
-              )}
+            <div>            
               <Nav
                 isCollapsed={mobileWidth ? true : isCollapsed}
                 links={overviewLinks}

From ed4a3e552d5272f7bd6f9c9f951c796b3a52bf42 Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Tue, 24 Dec 2024 13:42:40 +0100
Subject: [PATCH 6/7] Update SideNavbar.tsx

Updated toggle button states in the side Navigation bar on trash can front end interface.
---
 components/SideNavbar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index 55cacc4..70cc0c6 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -8,8 +8,8 @@ import { useTranslation } from "../lib/TranslationContext"; // Import useTransla
 import { useWindowWidth } from "@react-hook/window-size";
 
 import {
-  ChevronRight,
-  ChevronLeft,
+  PanelRightClose,
+  PanelLeftClose,
   LayoutDashboard,
   MapIcon,
   Route,
@@ -102,7 +102,7 @@ export default function SideNavbar() {
             variant="secondary"
             className="rounded-full p-2"
           >
-            {isCollapsed ? <ChevronRight /> : <ChevronLeft />}
+            {isCollapsed ? <PanelRightClose /> : <PanelLeftClose />}
           </Button>
         </div>
       )}

From 0c55a77cbab8b94d661fed202bb4675b3afc1e05 Mon Sep 17 00:00:00 2001
From: shadiamanan <smanan@uni-muenster.de>
Date: Fri, 27 Dec 2024 13:00:53 +0100
Subject: [PATCH 7/7] Added the logout button in Side Navigation bar and added
 the logout functionality on the main page and removed the extra Account
 settings page.

Added the logout button in Side Navigation bar and added the logout functionality on the main page and removed the extra Account settings page.
---
 components/SideNavbar.tsx | 29 +++++++++++++++++++++++++----
 lib/locales/en.json       |  2 +-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/components/SideNavbar.tsx b/components/SideNavbar.tsx
index 70cc0c6..0a5e10f 100644
--- a/components/SideNavbar.tsx
+++ b/components/SideNavbar.tsx
@@ -17,8 +17,14 @@ import {
   Settings,
   Settings2,
   CornerLeftUp,
+  MessageSquareReply
 } from "lucide-react";
 
+
+  const handleLogout = () => {
+    window.location.href = '/login';      // Redirect to the login page (where the authToken is cleared)
+  }
+
 export default function SideNavbar() {
   const [isCollapsed, setIsCollapsed] = useState(false);
 
@@ -86,11 +92,24 @@ export default function SideNavbar() {
       variant: "ghost" as "default" | "ghost",
     },
     {
-      title: t("menu.account"), // Translated text
-      href: "/settings",
-      icon: Settings,
-      variant: "ghost" as "default" | "ghost",
+      title: t("menu.logout"), // Translated text
+      icon: MessageSquareReply,    // Replace with an appropriate logout icon
+      href: '/login',               
+      variant: "ghost" as "default" | "ghost", 
+      custom: (
+        <Button
+          onClick={handleLogout}
+          variant="destructive"
+          className="w-full text-left"
+        >
+          {t("menu.logout")}
+        </Button>
+      )
+      //href: "/settings",
+      //icon: Settings,
+      //variant: "ghost" as "default" | "ghost",
     },
+   
   ];
 
   return (
@@ -117,6 +136,8 @@ export default function SideNavbar() {
           },
         ]}
       />
+       
+  
       <div className="flex flex-col gap-4 flex-grow justify-between h-full pb-6">
         <div>
           {overviewLinks.length > 0 && (
diff --git a/lib/locales/en.json b/lib/locales/en.json
index 544ac41..b76358d 100644
--- a/lib/locales/en.json
+++ b/lib/locales/en.json
@@ -35,7 +35,7 @@
       "trashbins": "Trashbins",
       "project": "Project",
       "project_setting": "Project Settings",
-      "account": "Account",
+      "logout": "Logout",
       "location": "Location",
       "last_emptied": "Last Emptied",
       "battery_level": "Battery Level",