Merge branch 'main' into main

Programmer-RD-AI · Aug 5, 2024 · bb6bde9 · bb6bde9
2 parents 89f8ac3 + dd6ccd3
commit bb6bde9
Show file tree

Hide file tree

Showing 55 changed files with 397 additions and 172 deletions.
diff --git a/build/hero/bgHero.png b/build/hero/bgHero.png
diff --git a/build/hero/heroBg.png b/build/hero/heroBg.png
diff --git a/build/index.html b/build/index.html
@@ -2,6 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
+    <link rel="preconnect" href="https://use.typekit.net">
+    <link rel="preconnect" href="https://use.typekit.net" crossorigin>
+    <link rel="stylesheet" href="https://use.typekit.net/hzv1rhy.css">
     <link rel="icon" type="image/svg+xml" href="/micromazeLogo.png" />
     <link href="https://fonts.cdnfonts.com/css/peace-sans" rel="stylesheet" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
@@ -47,6 +50,6 @@
     <link rel="stylesheet" crossorigin href="/assets/index-DM_qYnBC.css">
   </head>
   <body>
-    <div id="root"></div>
+    <div class="" id="root"></div>
   </body>
 </html>
diff --git a/build/merch/item1/band1.JPG b/build/merch/item1/band1.JPG
diff --git a/build/merch/item1/band2.JPG b/build/merch/item1/band2.JPG
diff --git a/build/merch/item1/wrist1.png b/build/merch/item1/wrist1.png
diff --git a/build/merch/item1/wrist2.png b/build/merch/item1/wrist2.png
diff --git a/index.html b/index.html
@@ -5,12 +5,12 @@
     <link rel="icon" type="image/svg+xml" href="/fav-bg.png" />
     <link href="https://fonts.cdnfonts.com/css/peace-sans" rel="stylesheet" />
     <link rel="preconnect" href="https://fonts.googleapis.com" />
+    <link rel="stylesheet" href="https://use.typekit.net/bog3ymk.css">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
       href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
       rel="stylesheet"
     />
-    <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Archivo+Black&family=League+Spartan:[email protected]&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
 
@@ -21,7 +21,6 @@
       integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH"
       crossorigin="anonymous"
     />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
     <link
       href="https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap"
@@ -42,7 +41,7 @@
       href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css"
     />
 
-    <title>MicroMaze-2024</title>
+    <title>MicroMaze</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "react-fast-marquee": "^1.6.5",
     "react-icons": "^5.2.1",
     "react-lazy-load-image-component": "^1.6.2",
+    "react-loader-spinner": "^6.1.6",
     "react-responsive-carousel": "^3.2.23",
     "react-vertical-timeline-component": "^3.6.0",
     "styled-components": "^6.1.12"

diff --git a/public/MicroMazeLogo.png b/public/MicroMazeLogo.png
diff --git a/public/contact/Yashmithapfp.jpg b/public/contact/Yashmithapfp.jpg
diff --git a/public/contact/Yashmithapfp2.jpg b/public/contact/Yashmithapfp2.jpg
diff --git a/public/counter/bgOver.png b/public/counter/bgOver.png
diff --git a/public/merch/item1/Sticker.png b/public/merch/item1/Sticker.png
diff --git a/public/merch/item1/tback.jpg b/public/merch/item1/tback.jpg
diff --git a/public/merch/item1/tfront.jpg b/public/merch/item1/tfront.jpg
diff --git a/public/merch/item1/wrist1.png b/public/merch/item1/wrist1.png
diff --git a/public/merch/item1/wrist2.png b/public/merch/item1/wrist2.png
diff --git a/public/micromazeLogo.png b/public/micromazeLogo.png
diff --git a/public/partners/CodeChefsLogo-Media.png b/public/partners/CodeChefsLogo-Media.png
diff --git a/public/partners/Linal-Photography.png b/public/partners/Linal-Photography.png
diff --git a/public/partners/Noriza-Videography.jpg b/public/partners/Noriza-Videography.jpg
diff --git a/src/App.jsx b/src/App.jsx
@@ -1,10 +1,21 @@
-import MainPage from "./pages/MainPage";
+import React, { useState, useEffect } from 'react';
+import LoadingComponent from './pages/layouts/LoadingComponent';
+import MainPage from './pages/MainPage';
 
 const App = () => {
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    // Simulate a loading process
+    setTimeout(() => {
+      setIsLoading(false);
+    }, 2000); // Adjust the time as needed
+  }, []);
+
   return (
-    <>
-      <MainPage />
-    </>
+    <div>
+      {isLoading ? <LoadingComponent /> : <MainPage />}
+    </div>
   );
 };
 

diff --git a/src/assets/styles/components/cards/AwardCard.css b/src/assets/styles/components/cards/AwardCard.css
@@ -29,3 +29,13 @@
   /* Overlay for text visibility */
   z-index: 5;
 }
+
+.font-reross{
+  font-family: "reross-quadratic", sans-serif;
+  font-weight: 400;
+  font-style: normal;
+}
+
+.font-sf-pro-display{
+  font-family: "SF Pro Display", sans-serif;
+}
diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css
@@ -1,20 +1,25 @@
 /* Importing Apple fonts via CSS properties */
+@import url("https://use.typekit.net/hzv1rhy.css");
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
+
+
 /* Root variables */
 :root {
   --font-sf: -apple-system, BlinkMacSystemFont, "San Francisco", "Segoe UI", "Roboto", "Helvetica Neue", sans-serif;
   --font-sf-mono: "SF Mono", "Menlo", "Courier", monospace;
   --font-new-york: "New York", serif;
+  --font-carbon: "t26-carbon", monospace;
 }
 
 /* Base styles */
 @layer base {
   body {
     @apply font-sans text-n-1 text-base;
-    font-family: var(--font-sf);
+    font-family: var(--font-carbon);
   }
 }
 

diff --git a/src/assets/styles/pages/layouts/About.css b/src/assets/styles/pages/layouts/About.css
@@ -129,4 +129,4 @@
   .text-right {
     text-align: center;
   }
-}
+}
diff --git a/src/assets/styles/pages/layouts/Awards.css b/src/assets/styles/pages/layouts/Awards.css
@@ -47,3 +47,15 @@
     position: relative;
     z-index: 2;
 }
+
+.font-reross{
+    font-family: "reross-quadratic", sans-serif;
+    font-weight: 400;
+    font-style: normal;
+}
+
+.font-t26-carbon{
+    font-family: "t26-carbon", monospace;
+    font-weight: 400;
+    font-style: normal;
+}
diff --git a/src/assets/styles/pages/layouts/Contact.css b/src/assets/styles/pages/layouts/Contact.css
@@ -21,14 +21,19 @@
 .contact-title {
   font-size: 5rem;
   font-weight: bold;
-  font-family: 'SF Pro Display', sans-serif;
-  margin-top:-50px;
+  font-family: "reross-quadratic", sans-serif;
+  font-weight: 400;
+  font-style: bold;
+  margin-top:-20px;
   margin-bottom: 10px;
 }
 
 .contact-subtitle {
   font-size: 2rem;
-  font-family: 'SF Pro Display', sans-serif;
+  font-family: "t26-carbon", monospace;
+font-weight: 400;
+font-style: normal;
+margin-top: -20px;
   margin-bottom: 20px;
 }
 
@@ -42,9 +47,10 @@
 .contact-card {
   background: rgba(255, 255, 255, 0.1);
   border-radius: 8px;
-  padding: 20px;
+  padding: 0px;
   width: 100%;
-  max-width: 300px;
+  max-width: 320px;
+  height:480px;
   text-align: center;
   backdrop-filter: blur(10px);
   box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
@@ -56,20 +62,19 @@
 }
 
 .contact-card-image {
-  width: 180px;
-  height: 180px;
-  border-radius: 10px;
+  width: 500px;
+  height: 300px;
   object-fit: cover;
   margin-bottom: 10px;
-  margin-left: 15%;
+
 }
 
 .contact-card-title {
-  font-size: 1.2rem;
-  font-family: 'SF Pro Display', sans-serif;
-  font-style:italic;
-  font-weight: 400;
-  margin-bottom: 10px;
+  font-size: 1.3rem;
+  font-family: "reross-quadratic", sans-serif;
+font-weight: 400;
+font-style: normal;
+  margin-bottom: 0;
   color: #ffffff;
 }
 
@@ -82,8 +87,10 @@
 }
 
 .contact-card-detail {
-  font-size: 0.9rem;
-  font-family: 'SF Pro Display', sans-serif;
+  font-size: 1.2rem;
+  font-family: "t26-carbon", monospace;
+font-weight: 400;
+font-style: normal;
   color: #bbbbbb;
 }
 
@@ -110,3 +117,20 @@
     background-position: 0% 50%;
   }
 }
+
+@media (max-width: 480px) {
+  .contact-title {
+    font-size: 3.4rem;
+    font-weight: normal;
+    font-family: "reross-quadratic", sans-serif;
+    margin-top:0;
+    margin-bottom: 40px;
+  }
+
+  .contact-subtitle{
+    font-size: 2rem;
+    font-family: "t26-carbon", monospace;
+    margin-bottom: 20px;
+  }
+}
+
diff --git a/src/assets/styles/pages/layouts/Countdown.css b/src/assets/styles/pages/layouts/Countdown.css
@@ -2,14 +2,13 @@
 .countdown-container {
     background: url('/counter/countBg.png') no-repeat center center;
     background-size: cover;
-    height: 120vh;
+    height: 100vh;
     width: 100%;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
     position: relative;
-    font-family: 'SF Pro Display', sans-serif;
     /* Default font */
 }
 
@@ -19,6 +18,7 @@
     gap: 4rem;
     /* Increased space between time units */
     margin-bottom: 6rem;
+    margin-top: -3rem;
 }
 
 /* Individual time unit container */
@@ -35,20 +35,19 @@
 
 /* Labels for time units */
 .countdown-time-label {
-    font-family: 'Carbon', sans-serif;
-
+    font-family: "t26-carbon", monospace;
+    font-weight: bold;
     /* Font for labels */
-    font-size: 3rem;
+    font-size: 3.5rem;
     /* Increased font size */
     color: white;
     position: relative;
     /* Changed to absolute positioning */
-    left: -3rem;
+    left: -4rem;
     margin-top: 0rem;
     /* Shift labels to the left */
-    margin-bottom: -8.2rem;
+    margin-bottom: -8.1rem;
     /* No bottom margin needed */
-    text-shadow: 0 0 8px rgba(0, 0, 0, 0.7);
     /* Darker shadow for better readability */
     z-index: 1;
     /* Ensure labels are below values */
@@ -65,7 +64,11 @@
     /* Darkish color for Apple font style */
     position: relative;
     z-index: 2;
-    color: white;
+    background: #E4EEF1;
+    background: linear-gradient(to top, #E4EEF1 4%, #C8C4CB 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+
     /* Ensure values are above labels */
     padding-top: -5rem !important;
 }
@@ -81,27 +84,29 @@
 
 /* GRAND FINALE text */
 .grand-finale-text {
-    font-family: 'SF Pro Display', sans-serif;
+    font-family: "reross-quadratic", sans-serif;
+font-weight: 400;
+font-style: normal;
     /* Font for GRAND FINALE text */
     font-size: 8rem;
     /* Increased font size */
     font-weight: bold;
     opacity: 100%;
-    color:white;
+    color: rgb(223, 185, 230);
 }
 
 /* Overlay Styles */
 .countdown-overlay {
     position: absolute;
-    top: 22.5%;
-    left: -8.3%;
-    width: 80%;
+    top: 20%;
+    left: -13%;
+    width: 100%;
     height: 80%;
     background-image: url('/counter/CounterNoBg.png');
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
-    z-index: 15;
+    z-index: 5;
 }
 
 /* Mobile responsiveness */
@@ -204,6 +209,7 @@
 
     .grand-finale-text {
         font-size: 2rem;
+
         /* Further decrease font size for GRAND FINALE text */
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -129,4 +129,4 @@ @@
       .text-right {
         text-align: center;
       }
-    }
+    }