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
Move settings nav into SideNav, matching WebsiteNav pattern
Mike Cao08e4da27c126
diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsxindex 92172be98..ba2893bb9 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 { SettingsNav } from '@/app/(main)/settings/SettingsNav';import { WebsiteNav } from '@/app/(main)/websites/[websiteId]/WebsiteNav';import { IconLabel } from '@/components/common/IconLabel';import { useGlobalState, useMessages, useNavigation } from '@/components/hooks';@@ -83,6 +84,8 @@ export function SideNav(props: any) {</Row>{websiteId ? (<WebsiteNav websiteId={websiteId} isCollapsed={isCollapsed} />+ ) : pathname.includes('/settings') ? (+ <SettingsNav isCollapsed={isCollapsed} />) : (<Column gap="2">{links.map(({ id, path, label, icon }) => {diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsxindex 9e89b19eb..1003b61ae 100644--- a/src/app/(main)/settings/SettingsLayout.tsx+++ b/src/app/(main)/settings/SettingsLayout.tsx@@ -1,25 +1,12 @@'use client';-import { Column, Grid } from '@umami/react-zen';+import { Column } from '@umami/react-zen';import type { ReactNode } from 'react';import { PageBody } from '@/components/common/PageBody';-import { SettingsNav } from './SettingsNav';export function SettingsLayout({ children }: { children: ReactNode }) {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"- >- <SettingsNav />- </Column>- <Column gap="6" margin="2">- <PageBody>{children}</PageBody>- </Column>- </Grid>+ <Column gap="6" margin="2" width="100%">+ <PageBody>{children}</PageBody>+ </Column>);}diff --git a/src/app/(main)/settings/SettingsNav.tsx b/src/app/(main)/settings/SettingsNav.tsxindex bfe8a0aee..113978381 100644--- a/src/app/(main)/settings/SettingsNav.tsx+++ b/src/app/(main)/settings/SettingsNav.tsx@@ -1,8 +1,16 @@-import { NavMenu } from '@/components/common/NavMenu';+import { Column, Focusable, Row, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';+import Link from 'next/link';+import { IconLabel } from '@/components/common/IconLabel';import { useMessages, useNavigation } from '@/components/hooks';-import { Settings2, UserCircle, Users } from '@/components/icons';+import { ArrowLeft, Settings2, UserCircle, Users } from '@/components/icons';-export function SettingsNav({ onItemClick }: { onItemClick?: () => void }) {+export function SettingsNav({+ isCollapsed,+ onItemClick,+}: {+ isCollapsed?: boolean;+ onItemClick?: () => void;+}) {const { t, labels } = useMessages();const { renderUrl, pathname } = useNavigation();@@ -42,12 +50,57 @@ export function SettingsNav({ onItemClick }: { onItemClick?: () => void }) {.find(({ path }) => path && pathname.includes(path.split('?')[0]))?.id;return (- <NavMenu- items={items}- title={t(labels.settings)}- selectedKey={selectedKey}- allowMinimize={false}- onItemClick={onItemClick}- />+ <Column gap="2">+ <Link href={renderUrl('/boards', false)} role="button" onClick={onItemClick}>+ <TooltipTrigger isDisabled={!isCollapsed} delay={0}>+ <Focusable>+ <Row+ alignItems="center"+ hover={{ backgroundColor: 'surface-sunken' }}+ borderRadius+ minHeight="40px"+ >+ <IconLabel icon={<ArrowLeft />} label={isCollapsed ? '' : t(labels.back)} padding />+ </Row>+ </Focusable>+ <Tooltip placement="right">{t(labels.back)}</Tooltip>+ </TooltipTrigger>+ </Link>+ {items.map(({ label: sectionLabel, items: sectionItems }, index) => (+ <Column key={`${sectionLabel}${index}`} gap="1" marginBottom="1">+ {!isCollapsed && (+ <Row padding>+ <Text weight="bold">{sectionLabel}</Text>+ </Row>+ )}+ {sectionItems.map(({ id, path, label, icon }) => {+ const isSelected = selectedKey === id;+ return (+ <Link key={id} href={path} role="button" onClick={onItemClick}>+ <TooltipTrigger isDisabled={!isCollapsed} delay={0}>+ <Focusable>+ <Row+ alignItems="center"+ hover={{ backgroundColor: 'surface-sunken' }}+ backgroundColor={isSelected ? 'surface-sunken' : undefined}+ borderRadius+ minHeight="40px"+ >+ <IconLabel+ icon={icon}+ label={isCollapsed ? '' : label}+ weight={isSelected ? 'bold' : undefined}+ padding+ />+ </Row>+ </Focusable>+ <Tooltip placement="right">{label}</Tooltip>+ </TooltipTrigger>+ </Link>+ );+ })}+ </Column>+ ))}+ </Column>);}diff --git a/src/components/input/TeamsButton.tsx b/src/components/input/TeamsButton.tsxindex c9e27d5fe..527ab1fa9 100644--- a/src/components/input/TeamsButton.tsx+++ b/src/components/input/TeamsButton.tsx@@ -47,9 +47,16 @@ export function TeamsButton() {return (<MenuTrigger><Button variant="quiet">- <Row alignItems="center" position="relative" gap maxHeight="40px">+ <Row+ alignItems="center"+ position="relative"+ gap+ maxHeight="40px"+ minWidth="200px"+ maxWidth="200px"+ ><Icon>{teamId ? <Users /> : <User />}</Icon>- <Text>{label}</Text>+ <Text truncate>{label}</Text></Row><Icon rotate={90} size="sm"><ChevronRight />