Skip to content

Commit

Permalink
Merge branch 'develop' into care-loading-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
Rishith25 committed Jan 5, 2025
2 parents 90eed66 + c34bf37 commit 5383c9f
Showing 1 changed file with 19 additions and 17 deletions.
36 changes: 19 additions & 17 deletions src/pages/Organization/components/OrganizationLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,23 +174,25 @@ export default function OrganizationLayout({
{/* Navigation */}
<div className="mt-4">
<Menubar>
{navItems.map((item) => (
<MenubarMenu key={item.path}>
<MenubarTrigger
className={`${
path === item.path
? "font-medium text-primary-700 bg-gray-100"
: "hover:text-primary-500 hover:bg-gray-100 text-gray-700"
}`}
asChild
>
<Link href={item.path} className="cursor-pointer">
<CareIcon icon={item.icon} className="mr-2 h-4 w-4" />
{item.title}
</Link>
</MenubarTrigger>
</MenubarMenu>
))}
{navItems
.filter((item) => item.visibility)
.map((item) => (
<MenubarMenu key={item.path}>
<MenubarTrigger
className={`${
path === item.path
? "font-medium text-primary-700 bg-gray-100"
: "hover:text-primary-500 hover:bg-gray-100 text-gray-700"
}`}
asChild
>
<Link href={item.path} className="cursor-pointer">
<CareIcon icon={item.icon} className="mr-2 h-4 w-4" />
{item.title}
</Link>
</MenubarTrigger>
</MenubarMenu>
))}
</Menubar>
</div>
{/* Page Content */}
Expand Down

0 comments on commit 5383c9f

Please sign in to comment.