Merge main branch into prod

dvm-bitspilani · Oct 18, 2024 · 3856d58 · 3856d58
2 parents 2eed634 + 517d340
commit 3856d58
Show file tree

Hide file tree

Showing 29 changed files with 116 additions and 1,296 deletions.
diff --git a/app/dev/dev.module.scss → app/devs/dev.module.scss b/app/dev/dev.module.scss → app/devs/dev.module.scss
diff --git a/app/dev/DevPage.tsx → app/devs/page.tsx b/app/dev/DevPage.tsx → app/devs/page.tsx
diff --git a/app/events/[categoryname]/categories.module.scss b/app/events/[categoryname]/categories.module.scss
@@ -284,6 +284,11 @@
             rgba(255, 232, 135, 0.02) 100%
           );
           z-index: 10;
+          transition: transform 0.3s ease-out;
+
+          &:hover{
+            transform: scale(1.15);
+          }
 
           @media screen and (max-width: 1400px) {
             height: 72px;

diff --git a/app/events/[categoryname]/page.tsx b/app/events/[categoryname]/page.tsx
@@ -10,15 +10,6 @@ import { useRouter } from "next/navigation";
 import LoaderChip from "@/components/Events/Loader/LoaderChip";
 import gsap from "gsap";
 
-const categories = [
-  "music",
-  "quizzes",
-  "drama",
-  "dance",
-  "fashion",
-  "photography",
-];
-
 export default function Page({ params }: { params: { categoryname: string } }) {
   const router = useRouter();
   const [eventsList, setEventsList] = useState<any>([]);
@@ -58,15 +49,12 @@ export default function Page({ params }: { params: { categoryname: string } }) {
         // console.log(filteredEvents);
         setEventsList(filteredEvents);
         setLoading(false);
+        if (filteredEvents.length === 0) {
+          router.push("/404");
+        }
       });
   }, []);
 
-  useEffect(() => {
-    if (!categories.includes(params.categoryname)) {
-      window.location.href = "/404";
-    }
-  }, []);
-
   const animate = (direction: string) => {
     const tl = gsap.timeline();
     tl.to([titleRef.current, subtitleRef.current, contactRef.current], {

diff --git a/app/events/events.module.scss b/app/events/events.module.scss
@@ -100,8 +100,13 @@
     width: 90%;
     justify-content: center;
     align-items: center;
+    // overflow-y: scroll;
 
-    @media (width<550px) {
+    // @media (width<550px) {
+    //   width: auto;
+    // }
+
+    @media(width<1650px) {
       width: auto;
     }
 
@@ -111,6 +116,7 @@
       gap: 4rem;
       align-items: center;
       justify-content: center;
+      position: relative;
       @media(width<1760px){
         gap: 0;
       }
@@ -138,8 +144,8 @@
             transform: scale(1);
           }
         }
-        @media (width<1610px) {
-          transform: scale(0.9);
+        @media (width<1650px) {
+          transform: scale(0.8);
           &:hover {
             transform: scale(1);
           }

diff --git a/app/events/page.tsx b/app/events/page.tsx
@@ -23,7 +23,7 @@ import musicbg from "../../assets/Events/Folders/musicbg.png";
 import quizbg from "../../assets/Events/Folders/quizbg.png";
 import dramabg from "../../assets/Events/Folders/dramabg.png";
 import dancebg from "../../assets/Events/Folders/dancebg.png";
-import fashionbg from "../../assets/Events/Folders/fashionbg.png";
+import miscbg from "../../assets/Events/Folders/miscbg.png";
 import camerabg from "../../assets/Events/Folders/camerabg.png";
 import PrePreloader from "@/components/PreloaderProMax/PreloaderProMax";
 import CursorEffect from "@/components/CursorEffect/CursorEffect";
@@ -125,9 +125,8 @@ export default function EventsPage() {
         router.push("/");
       }
     }
-    document.body.style.overflow = "hidden";
+    document.body.style.overflowY = "scroll";
   }, []);
-
 
   return (
     <>
@@ -262,14 +261,14 @@ export default function EventsPage() {
                 <Image src={dancebg} alt="music" width={484} height={300} />
               </div>
             </Link>
-            <Link href="/events/fashion">
+            <Link href="/events/photography">
               <div className={styles.box}>
-                <Image src={fashionbg} alt="music" width={484} height={300} />
+                <Image src={camerabg} alt="music" width={484} height={300} />
               </div>
             </Link>
-            <Link href="/events/photography">
+            <Link href="/events/misc">
               <div className={styles.box}>
-                <Image src={camerabg} alt="music" width={484} height={300} />
+                <Image src={miscbg} alt="music" width={484} height={300} />
               </div>
             </Link>
           </div>
@@ -303,9 +302,9 @@ export default function EventsPage() {
               className={styles.mobileimg}
             />
           </Link>
-          <Link href="/events/fashion">
+          <Link href="/events/photography">
             <Image
-              src={fashionmobile}
+              src={cameramobile}
               alt="music"
               width={312}
               height={132}
@@ -321,9 +320,9 @@ export default function EventsPage() {
               className={styles.mobileimg}
             />
           </Link>
-          <Link href="/events/photography">
+          <Link href="/events/misc">
             <Image
-              src={cameramobile}
+              src={fashionmobile}
               alt="music"
               width={312}
               height={132}

diff --git a/app/globals.css b/app/globals.css
@@ -12,6 +12,7 @@
     margin: 0;
     padding: 0;
     -webkit-tap-highlight-color: transparent;
+    user-select: none;
 }
 
 body {

diff --git a/assets/Events/Folders/4.png b/assets/Events/Folders/4.png
diff --git a/assets/Events/Folders/miscbg.png b/assets/Events/Folders/miscbg.png
diff --git a/components/Archive/Carousel.tsx b/components/Archive/Carousel.tsx
@@ -64,7 +64,6 @@ export default function Carousel({
   onNext,
   onPrev,
 }: CarouselProps) {
-
   const currentImage = activeEvent !== null ? images[activeEvent] : images[0];
 
   return (
@@ -77,7 +76,7 @@ export default function Carousel({
           fill="none"
           xmlns="http://www.w3.org/2000/svg"
         >
-          <g clip-path="url(#clip0_3432_1022)">
+          <g clipPath="url(#clip0_3432_1022)">
             <path
               d="M37.3337 37.3334L2.66699 2.66675M37.3337 2.66675L2.66699 37.3334"
               stroke="#FFE887"
@@ -162,9 +161,14 @@ export default function Carousel({
           </svg>
         </div>
         <div className={styles.cardContainer} id="card">
-            <section className={styles.cardContent}>
-              <Image src={currentImage} alt={`Event image ${activeEvent}`} className="styles.image"  draggable="false" />
-            </section>
+          <section className={styles.cardContent}>
+            <Image
+              src={currentImage}
+              alt={`Event image ${activeEvent}`}
+              className="styles.image"
+              draggable="false"
+            />
+          </section>
         </div>
         <div onClick={onNext} className={styles.right}>
           <svg