From fd600126903cd9a973a7b9943db346081db4bdcd Mon Sep 17 00:00:00 2001 From: YermIm Date: Mon, 23 Feb 2026 21:06:56 +0900 Subject: [PATCH 01/13] =?UTF-8?q?refactor:=20useSidebar=20hook=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 38 ++++++++++++-------------- src/hooks/sidebar/useSidebar.ts | 43 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 21 deletions(-) create mode 100644 src/hooks/sidebar/useSidebar.ts diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index f43788a..9e5a865 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -1,8 +1,9 @@ -import { useEffect, useState } from "react"; -import { NavLink, useLocation, useNavigate } from "react-router-dom"; +import { NavLink } from "react-router-dom"; import { footerNav, mainNav } from "@/constants/sidebarNav"; +import { useSidebar } from "@/hooks/sidebar/useSidebar"; + import ChevronIcon from "@/assets/icon/common/chevron-up.svg?react"; import CollapseIcon from "@/assets/icon/sidebar/chevron-left.svg?react"; import Logo from "@/assets/logo/symbol-color.svg?react"; @@ -26,19 +27,14 @@ function getFooterItemClass(isActive: boolean, isCollapsed: boolean) { } export default function Sidebar() { - const location = useLocation(); - const navigate = useNavigate(); - - const [openId, setOpenId] = useState(null); - const [isCollapsed, setIsCollapsed] = useState(false); - - useEffect(() => { - const activeParent = mainNav.find((item) => - item.children?.some((c) => c.path === location.pathname), - ); - - if (activeParent) setOpenId(activeParent.id); - }, [location.pathname]); + const { + isCollapsed, + openId, + setOpenId, + toggleSidebar, + handleItemClick, + location, + } = useSidebar(); return (
{ - setIsCollapsed((prev) => !prev); - setOpenId(null); - }} + onClick={toggleSidebar} className="absolute -right-3 top-10 flex h-6 w-6 items-center justify-center rounded-md bg-white border border-[#F6F6F6] transition hover:bg-[#F6F6F6]" > { - setOpenId(item.id); - if (item.path) navigate(item.path); + handleItemClick( + item.id, + !!item.children?.length, + item.path, + ); }} className={[ "flex items-center", diff --git a/src/hooks/sidebar/useSidebar.ts b/src/hooks/sidebar/useSidebar.ts new file mode 100644 index 0000000..a04e250 --- /dev/null +++ b/src/hooks/sidebar/useSidebar.ts @@ -0,0 +1,43 @@ +import { useEffect, useState } from "react"; +import { useLocation, useNavigate } from "react-router-dom"; + +import { mainNav } from "@/constants/sidebarNav"; + +export const useSidebar = () => { + const location = useLocation(); + const navigate = useNavigate(); + const [openId, setOpenId] = useState(null); + const [isCollapsed, setIsCollapsed] = useState(false); + + useEffect(() => { + if (isCollapsed) return; + const activeParent = mainNav.find((item) => + item.children?.some((c) => c.path === location.pathname), + ); + if (activeParent) setOpenId(activeParent.id); + }, [location.pathname, isCollapsed]); + + const toggleSidebar = () => { + setIsCollapsed((prev) => !prev); + setOpenId(null); + }; + + const handleItemClick = (id: string, hasChildren: boolean, path?: string) => { + if (hasChildren) { + setOpenId((prev) => (prev === id ? null : id)); + if (path) navigate(path); + } else if (path) { + navigate(path); + setOpenId(null); + } + }; + + return { + isCollapsed, + openId, + setOpenId, + location, + toggleSidebar, + handleItemClick, + }; +}; From 8a92dc4fbc055333b89d1ee4130f0169f57d8d4d Mon Sep 17 00:00:00 2001 From: YermIm Date: Tue, 24 Feb 2026 03:41:55 +0900 Subject: [PATCH 02/13] =?UTF-8?q?refactor:=20SidebarItem,=20SubMenu=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 209 +++++-------------------- src/components/Sidebar/SidebarItem.tsx | 80 ++++++++++ src/components/Sidebar/SubMenu.tsx | 38 +++++ 3 files changed, 154 insertions(+), 173 deletions(-) create mode 100644 src/components/Sidebar/SidebarItem.tsx create mode 100644 src/components/Sidebar/SubMenu.tsx diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index 9e5a865..f93bd70 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -4,6 +4,9 @@ import { footerNav, mainNav } from "@/constants/sidebarNav"; import { useSidebar } from "@/hooks/sidebar/useSidebar"; +import { SidebarItem } from "./SidebarItem"; +import { SubMenu } from "./SubMenu"; + import ChevronIcon from "@/assets/icon/common/chevron-up.svg?react"; import CollapseIcon from "@/assets/icon/sidebar/chevron-left.svg?react"; import Logo from "@/assets/logo/symbol-color.svg?react"; @@ -44,6 +47,7 @@ export default function Sidebar() { ].join(" ")} >
+ {/* Logo */} {mainNav.map((item) => { - const Icon = item.icon; - const isOpen = openId === item.id; const isChildActive = item.children?.some((c) => c.path === location.pathname) ?? false; - const isParentActive = (item.path && location.pathname === item.path) || isChildActive; const showChevron = @@ -88,188 +89,50 @@ export default function Sidebar() { !!item.children?.length && (isOpen || isParentActive); - // children 있는 부모 메뉴 - if (item.children?.length) { - return ( -
{ - if (isCollapsed) setOpenId(item.id); - }} - onMouseLeave={() => { - if (isCollapsed) setOpenId(null); - }} + return ( +
isCollapsed && setOpenId(item.id)} + onMouseLeave={() => isCollapsed && setOpenId(null)} + > + + handleItemClick(item.id, !!item.children?.length, item.path) + } > -
+ {showChevron && ( - - {showChevron && ( - - )} -
- - {/* 하위 메뉴 */} - {/* 확장 상태 */} - {!isCollapsed && isOpen && ( -
- {item.children.map((child) => ( - - [ - "pl-4 flex h-10 items-center rounded-xl px-3 text-sm transition-colors", - isActive - ? "bg-chart-3 text-white" - : "text-text-auth-sub hover:bg-[#F6F6F6]", - ].join(" ") - } - > - {child.label} - - ))} -
- )} - {/* 축소 상태 */} - {isCollapsed && isOpen && ( -
- {item.children.map((child) => ( - - [ - "flex h-10 items-center rounded-xl px-3 text-sm transition-colors", - isActive - ? "bg-chart-3 text-white" - : "text-text-auth-sub hover:bg-[#F6F6F6]", - ].join(" ") - } - > - {child.label} - - ))} -
)} -
- ); - } + - // path 있는 단일 메뉴 - if (item.path) { - return ( - - getMainItemClass(isActive, isCollapsed) - } - > - {Icon && ( - - )} - - {item.label} - - - ); - } - // path 없는 메뉴 - return ( - +
); })} diff --git a/src/components/Sidebar/SidebarItem.tsx b/src/components/Sidebar/SidebarItem.tsx new file mode 100644 index 0000000..1943882 --- /dev/null +++ b/src/components/Sidebar/SidebarItem.tsx @@ -0,0 +1,80 @@ +import React from "react"; +import { NavLink } from "react-router-dom"; + +import type { INavItem } from "@/types/navigation/navItem"; + +interface ISidebarItemProps { + item: INavItem; + isCollapsed: boolean; + isOpen?: boolean; + className: string; + onClick: () => void; + children?: React.ReactNode; +} + +export function SidebarItem({ + item, + isCollapsed, + isOpen, + className, + onClick, + children, +}: ISidebarItemProps) { + const Icon = item.icon; + + const content = ( +
+ {Icon && ( + + )} + + {item.label} + + {children} +
+ ); + + // path 있는 단일 메뉴 + if (item.path) { + return ( + className} + onClick={(e) => { + if (e.defaultPrevented) return; + onClick(); + }} + > +
{content}
+
+ ); + } + + // path 없는 메뉴 + return ( + + ); +} diff --git a/src/components/Sidebar/SubMenu.tsx b/src/components/Sidebar/SubMenu.tsx new file mode 100644 index 0000000..9d6c862 --- /dev/null +++ b/src/components/Sidebar/SubMenu.tsx @@ -0,0 +1,38 @@ +import { NavLink } from "react-router-dom"; + +import type { INavItem } from "@/types/navigation/navItem"; + +interface ISubMenuProps { + items: INavItem[]; + isCollapsed: boolean; +} + +export function SubMenu({ items, isCollapsed }: ISubMenuProps) { + const getSubItemClass = (isActive: boolean) => + [ + "flex h-10 items-center rounded-xl px-3 text-sm transition-colors", + isCollapsed ? "" : "pl-4", + isActive + ? "bg-chart-3 text-white" + : "text-text-auth-sub hover:bg-[#F6F6F6]", + ].join(" "); + + const menuContainerClass = isCollapsed + ? "absolute left-full top-0 ml-3 w-52 rounded-2xl bg-white p-2 shadow-lg z-50" + : "ml-11 mt-1 flex flex-col gap-1"; + + return ( +
+ {items.map((child) => ( + getSubItemClass(isActive)} + > + {child.label} + + ))} +
+ ); +} From 06fb413de29648d4b021670eced29576eb2769bd Mon Sep 17 00:00:00 2001 From: YermIm Date: Tue, 24 Feb 2026 04:09:22 +0900 Subject: [PATCH 03/13] =?UTF-8?q?refactor:=20Footer=20SidebarItem=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 68 +++++------------------------- 1 file changed, 11 insertions(+), 57 deletions(-) diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index f93bd70..5402d45 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -140,66 +140,20 @@ export default function Sidebar() { {/* Footer */}
{footerNav.map((item) => { - const Icon = item.icon; - - if (item.path) { - return ( - setOpenId(null)} - className={({ isActive }) => - getFooterItemClass(isActive, isCollapsed) - } - > - {Icon && ( - - )} - - {item.label} - - - ); - } + const isActive = item.path + ? location.pathname === item.path + : false; return ( - + item={item} + isCollapsed={isCollapsed} + className={getFooterItemClass(isActive, isCollapsed)} + onClick={() => { + setOpenId(null); + }} + /> ); })}
From 743062f100a082dcc8e350cf108343ef935db65d Mon Sep 17 00:00:00 2001 From: YermIm Date: Tue, 24 Feb 2026 04:44:24 +0900 Subject: [PATCH 04/13] =?UTF-8?q?fix:=20=EC=B6=95=EC=86=8C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=ED=95=98=EC=9C=84=20=EB=A9=94=EB=89=B4=20=ED=98=B8?= =?UTF-8?q?=EB=B2=84=20=EB=81=8A=EA=B9=80=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/SubMenu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Sidebar/SubMenu.tsx b/src/components/Sidebar/SubMenu.tsx index 9d6c862..e2c134b 100644 --- a/src/components/Sidebar/SubMenu.tsx +++ b/src/components/Sidebar/SubMenu.tsx @@ -10,7 +10,7 @@ interface ISubMenuProps { export function SubMenu({ items, isCollapsed }: ISubMenuProps) { const getSubItemClass = (isActive: boolean) => [ - "flex h-10 items-center rounded-xl px-3 text-sm transition-colors", + "flex h-10 items-center rounded-xl pl-4 px-3 text-sm transition-colors", isCollapsed ? "" : "pl-4", isActive ? "bg-chart-3 text-white" @@ -18,7 +18,7 @@ export function SubMenu({ items, isCollapsed }: ISubMenuProps) { ].join(" "); const menuContainerClass = isCollapsed - ? "absolute left-full top-0 ml-3 w-52 rounded-2xl bg-white p-2 shadow-lg z-50" + ? "absolute left-full top-0 pl-2 w-52 flex flex-col gap-1 rounded-2xl bg-white p-2 shadow-lg z-50" : "ml-11 mt-1 flex flex-col gap-1"; return ( From 924f924720f788ad9dc7e5cba5b9a8a7285e2bec Mon Sep 17 00:00:00 2001 From: YermIm Date: Tue, 24 Feb 2026 22:24:25 +0900 Subject: [PATCH 05/13] =?UTF-8?q?fix:=20=ED=99=95=EC=9E=A5/=EC=B6=95?= =?UTF-8?q?=EC=86=8C=20=EC=A0=84=ED=99=98=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 25 ++++++++++++++++--------- src/components/Sidebar/SidebarItem.tsx | 9 ++++++--- src/components/Sidebar/SubMenu.tsx | 6 +++--- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index 5402d45..84e862d 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -13,8 +13,10 @@ import Logo from "@/assets/logo/symbol-color.svg?react"; function getMainItemClass(isActive: boolean, isCollapsed: boolean) { return [ - "flex items-center rounded-xl px-3 text-sm cursor-pointer transition-colors", - isCollapsed ? "h-13 w-13 mx-auto justify-center" : "h-[55px] gap-4 px-3", + "flex items-center rounded-xl px-3 text-sm cursor-pointer transition-all duration-300", + isCollapsed + ? "h-[55px] w-[55px] mx-auto flex justify-center" + : "h-[55px] gap-4 px-3", isActive ? "bg-chart-3 text-white" : "text-text-auth-sub hover:bg-[#F6F6F6]", @@ -23,7 +25,7 @@ function getMainItemClass(isActive: boolean, isCollapsed: boolean) { function getFooterItemClass(isActive: boolean, isCollapsed: boolean) { return [ - "flex w-full h-[55px] items-center rounded-xl px-3 text-sm cursor-pointer transition-colors", + "flex w-full h-[55px] items-center rounded-xl px-3 text-sm cursor-pointer transition-all duration-300", isCollapsed ? "justify-center px-0" : "gap-4 px-3", isActive ? "text-chart-3" : "text-text-auth-sub hover:text-chart-3", ].join(" "); @@ -42,7 +44,7 @@ export default function Sidebar() { return (
@@ -52,14 +54,19 @@ export default function Sidebar() { to="/" aria-label="홈으로 이동" className={[ - "mt-5 mb-2 flex h-16 items-center", + "mt-5 mb-2 flex h-16 items-center transition-all duration-300", isCollapsed ? "justify-center" : "gap-3 px-4", ].join(" ")} > - - {!isCollapsed && ( - WhereYouAd - )} + + + WhereYouAd + )} - +
{/* SubMenu */} {isOpen && item.children && ( @@ -152,13 +153,19 @@ export default function Sidebar() { : false; return ( - + > + + handleItemClick(item.id, !!item.children?.length) + } + /> +
); })}
diff --git a/src/components/Sidebar/SidebarItem.tsx b/src/components/Sidebar/SidebarItem.tsx index 308a518..a597d96 100644 --- a/src/components/Sidebar/SidebarItem.tsx +++ b/src/components/Sidebar/SidebarItem.tsx @@ -1,4 +1,3 @@ -import React from "react"; import { NavLink } from "react-router-dom"; import type { INavItem } from "@/types/navigation/navItem"; @@ -9,7 +8,6 @@ interface ISidebarItemProps { isOpen?: boolean; className: string; onClick: (id: string, hasChildren: boolean) => void; - children?: React.ReactNode; } export function SidebarItem({ @@ -18,7 +16,6 @@ export function SidebarItem({ isOpen, className, onClick, - children, }: ISidebarItemProps) { const hasChildren = !!item.children?.length; const Icon = item.icon; @@ -32,21 +29,17 @@ export function SidebarItem({ > {Icon && ( )} {item.label} - {children} ); @@ -55,13 +48,13 @@ export function SidebarItem({ return ( className} + className={[className, "flex items-center"].join(" ")} onClick={(e) => { if (e.defaultPrevented) return; onClick(item.id, hasChildren); }} > -
{content}
+ {content}
); } @@ -72,7 +65,7 @@ export function SidebarItem({ type="button" aria-haspopup={hasChildren ? "menu" : undefined} aria-expanded={hasChildren ? isOpen : undefined} - className={className} + className={[className, "flex items-center text-left"].join(" ")} onClick={(e) => { if (e.defaultPrevented) return; onClick(item.id, hasChildren); From 24953af9d5f55a0e8833ac41fc1d08fbd6f97d8f Mon Sep 17 00:00:00 2001 From: YermIm Date: Thu, 26 Feb 2026 14:10:35 +0900 Subject: [PATCH 12/13] =?UTF-8?q?fix:=20twMerge=EB=A1=9C=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 41 +++++++++++++------------- src/components/Sidebar/SidebarItem.tsx | 15 +++++----- src/components/Sidebar/SubMenu.tsx | 9 +++--- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index a3a3c95..469d464 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -1,4 +1,5 @@ import { NavLink } from "react-router-dom"; +import { twMerge } from "tailwind-merge"; import { footerNav, mainNav } from "@/constants/sidebarNav"; @@ -12,7 +13,7 @@ import CollapseIcon from "@/assets/icon/sidebar/chevron-left.svg?react"; import Logo from "@/assets/logo/symbol-color.svg?react"; function getMainItemClass(isActive: boolean, isCollapsed: boolean) { - return [ + return twMerge( "flex items-center rounded-xl px-3 text-sm cursor-pointer transition-colors duration-200", isCollapsed ? "h-[55px] w-[55px] mx-auto flex justify-center" @@ -20,15 +21,15 @@ function getMainItemClass(isActive: boolean, isCollapsed: boolean) { isActive ? "bg-chart-3 text-white" : "text-text-auth-sub hover:bg-[#F6F6F6]", - ].join(" "); + ); } function getFooterItemClass(isActive: boolean, isCollapsed: boolean) { - return [ - "flex w-full h-[55px] items-center rounded-xl px-3 text-sm cursor-pointer transition-all duration-300", + return twMerge( + "flex w-full h-[55px] items-center rounded-xl px-3 text-sm cursor-pointer transition-all duration-200", isCollapsed ? "justify-center px-0" : "gap-4 px-3", isActive ? "text-chart-3" : "text-text-auth-sub hover:text-chart-3", - ].join(" "); + ); } export default function Sidebar() { @@ -43,27 +44,27 @@ export default function Sidebar() { return (
{/* Logo */} WhereYouAd @@ -76,10 +77,10 @@ export default function Sidebar() { className="absolute -right-3 top-10 flex h-6 w-6 items-center justify-center rounded-md bg-white border border-[#F6F6F6] transition hover:bg-[#F6F6F6]" > @@ -127,10 +128,10 @@ export default function Sidebar() { className="ml-auto p-2 hover:bg-black/5 rounded-lg transition-colors" > )} @@ -146,7 +147,7 @@ export default function Sidebar() { {/* Footer */} -
+
{footerNav.map((item) => { const isActive = item.path ? location.pathname === item.path diff --git a/src/components/Sidebar/SidebarItem.tsx b/src/components/Sidebar/SidebarItem.tsx index a597d96..342c2c2 100644 --- a/src/components/Sidebar/SidebarItem.tsx +++ b/src/components/Sidebar/SidebarItem.tsx @@ -1,4 +1,5 @@ import { NavLink } from "react-router-dom"; +import { twMerge } from "tailwind-merge"; import type { INavItem } from "@/types/navigation/navItem"; @@ -22,21 +23,21 @@ export function SidebarItem({ const content = (
{Icon && ( )} {item.label} @@ -48,7 +49,7 @@ export function SidebarItem({ return ( { if (e.defaultPrevented) return; onClick(item.id, hasChildren); @@ -65,7 +66,7 @@ export function SidebarItem({ type="button" aria-haspopup={hasChildren ? "menu" : undefined} aria-expanded={hasChildren ? isOpen : undefined} - className={[className, "flex items-center text-left"].join(" ")} + className={twMerge(className, "flex items-center text-left")} onClick={(e) => { if (e.defaultPrevented) return; onClick(item.id, hasChildren); diff --git a/src/components/Sidebar/SubMenu.tsx b/src/components/Sidebar/SubMenu.tsx index 3e94dc6..1af1c17 100644 --- a/src/components/Sidebar/SubMenu.tsx +++ b/src/components/Sidebar/SubMenu.tsx @@ -1,4 +1,5 @@ import { NavLink } from "react-router-dom"; +import { twMerge } from "tailwind-merge"; import type { INavItem } from "@/types/navigation/navItem"; @@ -9,17 +10,17 @@ interface ISubMenuProps { export function SubMenu({ items, isCollapsed }: ISubMenuProps) { const getSubItemClass = (isActive: boolean) => - [ - "flex h-10 items-center rounded-xl px-3 text-sm transition-all duration-300 whitespace-nowrap", + twMerge( + "flex h-10 items-center rounded-xl px-3 text-sm transition-all duration-200 whitespace-nowrap", isCollapsed ? "" : "pl-4", isActive ? "bg-chart-3 text-white" : "text-text-auth-sub hover:bg-[#F6F6F6]", - ].join(" "); + ); const menuContainerClass = isCollapsed ? "absolute left-full top-0 pl-2 w-52 flex flex-col gap-1 rounded-2xl bg-white p-2 shadow-lg z-50 whitespace-nowrap" - : "ml-11 mt-1 flex flex-col gap-1 overflow-hidden transition-all duration-300"; + : "ml-11 mt-1 flex flex-col gap-1 overflow-hidden transition-all duration-200"; return (
From d8341323c25c2ff34e804dfaaa151c8e68670860 Mon Sep 17 00:00:00 2001 From: YermIm Date: Thu, 26 Feb 2026 22:03:11 +0900 Subject: [PATCH 13/13] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B3=A0=20=EC=98=81?= =?UTF-8?q?=EC=97=AD=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Sidebar/Sidebar.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index 469d464..627a196 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -1,4 +1,4 @@ -import { NavLink } from "react-router-dom"; +// import { NavLink } from "react-router-dom"; import { twMerge } from "tailwind-merge"; import { footerNav, mainNav } from "@/constants/sidebarNav"; @@ -10,7 +10,7 @@ import { SubMenu } from "./SubMenu"; import ChevronIcon from "@/assets/icon/common/chevron-up.svg?react"; import CollapseIcon from "@/assets/icon/sidebar/chevron-left.svg?react"; -import Logo from "@/assets/logo/symbol-color.svg?react"; +// import Logo from "@/assets/logo/symbol-color.svg?react"; function getMainItemClass(isActive: boolean, isCollapsed: boolean) { return twMerge( @@ -49,9 +49,9 @@ export default function Sidebar() { isCollapsed ? "w-25" : "w-64", )} > -
+
{/* Logo */} - WhereYouAd - + */}