Merge branch 'main' into andresha__dev

src/App.jsx

@@ -14,6 +14,7 @@ import Surprise from "./pages/surprise/Surprise";
 import Team from "./pages/team/Team";
 import Telegram from "./pages/telegram/Telegram";
 import "./styles/Globals.scss";
+import Register from "./pages/registration/Register";
 
 const App = () => {
   return (
@@ -51,15 +52,18 @@ const App = () => {
             />
             <Route
               exact
-              path="/register"
+              path="/howto"
               element={
                 <Forward
-                  pathname={"/register"}
-                  title={"Registration"}
-                  url={"https://discord.gg/hack4bengal"}
+                  pathname={"/howto"}
+                  title={"Registration Walkthrough"}
+                  url={
+                    "https://www.instagram.com/reel/C7y9O1Ly4nk/?igsh=amYyamVtMDVlcmRi"
+                  }
                 />
               }
             />
+            <Route exact path="/register" element={<Register />} />
             <Route exact path="/coc" element={<CodeofConduct />} />
             <Route exact path="/brand" element={<Brand />} />
             <Route exact path="/tg" element={<Telegram />} />
@@ -68,12 +72,13 @@ const App = () => {
             <Route exact path="/evangelist" element={<Evangelist />} />
             <Route exact path="/team" element={<Team />} />
             <Route exact path="/load" element={<Loading />} />
-            <Route exact path="/surprise" element={<Surprise />} />
+            {/* <Route exact path="/surprise" element={<Register />} /> */}
             <Route exact path="/*" element={<Notfound />} />
           </Routes>
         </main>
 
-        {window.location.pathname !== "/surprise" && <Footer />}
+        {window.location.pathname !== "/surprise" &&
+          window.location.pathname !== "/register" && <Footer />}
       </Suspense>
     </Router>
   );

src/assets/data/HeaderContent.js

@@ -24,8 +24,8 @@ const HeaderData = {
   sponsors: {
     backWord: "Supporters",
     backWordMobile: "Backers",
-    backWordSize: "130px",
-    backWordSpacing: "0.5rem",
+    backWordSize: "120px",
+    backWordSpacing: "0.3rem",
     backWordSize_mobile: "75px",
     backWordSpacing_mobile: "0.2rem",
     frontWord: "Sponsors",

src/assets/data/SponsorsContent.js

@@ -21,16 +21,10 @@ import graph from "../images/SponsorImages/graph.png";
 // import snu from "../images/SponsorImages/snu.webp";
 // import solana from "../images/SponsorImages/solana.webp";
 import xyz from "../images/SponsorImages/xyz.png";
+import jis from "../images/SponsorImages/jis.png";
 // import zeeve from "../images/SponsorImages/zeeve.webp";
 
 const sponsors = {
-  Platinum: [
-    {
-      name: "Circle",
-      img: circle,
-      link: "https://www.circle.com/",
-    },
-  ],
   Gold: [
     {
       name: "Github",

src/assets/data/TeamContent.js

@@ -1,33 +1,33 @@
 import sanmoy from "../images/TeamCardImages/Sanmoy.webp";
-import aditya from "../images/TeamCardImages/aditya.webp";
-import amandeep from "../images/TeamCardImages/amandeep.webp";
+import aditya from "../images/TeamCardImages/aditya.png";
+import amandeep from "../images/TeamCardImages/amandeep.png";
 import anirban from "../images/TeamCardImages/anirban.webp";
 import ankita from "../images/TeamCardImages/ankita.webp";
-import arindam from "../images/TeamCardImages/arindam.webp";
-import arkapravo from "../images/TeamCardImages/arkapravo.webp";
-import kiran from "../images/TeamCardImages/kiran.webp";
-import krishnendu from "../images/TeamCardImages/krishnendu.webp";
+import arindam from "../images/TeamCardImages/arindam.png";
+import arkapravo from "../images/TeamCardImages/arkapravo.png";
+import kiran from "../images/TeamCardImages/kiran.png";
+import krishnendu from "../images/TeamCardImages/krishnendu.png";
 import manish from "../images/TeamCardImages/manish.webp";
-import prachi from "../images/TeamCardImages/prachi.webp";
-import rabishankar from "../images/TeamCardImages/rabishankar.webp";
-import rajdeep from "../images/TeamCardImages/rajdeep.webp";
-import rinki from "../images/TeamCardImages/rinki.webp";
-import rohit from "../images/TeamCardImages/rohit.webp";
+import prachi from "../images/TeamCardImages/prachi.png";
+import rabishankar from "../images/TeamCardImages/rabishankar.png";
+import rajdeep from "../images/TeamCardImages/rajdeep.png";
+import rinki from "../images/TeamCardImages/rinki.png";
+import rohit from "../images/TeamCardImages/rohit.png";
 import sagnik from "../images/TeamCardImages/sagnik.webp";
-import samrat from "../images/TeamCardImages/samrat.webp";
-import sanyukta from "../images/TeamCardImages/sanyukta.webp";
-import saswata from "../images/TeamCardImages/saswata.webp";
+import samrat from "../images/TeamCardImages/samrat.png";
+import sanyukta from "../images/TeamCardImages/sanyukta.png";
+import saswata from "../images/TeamCardImages/saswata.png";
 import satya from "../images/TeamCardImages/satya.webp";
-import saurabh from "../images/TeamCardImages/saurabh.webp";
+import saurabh from "../images/TeamCardImages/saurabh.png";
 import sayanabha from "../images/TeamCardImages/sayanabha.webp";
-import shruti from "../images/TeamCardImages/shruti.webp";
+import shruti from "../images/TeamCardImages/shruti.png";
 import shubham from "../images/TeamCardImages/shubham.webp";
-import souradeep from "../images/TeamCardImages/souradeep.webp";
+import souradeep from "../images/TeamCardImages/souradeep.png";
 import swarup from "../images/TeamCardImages/swarup.webp";
-import tamal from "../images/TeamCardImages/tamal.webp";
+import tamal from "../images/TeamCardImages/tamal.png";
 import tushar from "../images/TeamCardImages/tushar.webp";
-import utkarsh from "../images/TeamCardImages/utkarsh.webp";
 import priya from "../images/TeamCardImages/priya.webp";
+import utkarsh from "../images/TeamCardImages/utkarsh.png";
 
 const teamMember = {
   organizers: [
@@ -82,6 +82,37 @@ const teamMember = {
       title: "Associate Prof., Department of CSE, SNU",
     },
   ],
+  lead: [
+    {
+      img: aditya,
+      name: "Aditya",
+      title: "Marketing @autopilott.co",
+      linkedIn: "https://linkedin.com/in/withadityya",
+      twitter: "https://twitter.com/withadityya",
+    },
+    {
+      img: amandeep,
+      name: "Amandeep",
+      title: "ML Engineer",
+      linkedIn: "http://www.linkedin.com/in/amandeep404",
+      twitter: "https://twitter.com/amandeep_404",
+    },
+    {
+      img: kiran,
+      name: "Kiran",
+      title: "Content Lead, @H4B",
+      linkedIn:
+        "https://www.linkedin.com/in/kiranmishra21?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app",
+      twitter: "https://x.com/kiranmishra1706?t=jKakFAb5NRjRp6qLCl8BYA&s=09",
+    },
+    {
+      img: tamal,
+      name: "Tamal",
+      title: "You See The Site? Thanks.",
+      linkedIn: "https://www.linkedin.com/in/tamalcodes/",
+      twitter: "https://twitter.com/tamalCodes",
+    },
+  ],
   core: [
     {
       img: souradeep,
@@ -114,13 +145,7 @@ const teamMember = {
         "https://www.linkedin.com/in/rajdeepde?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app",
       twitter: "https://x.com/rajdeep_de_?t=VT6KpaywrWPfslnDWCJWTA&s=09",
     },
-    {
-      img: amandeep,
-      name: "Amandeep",
-      title: "ML Engineer",
-      linkedIn: "http://www.linkedin.com/in/amandeep404",
-      twitter: "https://twitter.com/amandeep_404",
-    },
+
     {
       img: rinki,
       name: "Rinki",
@@ -145,14 +170,7 @@ const teamMember = {
         "https://www.linkedin.com/in/utkarsh-jaiswal-6170b5258?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=ios_app",
       twitter: "https://x.com/utkxrsh_jaiswal/",
     },
-    {
-      img: kiran,
-      name: "Kiran",
-      title: "Content Lead, @H4B",
-      linkedIn:
-        "https://www.linkedin.com/in/kiranmishra21?utm_source=share&utm_campaign=share_via&utm_content=profile&utm_medium=android_app",
-      twitter: "https://x.com/kiranmishra1706?t=jKakFAb5NRjRp6qLCl8BYA&s=09",
-    },
+
     {
       img: sayanabha,
       name: "Sayanabha",
@@ -204,13 +222,6 @@ const teamMember = {
       linkedIn: "https://www.linkedin.com/in/priya-singh-271488222/",
       twitter: "https://x.com/PriyaSi77289347",
     },
-    {
-      img: aditya,
-      name: "Aditya",
-      title: "Marketing @autopilott.co",
-      linkedIn: "https://linkedin.com/in/withadityya",
-      twitter: "https://twitter.com/withadityya",
-    },
     {
       img: saurabh,
       name: "Saurabh",
@@ -232,13 +243,7 @@ const teamMember = {
       linkedIn: "https://www.linkedin.com/in/rabisankar-mishra-8418a5225",
       twitter: "https://x.com/Rabisankar21?t=O8FH-ya57mY-LjS5-TN7oQ&s=09",
     },
-    {
-      img: tamal,
-      name: "Tamal",
-      title: "Just a developer",
-      linkedIn: "https://www.linkedin.com/in/tamalcodes/",
-      twitter: "https://twitter.com/tamalCodes",
-    },
+
     {
       img: arkapravo,
       name: "Arkapravo",

src/components/private/faq/FAQ.jsx

@@ -24,7 +24,7 @@ const Faq = () => {
     {
       question: "Who can participate?",
       answer:
-        "Students in college, schools can apply. If you can innovate or just want to have a fun learning weekend, you are most welcome.",
+        "Students currently enrolled in any course in High School or College can participate in Hack4Bengal. Along with that current year passouts can participate too.",
     },
     {
       question: "How much does it cost to participate?",

src/components/private/faq/FAQ.scss

@@ -122,6 +122,12 @@
               align-items: center;
               border-radius: 50%;
 
+              svg {
+                width: 1em;
+                height: 1em;
+                fill: #ff1717;
+              }
+
               @media screen and (max-width: 576px) {
                 top: 50%;
                 transform: translateY(-50%);

src/components/private/landing/Landing.jsx

@@ -24,10 +24,13 @@ const Landing = () => {
             </p>
 
             <div className="home__buttons">
-              <Button type="solid" to={"https://discord.gg/hack4bengal"}>
+              <Button type="outline" to={"https://discord.gg/hack4bengal"}>
                 Join Discord
               </Button>
-              <Button type="outline" isDisabled={true}>
+              <Button
+                type="solid"
+                to={"https://lu.ma/0nruupo3?utm_source=website"}
+              >
                 Register Now
               </Button>
             </div>

src/components/private/prizes/Prizes.jsx

@@ -2,13 +2,36 @@ import React from "react";
 import HeaderData from "../../../assets/data/HeaderContent";
 import { ComingSoon, Header } from "../../shared";
 import "./Prizes.scss";
+import first from "../../../assets/images/PrizesImages/first.png";
+import second from "../../../assets/images/PrizesImages/second.png";
+import third from "../../../assets/images/PrizesImages/third.png";
+import agun from "../../../assets/images/PrizesImages/agun.png";
 
 const Prizes = () => {
   return (
     <>
       <div className="prizes__parent" id="prizes">
         <Header {...HeaderData.prizes} />
-        <ComingSoon />
+        {/* <ComingSoon /> */}
+
+        <div className="prizes_container">
+          <div className="second_prize prize_box">
+            <img src={second} className="prize_logo first_prize_logo" alt="" />
+            <h1>TBD</h1>
+            <p>1st Runner Up</p>
+          </div>
+          <div className="first_prize prize_box">
+            <img src={first} className="prize_logo first_prize_logo" alt="" />
+            {/* <img src={agun} className="prize_logo first_prize_logo" alt="" /> */}
+            <h1>TBD</h1>
+            <p>Winner</p>
+          </div>
+          <div className="third_prize prize_box">
+            <img src={third} className="prize_logo first_prize_logo" alt="" />
+            <h1>TBD</h1>
+            <p>2nd Runner Up</p>
+          </div>
+        </div>
       </div>
     </>
   );