Merge pull request #45 from bearhack-ucr/shahdivyank/fixes

Fixes
bearhack-ucr · Dec 23, 2023 · d53ba1c · d53ba1c
2 parents 3566c00 + 7ccb775
commit d53ba1c
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 44 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -72,7 +72,7 @@ jobs:
           project: ./
           browser: chrome
           start: npm run start
-          wait-on: "http://localhost:3040"
+          wait-on: "http://localhost:3000"
     env:
       NEXT_PUBLIC_FIREBASE_API_KEY: ${{secrets.NEXT_PUBLIC_FIREBASE_API_KEY}}
       NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{secrets.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN}}
@@ -107,7 +107,7 @@ jobs:
           project: ./
           browser: chrome
           start: npm run start
-          wait-on: "http://localhost:3040"
+          wait-on: "http://localhost:3000"
     env:
       NEXT_PUBLIC_FIREBASE_API_KEY: ${{secrets.NEXT_PUBLIC_FIREBASE_API_KEY}}
       NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN: ${{secrets.NEXT_PUBLIC_FIREBASE_AUTH_DOMAIN}}

diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ npm un <dependency>
 ### Running the Website Locally
 
 ```bash
-# Open a browser at localhost:3040
+# Open a browser at localhost:3000
 npm run dev
 ```
 

diff --git a/cypress.config.js b/cypress.config.js
@@ -4,7 +4,7 @@ module.exports = defineConfig({
   video: false,
   screenshotOnRunFailure: false,
   e2e: {
-    baseUrl: "http://localhost:3040",
+    baseUrl: "http://localhost:3000",
     chromeWebSecurity: false,
     setupNodeEvents(on, config) {},
   },

diff --git a/package.json b/package.json
@@ -3,15 +3,15 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev -p 3040",
+    "dev": "next dev",
     "build": "next build",
-    "start": "next start -p 3040",
+    "start": "next start",
     "lint": "next lint",
     "format": "npx prettier --write .",
     "check": "npx prettier --check .",
     "eslint": "npx eslint . --ext js --ext jsx",
     "cypress": "cypress open",
-    "test": "start-server-and-test dev 3040 cypress",
+    "test": "start-server-and-test dev 3000 cypress",
     "prepare": "husky install"
   },
   "dependencies": {

diff --git a/src/app/favicon.ico b/src/app/favicon.ico
diff --git a/src/components/static/Title.jsx b/src/components/static/Title.jsx
@@ -28,7 +28,7 @@ const Title = () => {
           <Link text={"Register"} link={"/form/participant"} />
           <Link text={"Mentor"} link={"/form/mentor"} />
           <Link text={"Volunteer"} link={"/form/volunteer"} />
-          <Link text={"Sponsor"} link={"/form/sponsor"} />
+          {/* <Link text={"Sponsor"} link={"/form/sponsor"} /> */}
         </div>
         <div className="w-4/5 m-auto">
           <HorizontalLine />

diff --git a/src/components/static/ToggleSelection.jsx b/src/components/static/ToggleSelection.jsx
@@ -1,6 +1,6 @@
 import React from "react";
 import { useState } from "react";
-import { LiaAngleDoubleUpSolid } from "react-icons/lia";
+import { LiaAngleDoubleDownSolid } from "react-icons/lia";
 
 const ToggleSelection = ({ title, children }) => {
   const [state, setState] = useState(false);
@@ -11,7 +11,7 @@ const ToggleSelection = ({ title, children }) => {
         className="flex items-center justify-between w-full py-3 text-white font-header text-sm md:text-3xl"
       >
         {title}
-        <LiaAngleDoubleUpSolid
+        <LiaAngleDoubleDownSolid
           className={`${state && "rotate-180"} duration-500 w-1/12 `}
         />
       </button>

diff --git a/src/components/static/live/Live.jsx b/src/components/static/live/Live.jsx
@@ -1,20 +1,20 @@
 import Title from "../Title";
-import AboutUs from "../AboutUs";
-import GetInvolved from "../GetInvolved";
-import Team from "../Team";
+// import AboutUs from "../AboutUs";
+// import GetInvolved from "../GetInvolved";
+// import Team from "../Team";
 import FAQ from "../FAQ";
-import Sponsors from "../Sponsors";
+// import Sponsors from "../Sponsors";
 import Footer from "../Footer";
 
 const Live = () => {
   return (
     <div className="bg-bear-dark">
       <Title />
-      <AboutUs />
-      <GetInvolved />
-      <Team />
+      {/* <AboutUs />
+      <GetInvolved /> */}
+      {/* <Team /> */}
       <FAQ />
-      <Sponsors />
+      {/* <Sponsors /> */}
       <Footer />
     </div>
   );

diff --git a/src/data/Releases.js b/src/data/Releases.js
@@ -1,12 +1,11 @@
-const LIVE_END = new Date("April 29, 2024 9:00:00");
 const DEV = {
   STATIC: {
     LIVE: {
       START: new Date("10/01/2000"),
-      END: LIVE_END,
+      END: new Date("April 29, 2024 9:00:00"),
     },
     POSTLIVE: {
-      START: LIVE_END,
+      START: new Date("April 29, 2024 9:00:00"),
       END: new Date("10/10/2100"),
     },
   },
@@ -27,7 +26,7 @@ const DEV = {
     "/admin/prizes": new Date("10/01/2023"),
     "/admin/statistics": new Date("10/01/2023"),
 
-    "/form/particpant": new Date("10/01/2023"),
+    "/form/participant": new Date("10/01/2023"),
     "/form/judge": new Date("10/01/2023"),
     "/form/volunteer": new Date("10/01/2023"),
     "/form/mentor": new Date("10/01/2023"),
@@ -47,10 +46,10 @@ const PRODUCTION = {
   STATIC: {
     LIVE: {
       START: new Date("10/01/2023"),
-      END: new Date("10/10/2024"),
+      END: new Date("April 29, 2024 9:00:00"),
     },
     POSTLIVE: {
-      START: new Date("10/01/2023"),
+      START: new Date("April 29, 2024 9:00:00"),
       END: new Date("10/10/2024"),
     },
   },
@@ -71,19 +70,19 @@ const PRODUCTION = {
     "/admin/prizes": new Date("10/01/2023"),
     "/admin/statistics": new Date("10/01/2023"),
 
-    "/form/particpant": new Date("10/01/2023"),
+    "/form/participant": new Date("10/01/2023"),
     "/form/judge": new Date("10/01/2023"),
     "/form/volunteer": new Date("10/01/2023"),
     "/form/mentor": new Date("10/01/2023"),
     "/form/admin": new Date("10/01/2023"),
     "/form/committee": new Date("10/01/2023"),
-    "/form/sponsor": new Date("10/01/2023"),
-    "/form/feedback": new Date("10/01/2023"),
-    "/form/interest": new Date("10/01/2023"),
+    "/form/sponsor": new Date("10/01/2024"),
+    "/form/feedback": new Date("10/01/2024"),
+    "/form/interest": new Date("10/01/2024"),
 
-    "/user/checkin": new Date("10/01/2023"),
-    "/user/dashboard": new Date("10/01/2023"),
-    "/user/join": new Date("10/01/2023"),
+    "/user/checkin": new Date("10/01/2024"),
+    "/user/dashboard": new Date("10/01/2024"),
+    "/user/join": new Date("10/01/2024"),
   },
 };
 

diff --git a/src/data/dynamic/form/Admins.js b/src/data/dynamic/form/Admins.js
@@ -13,7 +13,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for being on the organizing team, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for being on the organizing team, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Admins are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
       "Note: Admins are not permitted to become participants for the hackathon.",
     ],

diff --git a/src/data/dynamic/form/Committees.js b/src/data/dynamic/form/Committees.js
@@ -13,7 +13,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for being on the organizing team, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for being on the organizing team, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Committee members are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
       "Note: Committee members are allowed to become participants for the hackathon.",
     ],

diff --git a/src/data/dynamic/form/Information.js b/src/data/dynamic/form/Information.js
@@ -57,10 +57,6 @@ export const SOURCES = [
 ];
 
 export const AVAILABILITY = [
-  "Friday Morning",
-  "Friday Afternoon",
-  "Friday Evening",
-  "Friday Night",
   "Saturday Morning",
   "Saturday Afternoon",
   "Saturday Evening",

diff --git a/src/data/dynamic/form/Interest.js b/src/data/dynamic/form/Interest.js
@@ -3,7 +3,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for taking interestin in HACKAHTON_NAME, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for taking interest in Bearhack 2024, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "This is simply an interest form, once applications are released, you will be notified immediately and will be required to register again. We hope to see you there!",
     ],
   },

diff --git a/src/data/dynamic/form/Judge.js b/src/data/dynamic/form/Judge.js
@@ -12,7 +12,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for considering to become a volunteer, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for considering to become a volunteer, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Judges are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
       "Judge duties include but are not limited to visiting various teams to access teams on their idea, technical complexities and overall presentation after which they will decide the winners.",
       "Note: Judges are not permitted to become participants for the hackathon.",

diff --git a/src/data/dynamic/form/Mentors.js b/src/data/dynamic/form/Mentors.js
@@ -5,7 +5,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for considering to become a volunteer, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for considering to become a volunteer, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Mentors are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
       "Mentor duties include but are not limited to providing expertise and assistance to hackers throughout the hackathon without jeopardizing their chances at winning.",
       "Note: Mentors are not permitted to become participants for the hackathon.",

diff --git a/src/data/dynamic/form/Participant.js b/src/data/dynamic/form/Participant.js
@@ -9,7 +9,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for considering to become a participant, we appreciate your enthusiasm to join HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for considering to become a participant, we appreciate your enthusiasm to join Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Participants are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
     ],
   },

diff --git a/src/data/dynamic/form/Sponsors.js b/src/data/dynamic/form/Sponsors.js
@@ -10,8 +10,8 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for being on the Sponsorship team, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE. ",
-      "By sponsoring HAKCATHON_NAME, you help advocate for SPONSOR_REASONS.",
+      "Welcome to Bearhack 2024. Thank you for being on the Sponsorship team, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27. ",
+      "By sponsoring Bearhack 2024, you help advocate for SPONSOR_REASONS.",
       "Sponsorship members are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
     ],
   },

diff --git a/src/data/dynamic/form/Volunteers.js b/src/data/dynamic/form/Volunteers.js
@@ -5,7 +5,7 @@ export const FIELDS = {
     input: "description",
     width: 12,
     texts: [
-      "Welcome to HACKATHON_NAME. Thank you for considering to become a volunteer, we appreciate your efforts to help support HACKATHON_NAME. HACKATHON_NAME is a DESCRIPTION hackathon spanning HACKATHON_LENGTH on HACKATHON_DATE.",
+      "Welcome to Bearhack 2024. Thank you for considering to become a volunteer, we appreciate your efforts to help support Bearhack 2024. Bearhack 2024 is a healthcare and medical technology based hackathon spanning 24 hours on April 27.",
       "Volunteers are not required to stay the full duration of the event, but are encouraged to checkout the various events, workshops, and opportunities that are available.",
       "Volunteer duties include but are not limited to setup, workshop organization, food handling, cleanup and more.",
       "Note: Volunteers are not permitted to become participants for the hackathon.",