Merge branch 'main' into application-styles

src/App.jsx

@@ -7,7 +7,6 @@ import {
 } from 'react-router-dom';
 import LandingPage from './pages/LandingPage';
 import SponsorPage from './pages/SponsorPage';
-import Application from './pages/Application';
 import Login from './pages/Login';
 import Dashboard from './pages/HackerDashboard';
 import Portal from './pages/Portal';
@@ -17,7 +16,7 @@ const router = createBrowserRouter(
     <Route path="/">
       <Route index element={<LandingPage />} />
       <Route path="sponsor" element={<SponsorPage />} />
-      <Route path="portal" element={<Portal />} />
+      {/* <Route path="portal" element={<Portal />} /> */}
       <Route path="login" element={<Login />} />
       <Route path="dashboard" element={<Dashboard />} />
       <Route path="application" element={<Application />}/>

src/components/ApplicationPageComponents/ApplicationOptions.js

@@ -363,14 +363,16 @@ const majors = [
 
 // Question: Current Education Level.
 const educationLevels = [
-  'Undergraduate Student',
-  'Graduate Student',
-  'Post Doctorate',
+  'Less than Secondary / High School',
   'Secondary / High School',
+  'Undergraduate University (2 year - community college or similar)',
+  'Undergraduate University (3+ year)',
+  'Graduate University (Masters, Professional, Doctoral, etc)',
   'Code School / Bootcamp',
-  'Vocational / Trade Program or Apprenticeship',
-  'Other',
-  "I'm not currently a student",
+  'Other Vocational / Trade Program or Apprenticeship',
+  'Post Doctorate',
+  'Other ',
+  'I’m not currently a student',
   'Prefer not to answer',
 ];
 
@@ -1114,7 +1116,7 @@ const programmingList = [
   'ZPL',
 ];
 
-const shirtSizes = ['XS', 'S', 'M', 'L', 'XL'];
+const shirtSizes = ['S', 'M', 'L', 'XL'];
 
 export {
   ethnicities,

src/components/LandingPageComponents/FAQ.jsx

@@ -125,16 +125,18 @@ const FAQ = () => {
           <div className="overflow-hidden"></div>
         </div>
         {/* <div className="mt-[5rem] w-full flex flex-1 flex-col justify-between md:flex-row"> */}
+
         <img
           src={faqLeftCloud}
           alt="clouds"
           className="absolute z-10 left-0 max-sm:hidden"
-        />
+          />
         <img
           src={faqRightCloud}
           alt="clouds"
           className="absolute z-10 right-0 max-sm:hidden"
-        />
+          />
+
         <div className="mt-[5rem] w-full grid md:grid-cols-2 grid-cols-1 gap-x-[5rem] z-20 lg:gap-x-[10rem] md:px-[5rem]">
           <FAQColumn questionAnswers={faq[0]} />
           <FAQColumn questionAnswers={faq[1]} />

src/components/LandingPageComponents/Schedule.jsx

@@ -9,8 +9,8 @@ import felixPlatform from '../../assets/images/LandingPage/felixPlatform.svg';
 import mobileSchedule from '../../assets/images/LandingPage/mobileSchedule.svg';
 export default function Schedule() {
   return (
-    <div className="flex justify-center items-center flex-col w-full -mb-80 max-sm:mb-auto">
-      <img src={felixPlatform} className='mb-20 mt-20 max-sm:hidden'/>
+    <div className="flex justify-center items-center flex-col w-full -mb-80 max-sm:mb-auto overflow-clip">
+      <img src={felixPlatform} className="mb-20 mt-20 max-sm:hidden" />
       <div
         className="relative flex items-center justify-center md:h-[132px] md:w-[431px] h-[57px] w-[186px] mt-20 mb-20"
         id="schedule"
@@ -19,13 +19,30 @@ export default function Schedule() {
           SCHEDULE
         </h2>
         <img className="z-20 absolute" src={TitleBG} alt="TitleBG" />
-        <img src={cloudbottom} className="absolute -left-20 -top-20" alt="cloudleft"/>
+        <img
+          src={cloudbottom}
+          className="absolute -left-20 -top-20"
+          alt="cloudleft"
+        />
       </div>
-        <img src={scheduleTimeLine} className='max-sm:hidden' alt="schedule"/>
-        <img src={mobileSchedule} className='sm:hidden max-sm:scale-125 p-10 max-sm:mb-20' alt="mobile schedule"/>
-        <img src={cloudtop} className="relative max-md:hidden left-96" alt="cloudtop"/>
-        <img src={cloudleft} className="absolute left-0 max-md:scale-75 max-md:-left-4 max-sm:hidden" alt="cloudleft"/>
-        <img src={cloudright} className="absolute max-md:scale-75 max-md:-right-6 right-0 max-sm:hidden" alt="cloudright"/>
+      {/* <img src={scheduleTimeLine} className='max-sm:hidden' alt="schedule"/>
+        <img src={mobileSchedule} className='sm:hidden max-sm:scale-125 p-10 max-sm:mb-20' alt="mobile schedule"/> */}
+      <h1 className="text-white text-4xl">Schedule Coming Soon!</h1>
+      <img
+        src={cloudtop}
+        className="relative max-md:hidden left-96"
+        alt="cloudtop"
+      />
+      <img
+        src={cloudleft}
+        className="absolute left-0 max-md:scale-75 max-md:-left-4 max-sm:hidden"
+        alt="cloudleft"
+      />
+      <img
+        src={cloudright}
+        className="absolute max-md:scale-75 max-md:-right-6 right-0 max-sm:hidden"
+        alt="cloudright"
+      />
     </div>
   );
 }

src/components/LandingPageComponents/Sponsor.jsx

@@ -18,7 +18,7 @@ export default function Sponsor() {
         </h2>
         <img className="z-20 absolute" src={TitleBG} alt="TitleBG" />
       </div>
-      <div className="grid grid-cols-3 lg:grid-cols-6 gap-14 lg:gap-20 mt-20 mx-[5vw] mb-20">
+      <div className="grid z-10 grid-cols-3 lg:grid-cols-6 gap-14 lg:gap-20 mt-20 mx-[5vw] mb-20">
         {sponsors.map((sponsor) => (
           <div key={sponsor}>
             <img src={sponsorFaceBox} alt="sponsor" />
@@ -27,7 +27,7 @@ export default function Sponsor() {
         ))}
       </div>
 
-      <ApplyButton />
+      {/* <ApplyButton /> */}
     </div>
   );
 }

src/components/LandingPageComponents/Title.jsx

@@ -1,5 +1,4 @@
 import title from '../../assets/images/title.svg';
-import applyButton from '../../assets/images/applyButton.svg';
 
 const Title = () => {
   return (

src/components/SponsorPageComponents/SponsorButton.jsx

@@ -1,18 +1,25 @@
 import React, { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 import InitialButtonState from '../../assets/images/SponsorPage/SponsorButtonState1.svg';
 import HoverButtonState from '../../assets/images/SponsorPage/SponsorButtonState2.svg';
 import ClickedButtonState from '../../assets/images/SponsorPage/SponsorButtonState3.svg';
 
 const SponsorButton = () => {
   const [image, setImage] = useState(InitialButtonState);
   const navigate = useNavigate();
+  const location = useLocation();
+
   const handleClick = () => {
-    navigate('/sponsor');
+    if (location.pathname === '/sponsor') {
+      window.location.href =
+        'https://drive.google.com/file/d/1QXGi1T9DDUsQ0gbiHKvN5lo3pR0fJw2f/view?usp=sharing';
+    } else {
+      navigate('/sponsor');
+    }
   };
 
   return (
-    <div className="justify-center flex mt-auto z-50 max-sm:scale-75">
+    <div className="justify-center relative flex mt-auto z-50 max-sm:scale-75">
       <button className="z-50" onClick={handleClick}>
         <img
           src={image}

src/components/SponsorPageComponents/SponsorNav.jsx

@@ -6,7 +6,7 @@ const SponsorNav = () => {
   const [openBurger, setOpenBurger] = useState(false);
 
   return (
-    <div className="p-5 sticky top-0 z-[100000] w-[100vw]">
+    <div className="p-5 sticky top-0 z-[100000] w-full">
       <div className="flex flex-row align-center  justify-between ">
         <a href="/">
           <img src={Logo} alt="Bostonhacks Logo" height={34} width={39} />

src/components/common/Footer.jsx

@@ -4,40 +4,46 @@ import facebook from './svg/facebook.png';
 import instagram from './svg/instagram.png';
 import twitter from './svg/twitter.png';
 // import cloudBG from '../../assets/images/LandingPage/Background/footerCloudBG.svg';
+import FooterCloudImage from '../../assets/images/SponsorPage/FooterCloud.png';
 const Footer = () => {
   return (
-    <div className="mb-10 font-minecraft z-50">
+    <div className="mb-10 font-minecraft">
       <CountDownTimer />
-      <ul className="flex justify-center items-center space-x-5 scale-50 mb-10">
-        <li>
-          <a href="https://www.instagram.com/bostonhacks/">
-            <img
-              src={instagram}
-              className="hover:-translate-y-6 transition-all"
-            />
-          </a>
-        </li>
-        <li>
-          <a href="https://twitter.com/boston_hacks">
-            <img
-              src={twitter}
-              className="hover:-translate-y-6 transition-all"
-            />
-          </a>
-        </li>
-        <li>
-          <a href="https://www.facebook.com/bostonhacks/">
-            <img
-              src={facebook}
-              className="hover:-translate-y-6 transition-all"
-            />
-          </a>
-        </li>
-      </ul>
+      <div className=' relative z-50'>
+        <ul className="flex justify-center items-center space-x-5 scale-50 mb-10">
+          <li className=''>
+            <a href="https://www.instagram.com/bostonhacks/" className='z-'>
+              <img
+                src={instagram}
+                className="hover:-translate-y-6 transition-all"
+                />
+            </a>
+          </li>
+          <li>
+            <a href="https://twitter.com/boston_hacks">
+              <img
+                src={twitter}
+                className="hover:-translate-y-6 transition-all"
+                />
+            </a>
+          </li>
+          <li>
+            <a href="https://www.facebook.com/bostonhacks/">
+              <img
+                src={facebook}
+                className="hover:-translate-y-6 transition-all"
+                />
+            </a>
+          </li>
+        </ul>
+      </div>
       <div className='z-50 relative'>
         <p className="text-center font-black">Made with love by BostonHacks</p>
         <p className="text-center text-sm">Forest Pixel Art by Eder Muniz</p>
       </div>
+      <div className='relative'>
+        <img src={FooterCloudImage} className='absolute bottom-20 z-0 object-cover h-auto lg:h-[865px] 2xl:h-auto 2xl:w-full' onDragStart={(event)=> event.preventDefault()}/>
+      </div>
     </div>
   );
 };

src/components/common/svg/GoogleIcon.jsx

@@ -1,10 +1,33 @@
 import React from 'react';
 
 const GoogleIcon = () => {
-    return (
-        <svg className="fullSVG" width="30px" height="30px" viewBox="0 0 262 262" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid"><path d="M255.878 133.451c0-10.734-.871-18.567-2.756-26.69H130.55v48.448h71.947c-1.45 12.04-9.283 30.172-26.69 42.356l-.244 1.622 38.755 30.023 2.685.268c24.659-22.774 38.875-56.282 38.875-96.027" fill="#4285F4"/><path d="M130.55 261.1c35.248 0 64.839-11.605 86.453-31.622l-41.196-31.913c-11.024 7.688-25.82 13.055-45.257 13.055-34.523 0-63.824-22.773-74.269-54.25l-1.531.13-40.298 31.187-.527 1.465C35.393 231.798 79.49 261.1 130.55 261.1" fill="#34A853"/><path d="M56.281 156.37c-2.756-8.123-4.351-16.827-4.351-25.82 0-8.994 1.595-17.697 4.206-25.82l-.073-1.73L15.26 71.312l-1.335.635C5.077 89.644 0 109.517 0 130.55s5.077 40.905 13.925 58.602l42.356-32.782" fill="#FBBC05"/><path d="M130.55 50.479c24.514 0 41.05 10.589 50.479 19.438l36.844-35.974C195.245 12.91 165.798 0 130.55 0 79.49 0 35.393 29.301 13.925 71.947l42.211 32.783c10.59-31.477 39.891-54.251 74.414-54.251" fill="#EB4335"/></svg>
-    );
-}
+  return (
+    <svg
+      className="fullSVG"
+      width="40vw"
+      height=""
+      viewBox="0 0 262 262"
+      xmlns="http://www.w3.org/2000/svg"
+      preserveAspectRatio="xMidYMid"
+    >
+      <path
+        d="M255.878 133.451c0-10.734-.871-18.567-2.756-26.69H130.55v48.448h71.947c-1.45 12.04-9.283 30.172-26.69 42.356l-.244 1.622 38.755 30.023 2.685.268c24.659-22.774 38.875-56.282 38.875-96.027"
+        fill="#4285F4"
+      />
+      <path
+        d="M130.55 261.1c35.248 0 64.839-11.605 86.453-31.622l-41.196-31.913c-11.024 7.688-25.82 13.055-45.257 13.055-34.523 0-63.824-22.773-74.269-54.25l-1.531.13-40.298 31.187-.527 1.465C35.393 231.798 79.49 261.1 130.55 261.1"
+        fill="#34A853"
+      />
+      <path
+        d="M56.281 156.37c-2.756-8.123-4.351-16.827-4.351-25.82 0-8.994 1.595-17.697 4.206-25.82l-.073-1.73L15.26 71.312l-1.335.635C5.077 89.644 0 109.517 0 130.55s5.077 40.905 13.925 58.602l42.356-32.782"
+        fill="#FBBC05"
+      />
+      <path
+        d="M130.55 50.479c24.514 0 41.05 10.589 50.479 19.438l36.844-35.974C195.245 12.91 165.798 0 130.55 0 79.49 0 35.393 29.301 13.925 71.947l42.211 32.783c10.59-31.477 39.891-54.251 74.414-54.251"
+        fill="#EB4335"
+      />
+    </svg>
+  );
+};
 
-
-export default GoogleIcon;
+export default GoogleIcon;

src/firebase/firebase-config.jsx → src/firebase/firebase-config.js

@@ -16,6 +16,8 @@ import {
   signOut,
 } from 'firebase/auth';
 
+import { getStorage } from 'firebase/storage';
+
 const firebaseConfig = {
   apiKey: 'AIzaSyBhN3fCW3J8o_eRzUiUZrARHtN2VBQKyC4',
   authDomain: 'bhacks-2023.firebaseapp.com',
@@ -83,3 +85,5 @@ export const addApplicationDoc = async (formData, uid) => {
     throw err;
   }
 };
+
+export const storage = getStorage(app);