Layout changes.

.eslintrc.json

@@ -1,4 +1,4 @@
-export default {
+{
   "env": {
     "browser": true,
     "es2020": true,

Dockerfile

@@ -13,7 +13,7 @@ FROM node:22-alpine AS builder
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
-COPY docker/middleware.js ./src
+COPY docker/middleware.ts ./src
 
 ARG DATABASE_TYPE
 ARG BASE_PATH

next.config.js

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable @typescript-eslint/no-require-imports */
 require('dotenv').config();
 const pkg = require('./package.json');
 
@@ -182,7 +182,6 @@ const config = {
     basePath,
     cloudMode,
     cloudUrl,
-    configUrl: '/config',
     currentVersion: pkg.version,
     defaultLocale,
     disableLogin,
@@ -191,9 +190,6 @@ const config = {
   },
   basePath,
   output: 'standalone',
-  devIndicators: {
-    appIsrStatus: false,
-  },
   eslint: {
     ignoreDuringBuilds: true,
   },

package.json

@@ -112,7 +112,6 @@
     "prisma": "6.5.0",
     "pure-rand": "^6.1.0",
     "react": "^19.0.0",
-    "react-aria-components": "^1.6.0",
     "react-basics": "^0.126.0",
     "react-dom": "^19.0.0",
     "react-error-boundary": "^5.0.0",
@@ -196,7 +195,7 @@
       "sharp"
     ],
     "overrides": {
-      "@umami/react-zen": "link:../../../Library/pnpm/global/5/node_modules/@umami/react-zen"
+      "@umami/react-zen": "link:C:/Users/mike/AppData/Local/pnpm/global/5/node_modules/@umami/react-zen"
     }
   }
 }

src/app/(main)/App.tsx

@@ -1,5 +1,5 @@
 'use client';
-import { Grid, Loading } from '@umami/react-zen';
+import { Grid, Loading, Column } from '@umami/react-zen';
 import Script from 'next/script';
 import { usePathname } from 'next/navigation';
 import { UpdateNotice } from './UpdateNotice';
@@ -30,10 +30,17 @@ export function App({ children }) {
   }
 
   return (
-    <Grid height="100vh" width="100%" columns="auto 1fr">
-      <Nav />
-      <Grid rows="auto 1fr" overflow="auto">
-        <NavBar />
+    <Grid
+      height="100vh"
+      width="100%"
+      columns="auto 1fr"
+      rows="auto 1fr"
+      overflow="hidden"
+      backgroundColor="2"
+    >
+      <Nav gridColumn="1 / 2" gridRow="1 / 3" />
+      <NavBar gridColumn="2 / 3" gridRow="1 / 2" />
+      <Column alignItems="center" overflow="scroll">
         <Page>
           <UpdateNotice user={user} config={config} />
           {children}
@@ -41,7 +48,7 @@ export function App({ children }) {
             <Script src={`${process.env.basePath || ''}/telemetry.js`} />
           )}
         </Page>
-      </Grid>
+      </Column>
     </Grid>
   );
 }

src/app/(main)/Nav.tsx

@@ -11,8 +11,9 @@ import {
 } from '@umami/react-zen';
 import { Lucide, Icons } from '@/components/icons';
 import { useMessages, useTeamUrl } from '@/components/hooks';
+import type { SideNavProps } from '@umami/react-zen/SideNav';
 
-export function Nav() {
+export function Nav(props: SideNavProps) {
   const { formatMessage, labels } = useMessages();
   const { renderTeamUrl } = useTeamUrl();
   const [isCollapsed, setCollapsed] = useState(false);
@@ -46,7 +47,7 @@ export function Nav() {
   ].filter(n => n);
 
   return (
-    <SideNav isCollapsed={isCollapsed} variant="3">
+    <SideNav {...props} isCollapsed={isCollapsed} variant="3" showBorder={false}>
       <SideNavSection>
         <SideNavHeader label="umami" icon={<Icons.Logo />} />
       </SideNavSection>
@@ -59,7 +60,7 @@ export function Nav() {
           );
         })}
       </SideNavSection>
-      <SideNavSection>
+      <SideNavSection alignSelf="end">
         <Row justifyContent="flex-start">
           <Button onPress={() => setCollapsed(!isCollapsed)} variant="quiet">
             <Icon>

src/app/(main)/NavBar.tsx

@@ -1,4 +1,3 @@
-'use client';
 import { ThemeButton, Row } from '@umami/react-zen';
 import { LanguageButton } from '@/components/input/LanguageButton';
 import { ProfileButton } from '@/components/input/ProfileButton';
@@ -6,10 +5,9 @@ import { TeamsButton } from '@/components/input/TeamsButton';
 
 export function NavBar() {
   return (
-    <Row justifyContent="space-between" alignItems="center" paddingX="4" paddingY="3">
-      <div></div>
+    <Row justifyContent="space-between" alignItems="center" paddingY="3">
+      <TeamsButton />
       <Row justifyContent="flex-end">
-        <TeamsButton />
         <ThemeButton />
         <LanguageButton />
         <ProfileButton />

src/app/layout.tsx

@@ -23,7 +23,7 @@ export default function ({ children }) {
         <meta name="theme-color" content="#2f2f2f" media="(prefers-color-scheme: dark)" />
         <meta name="robots" content="noindex,nofollow" />
       </head>
-      <body suppressHydrationWarning>
+      <body>
         <Providers>{children}</Providers>
       </body>
     </html>

src/components/input/TeamsButton.tsx

@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import type { Selection } from 'react-aria-components';
 import { useRouter } from 'next/navigation';
 import {
   Text,
@@ -31,7 +30,7 @@ export function TeamsButton({
   const { teamId } = useTeamUrl();
   const router = useRouter();
   const team = result?.data?.find(({ id }) => id === teamId);
-  const [selectedKeys, setSelectedKeys] = useState<Selection>(new Set([teamId || user.id]));
+  const [selectedKeys, setSelectedKeys] = useState<any>(new Set([teamId || user.id]));
 
   const handleSelect = (keys: Set<string>) => {
     if (keys.size > 0) {
@@ -58,7 +57,7 @@ export function TeamsButton({
           </Icon>
         </Row>
       </Button>
-      <Popover placement="bottom end">
+      <Popover placement="bottom start">
         <Box minWidth={300}>
           <Menu
             selectionMode="single"

src/components/layout/Page.tsx

@@ -1,15 +1,13 @@
 'use client';
 import { ReactNode } from 'react';
-import classNames from 'classnames';
-import { AlertBanner, Loading } from '@umami/react-zen';
+import { AlertBanner, Loading, Column } from '@umami/react-zen';
 import { useMessages } from '@/components/hooks';
-import styles from './Page.module.css';
 
 export function Page({
-  className,
   error,
   isLoading,
   children,
+  ...props
 }: {
   className?: string;
   error?: unknown;
@@ -26,5 +24,25 @@ export function Page({
     return <Loading position="page" />;
   }
 
-  return <div className={classNames(styles.page, className)}>{children}</div>;
+  return (
+    <Column
+      {...props}
+      gridColumn="2 / 3"
+      gridRow="2 / 3"
+      marginRight="6"
+      marginBottom="6"
+      width="100%"
+      maxWidth="1320px"
+      minHeight="600px"
+      margin="auto"
+      backgroundColor="1"
+      overflow="auto"
+      borderRadius="3"
+      borderSize="1"
+      paddingX="8"
+      paddingY="4"
+    >
+      {children}
+    </Column>
+  );
 }

src/components/metrics/MetricsTable.tsx

@@ -85,7 +85,15 @@ export function MetricsTable({
   }, [data, dataFilter, search, limit, formatValue, type]);
 
   return (
-    <div className={classNames(styles.container, className)}>
+    <div
+      className={classNames(styles.container, className)}
+      style={{
+        background: 'var(--background-color)',
+        border: '1px solid var(--border-color)',
+        borderRadius: 'var(--border-radius)',
+        padding: '10px',
+      }}
+    >
       {error && <ErrorMessage />}
       <div className={styles.actions}>
         {allowSearch && (

src/lib/response.ts

@@ -2,7 +2,7 @@ export function ok() {
   return Response.json({ ok: true });
 }
 
-export function json(data: any) {
+export function json(data: any = {}) {
   return Response.json(data);
 }
 

src/styles/global.css

@@ -23,28 +23,24 @@ svg {
 
 ::-webkit-scrollbar {
   width: 15px;
-  background: var(--background-color);
+  background: transparent;
 }
 
 ::-webkit-scrollbar-track {
   border: 7px solid rgba(0, 0, 0, 0);
-  background-color: var(--border-color);
+  background-color: var(--base-color-3);
   background-clip: padding-box;
 }
 
-body::-webkit-scrollbar-track,
-main::-webkit-scrollbar-track {
-  background-color: var(--border-color);
-}
-
 ::-webkit-scrollbar-thumb {
   border: 7px solid rgba(0, 0, 0, 0);
-  background-color: var(--font-color);
+  background-color: var(--base-color-8);
+  border-radius: var(--border-radius-full);
   background-clip: padding-box;
 }
 
 ::-webkit-scrollbar-thumb:hover {
   border: 4px solid rgba(0, 0, 0, 0);
-  background-color: var(--font-color);
+  background-color: var(--base-color-8);
   background-clip: padding-box;
 }