Fix merge conflicts

CS3219-AY2425S1 · Sep 21, 2024 · 25acf98 · 25acf98
2 parents d4d236b + 2176d08
commit 25acf98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -10,10 +10,12 @@ function App() {
     <BrowserRouter>
       <Routes>
         <Route path="/" element={<Layout />}>
-          <Route path="/questions" element={<>question page list</>} />
-          <Route path="/questions/new" element={<NewQuestion />} />
-          <Route path="/questions/:questionId" element={<QuestionDetail />} />
-          <Route path="/questions/:questionId/edit" element={<QuestionEdit />} />
+          <Route path="questions">
+            <Route index element={<>question page list</>} />
+            <Route path="new" element={<NewQuestion />} />
+            <Route path=":questionId" element={<QuestionDetail />} />
+            <Route path=":questionId/edit" element={<QuestionEdit />} />
+          </Route>
           <Route path="*" element={<PageNotFound />} />
         </Route>
       </Routes>

diff --git a/frontend/src/components/Navbar/index.tsx b/frontend/src/components/Navbar/index.tsx
@@ -9,7 +9,7 @@ type NavbarItem = { label: string; link: string };
 type NavbarProps = { navbarItems?: Array<NavbarItem> };
 
 const Navbar: FunctionComponent<NavbarProps> = (props: NavbarProps) => {
-  const { navbarItems = [{ label: "Questions", link: "/" }] } = props;
+  const { navbarItems = [{ label: "Questions", link: "/questions" }] } = props;
   const navigate = useNavigate();
 
   return (