Merge pull request #177 from HackMelbourne/rerouting

Rerouting

src/layouts/Layout.tsx

@@ -44,7 +44,7 @@ const Layout = () => {
     clubname: "HackMelbourne",
     logo: "/img/HM_White_Transparent.png",
     pages: ["Home", "Meet The Team", "Calendar", "Sponsors"],
-    links: ["/", "/meettheteam", "/calendar", "/sponsor"],
+    links: ["/", "about/meettheteam", "upcoming/calendar", "sponsors"],
   };
 
   const footer = {
@@ -73,7 +73,7 @@ const Layout = () => {
           // { name: "Past Events", link: "#" },
           { name: "GitHub", link: GITHUB_LINK },
           // { name: "Design Guidelines", link: "#" },
-          { name: "Major Events", link: "/events" },
+          { name: "Major Events", link: "about/events" },
         ],
       },
     ],

src/main.tsx

@@ -1,20 +1,22 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
 
-import { createBrowserRouter, createRoutesFromElements, Route, RouterProvider } from "react-router-dom";
+import { createBrowserRouter, createRoutesFromElements, Navigate, Route, RouterProvider } from "react-router-dom";
 
 import "./index.css";
 
 import Layout from "./layouts/Layout";
 
 // Main Pages
+import Root from "./routes/Root";
+import OurMission from "./routes/OurMission";
 import Events from "./routes/Events";
-import Sponsors from "./routes/Sponsors";
 import MeetTheTeam from "./routes/MeetTheTeam";
-import Root from "./routes/Root";
+import Calendar from "./routes/Calendar";
+import Sponsors from "./routes/Sponsors";
+import HallOfFame from "./routes/HallOfFame";
 import Privacy from "./routes/Privacy";
 import Terms from "./routes/Terms";
-import Calendar from "./routes/Calendar";
 
 //Event Pages
 import OWeek from "./routes/eventPages/OWeek";
@@ -38,10 +40,15 @@ const router = createBrowserRouter(
   createRoutesFromElements(
     <Route path="/" element={<Layout />}>
       <Route index element={<Root />} />
-      <Route path="meettheteam" element={<MeetTheTeam />} />
-      <Route path="events" element={<Events />} />
-      <Route path="calendar" element={<Calendar />} />
-      <Route path="sponsor" element={<Sponsors />} />
+      <Route path="about" element={<OurMission />} />
+      <Route path="about/events" element={<Events />} />
+      <Route path="about/meettheteam" element={<MeetTheTeam />} />
+      <Route path="upcoming" element={<Navigate to="./calendar" replace />} />
+      <Route path="upcoming/calendar" element={<Calendar />} />
+      <Route path="upcoming/links" element={<Links />}></Route>
+      <Route path="sponsors" element={<Sponsors />} />
+      <Route path="past" element={<Navigate to="./halloffame" replace />} />
+      <Route path="past/halloffame" element={<HallOfFame />} />
       <Route path="privacy" element={<Privacy />} />
       <Route path="terms" element={<Terms />} />
       <Route path="O-Week" element={<OWeek />}></Route>
@@ -50,8 +57,6 @@ const router = createBrowserRouter(
       <Route path="Hackiethon" element={<Hackiethon></Hackiethon>}></Route>
       <Route path="Hackiethon/quiz" element={<HackiethonQuiz></HackiethonQuiz>}></Route>
       <Route path="Hackiethon/quiz/results" element={<QuizResults></QuizResults>}></Route>
-      <Route path="calendar" element={<Calendar></Calendar>}></Route>
-      <Route path="links" element={<Links></Links>}></Route>
       <Route path="blogs" element={<Blogs></Blogs>}></Route>
       {BlogsData.map((blog: BlogInterface) => (
         <Route key={blog.title} path={`blogs/${blog.url}`} element={<Blogs blogId={blog.articleId} />} />

src/routes/HallOfFame.tsx

@@ -0,0 +1,11 @@
+import TitleHero from "../features/TitleHero/TitleHero";
+
+const HallOfFame = () => {
+  return (
+    <>
+      <TitleHero pageTitle="Hall of Fame" pageDescription="Page coming soon!" />
+    </>
+  );
+};
+
+export default HallOfFame;

src/routes/OurMission.tsx

@@ -0,0 +1,11 @@
+import TitleHero from "../features/TitleHero/TitleHero";
+
+const OurMission = () => {
+  return (
+    <>
+      <TitleHero pageTitle="Our Mission" pageDescription="Page coming soon!" />
+    </>
+  );
+};
+
+export default OurMission;