Merge branch 'develop' into ThroughTheYears

hackupc · Apr 25, 2024 · d1472a5 · d1472a5
2 parents ce9002d + 8089dc5
commit d1472a5
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# IDE
+/.idea
diff --git a/public/Partners/cacaolat.png b/public/Partners/cacaolat.png
diff --git a/public/Partners/nestle.svg b/public/Partners/nestle.svg
diff --git a/public/Sponsors/esa.svg b/public/Sponsors/esa.svg
diff --git a/public/Sponsors/seidor.svg b/public/Sponsors/seidor.svg
diff --git a/public/Sponsors/vueling.svg b/public/Sponsors/vueling.svg
diff --git a/src/app/components/Live.tsx b/src/app/components/Live.tsx
@@ -2,7 +2,6 @@ import { Section } from "@/app/genericComponents/General";
 import {
   Body,
   BodyBold,
-  BodyLink,
   SectionTitle,
 } from "@/app/genericComponents/Typography";
 import { PrimaryButton } from "@/app/genericComponents/Buttons";
@@ -58,27 +57,15 @@ export default function Live() {
         <Body>
           In our live page you will find it out! It will be available before
           HackUPC so that you can prepare everything you might need! And also to
-          check out all the activities happening during the event. You can also
-          check our{" "}
-          <BodyLink
-            href="https://live.hackupc.com/"
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            last year's live page
-          </BodyLink>{" "}
-          and see what happened.
+          check out all the activities happening during the event.
         </Body>
       </TextContainer>
-      <PrimaryButton disabled>
-        {/* <a
-          href="https://live.hackupc.com/"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Check live
-        </a> */}
-        Coming soon...
+      <PrimaryButton
+        href="https://live.hackupc.com/"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Check live
       </PrimaryButton>
     </Section>
   );

diff --git a/src/app/components/SponsorsAndPartners.tsx b/src/app/components/SponsorsAndPartners.tsx
@@ -8,7 +8,6 @@ import {
   MegaBox,
   MiliBox,
   SponsorLogo,
-  SponsorUnrevealed,
 } from "@/app/genericComponents/Sponsors";
 
 const SponsorsBlock = styled.div`
@@ -69,15 +68,28 @@ export default function SponsorsAndPartners() {
             />
           </MegaBox>
           <MegaBox>
-            <SponsorUnrevealed />
+            <SponsorLogo
+              imageSrc={"/Sponsors/vueling.svg"}
+              imageAlt={"vueling"}
+              sponsorLink={"https://www.vueling.com/ca"}
+              smallPadding
+            />
           </MegaBox>
         </SponsorRow>
         <SponsorRow>
           <MegaBox>
-            <SponsorUnrevealed />
+            <SponsorLogo
+              imageSrc={"/Sponsors/seidor.svg"}
+              imageAlt={"seidor"}
+              sponsorLink={"https://www.seidor.com"}
+            />
           </MegaBox>
           <MegaBox>
-            <SponsorUnrevealed />
+            <SponsorLogo
+              imageSrc={"/Sponsors/esa.svg"}
+              imageAlt={"esa"}
+              sponsorLink={"https://www.esa.int/"}
+            />
           </MegaBox>
         </SponsorRow>
 
@@ -189,13 +201,28 @@ export default function SponsorsAndPartners() {
             smallPadding
           />
         </MiliBox>
+        <MiliBox>
+          <SponsorLogo
+            imageSrc={"/Partners/nestle.svg"}
+            imageAlt={"nestle"}
+            sponsorLink={"https://www.nestle.com/"}
+          />
+        </MiliBox>
         <MiliBox>
           <SponsorLogo
             imageSrc={"/Partners/incapto.svg"}
             imageAlt={"incapto"}
             sponsorLink={"https://incapto.com/profesional/"}
           />
         </MiliBox>
+        <MiliBox>
+          <SponsorLogo
+            imageSrc={"/Partners/cacaolat.png"}
+            imageAlt={"cacaolat"}
+            sponsorLink={"https://www.cacaolat.es/en"}
+            smallPadding
+          />
+        </MiliBox>
       </SponsorRow>
     </Section>
   );

diff --git a/src/app/components/Trailer.tsx b/src/app/components/Trailer.tsx
@@ -1,28 +1,26 @@
-import styled, { keyframes } from "styled-components";
+import styled from "styled-components";
 import { Section, SectionBackground } from "@/app/genericComponents/General";
 import { SectionTitle } from "@/app/genericComponents/Typography";
 import {
-  Neutral300,
-  Neutral500,
+  MobileBreakpoint,
   SpacingM,
   SpacingS,
-  SpacingXL,
 } from "@/app/genericComponents/tokens";
 import {
   PrimaryButton,
   SecondaryButton,
 } from "@/app/genericComponents/Buttons";
 import { silom } from "@/app/genericComponents/fonts";
 
-/*const VideoWrapper = styled.div`
+const VideoWrapper = styled.div`
   position: relative;
   width: 80%;
-  padding-top: 45%;  16:9 aspect ratio
-  margin-bottom: ${SpacingM};
+  padding-top: 45%;
+  aspect-ratio: 16 / 9;
 
   @media (max-width: ${MobileBreakpoint}) {
     width: 100%;
-    padding-top: 56.25%;  16:9 aspect ratio
+    padding-top: 56.25%;
   }
 `;
 
@@ -32,10 +30,10 @@ const StyledIframe = styled.iframe`
   left: 0;
   width: 100%;
   height: 100%;
-  border-radius: ${SpacingXS};
+  border-radius: ${SpacingS};
   border: none;
   overflow: hidden;
-`; */
+`;
 
 const ButtonContainer = styled.div`
   display: flex;
@@ -48,7 +46,7 @@ const ButtonContainer = styled.div`
   width: 100%;
 `;
 
-const shimmerAnimation = keyframes`
+/*const shimmerAnimation = keyframes`
     0% {
         transform: translateX(-100%);
     }
@@ -66,7 +64,6 @@ const VideoNotAvailable = styled.div`
   overflow: hidden;
   color: ${Neutral300};
 
-  /* Shimmer effect layer */
   &::before {
     content: "";
     position: absolute;
@@ -80,24 +77,24 @@ const VideoNotAvailable = styled.div`
       rgba(255, 255, 255, 0.1) 50%,
       rgba(35, 47, 52, 0) 100%
     );
-    animation: ${shimmerAnimation} 3s infinite linear; /* Apply the animation */
+    animation: ${shimmerAnimation} 3s infinite linear;
   }
-`;
+`; */
 
 export default function Trailer() {
   return (
     <SectionBackground haveBackground id="trailer">
       <Section>
         <SectionTitle>Teaser</SectionTitle>
-        <VideoNotAvailable> Teaser coming soon... </VideoNotAvailable>
-        {/* <VideoWrapper>
+        {/* <VideoNotAvailable> Teaser coming soon... </VideoNotAvailable> */}
+        <VideoWrapper>
           <StyledIframe
-            title="Teaser video"
-            src="https://www.youtube.com/embed/83RvKXCmcZ8?rel=0&showinfo=0"
+            title="HackUPC 2024 | Trailer"
+            src="https://www.youtube.com/embed/iDinGlzSpbI?si=ZzSusoVrzekuuanx"
             allowFullScreen
             allow="accelerometer; encrypted-media; gyroscope; picture-in-picture"
           />
-        </VideoWrapper> */}
+        </VideoWrapper>
         <ButtonContainer className={silom.className}>
           <SecondaryButton
             width={"60%"}

diff --git a/src/app/data/faqs_data.ts b/src/app/data/faqs_data.ts
@@ -178,7 +178,7 @@ export const travel_faqs: FAQs[] = [
         content:
           "To be able to receive Travel Reimbursement money, you need to match the following criteria:",
         options: [
-          "Upload your tickets before 19th April to our platform (we only accept flight, bus, or train tickets) alongside your PayPal account (we only pay this way).",
+          "Upload your tickets before 2nd May to our platform (we only accept flight, bus, or train tickets) alongside your PayPal account (we only pay this way).",
           "The arrival tickets should be after April 26th and the departure tickets should be prior to May 10th.",
           "In the hackathon, it’s mandatory to demo your project to HackUPC judges, presenting only to sponsors will not be considered valid.",
           "The project should follow all the HackUPC rules.",