Merge pull request #389 from nwplus/add-paused-apps-banner

Add nwHacks 2024 Apps Paused Banner
nwplus · Nov 26, 2023 · 0dce904 · 0dce904
2 parents bd958df + fd1e8f2
commit 0dce904
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 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,7 +1,6 @@
-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'
@@ -10,7 +9,6 @@ import RamHeadImage from '../assets/images/RamHead.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);

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
@@ -1,16 +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'
@@ -66,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 />