diff options
Diffstat (limited to 'src/components/Root.js')
| -rw-r--r-- | src/components/Root.js | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/components/Root.js b/src/components/Root.js index 27d8f26..7303ee7 100644 --- a/src/components/Root.js +++ b/src/components/Root.js @@ -1,7 +1,7 @@ import React, { Suspense } from 'react'; // import { Provider } from '../misc/store'; import StateProvider from './StateProvider'; -import { HashRouter as Router, Route } from 'react-router-dom'; +import { HashRouter as Router, Route, Routes } from 'react-router-dom'; import Loading2 from './Loading2'; import ErrorBoundary from './ErrorBoundary'; import SideBar from './SideBar'; @@ -34,13 +34,13 @@ const Rules = React.lazy(() => ); const routes = [ - ['home', '/', Home], - ['connections', '/connections', Connections], - ['configs', '/configs', Config], - ['logs', '/logs', Logs], - ['proxies', '/proxies', Proxies], - ['rules', '/rules', Rules], - __DEV__ ? ['style', '/style', StyleGuide] : false + ['home', '/', <Home />], + ['connections', '/connections', <Connections />], + ['configs', '/configs', <Config />], + ['logs', '/logs', <Logs />], + ['proxies', '/proxies', <Proxies />], + ['rules', '/rules', <Rules />], + __DEV__ ? ['style', '/style', <StyleGuide />] : false ].filter(Boolean); const Root = () => ( @@ -49,12 +49,14 @@ const Root = () => ( <Router> <div className={s0.app}> <APIDiscovery /> - <Route path="/" render={props => <SideBar {...props} />} /> + <Route path="/" element={<SideBar />} /> <div className={s0.content}> <Suspense fallback={<Loading2 />}> - {routes.map(([key, path, component]) => ( - <Route exact key={key} path={path} component={component} /> - ))} + <Routes> + {routes.map(([key, path, element]) => ( + <Route key={key} path={path} element={element} /> + ))} + </Routes> </Suspense> </div> </div> |
