Skip to content

Commit 716dabf

Browse files
switch to jsx routing
1 parent 32b1ad6 commit 716dabf

File tree

2 files changed

+19
-24
lines changed

2 files changed

+19
-24
lines changed

examples/playground/src/Root.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import MainWindow from "./MainWindow"
22
import SideBar from "./components/SideBar"
3-
import { Outlet } from "react-router-dom"
3+
import { Outlet, Route, Routes } from "react-router-dom"
44
import useUserUpdater from "./hooks/useUserUpdater"
55
import useAppConfigLoader from "./hooks/useAppConfigLoader"
6+
import App from "./pages/App"
7+
import Auth from "./pages/Auth"
8+
import Tiles from "./pages/Tiles"
69

710
function Root() {
811
useAppConfigLoader();
@@ -11,6 +14,11 @@ function Root() {
1114
return (
1215
<main className='flex flex-row h-screen'>
1316
<SideBar />
17+
<Routes>
18+
<Route path="/app" element={<App />} />
19+
<Route path="/auth" element={<Auth />} />
20+
<Route path="/tiles" element={<Tiles />} />
21+
</Routes>
1422
<Outlet />
1523
<MainWindow />
1624
</main>

examples/playground/src/main.tsx

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,20 @@ import { StrictMode } from 'react'
22
import { createRoot } from 'react-dom/client'
33
import Root from './Root.tsx'
44
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'
76
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'
108

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();
2710

2811
createRoot(document.getElementById('root')!).render(
2912
<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>
3320
</StrictMode>,
3421
)

0 commit comments

Comments
 (0)