HackMerced · AlissonRoss · Mar 4, 2022 · Mar 4, 2022 · Mar 6, 2022 · Mar 6, 2022
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
diff --git a/src/App.tsx b/src/App.tsx
@@ -3,7 +3,7 @@ import { Router, Route, Switch, Redirect } from "react-router-dom";
 import { createHashHistory } from "history";
 
 import Home from "./pages/Home";
-import HackMercedVII from "./pages/HackMercedVII";
+
 import PastHackathons from "./pages/PastHackathons";
 import SponsorUs from "./pages/SponsorUs";
 import ContactUs from "./pages/ContactUs";
@@ -14,9 +14,10 @@ import Error from "./pages/404";
 import DesignMerced from "./pages/Archive/DesignMerced";
 import HackMercedVI from "./pages/Archive/HackMercedVI";
 import Hacktually2 from "./pages/Archive/LearnDay";
+import HackMercedVII from "./pages/Archive/HackMercedVII";
 // import SignUp from "./pages/SignUp";
 import Maintenance from "./pages/Maintenance";
-import Dashboard from "./pages/Dashboard";
+import Dashboard from "./pages/Archive/Dashboard";
 import { animate } from "./utils/mousetrail";
 
 import "./App.scss";
@@ -36,11 +37,10 @@ const App: FC = (): JSX.Element => {
         >
             <Switch>
                 <Route exact path="/" component={Home} />
-                <Route exact path="/hackmercedvii" component={HackMercedVII} />
+
                 <Route path="/sponsors" component={SponsorUs} />
                 <Route path="/contact-us" component={ContactUs} />
                 <Route path="/past-hackathons" component={PastHackathons} />
-                <Route path="/live" component={Dashboard} />
                 <Route
                     path="/archive"
                     render={({ match: { url } }): JSX.Element => (
@@ -51,6 +51,9 @@ const App: FC = (): JSX.Element => {
                             <Route exact path={`${url}/hackmercedvi`}>
                                 <HackMercedVI />
                             </Route>
+                            <Route exact path={`${url}/hackmercedvii`}>
+                                <HackMercedVII />
+                            </Route>
                             <Route path={`${url}/live*`}>
                                 <Dashboard />
                             </Route>

diff --git a/src/assets/images/Error-404.jpg b/src/assets/images/Error-404.jpg
diff --git a/src/assets/images/HM_tower.png b/src/assets/images/HM_tower.png
diff --git a/src/assets/images/Intiser.png b/src/assets/images/Intiser.png
diff --git a/src/assets/images/abdus.png b/src/assets/images/abdus.png
diff --git a/src/assets/images/about-icon.png b/src/assets/images/about-icon.png
diff --git a/src/assets/images/adrian.jpg b/src/assets/images/adrian.jpg
diff --git a/src/assets/images/alisson.jpg b/src/assets/images/alisson.jpg
diff --git a/src/assets/images/alyssa.png b/src/assets/images/alyssa.png
diff --git a/src/assets/images/athena.jpg b/src/assets/images/athena.jpg
diff --git a/src/assets/images/awards-iii.jpg b/src/assets/images/awards-iii.jpg
diff --git a/src/assets/images/awards.jpg b/src/assets/images/awards.jpg
diff --git a/src/assets/images/awards2.jpg b/src/assets/images/awards2.jpg
diff --git a/src/assets/images/beginningsilustration.png b/src/assets/images/beginningsilustration.png
diff --git a/src/assets/images/betsy.jpg b/src/assets/images/betsy.jpg
diff --git a/src/assets/images/bob-ross-painting.jpg b/src/assets/images/bob-ross-painting.jpg
diff --git a/src/assets/images/bobby-ross.jpg b/src/assets/images/bobby-ross.jpg
diff --git a/src/assets/images/busher.jpg b/src/assets/images/busher.jpg
diff --git a/src/assets/images/checkin.jpg b/src/assets/images/checkin.jpg
diff --git a/src/assets/images/checking-in-ii.jpg b/src/assets/images/checking-in-ii.jpg
diff --git a/src/assets/images/citris.jpg b/src/assets/images/citris.jpg
diff --git a/src/assets/images/closing-ceremony.png b/src/assets/images/closing-ceremony.png
diff --git a/src/assets/images/cloud-test.jpg b/src/assets/images/cloud-test.jpg
diff --git a/src/assets/images/collaborate.jpg b/src/assets/images/collaborate.jpg
diff --git a/src/assets/images/collaboration.jpg b/src/assets/images/collaboration.jpg
diff --git a/src/assets/images/cropped-hackmercedvilogo.png b/src/assets/images/cropped-hackmercedvilogo.png
diff --git a/src/assets/images/cybersecurity.png b/src/assets/images/cybersecurity.png
diff --git a/src/assets/images/erick.png b/src/assets/images/erick.png
diff --git a/src/assets/images/francisco.png b/src/assets/images/francisco.png
diff --git a/src/assets/images/gehad.jpg b/src/assets/images/gehad.jpg
diff --git a/src/assets/images/hackers-ii.jpg b/src/assets/images/hackers-ii.jpg
diff --git a/src/assets/images/hackers.jpg b/src/assets/images/hackers.jpg
diff --git a/src/assets/images/hackers2.jpg b/src/assets/images/hackers2.jpg
diff --git a/src/assets/images/hackers3.jpg b/src/assets/images/hackers3.jpg
diff --git a/src/assets/images/hackers4.jpg b/src/assets/images/hackers4.jpg
diff --git a/src/assets/images/hackiv.jpg b/src/assets/images/hackiv.jpg
diff --git a/src/assets/images/hackmerced-logo.png b/src/assets/images/hackmerced-logo.png
diff --git a/src/assets/images/hackmerced-v.jpg b/src/assets/images/hackmerced-v.jpg
diff --git a/src/assets/images/hackmerced-wallpaper.png b/src/assets/images/hackmerced-wallpaper.png
diff --git a/src/assets/images/hackmercedvi-logo.png b/src/assets/images/hackmercedvi-logo.png
diff --git a/src/assets/images/hackmercedvii-dennys.png b/src/assets/images/hackmercedvii-dennys.png
diff --git a/src/assets/images/hackmercedvii-opening-ceremony.png b/src/assets/images/hackmercedvii-opening-ceremony.png
diff --git a/src/assets/images/hackmercedvii-tabling.jpg b/src/assets/images/hackmercedvii-tabling.jpg
diff --git a/src/assets/images/hackmercedvii-team.png b/src/assets/images/hackmercedvii-team.png
diff --git a/src/assets/images/hackmercedvii-tower.png b/src/assets/images/hackmercedvii-tower.png
diff --git a/src/assets/images/hackmercedviibanner.jpg b/src/assets/images/hackmercedviibanner.jpg
diff --git a/src/assets/images/hackv.jpg b/src/assets/images/hackv.jpg
diff --git a/src/assets/images/header.jpg b/src/assets/images/header.jpg
diff --git a/src/assets/images/header1.jpg b/src/assets/images/header1.jpg
diff --git a/src/assets/images/health-winner.jpg b/src/assets/images/health-winner.jpg
diff --git a/src/assets/images/health-winner1.jpg b/src/assets/images/health-winner1.jpg
diff --git a/src/assets/images/health2.jpg b/src/assets/images/health2.jpg
diff --git a/src/assets/images/health3.jpg b/src/assets/images/health3.jpg
diff --git a/src/assets/images/hmfood-v.jpg b/src/assets/images/hmfood-v.jpg
diff --git a/src/assets/images/hmfood.jpg b/src/assets/images/hmfood.jpg
diff --git a/src/assets/images/inclusivity.png b/src/assets/images/inclusivity.png
diff --git a/src/assets/images/janelle.jpg b/src/assets/images/janelle.jpg
diff --git a/src/assets/images/jet.jpg b/src/assets/images/jet.jpg
diff --git a/src/assets/images/joseph.jpg b/src/assets/images/joseph.jpg
diff --git a/src/assets/images/judges-iii.jpg b/src/assets/images/judges-iii.jpg
diff --git a/src/assets/images/judges.jpg b/src/assets/images/judges.jpg
diff --git a/src/assets/images/kacey.jpg b/src/assets/images/kacey.jpg
diff --git a/src/assets/images/kiana.png b/src/assets/images/kiana.png
diff --git a/src/assets/images/landing-page-hmvi.png b/src/assets/images/landing-page-hmvi.png
diff --git a/src/assets/images/laurence.png b/src/assets/images/laurence.png
diff --git a/src/assets/images/lightbulb-layers.png b/src/assets/images/lightbulb-layers.png
diff --git a/src/assets/images/lorenzo.png b/src/assets/images/lorenzo.png
diff --git a/src/assets/images/machine.jpg b/src/assets/images/machine.jpg
diff --git a/src/assets/images/manjot.jpg b/src/assets/images/manjot.jpg
diff --git a/src/assets/images/manjot.png b/src/assets/images/manjot.png
diff --git a/src/assets/images/marty.jpg b/src/assets/images/marty.jpg
diff --git a/src/assets/images/mary.jpg b/src/assets/images/mary.jpg
diff --git a/src/assets/images/mjpoint.jpg b/src/assets/images/mjpoint.jpg
diff --git a/src/assets/images/mlh-badge-example.jpg b/src/assets/images/mlh-badge-example.jpg
diff --git a/src/assets/images/mlh-badge1.jpg b/src/assets/images/mlh-badge1.jpg
diff --git a/src/assets/images/mlh-cupstack.jpg b/src/assets/images/mlh-cupstack.jpg
diff --git a/src/assets/images/mlh-ii.jpg b/src/assets/images/mlh-ii.jpg
diff --git a/src/assets/images/mlh-photobooth.jpg b/src/assets/images/mlh-photobooth.jpg
diff --git a/src/assets/images/openingceremony.png b/src/assets/images/openingceremony.png
diff --git a/src/assets/images/past-sponsors.png b/src/assets/images/past-sponsors.png
diff --git a/src/assets/images/pastsponsors.png b/src/assets/images/pastsponsors.png
diff --git a/src/assets/images/placeholder-box.png b/src/assets/images/placeholder-box.png
diff --git a/src/assets/images/placeholder-title.png b/src/assets/images/placeholder-title.png
diff --git a/src/assets/images/placeholder-tower.png b/src/assets/images/placeholder-tower.png
diff --git a/src/assets/images/presentations.jpg b/src/assets/images/presentations.jpg
diff --git a/src/assets/images/presenter.jpg b/src/assets/images/presenter.jpg
diff --git a/src/assets/images/prizes-iii.jpg b/src/assets/images/prizes-iii.jpg
diff --git a/src/assets/images/react-native-workshop.png b/src/assets/images/react-native-workshop.png
diff --git a/src/assets/images/redbull.jpg b/src/assets/images/redbull.jpg
diff --git a/src/assets/images/rohit.png b/src/assets/images/rohit.png
diff --git a/src/assets/images/salvador.png b/src/assets/images/salvador.png
diff --git a/src/assets/images/sean.jpg b/src/assets/images/sean.jpg
diff --git a/src/assets/images/shakti.jpg b/src/assets/images/shakti.jpg
diff --git a/src/assets/images/shawn.jpg b/src/assets/images/shawn.jpg
diff --git a/src/assets/images/shivanshu.jpg b/src/assets/images/shivanshu.jpg
diff --git a/src/assets/images/shub-award.jpg b/src/assets/images/shub-award.jpg
diff --git a/src/assets/images/speaker-ii.jpg b/src/assets/images/speaker-ii.jpg
diff --git a/src/assets/images/sponsor-design.jpg b/src/assets/images/sponsor-design.jpg
diff --git a/src/assets/images/sponsor-hackmercedvii.png b/src/assets/images/sponsor-hackmercedvii.png
diff --git a/src/assets/images/sponsor-logos/1Password.png b/src/assets/images/sponsor-logos/1Password.png
diff --git a/src/assets/images/sponsor-logos/ACM.png b/src/assets/images/sponsor-logos/ACM.png
diff --git a/src/assets/images/sponsor-logos/ASUCM.png b/src/assets/images/sponsor-logos/ASUCM.png
diff --git a/src/assets/images/sponsor-logos/Adobe.png b/src/assets/images/sponsor-logos/Adobe.png
diff --git a/src/assets/images/sponsor-logos/Alumni.png b/src/assets/images/sponsor-logos/Alumni.png
diff --git a/src/assets/images/sponsor-logos/Citrus.png b/src/assets/images/sponsor-logos/Citrus.png
diff --git a/src/assets/images/sponsor-logos/CoolerMaster.png b/src/assets/images/sponsor-logos/CoolerMaster.png
diff --git a/src/assets/images/sponsor-logos/GoodDayChocolate.png b/src/assets/images/sponsor-logos/GoodDayChocolate.png
diff --git a/src/assets/images/sponsor-logos/GuayakiYerbaMate.png b/src/assets/images/sponsor-logos/GuayakiYerbaMate.png
diff --git a/src/assets/images/sponsor-logos/IT.png b/src/assets/images/sponsor-logos/IT.png
diff --git a/src/assets/images/sponsor-logos/InterviewCake.png b/src/assets/images/sponsor-logos/InterviewCake.png
diff --git a/src/assets/images/sponsor-logos/JetBrains.png b/src/assets/images/sponsor-logos/JetBrains.png
diff --git a/src/assets/images/sponsor-logos/MLH.png b/src/assets/images/sponsor-logos/MLH.png
diff --git a/src/assets/images/sponsor-logos/MakeSchool.png b/src/assets/images/sponsor-logos/MakeSchool.png
diff --git a/src/assets/images/sponsor-logos/MakeyMakey.png b/src/assets/images/sponsor-logos/MakeyMakey.png
diff --git a/src/assets/images/sponsor-logos/MercoCU.png b/src/assets/images/sponsor-logos/MercoCU.png
diff --git a/src/assets/images/sponsor-logos/MonsterEnergy.png b/src/assets/images/sponsor-logos/MonsterEnergy.png
diff --git a/src/assets/images/sponsor-logos/OSI.png b/src/assets/images/sponsor-logos/OSI.png
diff --git a/src/assets/images/sponsor-logos/Replit.png b/src/assets/images/sponsor-logos/Replit.png
diff --git a/src/assets/images/sponsor-logos/Sketch.png b/src/assets/images/sponsor-logos/Sketch.png
diff --git a/src/assets/images/sponsor-logos/Snorkel.png b/src/assets/images/sponsor-logos/Snorkel.png
diff --git a/src/assets/images/sponsor-logos/Stickermule.png b/src/assets/images/sponsor-logos/Stickermule.png
diff --git a/src/assets/images/sponsor-logos/UCANR.png b/src/assets/images/sponsor-logos/UCANR.png
diff --git a/src/assets/images/sponsor-logos/Vanguard.png b/src/assets/images/sponsor-logos/Vanguard.png
diff --git a/src/assets/images/sponsor-logos/VentureLab.png b/src/assets/images/sponsor-logos/VentureLab.png
diff --git a/src/assets/images/sponsor-logos/WolframLanguage.png b/src/assets/images/sponsor-logos/WolframLanguage.png
diff --git a/src/assets/images/sponsor-logos/ZuckerbergInitiative.png b/src/assets/images/sponsor-logos/ZuckerbergInitiative.png
diff --git a/src/assets/images/sponsor-speech.jpg b/src/assets/images/sponsor-speech.jpg
diff --git a/src/assets/images/sponsor-title.png b/src/assets/images/sponsor-title.png
diff --git a/src/assets/images/sponsors-hackmercedvi-2.png b/src/assets/images/sponsors-hackmercedvi-2.png
diff --git a/src/assets/images/sponsors-hackmercedvi.png b/src/assets/images/sponsors-hackmercedvi.png
diff --git a/src/assets/images/sponsors-hackmercedvi1.png b/src/assets/images/sponsors-hackmercedvi1.png
diff --git a/src/assets/images/sponsors-hackmercedvii.png b/src/assets/images/sponsors-hackmercedvii.png
diff --git a/src/assets/images/sponsors-ii.jpg b/src/assets/images/sponsors-ii.jpg
diff --git a/src/assets/images/sponsors-v.jpg b/src/assets/images/sponsors-v.jpg
diff --git a/src/assets/images/sponsorsv.jpg b/src/assets/images/sponsorsv.jpg
diff --git a/src/assets/images/sticker-mule-logo-dark.png b/src/assets/images/sticker-mule-logo-dark.png
diff --git a/src/assets/images/sticker-mule-logo-light-stacked.png b/src/assets/images/sticker-mule-logo-light-stacked.png
diff --git a/src/assets/images/sticker-mule-logo-light.png b/src/assets/images/sticker-mule-logo-light.png
diff --git a/src/assets/images/sustainability.png b/src/assets/images/sustainability.png
diff --git a/src/assets/images/teaching.jpg b/src/assets/images/teaching.jpg
diff --git a/src/assets/images/team-2016.jpg b/src/assets/images/team-2016.jpg
diff --git a/src/assets/images/team-members-virtual.png b/src/assets/images/team-members-virtual.png
diff --git a/src/assets/images/team.jpg b/src/assets/images/team.jpg
diff --git a/src/assets/images/title-designmerced.png b/src/assets/images/title-designmerced.png
diff --git a/src/assets/images/tower.png b/src/assets/images/tower.png
diff --git a/src/assets/images/truman.png b/src/assets/images/truman.png
diff --git a/src/assets/images/tutor.jpg b/src/assets/images/tutor.jpg
diff --git a/src/assets/images/tuzette.jpg b/src/assets/images/tuzette.jpg
diff --git a/src/assets/images/virginia.png b/src/assets/images/virginia.png
diff --git a/src/assets/images/virtual-stickers.jpg b/src/assets/images/virtual-stickers.jpg
diff --git a/src/assets/images/virtual-teammembers.png b/src/assets/images/virtual-teammembers.png
diff --git a/src/assets/images/winners-iii.jpg b/src/assets/images/winners-iii.jpg
diff --git a/src/assets/images/winston.png b/src/assets/images/winston.png
diff --git a/src/assets/pastHackathons.ts b/src/assets/pastHackathons.ts
@@ -46,6 +46,14 @@ import HACKMERCED_VI_BOB_ROSS from "./images/bob-ross-painting.jpg";
 import HACKMERCED_VI_REACT_NATIVE_WORKSHOP from "./images/react-native-workshop.png";
 import HACKMERCED_VI_VIRTUAL_STICKERS from "./images/virtual-stickers.jpg";
 
+// HackMerced VII
+import HACKMERCED_VII_CLOSING_CEREMONY from "./images/hackmercedvii-dennys.png";
+import HACKMERCED_VII_OPENING_CEREMONY from "./images/hackmercedvii-tower.png";
+import HACKMERCED_VII_VIRTUAL_TEAM from "./images/hackmercedviibanner.jpg";
+import HACKMERCED_VII_BOB_ROSS from "./images/bobby-ross.jpg";
+import HACKMERCED_VII_REACT_NATIVE_WORKSHOP from "./images/hackmercedvii-opening-ceremony.png";
+import HACKMERCED_VII_VIRTUAL_STICKERS from "./images/hackmercedvii-tabling.jpg";
+
 const pastHackathonData = [
     {
         iteration: 1,
@@ -161,6 +169,25 @@ const pastHackathonData = [
             HACKMERCED_VI_CLOSING_CEREMONY,
         ],
     },
+    {
+        iteration: 7,
+        stats: {
+            hoursOfHacking: 36,
+            numberOfAttendees: 500,
+            projectsSubmitted: 70,
+            amountOfPrizes: 16, // in thousand of dollars
+            numberOfWorkshops: 11,
+            numberOfSponsors: 10,
+        },
+        gallery: [
+            HACKMERCED_VII_OPENING_CEREMONY,
+            HACKMERCED_VII_VIRTUAL_TEAM,
+            HACKMERCED_VII_BOB_ROSS,
+            HACKMERCED_VII_VIRTUAL_STICKERS,
+            HACKMERCED_VII_REACT_NATIVE_WORKSHOP,
+            HACKMERCED_VII_CLOSING_CEREMONY,
+        ],
+    },
 ];
 
 export default pastHackathonData;
diff --git a/src/components/MailingForm/index.js b/src/components/MailingForm/index.js
@@ -0,0 +1,46 @@
+module.exports = `<!DOCTYPE html>
+    <link href="//cdn-images.mailchimp.com/embedcode/classic-071822.css" rel="stylesheet" type="text/css">
+    <style type="text/css">
+        #mc_embed_signup {
+            clear: left;
+            font: 14px Helvetica, Arial, sans-serif;
+            width: 600px;
+        }
+
+        /* Add your own Mailchimp form style overrides in your site stylesheet or in this style block.
+        We recommend moving this block and the preceding CSS link to the HEAD of your HTML file. */
+    </style>
+    <div id="mc_embed_signup">
+        <form
+            action="https://hackmerced.us4.list-manage.com/subscribe/post?u=0f91e275ee2aafcee8f0fa7f9&amp;id=a837167e30&amp;f_id=00d307e9f0"
+            method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank"
+            novalidate>
+            <div id="mc_embed_signup_scroll">
+                <h2>Subscribe to our Mailing List</h2>
+                <div class="indicates-required"><span class="asterisk">*</span> indicates required</div>
+                <div class="mc-field-group">
+                    <label for="mce-EMAIL">Email Address <span class="asterisk">*</span>
+                    </label>
+                    <input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL" required>
+                    <span id="mce-EMAIL-HELPERTEXT" class="helper_text"></span>
+                </div>
+                <div id="mce-responses" class="clear foot">
+                    <div class="response" id="mce-error-response" style="display:none"></div>
+                    <div class="response" id="mce-success-response" style="display:none"></div>
+                </div>
+                <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
+                <div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text"
+                        name="b_0f91e275ee2aafcee8f0fa7f9_a837167e30" tabindex="-1" value=""></div>
+                <div class="optionalParent">
+                    <div class="clear foot">
+                        <input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button">
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+    <script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script>
+    <script
+        type='text/javascript'>(function ($) { window.fnames = new Array(); window.ftypes = new Array(); fnames[0] = 'EMAIL'; ftypes[0] = 'email'; fnames[1] = 'FNAME'; ftypes[1] = 'text'; fnames[2] = 'LNAME'; ftypes[2] = 'text'; fnames[3] = 'ADDRESS'; ftypes[3] = 'address'; fnames[4] = 'PHONE'; ftypes[4] = 'phone'; fnames[5] = 'BIRTHDAY'; ftypes[5] = 'birthday'; fnames[6] = 'MMERGE6'; ftypes[6] = 'date'; fnames[7] = 'MMERGE7'; ftypes[7] = 'address'; fnames[8] = 'MMERGE8'; ftypes[8] = 'imageurl'; fnames[9] = 'MMERGE9'; ftypes[9] = 'text'; }(jQuery)); var $mcj = jQuery.noConflict(true);</script>
+    <!--End mc_embed_signup-->
+    </link>`;
diff --git a/src/components/NavBar/index.tsx b/src/components/NavBar/index.tsx
@@ -86,13 +86,9 @@ const Navbar: FC<{
                         {pathname === "/" ? BreakLine() : null}
                     </Menu.Item>
                     <Menu.Item>
-                        <Link to="/hackmercedvii">HackMerced VII</Link>
-                        {pathname === "/hackmercedvii" ? BreakLine() : null}
-                    </Menu.Item>
-                    {/* <Menu.Item>
                         <Link to="/past-hackathons">Past Hackathons</Link>
                         {pathname === "/past-hackathons" ? BreakLine() : null}
-                    </Menu.Item> */}
+                    </Menu.Item>
                     <Menu.Item>
                         <Link to="/sponsors">Sponsors</Link>
                         {pathname === "/sponsors" ? BreakLine() : null}
@@ -101,10 +97,6 @@ const Navbar: FC<{
                         <Link to="/contact-us">Contact Us</Link>
                         {pathname === "/contact-us" ? BreakLine() : null}
                     </Menu.Item>
-                    <Menu.Item>
-                        <Link to="/live">Live</Link>
-                        {pathname === "/live" ? BreakLine() : null}
-                    </Menu.Item>
                     {showDLToggle ? (
                         <Menu.Item>
                             <div className="nav-toggle-switch">

diff --git a/src/pages/Dashboard/index.tsx → src/pages/Archive/Dashboard/index.tsx b/src/pages/Dashboard/index.tsx → src/pages/Archive/Dashboard/index.tsx
@@ -4,10 +4,10 @@ import { Link, useLocation } from "react-router-dom";
 import Live from "./live";
 import Schedule from "./schedule";
 import Prizes from "./prizes";
-import Footer from "../../components/Footer";
-import Navbar from "../../components/NavBar";
+import Footer from "../../../components/Footer";
+import Navbar from "../../../components/NavBar";
 
-import HACKMERCED_LOGO from "../../assets/images/hackmercedvi-logo.png";
+import HACKMERCED_LOGO from "../../../assets/images/hackmercedvi-logo.png";
 
 import "./styles.scss";
 

diff --git a/src/pages/Dashboard/live.tsx → src/pages/Archive/Dashboard/live.tsx b/src/pages/Dashboard/live.tsx → src/pages/Archive/Dashboard/live.tsx
@@ -15,15 +15,23 @@ const Live: FC<{ time: string }> = ({ time }): JSX.Element => {
             const current = new Date();
             const currentTime = Date.parse(String(current)) / 1000;
             const timer = endTime - currentTime;
-            const dd = Math.floor(timer / 86400);
-            const hh = Math.floor((timer - dd * 86400) / 3600);
-            const mm = Math.floor((timer - dd * 86400 - hh * 3600) / 60);
-            const ss = Math.floor(timer - dd * 86400 - hh * 3600 - mm * 60);
 
-            setDay(String(dd));
-            setHour(hh < 10 ? "0" + String(hh) : String(hh));
-            setMinute(mm < 10 ? "0" + String(mm) : String(mm));
-            setSecond(ss < 10 ? "0" + String(ss) : String(ss));
+            if (timer < 0) {
+                setDay("00");
+                setHour("00");
+                setMinute("00");
+                setSecond("00");
+            } else {
+                const dd = Math.floor(timer / 86400);
+                const hh = Math.floor((timer - dd * 86400) / 3600);
+                const mm = Math.floor((timer - dd * 86400 - hh * 3600) / 60);
+                const ss = Math.floor(timer - dd * 86400 - hh * 3600 - mm * 60);
+
+                setDay(String(dd));
+                setHour(hh < 10 ? "0" + String(hh) : String(hh));
+                setMinute(mm < 10 ? "0" + String(mm) : String(mm));
+                setSecond(ss < 10 ? "0" + String(ss) : String(ss));
+            }
         };
 
         setInterval(function () {

diff --git a/src/pages/Dashboard/prizes.tsx → src/pages/Archive/Dashboard/prizes.tsx b/src/pages/Dashboard/prizes.tsx → src/pages/Archive/Dashboard/prizes.tsx
diff --git a/src/pages/Dashboard/schedule.tsx → src/pages/Archive/Dashboard/schedule.tsx b/src/pages/Dashboard/schedule.tsx → src/pages/Archive/Dashboard/schedule.tsx
@@ -1,7 +1,7 @@
 import React, { FC, useState } from "react";
 
 import "./styles.scss";
-import useWindowDimensions from "../../components/WindowDimensions";
+import useWindowDimensions from "../../../components/WindowDimensions";
 
 const data: Array<{ day: number; title: string; body: string }> = [
     {
@@ -89,11 +89,11 @@ const data: Array<{ day: number; title: string; body: string }> = [
         title: "3:00 PM - 4:00 PM PST",
         body: "Intro to AI and ML Workshop",
     },
-    // {
-    //     day: 6,
-    //     title: "4:00 PM - 5:00 PM PST",
-    //     body: "Intro to AI and ML Workshop",
-    // },
+    {
+        day: 6,
+        title: "4:00 PM - 5:00 PM PST",
+        body: "Create a React.js todo list app Workshop with App Dev League",
+    },
     {
         day: 6,
         title: "5:00 PM - 6:00 PM PST",
@@ -131,7 +131,7 @@ const data: Array<{ day: number; title: string; body: string }> = [
     },
     {
         day: 7,
-        title: "6:00 AM - 7:00 AM PST",
+        title: "7:00 AM - 7:30 AM PST",
         body: "How to Pitch and Download your Projects?",
     },
     {

diff --git a/src/pages/Dashboard/styles.scss → src/pages/Archive/Dashboard/styles.scss b/src/pages/Dashboard/styles.scss → src/pages/Archive/Dashboard/styles.scss
diff --git a/src/pages/HackMercedVII/index.tsx → src/pages/Archive/HackMercedVII/index.tsx b/src/pages/HackMercedVII/index.tsx → src/pages/Archive/HackMercedVII/index.tsx
@@ -1,14 +1,14 @@
 import React, { FC, useEffect, useState } from "react";
 import ReactHtmlParser from "react-html-parser";
 
-import Navbar from "../../components/NavBar";
-import Footer from "../../components/Footer";
-import useWindowDimensions from "../../components/WindowDimensions";
+import Navbar from "../../../components/NavBar";
+import Footer from "../../../components/Footer";
+import useWindowDimensions from "../../../components/WindowDimensions";
 
-import SPONSORS from "../../assets/images/sponsor-hackmercedvii.png";
-import STICKER_MULE from "../../assets/images/sticker-mule-logo-dark.png";
+import SPONSORS from "../../../assets/images/sponsor-hackmercedvii.png";
+import STICKER_MULE from "../../../assets/images/sticker-mule-logo-dark.png";
 
-import { FAQData } from "../../assets/faq";
+import { FAQData } from "../../../assets/faq";
 
 import "./styles.scss";
 

diff --git a/src/pages/HackMercedVII/styles.scss → src/pages/Archive/HackMercedVII/styles.scss b/src/pages/HackMercedVII/styles.scss → src/pages/Archive/HackMercedVII/styles.scss
@@ -8,7 +8,7 @@
     * #########################
     */
     &__landing {
-        background-image: url("../../assets/images/HM_tower.png");
+        background-image: url("../../../assets/images/HM_tower.png");
         background-size: 100% 100%;
         background-repeat: no-repeat;
         height: 100%;

diff --git a/src/pages/Home/index.tsx b/src/pages/Home/index.tsx
@@ -1,4 +1,4 @@
-import React, { FC, Fragment} from "react";
+import React, { FC, Fragment } from "react";
 //import Axios, { AxiosResponse } from "axios";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { IconDefinition } from "@fortawesome/free-solid-svg-icons";
@@ -7,7 +7,7 @@ import Navbar from "../../components/NavBar";
 import Footer from "../../components/Footer";
 import Contribute from "../../components/Contribute";
 import useWindowDimensions from "../../components/WindowDimensions";
-import { Link } from "react-router-dom";
+//import { Link } from "react-router-dom";
 
 import HACKMERCED_TITLE from "../../assets/images/placeholder-title.png";
 import HACKMERCED_TITLE_WEBP from "../../assets/images/placeholder-title.webp";
@@ -20,6 +20,8 @@ import winners from "../../assets/winners";
 import "./styles.scss";
 // import jsonp from "jsonp";
 // import queryString from 'querystring';
+var __html = require('../../components/MailingForm/index.js');
+var form = { __html: __html };
 
 
 type TeamProps = {
@@ -94,32 +96,32 @@ const generateSectionHeading = (title: string): JSX.Element => {
 
 const Home: FC = (): JSX.Element => {
     const { width } = useWindowDimensions();
-    
-//     const [form, setForm] = useState<{ email: string }>({ email: "" });
-
-//     // Handles Change on the fields of the form
-//     const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
-//         const { name, value } = event.target;
-//         setForm({ ...form, [name]: value });
-//        // console.log(form);
-//    };
- 
-//     // Handles the submission action when the submit button is pressed
-//     const handleSubmit = async (event: React.ChangeEvent<HTMLFormElement>): Promise<void> => {
-//         const formData = {
-//             EMAIL: form.email,
-//         };
-       
-//         const baseURL = process.env.REACT_APP_MAILCHIMP_API_KEY;
-//         const finalURL = baseURL + "&" + queryString.stringify(formData);
-      
-//         event.preventDefault();
-//         jsonp(finalURL, { param: 'c' },  
-
-//         );
-//         alert("Subscribed to HackMerced Newsletter!");
-//         // console.log(process.env.REACT_APP_MAILCHIMP_API_KEY);
-//     }
+
+    //     const [form, setForm] = useState<{ email: string }>({ email: "" });
+
+    //     // Handles Change on the fields of the form
+    //     const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>): void => {
+    //         const { name, value } = event.target;
+    //         setForm({ ...form, [name]: value });
+    //        // console.log(form);
+    //    };
+
+    //     // Handles the submission action when the submit button is pressed
+    //     const handleSubmit = async (event: React.ChangeEvent<HTMLFormElement>): Promise<void> => {
+    //         const formData = {
+    //             EMAIL: form.email,
+    //         };
+
+    //         const baseURL = process.env.REACT_APP_MAILCHIMP_API_KEY;
+    //         const finalURL = baseURL + "&" + queryString.stringify(formData);
+
+    //         event.preventDefault();
+    //         jsonp(finalURL, { param: 'c' },  
+
+    //         );
+    //         alert("Subscribed to HackMerced Newsletter!");
+    //         // console.log(process.env.REACT_APP_MAILCHIMP_API_KEY);
+    //     }
 
     return (
         <main className="home">
@@ -157,7 +159,7 @@ const Home: FC = (): JSX.Element => {
                         </picture>
                         <div className="home__heading__content__title__text">The biggest San Joaquin Valley hackathon.</div>
                         <div className="home__heading__content__title__sub-text">Stay updated with HackMerced and subscribe to our email list!</div>
-                        <Link to="/hackmercedvii"><button className="home__heading__content__title__event-button">HackMerced VII</button></Link>
+                        <div dangerouslySetInnerHTML={form} />
                         {/* <form className="home__heading__content__title__form" onSubmit={handleSubmit}>
                             <input
                                 className="home__heading__content__title__form_input"