kyle/flxn-app
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

significant refactor

Browse Source
This commit is contained in:
Kyle Yohler
2025-08-30 01:42:23 -05:00
parent 7136f646a3
commit 052f53444e
106 changed files with 1994 additions and 1701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/features/core/components/nav-link/nav-link.tsx
View File

@@ -8,11 +8,12 @@ interface NavLinkProps {
href: string;
label: string;
Icon: Icon;
include?: string[];
}
export const NavLink = ({ href, label, Icon }: NavLinkProps) => {
export const NavLink = ({ href, label, Icon, include }: NavLinkProps) => {
const router = useRouterState();
const isActive = useMemo(() => router.location.pathname === href || (router.location.pathname.includes(href) && href !== '/'), [router.location.pathname, href]);
const isActive = useMemo(() => (router.location.pathname === href || (router.location.pathname.includes(href) && href !== '/')) || include?.includes(router.location.pathname), [router.location.pathname, href]);
return (
<Box component={Link} to={href}

1
src/features/core/components/navbar.tsx
View File

@@ -8,6 +8,7 @@ import { useLinks } from "../hooks/use-links";
const Navbar = () => {
const { user, roles } = useAuth()
const isMobile = useIsMobile();
const links = useLinks(user?.id, roles);
if (isMobile) return (