Merge branch 'main' into prod

dvm-bitspilani · Oct 16, 2024 · 94f93de · 94f93de
2 parents fc51ca3 + 2c82f8e
commit 94f93de
Show file tree

Hide file tree

Showing 34 changed files with 1,203 additions and 263 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -13,11 +13,13 @@ import PrePreloader from "@/components/PreloaderProMax/PreloaderProMax";
 import AboutUsPage from "@/components/AboutUs/AboutUsPage";
 import RegBtn from "@/components/Landing/Navbar/RegBtn/RegBtn";
 import MobileSlotMachine from "@/components/AboutUs/Machine/Machine";
+import CursorEffect from "@/components/CursorEffect/CursorEffect";
 
 export default function About() {
   return (
     <>
       <PrePreloader />
+      <CursorEffect />
       <div className={styles.aboutBack}>
         <Glow />
         <Grunge />

diff --git a/app/contact/page.tsx b/app/contact/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React, {useEffect, useRef } from "react";
+import React, { useEffect, useRef } from "react";
 import styles from "./contact.module.scss";
 
 import Grid from "@/components/Landing/Grid/Grid";
@@ -29,23 +29,25 @@ import RegBtn from "@/components/Landing/Navbar/RegBtn/RegBtn";
 import CursorEffect from "@/components/CursorEffect/CursorEffect";
 
 export default function ContactUs() {
-
   const contactCardRef = useRef<HTMLDivElement>(null);
   const contactCard1Ref = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-
-    if (!localStorage.getItem('hasReloaded')) {
-      localStorage.setItem('hasReloaded', 'true');
+    if (!localStorage.getItem("hasReloaded")) {
+      localStorage.setItem("hasReloaded", "true");
       window.location.reload();
     }
 
     const container = contactCardRef.current;
     const container1 = contactCard1Ref.current;
 
     if (container && container1) {
-      const cards = Array.from(container.querySelectorAll(".card")) as HTMLElement[];
-      const cards1 = Array.from(container1.querySelectorAll(".card")) as HTMLElement[];
+      const cards = Array.from(
+        container.querySelectorAll(".card")
+      ) as HTMLElement[];
+      const cards1 = Array.from(
+        container1.querySelectorAll(".card")
+      ) as HTMLElement[];
 
       if (cards.length > 0) {
         const cardCount = cards.length;
@@ -191,9 +193,9 @@ export default function ContactUs() {
   }, []);
 
   const handleBackButtonClick = () => {
-    localStorage.removeItem('hasReloaded');
+    localStorage.removeItem("hasReloaded");
   };
-    
+
   return (
     <>
       <PrePreloader />
@@ -278,17 +280,19 @@ export default function ContactUs() {
           </svg>
         </div>
 
-        <div className={styles.cardContainer} id="contactCard" ref={contactCardRef}>
+        <div
+          className={styles.cardContainer}
+          id="contactCard"
+          ref={contactCardRef}
+        >
           <div className={`${styles.first} card`}>
             <ContactCard
               name="Jaiditya Singh"
               img={jaiditya}
               dept1="Logistics and"
               dept2="Operations"
-              // contact="tel:+919168421199"
-              contact={null}
-              // mail="mailto:[email protected]"
-              mail={null}
+              contact="tel:+919168421199"
+              mail="mailto:[email protected]"
             />
           </div>
 
@@ -331,25 +335,25 @@ export default function ContactUs() {
               img={rijul}
               dept1="Reception and"
               dept2="Accommodation"
-              // contact="tel:+919811529877"
-              contact={null}
-              // mail="mailto:[email protected]"
-              mail={null}
+              contact="tel:+919811529877"
+              mail="mailto:[email protected]"
             />
           </div>
         </div>
 
-        <div className={styles.cardContainer1} id="contactCard1" ref={contactCard1Ref}>
+        <div
+          className={styles.cardContainer1}
+          id="contactCard1"
+          ref={contactCard1Ref}
+        >
           <div className={`${styles.first} card`}>
             <ContactCard
               name="Shreyansh Vanjani"
               img={shreyansh}
               dept1="Publicity and"
               dept2="Collaborations"
-              //contact="tel:+918000695988"
-              contact={null}
-              // mail="mailto:[email protected]"
-              mail={null}
+              contact="tel:+918000695988"
+              mail="mailto:[email protected]"
             />
           </div>
 
@@ -359,10 +363,8 @@ export default function ContactUs() {
               img={ahan}
               dept1="President,"
               dept2="Students' Union"
-              // contact="tel:+9180050 00213"
-              contact={null}
-              // mail="mailto:[email protected]"
-              mail={null}
+              contact="tel:+9180050 00213"
+              mail="mailto:[email protected]"
             />
           </div>
 
@@ -372,10 +374,8 @@ export default function ContactUs() {
               img={aryankhorana}
               dept1="General Secretary,"
               dept2="Students' Union"
-              // contact="tel:+917078879443"
-              contact={null}
-              // mail="mailto:[email protected]"
-              mail={null}
+              contact="tel:+917078879443"
+              mail="mailto:[email protected]"
             />
           </div>
         </div>
@@ -416,44 +416,44 @@ export default function ContactUs() {
                 img={jaiditya}
                 dept1="Logistics and"
                 dept2="Operations"
-                contact={null}
-                mail={null}
+                contact="tel:+919168421199"
+                mail="mailto:[email protected]"
               />
 
               <ContactCard
                 name="Rijul Bassamboo"
                 img={rijul}
                 dept1="Reception and"
                 dept2="Accommodation"
-                contact={null}
-                mail={null}
+                contact="tel:+919811529877"
+                mail="mailto:[email protected]"
               />
 
               <ContactCard
                 name="Shreyansh Vanjani"
                 img={shreyansh}
                 dept1="Publicity and"
                 dept2="Collaborations"
-                contact={null}
-                mail={null}
+                contact="tel:+918000695988"
+                mail="mailto:[email protected]"
               />
 
               <ContactCard
                 name="Ahan Bansal"
                 img={ahan}
                 dept1="President,"
                 dept2="Students' Union"
-                contact={null}
-                mail={null}
+                contact="tel:+9180050 00213"
+                mail="mailto:[email protected]"
               />
 
               <ContactCard
                 name="Aryan Khorana"
                 img={aryankhorana}
                 dept1="General Secretary,"
                 dept2="Students' Union"
-                contact={null}
-                mail={null}
+                contact="tel:+917078879443"
+                mail="mailto:[email protected]"
               />
             </div>
           </div>

diff --git a/app/events/[categoryname]/categories.module.scss b/app/events/[categoryname]/categories.module.scss
@@ -130,7 +130,7 @@
         width: 100%;
 
         font-family: "Thedus Condensed Light";
-        font-size: 150px;
+        font-size: 8rem;
         font-weight: 900;
         line-height: 105px;
         text-align: left;
@@ -347,15 +347,15 @@
         text-align: center;
         text-shadow: 0px 0px 20px rgba(229, 195, 132, 0.3);
         font-family: "Source Serif 4";
-        font-size: 28px;
+        font-size: 2rem;
         font-style: normal;
         font-weight: 400;
         line-height: 45px; /* 160.714% */
         letter-spacing: 0.56px;
 
         @media screen and (max-height: 900px) {
-          font-size: 14px;
-          line-height: 16px;
+          font-size: 1.5rem;
+          line-height: 1.7rem;
         }
 
         @media screen and (max-width: 1400px) and (min-height: 900px) {
@@ -370,6 +370,7 @@
           line-height: 24px;
           letter-spacing: 0.02em;
           text-align: center;
+          padding-left: 0;
         }
 
         @media screen and (max-width: 600px) {

diff --git a/app/events/[categoryname]/page.tsx b/app/events/[categoryname]/page.tsx
@@ -8,6 +8,7 @@ import grunge from "@/assets/Landing/Grunge.png";
 import axios from "axios";
 import eventcard from "../../../assets/Events/Carousel/eventcard.png";
 import Preloader from "@/components/Preloader/Preloader";
+import { useRouter } from "next/navigation";
 
 const categories = [
   "music",
@@ -19,10 +20,23 @@ const categories = [
 ];
 
 export default function Page({ params }: { params: { categoryname: string } }) {
+  const router = useRouter();
   const [eventsList, setEventsList] = useState<any>([]);
   const [eventID, setEventID] = useState(0);
   const [loading, setLoading] = useState(true);
 
+  const handleBack = () => {
+    if (window.history.length > 1) {
+      router.back();
+    } else {
+      router.push("/");
+    }
+  };
+
+  useEffect(() => {
+    document.body.style.overflow = "hidden";
+  }, []);
+
   useEffect(() => {
     axios
       .get("https://bits-oasis.org/2024/main/registrations/events_details/")
@@ -76,21 +90,19 @@ export default function Page({ params }: { params: { categoryname: string } }) {
                 zIndex: 1,
               }}
             />
-            <div className={styles.backBtn}>
-              <Link href="/events">
-                <svg
-                  width="76"
-                  height="60"
-                  viewBox="0 0 76 60"
-                  fill="none"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M33.7706 2.2295C32.7704 1.22965 31.4141 0.667969 29.9999 0.667969C28.5857 0.667969 27.2294 1.22965 26.2293 2.2295L2.22925 26.2295C1.22941 27.2296 0.667725 28.586 0.667725 30.0002C0.667725 31.4144 1.22941 32.7707 2.22925 33.7708L26.2293 57.7708C27.2351 58.7423 28.5823 59.2799 29.9807 59.2678C31.3791 59.2556 32.7168 58.6947 33.7056 57.7059C34.6945 56.717 35.2554 55.3794 35.2675 53.981C35.2797 52.5826 34.7421 51.2354 33.7706 50.2295L19.3333 35.3335H69.9999C71.4144 35.3335 72.771 34.7716 73.7712 33.7714C74.7713 32.7712 75.3333 31.4147 75.3333 30.0002C75.3333 28.5857 74.7713 27.2291 73.7712 26.2289C72.771 25.2287 71.4144 24.6668 69.9999 24.6668H19.3333L33.7706 9.77083C34.7704 8.77068 35.3321 7.41437 35.3321 6.00016C35.3321 4.58595 34.7704 3.22964 33.7706 2.2295Z"
-                    fill="white"
-                  />
-                </svg>
-              </Link>
+            <div className={styles.backBtn} onClick={handleBack}>
+              <svg
+                width="76"
+                height="60"
+                viewBox="0 0 76 60"
+                fill="none"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <path
+                  d="M33.7706 2.2295C32.7704 1.22965 31.4141 0.667969 29.9999 0.667969C28.5857 0.667969 27.2294 1.22965 26.2293 2.2295L2.22925 26.2295C1.22941 27.2296 0.667725 28.586 0.667725 30.0002C0.667725 31.4144 1.22941 32.7707 2.22925 33.7708L26.2293 57.7708C27.2351 58.7423 28.5823 59.2799 29.9807 59.2678C31.3791 59.2556 32.7168 58.6947 33.7056 57.7059C34.6945 56.717 35.2554 55.3794 35.2675 53.981C35.2797 52.5826 34.7421 51.2354 33.7706 50.2295L19.3333 35.3335H69.9999C71.4144 35.3335 72.771 34.7716 73.7712 33.7714C74.7713 32.7712 75.3333 31.4147 75.3333 30.0002C75.3333 28.5857 74.7713 27.2291 73.7712 26.2289C72.771 25.2287 71.4144 24.6668 69.9999 24.6668H19.3333L33.7706 9.77083C34.7704 8.77068 35.3321 7.41437 35.3321 6.00016C35.3321 4.58595 34.7704 3.22964 33.7706 2.2295Z"
+                  fill="white"
+                />
+              </svg>
             </div>
 
             <div className={styles.textBackground}>