Merge remote-tracking branch 'origin/main' into prod

dvm-bitspilani · Oct 15, 2024 · 7588561 · 7588561
2 parents f48d34a + ac8afa6
commit 7588561
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 43 deletions.
diff --git a/app/about/about.module.scss b/app/about/about.module.scss
@@ -1,6 +1,6 @@
 .brochureBack {
   position: fixed;
-  height: 100%;
+  height: 100vh;
   width: 100%;
   overflow: hidden;
 }

diff --git a/app/events/events.module.scss b/app/events/events.module.scss
@@ -2,7 +2,7 @@
   position: fixed;
   height: 100%;
   width: 100%;
-  overflow: hidden;
+  // overflow: hidden;
 }
 
 .ham {
@@ -26,11 +26,15 @@
   @media (width>1920px) {
     top: 20px;
   }
+
+  @media (width<600px) {
+    opacity: 0;
+  }
 }
 .eventsPage {
-  position: fixed;
+  // position: fixed;
   top: 0rem;
-  height: 100lvh;
+  // height: 100lvh;
   width: 100vw;
   opacity: 1;
   pointer-events: none;
@@ -40,7 +44,7 @@
   justify-content: center;
 
   .heading {
-    margin-top: 3rem;
+    // margin-top: 3rem;
     display: flex;
     justify-content: center;
     align-items: center;
@@ -66,40 +70,46 @@
     // top: 25%;
     padding-top: 13%;
     display: flex;
+    flex-wrap: wrap;
     flex-direction: column;
     gap: 4rem;
     // left: 50%;
-    // width: 90%;
-    // transform: scale(0.9);
-    @media(width>2100px){
-      transform: scale(1.4);
-      padding-top: 18%;
-    }
-    @media(width>1920px){
-      transform: scale(1.2);
-      padding-top: 15%;
-    }
-    @media(width<=1850px){
-      transform: scale(0.9);
-      padding-top: 7%;
-    }
-    @media(width<=1700px){
-      transform: scale(0.8);
-      // padding-left: 0;
-      // left: -2%;
-    }
-    @media(width<=1280px){
-      transform: scale(0.7);
+    width: 90%;
+    justify-content: center;
+    align-items: center;
+
+    @media (width<500px) {
+      width: auto;
     }
+
     .row {
       display: flex;
-      gap: 6rem;
-      @media(width<=1700px){
-        gap: 3rem;
+      flex-wrap: wrap;
+      gap: 2rem;
+      align-items: center;
+      justify-content: center;
+      @media (width<550px) {
+        gap: 0rem;
+        transform: scale(0.8) translateY(-10%);
       }
+
       .box {
         display: flex;
         position: relative;
+        margin: auto;
+        pointer-events: auto;
+        // @media(width<1700px){
+        //   transform: scale(0.8);
+        // }
+        @media (width<1700px) {
+          transform: scale(0.95);
+        }
+        @media (width<1110px) {
+          transform: scale(0.8);
+        }
+        @media (width<550px) {
+          transform: scale(0.65);
+        }
         .dance {
           position: absolute;
           left: 0.5%;
@@ -128,7 +138,7 @@
           height: 80%;
           width: auto;
         }
-        .phototxt{
+        .phototxt {
           color: #fff;
           font-family: "Thedus Condensed Light";
           font-size: 70px;
@@ -140,7 +150,7 @@
           top: 45%;
           transform: translateY(-50%);
         }
-        .cameratxt{
+        .cameratxt {
           color: #fff;
           font-family: "Thedus Condensed Light";
           font-size: 70px;

diff --git a/app/events/page.tsx b/app/events/page.tsx
@@ -186,6 +186,42 @@ export default function EventsPage() {
 
         <div className={styles.gridcontainer}>
           <div className={styles.row}>
+            <Link href="/events/music">
+              <div className={styles.box}>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="484"
+                  height="300"
+                  viewBox="0 0 484 300"
+                  fill="none"
+                >
+                  <g opacity="0.6">
+                    <mask id="path-1-inside-1_4440_1109" fill="white">
+                      <path
+                        fill-rule="evenodd"
+                        clip-rule="evenodd"
+                        d="M22 0.5C22 12.3741 12.3741 22 0.5 22C0.332881 22 0.166208 21.9981 0 21.9943V278.006C0.166208 278.002 0.332881 278 0.5 278C12.3741 278 22 287.626 22 299.5C22 299.667 21.9981 299.834 21.9943 300H462.006C462.002 299.834 462 299.667 462 299.5C462 287.626 471.626 278 483.5 278C483.667 278 483.834 278.002 484 278.006V21.9943C483.834 21.9981 483.667 22 483.5 22C471.626 22 462 12.3741 462 0.5C462 0.332881 462.002 0.166208 462.006 0H21.9943C21.9981 0.166208 22 0.332881 22 0.5Z"
+                      />
+                    </mask>
+                    <path
+                      d="M0 21.9943L0.0273831 20.7946L-1.2 20.7666V21.9943H0ZM0 278.006H-1.2V279.233L0.0273143 279.205L0 278.006ZM21.9943 300L20.7946 299.973L20.7666 301.2H21.9943V300ZM462.006 300V301.2H463.233L463.205 299.973L462.006 300ZM484 278.006L483.973 279.205L485.2 279.233V278.006H484ZM484 21.9943H485.2V20.7666L483.973 20.7946L484 21.9943ZM462.006 0L463.205 0.0273143L463.233 -1.2H462.006V0ZM21.9943 0V-1.2H20.7666L20.7946 0.0273831L21.9943 0ZM0.5 23.2C13.0369 23.2 23.2 13.0369 23.2 0.5H20.8C20.8 11.7114 11.7114 20.8 0.5 20.8V23.2ZM-0.0273831 23.194C0.147958 23.198 0.323759 23.2 0.5 23.2V20.8C0.342003 20.8 0.184458 20.7982 0.0273831 20.7946L-0.0273831 23.194ZM1.2 278.006V21.9943H-1.2V278.006H1.2ZM0.5 276.8C0.323677 276.8 0.147898 276.802 -0.0273143 276.806L0.0273143 279.205C0.184517 279.202 0.342085 279.2 0.5 279.2V276.8ZM23.2 299.5C23.2 286.963 13.0369 276.8 0.5 276.8V279.2C11.7114 279.2 20.8 288.289 20.8 299.5H23.2ZM23.194 300.027C23.198 299.852 23.2 299.676 23.2 299.5H20.8C20.8 299.658 20.7982 299.816 20.7946 299.973L23.194 300.027ZM462.006 298.8H21.9943V301.2H462.006V298.8ZM460.8 299.5C460.8 299.676 460.802 299.852 460.806 300.027L463.205 299.973C463.202 299.815 463.2 299.658 463.2 299.5H460.8ZM483.5 276.8C470.963 276.8 460.8 286.963 460.8 299.5H463.2C463.2 288.289 472.289 279.2 483.5 279.2V276.8ZM484.027 276.806C483.852 276.802 483.676 276.8 483.5 276.8V279.2C483.658 279.2 483.815 279.202 483.973 279.205L484.027 276.806ZM482.8 21.9943V278.006H485.2V21.9943H482.8ZM483.973 20.7946C483.816 20.7982 483.658 20.8 483.5 20.8V23.2C483.676 23.2 483.852 23.198 484.027 23.194L483.973 20.7946ZM483.5 20.8C472.289 20.8 463.2 11.7114 463.2 0.5H460.8C460.8 13.0369 470.963 23.2 483.5 23.2V20.8ZM463.2 0.5C463.2 0.342085 463.202 0.184517 463.205 0.0273143L460.806 -0.0273143C460.802 0.147898 460.8 0.323677 460.8 0.5H463.2ZM21.9943 1.2H462.006V-1.2H21.9943V1.2ZM23.2 0.5C23.2 0.323759 23.198 0.147958 23.194 -0.0273831L20.7946 0.0273831C20.7982 0.184458 20.8 0.342003 20.8 0.5H23.2Z"
+                      fill="#CBAE57"
+                      mask="url(#path-1-inside-1_4440_1109)"
+                    />
+                  </g>
+                </svg>
+                <div className={styles.fill}></div>
+                <Image
+                  src={music}
+                  alt="music"
+                  width={200}
+                  height={200}
+                  className={styles.music}
+                />
+                <p className={styles.musictxt}>MUSIC</p>
+              </div>
+            </Link>
+            <Link href="/events/quiz">
             <div className={styles.box}>
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -210,9 +246,17 @@ export default function EventsPage() {
                 </g>
               </svg>
               <div className={styles.fill}></div>
-              <Image src={music} alt="music" width={200} height={200} className={styles.music}/>
-              <p className={styles.musictxt}>MUSIC</p>
+              <Image
+                src={quiz}
+                alt="music"
+                width={200}
+                height={200}
+                className={styles.quiz}
+              />
+              <p className={styles.quiztxt}>QUIZ</p>
             </div>
+            </Link>
+            <Link href="/events/drama">
             <div className={styles.box}>
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -237,9 +281,17 @@ export default function EventsPage() {
                 </g>
               </svg>
               <div className={styles.fill}></div>
-              <Image src={quiz} alt="music" width={200} height={200} className={styles.quiz}/>
-              <p className={styles.quiztxt}>QUIZ</p>
+              <Image
+                src={drama}
+                alt="music"
+                width={200}
+                height={200}
+                className={styles.drama}
+              />
+              <p className={styles.dramatxt}>DRAMA</p>
             </div>
+            </Link>
+            <Link href="/events/dance">
             <div className={styles.box}>
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -264,11 +316,89 @@ export default function EventsPage() {
                 </g>
               </svg>
               <div className={styles.fill}></div>
-              <Image src={drama} alt="music" width={200} height={200} className={styles.drama}/>
-              <p className={styles.dramatxt}>DRAMA</p>
+              <Image
+                src={dance}
+                alt="music"
+                width={200}
+                height={200}
+                className={styles.dance}
+              />
+              <p className={styles.dancetxt}>DANCE</p>
+            </div>
+            </Link>
+            <Link href="/events/fashion">
+            <div className={styles.box}>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="484"
+                height="300"
+                viewBox="0 0 484 300"
+                fill="none"
+              >
+                <g opacity="0.6">
+                  <mask id="path-1-inside-1_4440_1109" fill="white">
+                    <path
+                      fill-rule="evenodd"
+                      clip-rule="evenodd"
+                      d="M22 0.5C22 12.3741 12.3741 22 0.5 22C0.332881 22 0.166208 21.9981 0 21.9943V278.006C0.166208 278.002 0.332881 278 0.5 278C12.3741 278 22 287.626 22 299.5C22 299.667 21.9981 299.834 21.9943 300H462.006C462.002 299.834 462 299.667 462 299.5C462 287.626 471.626 278 483.5 278C483.667 278 483.834 278.002 484 278.006V21.9943C483.834 21.9981 483.667 22 483.5 22C471.626 22 462 12.3741 462 0.5C462 0.332881 462.002 0.166208 462.006 0H21.9943C21.9981 0.166208 22 0.332881 22 0.5Z"
+                    />
+                  </mask>
+                  <path
+                    d="M0 21.9943L0.0273831 20.7946L-1.2 20.7666V21.9943H0ZM0 278.006H-1.2V279.233L0.0273143 279.205L0 278.006ZM21.9943 300L20.7946 299.973L20.7666 301.2H21.9943V300ZM462.006 300V301.2H463.233L463.205 299.973L462.006 300ZM484 278.006L483.973 279.205L485.2 279.233V278.006H484ZM484 21.9943H485.2V20.7666L483.973 20.7946L484 21.9943ZM462.006 0L463.205 0.0273143L463.233 -1.2H462.006V0ZM21.9943 0V-1.2H20.7666L20.7946 0.0273831L21.9943 0ZM0.5 23.2C13.0369 23.2 23.2 13.0369 23.2 0.5H20.8C20.8 11.7114 11.7114 20.8 0.5 20.8V23.2ZM-0.0273831 23.194C0.147958 23.198 0.323759 23.2 0.5 23.2V20.8C0.342003 20.8 0.184458 20.7982 0.0273831 20.7946L-0.0273831 23.194ZM1.2 278.006V21.9943H-1.2V278.006H1.2ZM0.5 276.8C0.323677 276.8 0.147898 276.802 -0.0273143 276.806L0.0273143 279.205C0.184517 279.202 0.342085 279.2 0.5 279.2V276.8ZM23.2 299.5C23.2 286.963 13.0369 276.8 0.5 276.8V279.2C11.7114 279.2 20.8 288.289 20.8 299.5H23.2ZM23.194 300.027C23.198 299.852 23.2 299.676 23.2 299.5H20.8C20.8 299.658 20.7982 299.816 20.7946 299.973L23.194 300.027ZM462.006 298.8H21.9943V301.2H462.006V298.8ZM460.8 299.5C460.8 299.676 460.802 299.852 460.806 300.027L463.205 299.973C463.202 299.815 463.2 299.658 463.2 299.5H460.8ZM483.5 276.8C470.963 276.8 460.8 286.963 460.8 299.5H463.2C463.2 288.289 472.289 279.2 483.5 279.2V276.8ZM484.027 276.806C483.852 276.802 483.676 276.8 483.5 276.8V279.2C483.658 279.2 483.815 279.202 483.973 279.205L484.027 276.806ZM482.8 21.9943V278.006H485.2V21.9943H482.8ZM483.973 20.7946C483.816 20.7982 483.658 20.8 483.5 20.8V23.2C483.676 23.2 483.852 23.198 484.027 23.194L483.973 20.7946ZM483.5 20.8C472.289 20.8 463.2 11.7114 463.2 0.5H460.8C460.8 13.0369 470.963 23.2 483.5 23.2V20.8ZM463.2 0.5C463.2 0.342085 463.202 0.184517 463.205 0.0273143L460.806 -0.0273143C460.802 0.147898 460.8 0.323677 460.8 0.5H463.2ZM21.9943 1.2H462.006V-1.2H21.9943V1.2ZM23.2 0.5C23.2 0.323759 23.198 0.147958 23.194 -0.0273831L20.7946 0.0273831C20.7982 0.184458 20.8 0.342003 20.8 0.5H23.2Z"
+                    fill="#CBAE57"
+                    mask="url(#path-1-inside-1_4440_1109)"
+                  />
+                </g>
+              </svg>
+              <div className={styles.fill}></div>
+              <Image
+                src={fashion}
+                alt="music"
+                width={200}
+                height={200}
+                className={styles.dance}
+              />
+              <p className={styles.fashiontxt}>FASHION</p>
             </div>
+            </Link>
+            <Link href="/events/photography">
+            <div className={styles.box}>
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="484"
+                height="300"
+                viewBox="0 0 484 300"
+                fill="none"
+              >
+                <g opacity="0.6">
+                  <mask id="path-1-inside-1_4440_1109" fill="white">
+                    <path
+                      fill-rule="evenodd"
+                      clip-rule="evenodd"
+                      d="M22 0.5C22 12.3741 12.3741 22 0.5 22C0.332881 22 0.166208 21.9981 0 21.9943V278.006C0.166208 278.002 0.332881 278 0.5 278C12.3741 278 22 287.626 22 299.5C22 299.667 21.9981 299.834 21.9943 300H462.006C462.002 299.834 462 299.667 462 299.5C462 287.626 471.626 278 483.5 278C483.667 278 483.834 278.002 484 278.006V21.9943C483.834 21.9981 483.667 22 483.5 22C471.626 22 462 12.3741 462 0.5C462 0.332881 462.002 0.166208 462.006 0H21.9943C21.9981 0.166208 22 0.332881 22 0.5Z"
+                    />
+                  </mask>
+                  <path
+                    d="M0 21.9943L0.0273831 20.7946L-1.2 20.7666V21.9943H0ZM0 278.006H-1.2V279.233L0.0273143 279.205L0 278.006ZM21.9943 300L20.7946 299.973L20.7666 301.2H21.9943V300ZM462.006 300V301.2H463.233L463.205 299.973L462.006 300ZM484 278.006L483.973 279.205L485.2 279.233V278.006H484ZM484 21.9943H485.2V20.7666L483.973 20.7946L484 21.9943ZM462.006 0L463.205 0.0273143L463.233 -1.2H462.006V0ZM21.9943 0V-1.2H20.7666L20.7946 0.0273831L21.9943 0ZM0.5 23.2C13.0369 23.2 23.2 13.0369 23.2 0.5H20.8C20.8 11.7114 11.7114 20.8 0.5 20.8V23.2ZM-0.0273831 23.194C0.147958 23.198 0.323759 23.2 0.5 23.2V20.8C0.342003 20.8 0.184458 20.7982 0.0273831 20.7946L-0.0273831 23.194ZM1.2 278.006V21.9943H-1.2V278.006H1.2ZM0.5 276.8C0.323677 276.8 0.147898 276.802 -0.0273143 276.806L0.0273143 279.205C0.184517 279.202 0.342085 279.2 0.5 279.2V276.8ZM23.2 299.5C23.2 286.963 13.0369 276.8 0.5 276.8V279.2C11.7114 279.2 20.8 288.289 20.8 299.5H23.2ZM23.194 300.027C23.198 299.852 23.2 299.676 23.2 299.5H20.8C20.8 299.658 20.7982 299.816 20.7946 299.973L23.194 300.027ZM462.006 298.8H21.9943V301.2H462.006V298.8ZM460.8 299.5C460.8 299.676 460.802 299.852 460.806 300.027L463.205 299.973C463.202 299.815 463.2 299.658 463.2 299.5H460.8ZM483.5 276.8C470.963 276.8 460.8 286.963 460.8 299.5H463.2C463.2 288.289 472.289 279.2 483.5 279.2V276.8ZM484.027 276.806C483.852 276.802 483.676 276.8 483.5 276.8V279.2C483.658 279.2 483.815 279.202 483.973 279.205L484.027 276.806ZM482.8 21.9943V278.006H485.2V21.9943H482.8ZM483.973 20.7946C483.816 20.7982 483.658 20.8 483.5 20.8V23.2C483.676 23.2 483.852 23.198 484.027 23.194L483.973 20.7946ZM483.5 20.8C472.289 20.8 463.2 11.7114 463.2 0.5H460.8C460.8 13.0369 470.963 23.2 483.5 23.2V20.8ZM463.2 0.5C463.2 0.342085 463.202 0.184517 463.205 0.0273143L460.806 -0.0273143C460.802 0.147898 460.8 0.323677 460.8 0.5H463.2ZM21.9943 1.2H462.006V-1.2H21.9943V1.2ZM23.2 0.5C23.2 0.323759 23.198 0.147958 23.194 -0.0273831L20.7946 0.0273831C20.7982 0.184458 20.8 0.342003 20.8 0.5H23.2Z"
+                    fill="#CBAE57"
+                    mask="url(#path-1-inside-1_4440_1109)"
+                  />
+                </g>
+              </svg>
+              <div className={styles.fill}></div>
+              <Image
+                src={camera}
+                alt="music"
+                width={200}
+                height={200}
+                className={styles.dance}
+              />
+              <p className={styles.phototxt}>PHOTO</p>
+              <p className={styles.cameratxt}>GRAPHY</p>
+            </div>
+            </Link>
           </div>
-          <div className={styles.row}>
+          {/* <div className={styles.row}>
             <div className={styles.box}>
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -351,7 +481,7 @@ export default function EventsPage() {
               <p className={styles.phototxt}>PHOTO</p>
               <p className={styles.cameratxt}>GRAPHY</p>
             </div>
-          </div>
+          </div> */}
         </div>
       </div>
 

diff --git a/app/shows/profshow.module.scss b/app/shows/profshow.module.scss
@@ -13,16 +13,16 @@
   overflow: hidden;
 
   @media (max-width: 4000px) and (min-width: 2200px) {
-    padding-top: 5rem;
+    // padding-top: 5rem;
     overflow-x: hidden;
   }
 
   @media (max-width: 2200px) and (min-width: 1850px) {
-    padding-top: 3rem;
+    // padding-top: 3rem;
   }
 
   @media (max-width: 1850px) and (min-width: 1500px) {
-    padding-top: 3rem;
+    // padding-top: 3rem;
   }
 
   .backBtn {

diff --git a/components/AboutUs/Machine/machine.module.scss b/components/AboutUs/Machine/machine.module.scss
@@ -18,7 +18,10 @@
     transform: translateX(100px) translateY(50px);
   }
   @media screen and (width <= 1200px) {
-    display: none;
+    // display: none;
+    left: 50%;
+    transform: translateX(-70%) translateY(35%);
+    scale: 0.6;
   }
 
   .machine {

diff --git a/components/AboutUs/page.module.scss b/components/AboutUs/page.module.scss
@@ -9,8 +9,10 @@
   width: 40%;
   @media screen and (width <= 1200px) {
     width: 90%;
+    transform: translateY(-250px);
   }
 
+
   height: 100lvh;
   margin-left: 8.5%;