Skip to content

Implement Browser Router #58

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.

Sign up for GitHub

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

Implement Browser Router #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e14271
Update HashRouter to BrowserRouter
shubham6822 Mar 17, 2025
85daab4
Add a fallback to prevent 404s
shubham6822 Mar 18, 2025
f113291
Fix BrowserRouter
shubham6822 Mar 18, 2025
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
8 changes: 5 additions & 3 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import { RouterProvider } from 'react-router-dom';
import router from './routes';
import { BrowserRouter } from 'react-router-dom';
import Router from './routes';

const App = () => {
return (
<div className="min-h-screen flex flex-col">
<RouterProvider router={router} />
<BrowserRouter basename="/">
<Router />
</BrowserRouter>
</div>
);
};
Expand Down
52 changes: 27 additions & 25 deletions src/routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createHashRouter } from 'react-router-dom';
import { Route, Routes } from 'react-router-dom';
import MainPage from '@/pages/MainPage';
import AboutUs from '@/pages/About/AboutUs';
import Leadership from '@/pages/About/Leadership';
Expand All @@ -19,28 +19,30 @@ import TrisquelPage from '@/pages/TryNow/Trisquel';
import RaspberryPiPage from '@/pages/TryNow/Raspberry';
import MusicBlocksPage from '@/pages/TryNow/MusicBlocks';

const router = createHashRouter([
{ path: `/`, element: <MainPage /> },
{ path: `/about-us`, element: <AboutUs /> },
{ path: `/leadership`, element: <Leadership /> },
{ path: `/contact-us`, element: <ContactUs /> },
{ path: `/faqs`, element: <FAQs /> },
{ path: `/news`, element: <NewsPage /> },
{ path: `/news/:category`, element: <NewsPage /> },
{ path: `/news/:category/:slug`, element: <NewsDetailPage /> },
{ path: `/more`, element: <MorePage /> },
{ path: `/more/:slug`, element: <MorePage /> },
{ path: `/try-sugar`, element: <TrySugar /> },
{ path: `/join-development`, element: <JoinDevelopment /> },
{ path: `/volunteer`, element: <Volunteer /> },
{ path: `/donate`, element: <Donate /> },
{ path: `/products`, element: <Products /> },
{ path: `/turtleblocks`, element: <TurtleBlocksPage /> },
{ path: `/sugarizer`, element: <SugarizerPage /> },
{ path: `/bootablesoas`, element: <BootableSoasPage /> },
{ path: `/trisquel`, element: <TrisquelPage /> },
{ path: `/raspberry`, element: <RaspberryPiPage /> },
{ path: `/musicblocks`, element: <MusicBlocksPage /> },
]);
const Router = () => (
<Routes>
<Route path="/" element={<MainPage />} />
<Route path="/about-us" element={<AboutUs />} />
<Route path="/leadership" element={<Leadership />} />
<Route path="/contact-us" element={<ContactUs />} />
<Route path="/faqs" element={<FAQs />} />
<Route path="/news" element={<NewsPage />} />
<Route path="/news/:category" element={<NewsPage />} />
<Route path="/news/:category/:slug" element={<NewsDetailPage />} />
<Route path="/more" element={<MorePage />} />
<Route path="/more/:slug" element={<MorePage />} />
<Route path="/try-sugar" element={<TrySugar />} />
<Route path="/join-development" element={<JoinDevelopment />} />
<Route path="/volunteer" element={<Volunteer />} />
<Route path="/donate" element={<Donate />} />
<Route path="/products" element={<Products />} />
<Route path="/turtleblocks" element={<TurtleBlocksPage />} />
<Route path="/sugarizer" element={<SugarizerPage />} />
<Route path="/bootablesoas" element={<BootableSoasPage />} />
<Route path="/trisquel" element={<TrisquelPage />} />
<Route path="/raspberry" element={<RaspberryPiPage />} />
<Route path="/musicblocks" element={<MusicBlocksPage />} />
</Routes>
);

export default router;
export default Router;