Skip to content

Moved router to a separate folder for better code readability #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 5 additions & 48 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,58 +1,15 @@
import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom";
import { useLocation, Outlet } from "react-router-dom";
import { useLayoutEffect } from "react";
import Editor from "./pages/Editor";
import Survey from "./pages/Survey";
import BugReport from "./pages/BugReport";
import Shortcuts from "./pages/Shortcuts";
import Templates from "./pages/Templates";
import LandingPage from "./pages/LandingPage";
import SettingsContextProvider from "./context/SettingsContext";
import { useSettings } from "./hooks";
import NotFound from "./pages/NotFound";

export default function App() {
return (
<SettingsContextProvider>
<BrowserRouter>
<RestoreScroll />
<Routes>
<Route path="/" element={<LandingPage />} />
<Route
path="/editor"
element={
<ThemedPage>
<Editor />
</ThemedPage>
}
/>
<Route
path="/survey"
element={
<ThemedPage>
<Survey />
</ThemedPage>
}
/>
<Route
path="/shortcuts"
element={
<ThemedPage>
<Shortcuts />
</ThemedPage>
}
/>
<Route
path="/bug-report"
element={
<ThemedPage>
<BugReport />
</ThemedPage>
}
/>
<Route path="/templates" element={<Templates />} />
<Route path="*" element={<NotFound />} />
</Routes>
</BrowserRouter>
<RestoreScroll />
<ThemedPage>
<Outlet />
</ThemedPage>
</SettingsContextProvider>
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/main.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import ReactDOM from "react-dom/client";
import { LocaleProvider } from "@douyinfe/semi-ui";
import { Analytics } from "@vercel/analytics/react";
import App from "./App.jsx";
import en_US from "@douyinfe/semi-ui/lib/es/locale/source/en_US";
import "./index.css";
import "./i18n/i18n.js";

import { RouterProvider } from "react-router-dom";
import router from "./routes";
const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
<LocaleProvider locale={en_US}>
<App />
<RouterProvider router={router} />
<Analytics />
</LocaleProvider>,
);
29 changes: 29 additions & 0 deletions src/routes/index.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import {
createBrowserRouter,
createRoutesFromElements,
Route,
} from "react-router-dom";
import LandingPage from "../pages/LandingPage";
import Editor from "../pages/Editor";
import Survey from "../pages/Survey";
import Shortcuts from "../pages/Shortcuts";
import BugReport from "../pages/BugReport";
import Templates from "../pages/Templates";
import NotFound from "../pages/NotFound";
import App from "../App";

const router = createBrowserRouter(
createRoutesFromElements(
<Route path="/" element={<App />}>
<Route path="/" index={true} element={<LandingPage />} />
<Route path="/editor" element={<Editor />} />
<Route path="/survey" element={<Survey />} />
<Route path="/shortcuts" element={<Shortcuts />} />
<Route path="/bug-report" element={<BugReport />} />
<Route path="/templates" element={<Templates />} />
<Route path="*" element={<NotFound />} />
</Route>
)
);

export default router;