Merge pull request #145 from dvm-bitspilani/main

Merge to prod
dvm-bitspilani · Oct 16, 2024 · d511150 · d511150
2 parents fa63689 + b09ebcf
commit d511150
Show file tree

Hide file tree

Showing 19 changed files with 455 additions and 708 deletions.
diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -21,7 +21,7 @@ export default function About() {
       <PrePreloader />
       <CursorEffect />
       <div className={styles.aboutBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/archive/page.tsx b/app/archive/page.tsx
@@ -152,7 +152,7 @@ export default function GalleryPage() {
       <PrePreloader />
       <CursorEffect />
       <div className={styles.galleryBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/articles/page.tsx b/app/articles/page.tsx
@@ -53,7 +53,7 @@ const Articles: React.FC = () => {
       <PrePreloader />
       <CursorEffect />
       <div className={styles.epcBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/brochure/page.tsx b/app/brochure/page.tsx
@@ -19,7 +19,7 @@ export default function Brochure() {
       <PrePreloader />
       <CursorEffect />
       <div className={styles.brochureBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/contact/contact.module.scss b/app/contact/contact.module.scss
@@ -10,6 +10,7 @@
   z-index: 100;
   top: 30px;
   left: 20px;
+  z-index: 15;
   @media(width>1920px){
     transform: scale(1.3);
     left: 40px;

diff --git a/app/contact/page.tsx b/app/contact/page.tsx
@@ -201,7 +201,7 @@ export default function ContactUs() {
       <PrePreloader />
       <CursorEffect />
       <div className={styles.contactBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/events/[categoryname]/categories.module.scss b/app/events/[categoryname]/categories.module.scss
@@ -335,7 +335,6 @@
         .eventImage {
           width: 100%;
           height: 100%;
-          filter: brightness(200%);
           user-select: none;
           box-shadow: 0px 0px 20px 4px #cbae5780;
           background-color: #110e16;

diff --git a/app/events/[categoryname]/page.tsx b/app/events/[categoryname]/page.tsx
@@ -204,7 +204,11 @@ export default function Page({ params }: { params: { categoryname: string } }) {
                   <div
                     className={styles.eventImage}
                     style={{
-                      backgroundImage: `url(${eventsList[eventID]?.img_url})`,
+                      backgroundImage: `url(${
+                        eventsList[eventID]?.img_url !== "Nill"
+                          ? eventsList[eventID]?.img_url
+                          : "https://bits-oasis.org/media/icons/default_98OZ5vb.png"
+                      })`,
                       backgroundSize: "cover",
                       backgroundPosition: "center",
                       backgroundRepeat: "no-repeat",

diff --git a/app/events/events.module.scss b/app/events/events.module.scss
@@ -17,6 +17,7 @@
   position: absolute;
   top: 30px;
   left: 20px;
+  z-index: 15;
   @media (width>1920px) {
     transform: scale(1.3);
     left: 40px;

diff --git a/app/events/page.tsx b/app/events/page.tsx
diff --git a/app/gallery/page.tsx b/app/gallery/page.tsx
@@ -75,7 +75,7 @@ const Gallery: React.FC = () => {
     <>
       <PrePreloader />
       <div className={styles.galleryBack}>
-        <Glow />
+        {/* <Glow /> */}
         <Grunge />
         <Grid />
         <SuitBackground />

diff --git a/app/landing.module.scss b/app/landing.module.scss
@@ -61,7 +61,7 @@
     width: 100vw;
     height: 100lvh;
     top: 0;
-    z-index: 0;
+    z-index: -100000;
   }
 }
 

diff --git a/app/page.tsx b/app/page.tsx
@@ -15,51 +15,48 @@ import MobileLanding from "@/components/MobileLanding/MobileLanding/MobileLandin
 import Sidenav from "@/components/Sidenav/Sidenav";
 import Image from "next/image";
 
-import locationIcon from '@/assets/MobileLanding/locationIcon.svg'
+import locationIcon from "@/assets/MobileLanding/locationIcon.svg";
 
 export default function Home() {
-    return (
-        <>
-            <PrePreloader/>
-            <CursorEffect/>
-            <div className={styles.hamBtn} id="hamBtn">
-                <HamBtn/>
-            </div>
-            <div className={styles.navTickets} id="tickets-container">
-                {/*<Nav/>*/}
-                <Sidenav/>
-            </div>
-            <main className={styles.scrollWrapper} id="scrollWrapper">
-                <main className={styles.desktopPage}>
-                    <Landing/>
-                    <LandingOverlay/>
-                    <Grid/>
-                    <Glow/>
-                    <Trees/>
-                    <Grunge/>
-                </main>
-                <main className={styles.mobilePage}>
-                    <OasisLogo/>
-                    <a
-                        href="https://maps.app.goo.gl/EMBKXct4V92g8MbPA"
-                        target='_blank'
-                        className={styles.locationRedirect}
-                    >
-                        <Image
-                            src={locationIcon}
-                            alt='location icon'
-                        />
-                    </a>
-                    <Countdown dateString="October 23, 2024 19:00:00"/>
-                    <MobileLanding/>
-                    <div className={styles.mobileBackdrop}>
-                        <Grid/>
-                        <Glow/>
-                        <Grunge/>
-                    </div>
-                </main>
-            </main>
-            {/*<AmbientMusic/>*/}
-        </>
-    );
+  return (
+    <>
+      <PrePreloader />
+      <CursorEffect />
+      <div className={styles.hamBtn} id="hamBtn">
+        <HamBtn />
+      </div>
+      <div className={styles.navTickets} id="tickets-container">
+        {/*<Nav/>*/}
+        <Sidenav />
+      </div>
+      <main className={styles.scrollWrapper} id="scrollWrapper">
+        <main className={styles.desktopPage}>
+          <Landing />
+          <LandingOverlay />
+          <Grid />
+          {/* <Glow /> */}
+          <Trees />
+          <Grunge />
+        </main>
+        <main className={styles.mobilePage}>
+          <OasisLogo />
+          <a
+            href="https://maps.app.goo.gl/EMBKXct4V92g8MbPA"
+            target="_blank"
+            className={styles.locationRedirect}
+          >
+            <Image src={locationIcon} alt="location icon" />
+          </a>
+          <Countdown dateString="October 23, 2024 19:00:00" />
+          <MobileLanding />
+          <div className={styles.mobileBackdrop}>
+            <Grid />
+            {/* <Glow /> */}
+            <Grunge />
+          </div>
+        </main>
+      </main>
+      {/*<AmbientMusic/>*/}
+    </>
+  );
 }