Merge branch 'main' into prod

dvm-bitspilani · Oct 14, 2024 · d648c33 · d648c33
2 parents cc97898 + 65ad510
commit d648c33
Show file tree

Hide file tree

Showing 25 changed files with 1,054 additions and 492 deletions.
diff --git a/app/events/events.module.scss b/app/events/events.module.scss
@@ -45,7 +45,7 @@
 
   h2 {
     font-family: "Pixelify Sans";
-    font-size: 39.6px;
+    font-size: 47px;
     font-weight: 600;
     text-align: center;
     background: linear-gradient(180deg, #ffcff3 -38.31%, #997c92 174.55%);

diff --git a/app/events/page.tsx b/app/events/page.tsx
@@ -34,11 +34,11 @@ export default function EventsPage() {
         transform: "rotateY(180deg)",
       }}
     >
-      {/* <div className={styles.heading}>
+      <div className={styles.heading}>
         <h2>EVENTS</h2>
-      </div> */}
+      </div>
 
-      {/* <div className={styles.folderContainer}>
+      <div className={styles.folderContainer}>
         <Folder
           folderIcon={dance}
           isSelected={category === "dance"}
@@ -55,10 +55,10 @@ export default function EventsPage() {
         </Folder>
         <Folder
           folderIcon={art}
-          isSelected={category === "art"}
-          onSelect={() => handleSelect("art")}
+          isSelected={category === "quizzes"}
+          onSelect={() => handleSelect("quizzes")}
         >
-          Art
+          Quizzes
         </Folder>
         <Folder
           folderIcon={camera}
@@ -69,10 +69,10 @@ export default function EventsPage() {
         </Folder>
         <Folder
           folderIcon={music}
-          isSelected={category === "kernel"}
-          onSelect={() => handleSelect("kernel")}
+          isSelected={category === "drama"}
+          onSelect={() => handleSelect("drama")}
         >
-          Kernel
+          Drama
         </Folder>
         <Folder
           folderIcon={fashion}
@@ -81,33 +81,27 @@ export default function EventsPage() {
         >
           Fashion
         </Folder>
-        <Folder
+        {/* <Folder
           folderIcon={singing}
           isSelected={category === "profshow"}
           onSelect={() => handleSelect("profshow")}
         >
           ProfShow
-        </Folder>
-        <Folder
-          folderIcon={music}
-          isSelected={category === "lorem"}
-          onSelect={() => handleSelect("lorem")}
-        >
-          Lorem
-        </Folder>
+        </Folder> */}
       </div>
       <div className={styles.category}>
         <p>Please select a category</p>
-      </div> */}
-      <div className={styles.fixedCategoryContainer}>
-        <Category onClose={handleCloseModal} />
       </div>
 
-      {/* {isModalOpen && (
+      {/* <div className={styles.fixedCategoryContainer}>
+        <Category onClose={handleCloseModal} />
+      </div> */}
+
+      {isModalOpen && (
         <div className={styles.fixedCategoryContainer}>
-          <Category onClose={handleCloseModal} />
+          <Category onClose={handleCloseModal} currentCategory={category}/>
         </div>
-      )} */}
+      )}
     </main>
   );
 }
diff --git a/app/page.tsx b/app/page.tsx
@@ -6,36 +6,35 @@ import Landing from "@/components/Landing/Landing/Landing";
 import Trees from "@/components/Landing/Trees/Trees";
 import LandingOverlay from "@/components/Landing/LandingOverlay/LandingOverlay";
 import Grid from "@/components/Landing/Grid/Grid";
-import OasisLogo from "@/components/Landing/Navbar/Logo/Logo";
 import PrePreloader from "@/components/PreloaderProMax/PreloaderProMax";
 import Nav from "@/components/Nav/Nav";
 import HamBtn from "@/components/Landing/Navbar/HamBtn/Btn";
-import SuitBackground from "@/components/Landing/Backdrop/Backdrop";
 import CursorEffect from "@/components/CursorEffect/CursorEffect";
 
 export default function Home() {
-  return (
-    <>
-      <PrePreloader />
-      <CursorEffect />
-      <div className={styles.hamBtn} id="hamBtn">
-        <HamBtn />
-      </div>
-      <div className={styles.navTickets} id="tickets-container">
-        <Nav />
-      </div>
-      <main className={styles.scrollWrapper} id="scrollWrapper">
-        <main className={styles.page}>
-          {/* <OasisLogo /> */}
-          <Landing />
-          <LandingOverlay />
-          <Grid />
-          <Glow />
-          <Trees />
-          <Grunge />
-          {/* <SuitBackground /> */}
-        </main>
-      </main>
-    </>
-  );
+    return (
+        <>
+            <PrePreloader/>
+            <CursorEffect/>
+            <div className={styles.hamBtn} id="hamBtn">
+                <HamBtn/>
+            </div>
+            <div className={styles.navTickets} id="tickets-container">
+                <Nav/>
+            </div>
+            <main className={styles.scrollWrapper} id="scrollWrapper">
+                <main className={styles.page}>
+                    {/* <OasisLogo /> */}
+                    <Landing/>
+                    <LandingOverlay/>
+                    <Grid/>
+                    <Glow/>
+                    <Trees/>
+                    <Grunge/>
+                    {/* <SuitBackground /> */}
+                </main>
+            </main>
+            {/*<AmbientMusic/>*/}
+        </>
+    );
 }
diff --git a/app/sponsors/loading.tsx b/app/sponsors/loading.tsx
@@ -0,0 +1,5 @@
+import Preloader from "@/components/Preloader/Preloader";
+
+export default function PreloaderPage() {
+  return <Preloader />;
+}