From 62cc934035683e252368af78ed21975dc2d5d329 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Mon, 8 Apr 2024 17:12:01 +0800 Subject: [PATCH] refactor: remvoe old router --- src/client/App.tsx | 73 +++++++--------------------------------------- 1 file changed, 10 insertions(+), 63 deletions(-) diff --git a/src/client/App.tsx b/src/client/App.tsx index 1b3e59d..5e8f684 100644 --- a/src/client/App.tsx +++ b/src/client/App.tsx @@ -1,25 +1,13 @@ -import { BrowserRouter, Route, Routes, Navigate } from 'react-router-dom'; -import { Layout } from './pages/Layout'; -import { DashboardPage } from './pages/Dashboard'; -import { Login } from './pages/Login'; -import { SettingsPage } from './pages/Settings'; -import { Servers } from './pages/Servers'; +import { BrowserRouter } from 'react-router-dom'; import { useUserStore } from './store/user'; -import { Register } from './pages/Register'; import { QueryClientProvider } from '@tanstack/react-query'; import { queryClient } from './api/cache'; import { TokenLoginContainer } from './components/TokenLoginContainer'; import React, { useRef } from 'react'; import { trpc, trpcClient } from './api/trpc'; -import { MonitorPage } from './pages/Monitor'; -import { WebsitePage } from './pages/Website'; -import { useGlobalConfig } from './hooks/useConfig'; import { useInjectWebsiteScript } from './hooks/useInjectWebsiteScript'; import { ConfigProvider, theme } from 'antd'; import { useColorSchema } from './store/settings'; -import { StatusPage } from './pages/Status'; -import { TelemetryPage } from './pages/Telemetry'; -import { isDev } from './utils/env'; import { RouterProvider, createRouter } from '@tanstack/react-router'; import { routeTree } from './routeTree.gen'; import { DefaultNotFound } from './components/DefaultNotFound'; @@ -43,43 +31,6 @@ declare module '@tanstack/react-router' { } } -export const AppRoutes: React.FC = React.memo(() => { - const { info: userInfo } = useUserStore(); - const { allowRegister } = useGlobalConfig(); - - useInjectWebsiteScript(); - - return ( - - {userInfo ? ( - }> - } /> - } /> - } /> - } /> - } /> - } /> - - ) : ( - - } /> - {allowRegister && } />} - - )} - - } /> - - - } - /> - - ); -}); -AppRoutes.displayName = 'AppRoutes'; - export const App: React.FC = React.memo(() => { const rootRef = useRef(null); const colorScheme = useColorSchema(); @@ -87,6 +38,8 @@ export const App: React.FC = React.memo(() => { colorScheme === 'dark' ? theme.darkAlgorithm : theme.defaultAlgorithm; const { info: userInfo } = useUserStore(); + useInjectWebsiteScript(); + return (
@@ -96,20 +49,14 @@ export const App: React.FC = React.memo(() => { getPopupContainer={() => rootRef.current!} > - {isDev ? ( - // Compatible with old routes - - - - + {/* Compatible with old routes */} + + + + - - - ) : ( - - - - )} + +