Merge main branch into prod

dvm-bitspilani · Sep 8, 2024 · b274417 · b274417
2 parents 4b090aa + 43935e8
commit b274417
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 39 deletions.
diff --git a/app/Registration/registration.module.scss b/app/Registration/registration.module.scss
@@ -34,6 +34,11 @@
       @media screen and (width >= 1150px) {
         display: none;
       }
+
+      @media (width <= 450px) {
+        font-size: 25px;
+        top: 20px;
+      }
       position: absolute;
       top: 12px;
       left: 50%;
@@ -61,22 +66,22 @@
       span {
         padding: 0 1rem;
       }
-      @media screen and (width > 1150px) {
-        display: none;
-      }
     }
 
     .border {
-      @media screen and (width <= 1150px) {
-        display: none;
-      }
+      // @media screen and (width <= 1150px) {
+      //   display: none;
+      // }
       position: absolute;
       display: flex;
       justify-content: center;
       width: 100vw;
       gap: 1rem;
       height: 100vh;
       .registration {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         top: 12px;
         left: 50%;
@@ -110,8 +115,19 @@
         top: 5px;
         left: 10px;
         z-index: 100;
+
+        @media(width <= 500px) {
+          left: -10px;
+        }
+        // @media(width <= 450px) {
+        //   left: 50%;
+        //   transform: translateX(-50%);
+        // }
       }
       .frameLeft {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         top: 110px;
         left: 50px;
@@ -120,6 +136,9 @@
         background-color: #d6c28a;
       }
       .frameTopLeft {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         top: 46px;
         left: 115px;
@@ -128,6 +147,9 @@
         background-color: #d6c28a;
       }
       .frameTopRight {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         top: 46px;
         right: 50px;
@@ -140,6 +162,9 @@
         }
       }
       .frameRight {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         right: 50px;
         display: flex;
@@ -151,6 +176,9 @@
         width: 34px;
       }
       .frameBottomRight {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         right: 52px;
         bottom: 46px;
@@ -164,6 +192,9 @@
         }
       }
       .frameBottomLeft {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         bottom: 46px;
         right: 500px;
@@ -172,13 +203,19 @@
         background-color: #d6c28a;
       }
       .bottomSLine {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         bottom: -81.7vh;
         right: 7.3rem;
         // height: 2px;
         width: 9.5vw;
       }
       .bottomLine {
+        @media screen and (width <= 1150px) {
+          display: none;
+        }
         position: absolute;
         bottom: -82.1vh;
         right: calc((9.5vw) + 7.3rem + 10vw);

diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,4 +1,5 @@
 import type { Metadata } from "next";
+import type { Viewport } from 'next'
 import { Inter } from "next/font/google";
 import { GoogleOAuthProvider } from "@react-oauth/google";
 import { GoogleAnalytics } from '@next/third-parties/google';
@@ -9,8 +10,7 @@ const inter = Inter({ subsets: ["latin"] });
 
 export const metadata: Metadata = {
   title: "Oasis '24",
-  description: "The official website of Oasis 2024 - , Asia's Largest Student-Run College Cultural Festival returns for its 52nd edition in 2024! Est. 1971",
-  colorScheme: "dark",
+  description: "The official website of Oasis 2024 - Asia's Largest Student-Run College Cultural Festival returns for its 52nd edition in 2024! Est. 1971",
   robots: {
     index: true,
     follow: true,
@@ -24,18 +24,23 @@ export const metadata: Metadata = {
       "max-snippet": -1,
     },
   },
-  viewport: {
-    width: "device-width",
-    initialScale: 1,
-    maximumScale: 1,
-  },
-  openGraph: {
-    images: [
-      OasisLogo.src,
-    ],
-  },
+  // openGraph: {
+  //   title: "Oasis '24",
+  // },
+  // openGraph: {
+  //   images: [
+  //     OasisLogo.src,
+  //   ],
+  // },
 };
 
+export const viewport: Viewport = {
+  colorScheme: 'dark',
+  width: "device-width",
+  initialScale: 1,
+  maximumScale: 1,
+}
+
 export default function RootLayout({
   children,
 }: Readonly<{

diff --git a/components/Landing/Landing/Landing.tsx b/components/Landing/Landing/Landing.tsx
@@ -925,23 +925,23 @@ export default function Landing() {
                   },
                   "<"
                 )
-                .to(
-                  "#contactBottom",
-                  {
-                    opacity: 1,
-                    duration: 0,
-                    pointerEvents: "auto",
-                  },
-                  "-=1.5"
-                )
-                .from(
-                  "#contactBottom",
-                  {
-                    y: 75,
-                    duration: 1,
-                  },
-                  "<"
-                );
+                // .to(
+                //   "#contactBottom",
+                //   {
+                //     opacity: 1,
+                //     duration: 0,
+                //     pointerEvents: "auto",
+                //   },
+                //   "-=1.5"
+                // )
+                // .from(
+                //   "#contactBottom",
+                //   {
+                //     y: 75,
+                //     duration: 1,
+                //   },
+                //   "<"
+                // );
             }
           );
         }

diff --git a/components/Registration/BackButton/btn.module.scss b/components/Registration/BackButton/btn.module.scss
@@ -15,7 +15,7 @@
     height: 100%;
     position: absolute;
 
-    @media (width <= 585px) {
+    @media (width <= 1150px) {
       display: none;
     }
   }
@@ -63,7 +63,4 @@
     transform: scale(0.65);
   }
 
-  @media (width <= 585px) {
-    transform: scale(1);
-  }
 }
diff --git a/components/Registration/SignIn/signin.module.scss b/components/Registration/SignIn/signin.module.scss
@@ -6,6 +6,9 @@
     display: flex;
     align-items: center;
     gap: 10px;
+    @media(width <= 500px){
+      transform: scale(0.8);
+    }
     .title {
       background: linear-gradient(
         0deg,
@@ -31,6 +34,7 @@
       @media (width <= 650px) {
         font-size: 28px;
       }
+
     }
   }
   .contentcontainer {