File tree Expand file tree Collapse file tree 2 files changed +19
-24
lines changed Expand file tree Collapse file tree 2 files changed +19
-24
lines changed Original file line number Diff line number Diff line change 1
1
import MainWindow from "./MainWindow"
2
2
import SideBar from "./components/SideBar"
3
- import { Outlet } from "react-router-dom"
3
+ import { Outlet , Route , Routes } from "react-router-dom"
4
4
import useUserUpdater from "./hooks/useUserUpdater"
5
5
import useAppConfigLoader from "./hooks/useAppConfigLoader"
6
+ import App from "./pages/App"
7
+ import Auth from "./pages/Auth"
8
+ import Tiles from "./pages/Tiles"
6
9
7
10
function Root ( ) {
8
11
useAppConfigLoader ( ) ;
@@ -11,6 +14,11 @@ function Root() {
11
14
return (
12
15
< main className = 'flex flex-row h-screen' >
13
16
< SideBar />
17
+ < Routes >
18
+ < Route path = "/app" element = { < App /> } />
19
+ < Route path = "/auth" element = { < Auth /> } />
20
+ < Route path = "/tiles" element = { < Tiles /> } />
21
+ </ Routes >
14
22
< Outlet />
15
23
< MainWindow />
16
24
</ main >
Original file line number Diff line number Diff line change @@ -2,33 +2,20 @@ import { StrictMode } from 'react'
2
2
import { createRoot } from 'react-dom/client'
3
3
import Root from './Root.tsx'
4
4
import './index.css'
5
- import { createBrowserRouter , RouterProvider } from 'react-router-dom'
6
- import App from './pages/App.tsx'
5
+ import { BrowserRouter } from 'react-router-dom'
7
6
import { RecoilRoot } from 'recoil'
8
- import Auth from './pages/Auth.tsx'
9
- import Tiles from './pages/Tiles.tsx'
7
+ import { QueryClient , QueryClientProvider } from '@tanstack/react-query'
10
8
11
- const router = createBrowserRouter ( [
12
- {
13
- path : '/' ,
14
- element : < Root /> ,
15
- children : [ {
16
- path : 'app' ,
17
- element : < App />
18
- } , {
19
- path : 'auth' ,
20
- element : < Auth />
21
- } , {
22
- path : 'tiles' ,
23
- element : < Tiles />
24
- } ]
25
- }
26
- ] )
9
+ const client = new QueryClient ( ) ;
27
10
28
11
createRoot ( document . getElementById ( 'root' ) ! ) . render (
29
12
< StrictMode >
30
- < RecoilRoot >
31
- < RouterProvider router = { router } />
32
- </ RecoilRoot >
13
+ < QueryClientProvider client = { client } >
14
+ < RecoilRoot >
15
+ < BrowserRouter >
16
+ < Root />
17
+ </ BrowserRouter >
18
+ </ RecoilRoot >
19
+ </ QueryClientProvider >
33
20
</ StrictMode > ,
34
21
)
You can’t perform that action at this time.
0 commit comments