Merge branch 'prod' of https://github.com/dvm-bitspilani/oasis-2024-web…

… into prod
dvm-bitspilani · Oct 16, 2024 · fc51ca3 · fc51ca3
2 parents 511694d + ab433d7
commit fc51ca3
Show file tree

Hide file tree

Showing 44 changed files with 2,904 additions and 2,082 deletions.
diff --git a/app/about/about.module.scss b/app/about/about.module.scss
@@ -1,4 +1,4 @@
-.brochureBack {
+.aboutBack {
   position: fixed;
   height: 100vh;
   width: 100%;
@@ -32,10 +32,12 @@
   padding-top: 0 !important;
   position: absolute;
   top: -0rem;
+  height: 100vh;
+  overflow-y: hidden;
 }
 
 @media (max-width: 4000px) and (min-width: 2200px) {
-  .brochureBack {
+  .aboutBack {
     overflow-x: hidden;
   }
 

diff --git a/app/about/page.tsx b/app/about/page.tsx
@@ -18,7 +18,7 @@ export default function About() {
   return (
     <>
       <PrePreloader />
-      <div className={styles.brochureBack}>
+      <div className={styles.aboutBack}>
         <Glow />
         <Grunge />
         <Grid />

diff --git a/app/archive/page.tsx b/app/archive/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, Suspense } from "react";
 import styles from "./archive.module.scss";
 
 import Grid from "@/components/Landing/Grid/Grid";
@@ -10,7 +10,6 @@ import SuitBackground from "@/components/Landing/Backdrop/Backdrop";
 import BackButton from "@/components/Registration/BackButton/BackButton";
 import Image from "next/image";
 import Link from "next/link";
-import PrePreloader from "@/components/PreloaderProMax/PreloaderProMax";
 import Carousel from "@/components/Archive/Carousel";
 
 import one from "../../assets/Gallery/one.jpg";
@@ -148,7 +147,6 @@ export default function GalleryPage() {
 
   return (
     <>
-      <PrePreloader />
       <div className={styles.galleryBack}>
         <Glow />
         <Grunge />
@@ -186,7 +184,7 @@ export default function GalleryPage() {
             />
           </svg>
 
-          <h2>ARCHIVE</h2>
+          <h2>ARCHIVES</h2>
 
           <svg
             width="42"
@@ -331,6 +329,7 @@ export default function GalleryPage() {
             <Image
               key={index}
               src={img}
+              placeholder="blur"
               alt={`Image ${index + 1}`}
               className={imageClasses[index]}
               onClick={() => openCarousel(index)}

diff --git a/app/contact/brochure.module.scss → app/contact/contact.module.scss b/app/contact/brochure.module.scss → app/contact/contact.module.scss
@@ -1,4 +1,4 @@
-.brochureBack {
+.contactBack {
   position: fixed;
   height: 100%;
   width: 100%;
@@ -7,6 +7,7 @@
 
 .ham {
   position: fixed;
+  z-index: 100;
   top: 30px;
   left: 20px;
   @media(width>1920px){
@@ -31,10 +32,10 @@
 .contactPage {
   position: fixed;
   top: 0rem;
-  height: 100lvh;
+  height: 100%;
   width: 100vw;
-  opacity: 1;
-  pointer-events: none;
+  //opacity: 1;
+  //pointer-events: auto;
   overflow-x: hidden;
   overflow-y: scroll;
 
@@ -137,21 +138,6 @@
   }
 }
 
-// @media (max-width: 2100px) and (min-width: 1400px) {
-//   .contactPage {
-//     .heading {
-//       margin-top: 5.5rem;
-
-//       h2 {
-//         font-size: 72px;
-//       }
-//     }
-
-//     .cardContainer {
-//       margin-top: 5rem;
-//     }
-//   }
-// }
 
 @media (max-width: 2100px) and (min-width: 1800px) {
   .contactPage {
@@ -187,7 +173,7 @@
       margin-top: 4rem;
 
       h2 {
-        font-size: 65px;
+        font-size: 58px;
       }
     }
 
@@ -217,11 +203,13 @@
 
 @media (max-width: 1000px) {
   .contactPage {
+    height: fit-content;
+
     .heading {
       h2 {
-        font-size: 62px;
+        font-size: 52px;
         font-weight: 400;
-        line-height: 43px;
+        line-height: normal;
         box-shadow: none;
       }
     }