Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Fix admin nav issues
Francis Cao28f738717d69
diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex aadf8670f..55ff27cd1 100644--- a/src/app/(main)/SideNav.tsx+++ b/src/app/(main)/SideNav.tsx@@ -10,6 +10,7 @@ import {TooltipTrigger,} from '@umami/react-zen';import Link from 'next/link';+import { AdminNav } from '@/app/(main)/admin/AdminNav';import { SettingsNav } from '@/app/(main)/settings/SettingsNav';import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { IconLabel } from '@/components/common/IconLabel';@@ -103,6 +104,8 @@ export function SideNav(props: any) {<WebsiteNav websiteId={websiteId} isCollapsed={isCollapsed} />) : pathname.includes('/settings') ? (<SettingsNav isCollapsed={isCollapsed} />+ ) : pathname.includes('/admin') ? (+ <AdminNav />) : (<Column gap="2">{links.map(({ id, path, label, icon }) => {diff --git a/src/app/(main)/admin/AdminLayout.tsx b/src/app/(main)/admin/AdminLayout.tsxindex 681ba3f03..92d316ac5 100644--- a/src/app/(main)/admin/AdminLayout.tsx+++ b/src/app/(main)/admin/AdminLayout.tsx@@ -1,9 +1,7 @@'use client';-import { Column, Grid } from '@umami/react-zen';import type { ReactNode } from 'react';import { PageBody } from '@/components/common/PageBody';import { useLoginQuery } from '@/components/hooks';-import { AdminNav } from './AdminNav';export function AdminLayout({ children }: { children: ReactNode }) {const { user } = useLoginQuery();@@ -12,21 +10,5 @@ export function AdminLayout({ children }: { children: ReactNode }) {return null;}- return (- <Grid columns={{ base: '1fr', lg: 'auto 1fr' }} width="100%" height="100%">- <Column- display={{ base: 'none', lg: 'flex' }}- width="240px"- height="100%"- border="right"- marginRight="2"- padding="3"- >- <AdminNav />- </Column>- <Column gap="6" margin="2">- <PageBody>{children}</PageBody>- </Column>- </Grid>- );+ return <PageBody>{children}</PageBody>;}diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsxindex edcfb4c62..064305cfa 100644--- a/src/app/(main)/admin/AdminNav.tsx+++ b/src/app/(main)/admin/AdminNav.tsx@@ -1,9 +1,9 @@-import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';-import Link from 'next/link';import { IconLabel } from '@/components/common/IconLabel';import { NavMenu } from '@/components/common/NavMenu';import { useMessages, useNavigation } from '@/components/hooks';import { ArrowLeft, Globe, User, Users } from '@/components/icons';+import { Column, Focusable, Row, Tooltip, TooltipTrigger } from '@umami/react-zen';+import Link from 'next/link';export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {const { t, labels } = useMessages();@@ -41,7 +41,7 @@ export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {return (<Column gap="2">- <Link href={renderUrl('/boards', false)} role="button" onClick={onItemClick}>+ <Link href={renderUrl('/websites', false)} role="button" onClick={onItemClick}><TooltipTrigger delay={0}><Focusable><Row@@ -58,7 +58,6 @@ export function AdminNav({ onItemClick }: { onItemClick?: () => void }) {</Link><NavMenuitems={items}- title={t(labels.admin)}selectedKey={selectedKey}allowMinimize={false}onItemClick={onItemClick}diff --git a/src/app/(main)/settings/SettingsNav.tsx b/src/app/(main)/settings/SettingsNav.tsxindex 113978381..47cdb9cb5 100644--- a/src/app/(main)/settings/SettingsNav.tsx+++ b/src/app/(main)/settings/SettingsNav.tsx@@ -51,7 +51,7 @@ export function SettingsNav({return (<Column gap="2">- <Link href={renderUrl('/boards', false)} role="button" onClick={onItemClick}>+ <Link href={renderUrl('/websites', false)} role="button" onClick={onItemClick}><TooltipTrigger isDisabled={!isCollapsed} delay={0}><Focusable><Row