Pandore/homarr
Public Access
1
0 Fork 0
Code Actions Activity

Merge remote-tracking branch 'origin/feat/docker-logs' into insiders/ui-ux

Browse Source 
# Conflicts:
#	apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx
#	apps/nextjs/src/app/[locale]/manage/tools/logs/terminal.tsx
#	apps/nextjs/src/components/layout/navigation-link.tsx
#	pnpm-lock.yaml
This commit is contained in:
Thomas Camlong committed 2026-06-04 13:41:47 +02:00
2 parents 3b11671366 b829568a7e
commit 69e3b7bc97
10 files changed
+437 -476
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

apps/nextjs/src/components/layout/navigation-link.tsx
+2 -2
View File
@@ -26,7 +26,7 @@ const NavLinkHref = (props: NavigationLinkHref) => {
label={props.label}
leftSection={props.icon}
href={props.href}
active={pathname === props.href}
active={pathname === props.href || pathname.startsWith(`${props.href}/`)}
/>
);
return <TourTarget id={tourId}>{link}</TourTarget>;
@@ -34,7 +34,7 @@ const NavLinkHref = (props: NavigationLinkHref) => {
const NavLinkWithItems = (props: NavigationLinkWithItems) => {
const pathname = usePathname();
const isActive = props.items.some((item) => item.href === pathname);
const isActive = props.items.some((item) => pathname === item.href || pathname.startsWith(`${item.href}/`));
const nav = (
<NavLink label={props.label} leftSection={props.icon} defaultOpened={isActive}>
{props.items.map((item) => (