Merge pull request #390 from nwplus/nwhacks2024_dev

Add hacker apps closed Banner Message
nwplus · Nov 26, 2023 · 9e9f556 · 9e9f556
2 parents e240d30 + 0dce904
commit 9e9f556
Show file tree

Hide file tree

Showing 9 changed files with 120 additions and 128 deletions.
diff --git a/src/components/Banner.jsx b/src/components/Banner.jsx
@@ -1,6 +1,5 @@
 // implement a banner component that displays a message and a button
 
-import React from 'react'
 import styled from 'styled-components'
 
 const BannerContainer = styled.div`
@@ -31,20 +30,17 @@ const BannerText = styled.div`
   font-weight: 400;
 `
 
-const LearnMore = styled.a`
-  text-decoration: underline;
-  color: #2c2543;
-`
+// Used as a link on the Banner component (last used to redirect to info.jsx)
+// const LearnMore = styled.a`
+//   text-decoration: underline;
+//   color: #2c2543;
+// `
 
-const Banner = ({ buttonLink }) => (
+const Banner = () => (
   <BannerContainer>
     <BannerHeader>IMPORTANT UPDATE:</BannerHeader>
     <BannerText>
-      nwHacks 2023 is rescheduled to January 21-22, 2023. The event will still take place at the University of British
-      Columbia (UBC).{' '}
-      <span>
-        <LearnMore href={buttonLink}>Learn more here.</LearnMore>
-      </span>
+      nwHacks 2024 is not currently accepting applications. The application form will open on December 1st, 2023.
     </BannerText>
   </BannerContainer>
 )

diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
@@ -1,18 +1,14 @@
-import React from 'react'
-import styled, { keyframes } from 'styled-components'
 import { LAPTOP, TABLET } from '@constants/measurements'
 import { useParallax } from 'react-scroll-parallax'
+import styled, { keyframes } from 'styled-components'
 import CarAndMap from '../assets/images/CarAndMap.svg'
 import CarScenery from '../assets/images/CarScenery.svg'
 import RamBodyImage from '../assets/images/RamBody.svg'
 import RamHeadImage from '../assets/images/RamHead.svg'
-import Button from './Button'
-import LivepeerImage from '../assets/images/Livepeer.svg'
 
 const HeroContainer = styled.div`
   position: relative;
   min-height: calc(calc(800 / 1440) * 100vw);
-  margin-top: -15rem;
 
   ${p => p.theme.mediaQueries.mobile} {
     min-height: calc(calc(1200 / 882) * 100vw);
@@ -137,32 +133,32 @@ const Description = styled.p`
   letter-spacing: 0em;
 `
 
-const ActionsContainer = styled.div`
-  margin-left: 10vw;
-  position: relative;
-  padding-top: 1rem;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  align-items: flex-start;
-
-  @media (max-width: ${TABLET}) {
-    display: flex;
-    flex-direction: column;
-    margin: auto;
-    padding-top: 20px;
-    width: 50%;
-    align-items: center;
-  }
-
-  ${p => p.theme.mediaQueries.mobile} {
-    padding-top: 0.5rem;
-    margin-top: 0;
-    font-size: 10px;
-    margin-bottom: 0;
-    gap: 1rem;
-  }
-`
+// const ActionsContainer = styled.div`
+//   margin-left: 10vw;
+//   position: relative;
+//   padding-top: 1rem;
+//   display: flex;
+//   flex-direction: column;
+//   gap: 1rem;
+//   align-items: flex-start;
+
+//   @media (max-width: ${TABLET}) {
+//     display: flex;
+//     flex-direction: column;
+//     margin: auto;
+//     padding-top: 20px;
+//     width: 50%;
+//     align-items: center;
+//   }
+
+//   ${p => p.theme.mediaQueries.mobile} {
+//     padding-top: 0.5rem;
+//     margin-top: 0;
+//     font-size: 10px;
+//     margin-bottom: 0;
+//     gap: 1rem;
+//   }
+// `
 
 const ZeroHeightContainer = styled.div`
   height: 0;
@@ -250,73 +246,73 @@ const TitleContainer = styled.div`
   }
 `
 
-const LivepeerContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  font-size: 1rem;
-  padding-bottom: 0.5rem;
-  padding-left: 0.5rem;
-
-  ${p => p.theme.mediaQueries.mobile} {
-    padding-bottom: 0;
-    padding-left: 0;
-    flex-direction: row;
-    gap: 0.47rem;
-  }
-`
-
-const PoweredBy = styled.div`
-  font-size: 1.25rem;
-  font-weight: 600;
-`
-
-const Livepeer = styled.img`
-  margin-left: -0.5rem;
-
-  ${p => p.theme.mediaQueries.mobile} {
-    width: 85px;
-  }
-`
-
-const ButtonsContainer = styled.div`
-  display: flex;
-  gap: 1rem;
-  align-items: center;
-
-  ${p => p.theme.mediaQueries.mobile} {
-    flex-direction: column;
-    gap: 0rem;
-  }
-`
-
-const VolunteerLink = styled.a`
-  position: relative;
-  color: #969dfb;
-  text-decoration: none;
-  font-weight: 600;
-  font-size: 1.1rem;
-  letter-spacing: -0.2px;
-  transition: color 0.13s linear;
-
-  &:after {
-    content: ' ';
-    position: absolute;
-    bottom: -2px;
-    left: 0;
-    width: 100%;
-    height: 2px;
-    background-color: #969dfb;
-    transition: background 0.13s linear;
-  }
-
-  &:hover {
-    color: #9ad4de;
-
-    &:after {
-      background-color: #9ad4de;
-    }
-  }
-`
+// const LivepeerContainer = styled.div`
+//   display: flex;
+//   flex-direction: column;
+//   font-size: 1rem;
+//   padding-bottom: 0.5rem;
+//   padding-left: 0.5rem;
+
+//   ${p => p.theme.mediaQueries.mobile} {
+//     padding-bottom: 0;
+//     padding-left: 0;
+//     flex-direction: row;
+//     gap: 0.47rem;
+//   }
+// `
+
+// const PoweredBy = styled.div`
+//   font-size: 1.25rem;
+//   font-weight: 600;
+// `
+
+// const Livepeer = styled.img`
+//   margin-left: -0.5rem;
+
+//   ${p => p.theme.mediaQueries.mobile} {
+//     width: 85px;
+//   }
+// `
+
+// const ButtonsContainer = styled.div`
+//   display: flex;
+//   gap: 1rem;
+//   align-items: center;
+
+//   ${p => p.theme.mediaQueries.mobile} {
+//     flex-direction: column;
+//     gap: 0rem;
+//   }
+// `
+
+// const VolunteerLink = styled.a`
+//   position: relative;
+//   color: #969dfb;
+//   text-decoration: none;
+//   font-weight: 600;
+//   font-size: 1.1rem;
+//   letter-spacing: -0.2px;
+//   transition: color 0.13s linear;
+
+//   &:after {
+//     content: ' ';
+//     position: absolute;
+//     bottom: -2px;
+//     left: 0;
+//     width: 100%;
+//     height: 2px;
+//     background-color: #969dfb;
+//     transition: background 0.13s linear;
+//   }
+
+//   &:hover {
+//     color: #9ad4de;
+
+//     &:after {
+//       background-color: #9ad4de;
+//     }
+//   }
+// `
 
 const Hero = () => {
   const parallax = useParallax({ speed: -15 })

diff --git a/src/components/NavigationBar.jsx b/src/components/NavigationBar.jsx
@@ -332,7 +332,7 @@ const NavigationBar = ({ bannerExists }) => {
           </a>
           <MenuList isMobile={showDropdown} closeDropdown={setShowDropdown} />
           {/* Make sure desktop (below) has the same portalOpen value */}
-          <PortalButton portalOpen={true} />
+          <PortalButton portalOpen />
         </DropDownContentContainer>
         <TrustBadge stayAtTop={stayAtTop} />
       </>
@@ -350,7 +350,7 @@ const NavigationBar = ({ bannerExists }) => {
           <MenuList />
         </NavTextContainer>
         {/* Make sure mobile (above) has the same portalOpen value */}
-        <PortalButton portalOpen={true} />
+        <PortalButton portalOpen />
       </NavGroupContainer>
       <HamburgerMenu src="/images/icons/menu.svg" alt="dropdown menu icon" onClick={() => setShowDropdown(true)} />
       <TrustBadge stayAtTop={stayAtTop} />

diff --git a/src/components/SponsorsGrid.jsx b/src/components/SponsorsGrid.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import styled from 'styled-components'
 
 const Container = styled.div`

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
@@ -1,17 +1,16 @@
-import Head from 'next/head'
-import React from 'react'
 import GlobalStyles from '@styles/global'
+import Head from 'next/head'
 import styled from 'styled-components'
 
-import Sponsors from 'src/sections/Sponsors'
+import About from 'src/sections/About'
+import Countdown from 'src/sections/Countdown'
 import Faq from 'src/sections/FAQ'
 import Footer from 'src/sections/Footer'
-import Countdown from 'src/sections/Countdown'
-import About from 'src/sections/About'
-
+import Sponsors from 'src/sections/Sponsors'
 import Banner from '../components/Banner'
-import NavigationBar from '../components/NavigationBar'
+
 import Hero from '../components/Hero'
+import NavigationBar from '../components/NavigationBar'
 
 import MainGraphicsTop from '../assets/images/MainBackground.svg'
 import MainGraphicsMobile from '../assets/images/mobile/MainBackground.svg'
@@ -67,9 +66,9 @@ export default function Index({ title }) {
         <meta property="og:image" content="/og_preview.png" />
       </Head>
       {/* Components Starts */}
-      {/* <Banner buttonLink="info.html" /> */}
-      {/* <NavigationBar bannerExists /> */}
-      <NavigationBar />
+      <Banner />
+      <NavigationBar bannerExists />
+      {/* <NavigationBar /> */}
       <HalfContainer>
         <HalfBackgroundImage src={MainGraphicsTop} alt="Background image" />
         <Hero />

diff --git a/src/pages/info.jsx b/src/pages/info.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import styled from 'styled-components'
 import NavigationBar from '@components/NavigationBar'
 import InfoBackground from '@assets/images/InfoBackground.svg'
-import { LAPTOP, MOBILE } from '@constants/measurements'
+import { LAPTOP } from '@constants/measurements'
 
 const Container = styled.div`
   display: flex;

diff --git a/src/sections/About.jsx b/src/sections/About.jsx
@@ -94,9 +94,10 @@ const About = () => {
         <BlurbContainer bias="right">
           <BlurbHeader>Join us for an unforgettable experience!</BlurbHeader>
           <BlurbText>
-            We're thrilled to announce that we're once again bringing you an incredible hackathon experience! Last year,
-            we connected hundreds of the brightest developers, engineers, and designers coming from all over North
-            America. Whether we're reuniting or meeting you for the first time, we can't wait to see you there!
+            We{`'`}re thrilled to announce that we{`'`}re once again bringing you an incredible hackathon experience!
+            Last year, we connected hundreds of the brightest developers, engineers, and designers coming from all over
+            North America. Whether we{`'`}re reuniting or meeting you for the first time, we can{`'`}t wait to see you
+            there!
           </BlurbText>
         </BlurbContainer>
       </AboutInner>

diff --git a/src/sections/Countdown.jsx b/src/sections/Countdown.jsx
@@ -160,7 +160,7 @@ const Countdown = () => {
   return (
     <CountdownContainer>
       <Keychain ref={parallax.ref} src={KeychainImage} alt="Keychain" />
-      <UltiAnimation src={UltiAnimationImg} alt="Nugget and Reindeer tossing around a Firsbee"></UltiAnimation>
+      <UltiAnimation src={UltiAnimationImg} alt="Nugget and Reindeer tossing around a Firsbee" />
       <FauxBillboard>
         <StyledHeader>Registration closes in:</StyledHeader>
         <CountdownGrid>

diff --git a/src/sections/FAQ.jsx b/src/sections/FAQ.jsx
@@ -137,7 +137,7 @@ const Faq = () => {
             </FaqColumn>
 
             <FaqColumn>
-              {faqData['Logistics'] && <FaqCollection category="Logistics" faqs={faqData['Logistics']} />}
+              {faqData.Logistics && <FaqCollection category="Logistics" faqs={faqData.Logistics} />}
             </FaqColumn>
           </FaqGrid>
         ) : (