From 26149ca0045594dcbbe94081d943ab019f34c05c Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Sun, 5 Jan 2025 17:27:30 +0530
Subject: [PATCH 1/3] Added auto hide for side bar

---
 src/components/ui/sidebar/app-sidebar.tsx |  2 +-
 src/components/ui/sidebar/nav-main.tsx    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/sidebar/app-sidebar.tsx b/src/components/ui/sidebar/app-sidebar.tsx
index 7e2fa302349..3c10613b672 100644
--- a/src/components/ui/sidebar/app-sidebar.tsx
+++ b/src/components/ui/sidebar/app-sidebar.tsx
@@ -62,7 +62,7 @@ function generateFacilityLinks(
     { name: t("encounters"), url: `${baseUrl}/encounters`, icon: "d-patient" },
     // { name: t("assets"), url: `${baseUrl}/assets`, icon: "d-folder" },
     // { name: t("shifting"), url: "/shifting", icon: "d-ambulance" },
-    { name: t("resource"), url: "/resource", icon: "d-book-open" },
+    { name: t("resource"), url: "/resource/board", icon: "d-book-open" },
     { name: t("users"), url: `${baseUrl}/users`, icon: "d-people" },
     // { name: t("All users"), url: "/users", icon: "d-people" },
     {
diff --git a/src/components/ui/sidebar/nav-main.tsx b/src/components/ui/sidebar/nav-main.tsx
index f50590ab35f..7bb14156577 100644
--- a/src/components/ui/sidebar/nav-main.tsx
+++ b/src/components/ui/sidebar/nav-main.tsx
@@ -9,6 +9,7 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
+  useSidebar,
 } from "@/components/ui/sidebar";
 
 export function NavMain({
@@ -20,6 +21,13 @@ export function NavMain({
     icon?: string;
   }[];
 }) {
+  const { isMobile, setOpenMobile } = useSidebar();
+  const handleLinkClick = () => {
+    if (isMobile) {
+      setOpenMobile(false);
+    }
+  };
+
   return (
     <SidebarGroup>
       <SidebarMenu>
@@ -31,10 +39,10 @@ export function NavMain({
               className={
                 "text-gray-600 transition font-normal hover:bg-gray-200 hover:text-green-700"
               }
+              onClick={handleLinkClick}
             >
               <ActiveLink
                 href={link.url}
-                activeClass="bg-white text-green-700 shadow"
                 exactActiveClass="bg-white text-green-700 shadow"
               >
                 {link.icon && <CareIcon icon={link.icon as IconName} />}

From dbd294b3ca2cab468734ad83b55cc8a2ab55d333 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Sun, 5 Jan 2025 18:07:04 +0530
Subject: [PATCH 2/3] Revert "Added auto hide for side bar"

This reverts commit 26149ca0045594dcbbe94081d943ab019f34c05c.
---
 src/components/ui/sidebar/app-sidebar.tsx |  2 +-
 src/components/ui/sidebar/nav-main.tsx    | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/ui/sidebar/app-sidebar.tsx b/src/components/ui/sidebar/app-sidebar.tsx
index 3c10613b672..7e2fa302349 100644
--- a/src/components/ui/sidebar/app-sidebar.tsx
+++ b/src/components/ui/sidebar/app-sidebar.tsx
@@ -62,7 +62,7 @@ function generateFacilityLinks(
     { name: t("encounters"), url: `${baseUrl}/encounters`, icon: "d-patient" },
     // { name: t("assets"), url: `${baseUrl}/assets`, icon: "d-folder" },
     // { name: t("shifting"), url: "/shifting", icon: "d-ambulance" },
-    { name: t("resource"), url: "/resource/board", icon: "d-book-open" },
+    { name: t("resource"), url: "/resource", icon: "d-book-open" },
     { name: t("users"), url: `${baseUrl}/users`, icon: "d-people" },
     // { name: t("All users"), url: "/users", icon: "d-people" },
     {
diff --git a/src/components/ui/sidebar/nav-main.tsx b/src/components/ui/sidebar/nav-main.tsx
index 7bb14156577..f50590ab35f 100644
--- a/src/components/ui/sidebar/nav-main.tsx
+++ b/src/components/ui/sidebar/nav-main.tsx
@@ -9,7 +9,6 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
-  useSidebar,
 } from "@/components/ui/sidebar";
 
 export function NavMain({
@@ -21,13 +20,6 @@ export function NavMain({
     icon?: string;
   }[];
 }) {
-  const { isMobile, setOpenMobile } = useSidebar();
-  const handleLinkClick = () => {
-    if (isMobile) {
-      setOpenMobile(false);
-    }
-  };
-
   return (
     <SidebarGroup>
       <SidebarMenu>
@@ -39,10 +31,10 @@ export function NavMain({
               className={
                 "text-gray-600 transition font-normal hover:bg-gray-200 hover:text-green-700"
               }
-              onClick={handleLinkClick}
             >
               <ActiveLink
                 href={link.url}
+                activeClass="bg-white text-green-700 shadow"
                 exactActiveClass="bg-white text-green-700 shadow"
               >
                 {link.icon && <CareIcon icon={link.icon as IconName} />}

From 0b80b3687186a46116ec3ff22f3d4e34429940f3 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Sun, 5 Jan 2025 18:11:27 +0530
Subject: [PATCH 3/3] Auto hide sidebar

---
 src/components/ui/sidebar/nav-main.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/components/ui/sidebar/nav-main.tsx b/src/components/ui/sidebar/nav-main.tsx
index f50590ab35f..f69eed4e175 100644
--- a/src/components/ui/sidebar/nav-main.tsx
+++ b/src/components/ui/sidebar/nav-main.tsx
@@ -9,6 +9,7 @@ import {
   SidebarMenu,
   SidebarMenuButton,
   SidebarMenuItem,
+  useSidebar,
 } from "@/components/ui/sidebar";
 
 export function NavMain({
@@ -20,6 +21,8 @@ export function NavMain({
     icon?: string;
   }[];
 }) {
+  const { isMobile, setOpenMobile } = useSidebar();
+
   return (
     <SidebarGroup>
       <SidebarMenu>
@@ -31,6 +34,11 @@ export function NavMain({
               className={
                 "text-gray-600 transition font-normal hover:bg-gray-200 hover:text-green-700"
               }
+              onClick={() => {
+                if (isMobile) {
+                  setOpenMobile(false);
+                }
+              }}
             >
               <ActiveLink
                 href={link.url}