From b53606d49796dc71b9ddcdfb8f068ea83f513145 Mon Sep 17 00:00:00 2001 From: Mike Cao Date: Sun, 16 Feb 2025 01:11:45 -0800 Subject: [PATCH] Added side nav. --- next-env.d.ts | 2 +- next.config.js | 3 + package.json | 6 +- src/app/(main)/App.tsx | 22 +-- src/app/(main)/NavBar.tsx | 33 +--- src/app/(main)/SideNav.module.css | 46 ++++++ src/app/(main)/SideNav.tsx | 81 ++++++++++ src/app/(main)/boards/Board.tsx | 9 ++ src/app/(main)/boards/BoardsPage.tsx | 4 +- src/app/layout.tsx | 2 +- src/components/messages.ts | 1 + src/styles/global.css | 1 + yarn.lock | 231 +++++++++------------------ 13 files changed, 239 insertions(+), 202 deletions(-) create mode 100644 src/app/(main)/SideNav.module.css create mode 100644 src/app/(main)/SideNav.tsx create mode 100644 src/app/(main)/boards/Board.tsx diff --git a/next-env.d.ts b/next-env.d.ts index 40c3d680..1b3be084 100644 --- a/next-env.d.ts +++ b/next-env.d.ts @@ -2,4 +2,4 @@ /// // NOTE: This file should not be edited -// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information. +// see https://nextjs.org/docs/app/api-reference/config/typescript for more information. diff --git a/next.config.js b/next.config.js index 7a65c472..c767a784 100644 --- a/next.config.js +++ b/next.config.js @@ -172,6 +172,9 @@ const config = { }, basePath, output: 'standalone', + devIndicators: { + appIsrStatus: false, + }, eslint: { ignoreDuringBuilds: true, }, diff --git a/package.json b/package.json index d768e6a0..e551987c 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "url": "https://github.com/umami-software/umami.git" }, "scripts": { - "dev": "next dev -p 3000 --turbo", + "dev": "next dev -p 3000", "build": "npm-run-all check-env build-db check-db build-tracker build-geo build-app", "start": "next start", "build-docker": "npm-run-all build-db build-tracker build-geo build-app", @@ -75,7 +75,7 @@ "@react-spring/web": "^9.7.5", "@tanstack/react-query": "^5.28.6", "@umami/prisma-client": "^0.14.0", - "@umami/react-zen": "^0.51.0", + "@umami/react-zen": "^0.54.0", "@umami/redis-client": "^0.26.0", "bcryptjs": "^2.4.3", "chalk": "^4.1.1", @@ -103,7 +103,7 @@ "kafkajs": "^2.1.0", "maxmind": "^4.3.24", "md5": "^2.3.0", - "next": "15.0.4", + "next": "15.1.7", "node-fetch": "^3.2.8", "npm-run-all": "^4.1.5", "prisma": "6.1.0", diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx index bfb53733..56d50a6a 100644 --- a/src/app/(main)/App.tsx +++ b/src/app/(main)/App.tsx @@ -6,6 +6,7 @@ import { UpdateNotice } from './UpdateNotice'; import { NavBar } from '@/app/(main)/NavBar'; import { Page } from '@/components/layout/Page'; import { useLogin, useConfig } from '@/components/hooks'; +import { SideNav } from '@/app/(main)/SideNav'; export function App({ children }) { const { user, isLoading, error } = useLogin(); @@ -29,15 +30,18 @@ export function App({ children }) { } return ( - - - - - {children} - {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && ( -