diff --git a/package.json b/package.json index b3c3a60f..2667c607 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "@react-spring/web": "^9.7.3", "@tanstack/react-query": "^5.28.6", "@umami/prisma-client": "^0.14.0", + "@umami/react-zen": "^0.50.0", "@umami/redis-client": "^0.26.0", "bcryptjs": "^2.4.3", "chalk": "^4.1.1", @@ -111,7 +112,7 @@ "react-basics": "^0.126.0", "react-dom": "^19.0.0", "react-error-boundary": "^4.0.4", - "react-intl": "^6.5.5", + "react-intl": "^7.1.6", "react-simple-maps": "^2.3.0", "react-use-measure": "^2.0.4", "react-window": "^1.8.6", @@ -126,6 +127,7 @@ "devDependencies": { "@formatjs/cli": "^4.2.29", "@netlify/plugin-nextjs": "^5.8.1", + "@react-spring/types": "^9.7.5", "@rollup/plugin-alias": "^5.0.0", "@rollup/plugin-commonjs": "^25.0.4", "@rollup/plugin-json": "^6.0.0", @@ -135,9 +137,9 @@ "@svgr/webpack": "^8.1.0", "@types/cypress": "^1.1.3", "@types/jest": "^29.5.14", - "@types/node": "^22.10.5", - "@types/react": "^19.0.4", - "@types/react-dom": "^19.0.2", + "@types/node": "^22.13.1", + "@types/react": "^19.0.8", + "@types/react-dom": "^19.0.3", "@types/react-intl": "^3.0.0", "@types/react-window": "^1.8.8", "@typescript-eslint/eslint-plugin": "^6.7.3", diff --git a/src/app/(main)/App.tsx b/src/app/(main)/App.tsx index 4cbb1c80..2d3fd0bd 100644 --- a/src/app/(main)/App.tsx +++ b/src/app/(main)/App.tsx @@ -1,9 +1,11 @@ 'use client'; -import { Loading } from 'react-basics'; +import { Grid, Loading } from '@umami/react-zen'; import Script from 'next/script'; import { usePathname } from 'next/navigation'; -import { useLogin, useConfig } from '@/components/hooks'; import UpdateNotice from './UpdateNotice'; +import NavBar from '@/app/(main)/NavBar'; +import Page from '@/components/layout/Page'; +import { useLogin, useConfig } from '@/components/hooks'; export function App({ children }) { const { user, isLoading, error } = useLogin(); @@ -27,13 +29,16 @@ export function App({ children }) { } return ( - <> - {children} - - {process.env.NODE_ENV === 'production' && !pathname.includes('/share/') && ( -