diff --git a/src/app/(main)/SideNav.tsx b/src/app/(main)/SideNav.tsx index 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) { ) : pathname.includes('/settings') ? ( + ) : pathname.includes('/admin') ? ( + ) : ( {links.map(({ id, path, label, icon }) => { diff --git a/src/app/(main)/admin/AdminLayout.tsx b/src/app/(main)/admin/AdminLayout.tsx index 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 ( - - - - - - {children} - - - ); + return {children}; } diff --git a/src/app/(main)/admin/AdminNav.tsx b/src/app/(main)/admin/AdminNav.tsx index 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 ( - + void }) { - +