ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use named constants for settings URL query params (#3333)

Browse Source
This commit is contained in:
Frank Noirot
2024-08-09 02:47:25 -04:00
committed by GitHub
parent 11a94cc99e
commit a503d1ce50
23 changed files with 106 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Router.tsx
View File

@ -20,7 +20,7 @@ import { WasmErrBanner } from 'components/WasmErrBanner'
import { CommandBar } from 'components/CommandBar/CommandBar'
import ModelingMachineProvider from 'components/ModelingMachineProvider'
import FileMachineProvider from 'components/FileMachineProvider'
import { paths } from 'lib/paths'
import { PATHS } from 'lib/paths'
import {
fileLoader,
homeLoader,
@ -45,7 +45,7 @@ import { AppStateProvider } from 'AppState'
const router = createBrowserRouter([
{
loader: settingsLoader,
id: paths.INDEX,
id: PATHS.INDEX,
/* Make sure auth is the outermost provider or else we will have
* inefficient re-renders, use the react profiler to see. */
element: (
@ -64,7 +64,7 @@ const router = createBrowserRouter([
errorElement: <ErrorPage />,
children: [
{
path: paths.INDEX,
path: PATHS.INDEX,
loader: async () => {
const inTauri = isTauri()
if (inTauri) {
@ -78,21 +78,21 @@ const router = createBrowserRouter([
// Redirect to the file if we have a file path.
if (appState.current_file) {
return redirect(
paths.FILE + '/' + encodeURIComponent(appState.current_file)
PATHS.FILE + '/' + encodeURIComponent(appState.current_file)
)
}
}
}
return inTauri
? redirect(paths.HOME)
: redirect(paths.FILE + '/%2F' + BROWSER_PROJECT_NAME)
? redirect(PATHS.HOME)
: redirect(PATHS.FILE + '/%2F' + BROWSER_PROJECT_NAME)
},
},
{
loader: fileLoader,
id: paths.FILE,
path: paths.FILE + '/:id',
id: PATHS.FILE,
path: PATHS.FILE + '/:id',
element: (
<Auth>
<FileMachineProvider>
@ -109,7 +109,7 @@ const router = createBrowserRouter([
),
children: [
{
id: paths.FILE + 'SETTINGS',
id: PATHS.FILE + 'SETTINGS',
loader: settingsLoader,
children: [
{
@ -118,11 +118,11 @@ const router = createBrowserRouter([
element: <></>,
},
{
path: makeUrlPathRelative(paths.SETTINGS),
path: makeUrlPathRelative(PATHS.SETTINGS),
element: <Settings />,
},
{
path: makeUrlPathRelative(paths.ONBOARDING.INDEX),
path: makeUrlPathRelative(PATHS.ONBOARDING.INDEX),
element: <Onboarding />,
children: onboardingRoutes,
},
@ -131,7 +131,7 @@ const router = createBrowserRouter([
],
},
{
path: paths.HOME,
path: PATHS.HOME,
element: (
<Auth>
<Outlet />
@ -139,24 +139,24 @@ const router = createBrowserRouter([
<CommandBar />
</Auth>
),
id: paths.HOME,
id: PATHS.HOME,
loader: homeLoader,
children: [
{
index: true,
element: <></>,
id: paths.HOME + 'SETTINGS',
id: PATHS.HOME + 'SETTINGS',
loader: settingsLoader,
},
{
path: makeUrlPathRelative(paths.SETTINGS),
path: makeUrlPathRelative(PATHS.SETTINGS),
loader: settingsLoader,
element: <Settings />,
},
],
},
{
path: paths.SIGN_IN,
path: PATHS.SIGN_IN,
element: <SignIn />,
},
],