Merge pull request #89 from gdsc-nits-org/New

asme add
gdsc-nits-org · Nov 1, 2024 · 1b6358a · 1b6358a
2 parents 9fde38b + 5842fd4
commit 1b6358a
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 103 deletions.
diff --git a/public/data/moduleheads.json b/public/data/moduleheads.json
@@ -13,6 +13,20 @@
             }
         ]
     },
+    {
+        "id":15,
+        "module": "ASME",
+        "heads":[
+            {
+                "name": "Dhritiman Das",
+                "designation": "Module Head",
+                "photo": "https://res.cloudinary.com/dprjiwgfo/image/upload/v1729687270/event_management_heads_Dhritiman_Das.webp",
+                "facebook": "https://www.facebook.com/profile.php?id=100076444172130",
+                "instagram": "https://www.instagram.com/who_dhritimandas/",
+                "linkedin": "https://www.linkedin.com/in/dhritiman-das-34439b22a/"
+            }
+        ]
+    },
     {
         "id": 2,
         "module": "Bytewatt",

diff --git a/public/sponsors/jrny.webp b/public/sponsors/jrny.webp
diff --git a/src/app/(main)/home/page.tsx b/src/app/(main)/home/page.tsx
@@ -21,16 +21,16 @@ export default function Page() {
       <div className="text-gradient-blue titleText m-10 text-center font-rp1 font-bold">
         Past Sponsors
       </div>
-      <div className="mb-20 flex w-full flex-col gap-y-20 md:w-4/5">
+      <div className="flex w-full flex-col gap-y-20 md:w-4/5">
         <MarqueeComponent direction={"left"} set={1} />
         <MarqueeComponent direction={"right"} set={2} />
       </div>
-      {/* <div className="text-gradient-blue titleText mb-10 mt-20 font-rp1 font-bold sm:pt-20">
+      <div className="text-gradient-blue titleText mt-20 font-rp1 font-bold sm:pt-20">
         Sponsors
       </div>
-      <div className="w-full px-10">
+      <div className="w-full px-10 mb-20">
         <SponsorHome />
-      </div> */}
+      </div>
       <FinalFooter />
     </div>
   );

diff --git a/src/components/FinalFooter.tsx b/src/components/FinalFooter.tsx
@@ -156,7 +156,7 @@ const LandingFooter = () => {
 
   return (
     <>
-      <footer className="relative flex min-h-[50vh] w-full flex-col overflow-hidden bg-black">
+      <footer className="relative flex min-h-[50vh] w-full flex-col overflow-hidden bg-black footer_mask">
         <div
           className="bg-[linear-gradient(black, #000000)] z-40 mb-[-150px] h-[160px] w-full"
           style={{
@@ -186,7 +186,7 @@ const LandingFooter = () => {
         )}
         <div className="z-20 flex h-fit w-full flex-grow flex-col items-center justify-between bg-[url('/assets/footer/imgs/globe.png')] bg-cover bg-center">
           <div className="flex w-full flex-col items-center justify-between">
-            <div className="mb-0 mb-[-20px] mt-[150px] flex h-[30vh] w-[90vw] flex-col items-center justify-center bg-[url('/assets/footer/imgs/tecno.webp')] bg-contain bg-center bg-no-repeat sm:h-[30vh] sm:w-[80%] md:h-[35vh] md:w-[80%] lg:h-[40vh] lg:w-[80%]"></div>
+            <div className="mb-[-20px] mt-[150px] flex h-[30vh] w-[90vw] flex-col items-center justify-center bg-[url('/assets/footer/imgs/tecno.webp')] bg-contain bg-center bg-no-repeat sm:h-[30vh] sm:w-[80%] md:h-[35vh] md:w-[80%] lg:h-[40vh] lg:w-[80%]"></div>
           </div>
 
           <div className="mb-0 mt-auto flex w-full flex-col items-center justify-end py-8 sm:mb-[-10px]">

diff --git a/src/components/GoogleAuth.tsx b/src/components/GoogleAuth.tsx
@@ -24,6 +24,9 @@ const Login = () => {
   const [userName, setUserName] = useState("");
   const [firstName, setFirstName] = useState("");
   const [lastName, setLastName] = useState("");
+
+
+
   useEffect(() => {
     const checkUserFirstTime = async () => {
       if (!_user) return;
@@ -37,6 +40,7 @@ const Login = () => {
             },
           },
         );
+
         setUserName(() => res.data.msg.username);
         setFirstName(() => res.data.msg.firstName);
         setLastName(() => res.data.msg.lastName);
@@ -51,7 +55,7 @@ const Login = () => {
       }
     };
     void checkUserFirstTime();
-  }, [user, router, _user, userName, setUserName]);
+  }, [ _user, userName, setUserName, router, user]);
 
   if (error) {
     toast.error("There was some Firebase error");

diff --git a/src/components/Modules.tsx b/src/components/Modules.tsx
@@ -40,18 +40,6 @@ const Modules: React.FC = () => {
     void fetchModules();
   }, []);
 
-  useEffect(() => {
-    const script = document.createElement("script");
-    script.type = "module";
-    script.src =
-      "https://unpkg.com/@splinetool/[email protected]/build/spline-viewer.js";
-    document.body.appendChild(script);
-
-    return () => {
-      document.body.removeChild(script);
-    };
-  }, []);
-
   useEffect(() => {
     const images = imagesRef.current;
     const texts = textRefs.current;
@@ -113,13 +101,7 @@ const Modules: React.FC = () => {
 
   return (
     <div className="relative min-h-screen overflow-hidden bg-[url('/assets/modules/bg-modules.gif')] bg-fixed bg-center bg-no-repeat bg-contain md:bg-none">
-      <div
-        className="z-10000 fixed inset-0 md:flex hidden"
-        dangerouslySetInnerHTML={{
-          __html: `<spline-viewer url="https://prod.spline.design/OmWCr5bjwkhWeTeP/scene.splinecode" style="width: 100%; height: 100%;"></spline-viewer>`,
-        }}
-      ></div>
-      {/* <div className="relative min-h-screen overflow-hidden md:bg-[url('/assets/modules/bg-modules.gif')] md:bg-fixed md:bg-center md:bg-no-repeat bg-none md:bg-contain"> */}
+      <div className="relative min-h-screen overflow-hidden md:bg-[url('/assets/modules/bg-modules.gif')] md:bg-fixed md:bg-center md:bg-no-repeat bg-none md:bg-contain">
         {isLoading ? (
           <div className="relative z-10 pt-[7.4rem] text-white">
             <div className="flex w-full flex-col gap-24">
@@ -217,7 +199,7 @@ const Modules: React.FC = () => {
           </div>
         ) : null}
       </div>
-    // </div>
+     </div>
   );
 };
 

diff --git a/src/components/SponsorHome.tsx b/src/components/SponsorHome.tsx
@@ -7,42 +7,12 @@ const backgroundImg = '/past-sponsor-logos/sponsorRect.webp';
 const imageSets = [
   [
     {
-      src: "/past-sponsor-logos/amul-logo.webp",
+      src: "/sponsors/jrny.webp",
       alt: "Amul",
       width: 150,
       height: 150,
-    },
-    {
-      src: "/past-sponsor-logos/hackerearth-logo.webp",
-      alt: "HackerEarth",
-      width: 150,
-      height: 150,
-    },
-    {
-      src: "/past-sponsor-logos/gplus-logo.webp",
-      alt: "G Plus",
-      width: 200,
-      height: 100,
-    },
-    {
-      src: "/past-sponsor-logos/cocacola-logo.webp",
-      alt: "Coca Cola",
-      width: 150,
-      height: 150,
-    },
-    {
-      src: "/past-sponsor-logos/zebronics-logo-white.webp",
-      alt: "Zebronics",
-      width: 150,
-      height: 150,
-    },
-    {
-      src: "/past-sponsor-logos/MTV-logo.webp",
-      alt: "MTV",
-      width: 200,
-      height: 200,
-    },
-  ],
+    }
+  ]
 ];
 
 const SponsorHome: React.FC = () => {

diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -296,8 +296,7 @@ body {
 .starry-background {
   background-color: #000;
   background-image: radial-gradient(circle, #ffffff 1px, transparent 1px),
-    radial-gradient(circle, #ffffff 2px, transparent 2px),
-    radial-gradient(circle, #ffffff 3px, transparent 3px);
+    radial-gradient(circle, #ffffff 2px, transparent 2px), radial-gradient(circle, #ffffff 3px, transparent 3px);
   background-size:
     20px 20px,
     40px 40px,
@@ -559,12 +558,7 @@ body {
 }
 .newEventCard {
   border: 1.5px solid;
-  border-image-source: linear-gradient(
-    148.38deg,
-    #7decff 1.01%,
-    #111922 51.14%,
-    #76bef8 97.42%
-  );
+  border-image-source: linear-gradient(148.38deg, #7decff 1.01%, #111922 51.14%, #76bef8 97.42%);
   border-image-slice: 1;
   border-radius: 10px;
   mask-image: radial-gradient(circle, white 100%, transparent 100%);
@@ -573,9 +567,9 @@ body {
   z-index: 1;
 }
 
-@media screen and (max-width:500px){
-  .newEventCard{
-    scale: .8;
+@media screen and (max-width: 500px) {
+  .newEventCard {
+    scale: 0.8;
   }
 }
 .gradCont {
@@ -594,12 +588,7 @@ body {
 .eventcard {
   margin: 10px;
   border: 1px solid;
-  border-image-source: linear-gradient(
-    148.38deg,
-    #7decff 1.01%,
-    #111922 51.14%,
-    #76bef8 97.42%
-  );
+  border-image-source: linear-gradient(148.38deg, #7decff 1.01%, #111922 51.14%, #76bef8 97.42%);
   border-image-slice: 1;
   padding: 20px;
   border-radius: 10px;
@@ -631,7 +620,11 @@ body {
   }
 }
 
-.homepage,.teampage,.gallerypage,.dashboardpage,.modulepage {
+.homepage,
+.teampage,
+.gallerypage,
+.dashboardpage,
+.modulepage {
   animation-name: emerge;
   animation-duration: 1s;
   animation-iteration-count: 1;
@@ -677,22 +670,12 @@ body {
 }
 
 ::-webkit-scrollbar-thumb {
-  background: linear-gradient(
-    to top,
-    transparent 0%,
-    #0f0fefaa 40%,
-    #000009 60%
-  );
+  background: linear-gradient(to top, transparent 0%, #0f0fefaa 40%, #000009 60%);
   border-radius: 10px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-  background: linear-gradient(
-    to top,
-    transparent 0%,
-    #0f0fefaa 40%,
-    #000009 60%
-  );
+  background: linear-gradient(to top, transparent 0%, #0f0fefaa 40%, #000009 60%);
   border-radius: 10px;
 }
 
@@ -705,41 +688,53 @@ body {
 .btnText {
   @apply text-sm lg:text-base 3xl:text-xl 4xl:text-4xl;
 }
-.sparkheroParent {
-  -webkit-mask-image: linear-gradient(to top, transparent 0%, rgba(255, 255, 255, 1) 80%,transparent);
-  mask-image: linear-gradient(to top, transparent 0%, rgba(255, 255, 255, 1) 80%,transparent);
+.sparkheroParent{
+  -webkit-mask-image: linear-gradient(to top, transparent 0%, rgba(255, 255, 255, 1) 80%, transparent);
+  mask-image: linear-gradient(to top, transparent 0%, rgba(255, 255, 255, 1) 80%, transparent);
 }
-
-.sparkHero{
-  background: linear-gradient(137.95deg, #7A96AC 2.28%, #EAEFF3 19.8%, #C2D4E1 32.94%, #FFFFFF 50.16%, #D4DEE5 62.15%, #ABBDC8 78.69%, #BCCAD7 95.24%);
+.footer_mask{
+  -webkit-mask-image: linear-gradient(to bottom, transparent 0%, rgba(255, 255, 255, 1) 80%);
+  mask-image: linear-gradient(to bottom, transparent 0%, rgba(255, 255, 255, 1) 80%);
+}
+.sparkHero {
+  background: linear-gradient(
+    137.95deg,
+    #7a96ac 2.28%,
+    #eaeff3 19.8%,
+    #c2d4e1 32.94%,
+    #ffffff 50.16%,
+    #d4dee5 62.15%,
+    #abbdc8 78.69%,
+    #bccad7 95.24%
+  );
   -webkit-background-clip: text;
   background-clip: text;
-  color:transparent;
-  animation-name:sparkGlow;
+  color: transparent;
+  animation-name: sparkGlow;
   animation-iteration-count: infinite;
   animation-duration: 1s;
   animation-fill-mode: forwards;
 }
 @keyframes sparkGlow {
-  0%{
+  0% {
     text-shadow: 0 0 0.5rem #ffffff;
   }
-  50%{
+  50% {
     text-shadow: 0 0 1rem #ffffff;
   }
-  100%{
+  100% {
     text-shadow: 0 0 0.5rem #ffffff;
   }
 }
 
-
 .glitch {
   font-size: 4rem;
   color: #f1f1f1;
   transform: skew(var(--skew)) scale(var(--scale));
 }
 
-.glitch::after, .glitch::before {
+.glitch::after,
+.glitch::before {
   content: attr(data-text);
   position: absolute;
   width: 100%;