diff --git a/app/layouts/admin/sidebar.tsx b/app/layouts/admin/sidebar.tsx index 064c409..2182143 100644 --- a/app/layouts/admin/sidebar.tsx +++ b/app/layouts/admin/sidebar.tsx @@ -1,9 +1,11 @@ -import { NavLink } from 'react-router' +import { NavLink, useLocation } from 'react-router' import { twMerge } from 'tailwind-merge' import { MENU } from './menu' export const Sidebar = () => { + const { pathname } = useLocation() + return (
{MENU.map(({ group, items }) => ( @@ -16,31 +18,25 @@ export const Sidebar = () => { - twMerge( - isActive ? 'bg-[#707FDD]/10 font-bold' : '', - 'group/menu flex h-[42px] w-[200px] items-center gap-x-3 rounded-md px-5 transition-all hover:bg-[#707FDD]/10', - ) - } - > - {({ isActive }) => ( - <> - - - {title} - - + className={twMerge( + pathname === url ? 'bg-[#707FDD]/10 font-bold' : '', + 'group/menu flex h-[42px] w-[200px] items-center gap-x-3 rounded-md px-5 transition-all hover:bg-[#707FDD]/10', )} + > + + + {title} + ))}
diff --git a/app/routes/_layout.admin.dashboard.subsciptions.tsx b/app/routes/_layout.admin.dashboard.subscriptions.tsx similarity index 100% rename from app/routes/_layout.admin.dashboard.subsciptions.tsx rename to app/routes/_layout.admin.dashboard.subscriptions.tsx