Merge pull request #186 from HackMerced/learnday-navbar_render

trumanjchan · web-flow · commit 388e8c5f10ed · 2021-09-20T19:32:46.000-07:00
Started the LHD: Learn page
diff --git a/src/App.tsx b/src/App.tsx
@@ -2,6 +2,7 @@ import React, { FC, Fragment } from "react";
 import { Router, Route, Switch, Redirect } from "react-router-dom";
 import { createHashHistory } from "history";
 
+import LearnDay from "./pages/LearnDay";
 import Home from "./pages/Home";
 import PastHackathons from "./pages/PastHackathons";
 import SponsorUs from "./pages/SponsorUs";
@@ -28,6 +29,7 @@ const App: FC = (): JSX.Element => {
             })}
         >
             <Switch>
+                <Route path="/learn-day" component={LearnDay} />
                 <Route exact path="/" component={Home} />
                 <Route path="/sponsors" component={SponsorUs} />
                 <Route path="/contact-us" component={ContactUs} />
diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx
@@ -78,6 +78,10 @@ const Navbar: FC<{ backgroundColor?: string; textColor?: string; breakLineColor?
                             <img src={CLOSE_ICON} height="40" width="40" />
                         </HamburgerButton.Wrapper>
                     </Menu.Item>
+                    <Menu.Item>
+                        <Link to="/learn-day">Learn Day</Link>
+                        {pathname === "/learn-day" ? BreakLine() : null}
+                    </Menu.Item>
                     <Menu.Item>
                         <Link to="/">Home</Link>
                         {pathname === "/" ? BreakLine() : null}
diff --git a/src/pages/LearnDay/index.tsx b/src/pages/LearnDay/index.tsx
@@ -0,0 +1,17 @@
+import React, { FC } from "react";
+
+import Navbar from "../../components/NavBar";
+
+import "./styles.scss";
+
+const LearnDay: FC = (): JSX.Element => {
+    return(
+        <Navbar />
+        // Title component
+        // FAQ component
+        // Schedule component
+        // render Footer component
+    );
+};
+
+export default LearnDay;
diff --git a/src/pages/LearnDay/styles.scss b/src/pages/LearnDay/styles.scss
