diff --git a/apps/site/next.config.js b/apps/site/next.config.js index bbdf2a2c..4f487130 100644 --- a/apps/site/next.config.js +++ b/apps/site/next.config.js @@ -29,36 +29,36 @@ const nextConfig = { }, async redirects() { return [ - { - source: "/mentor", - destination: "https://forms.gle/yCmXvG89ygvxUSCd7", - permanent: true, - }, - { - source: "/volunteer", - destination: "https://forms.gle/erpJjErKLJkEZMw48", - permanent: true, - }, - { - source: "/waiver", - destination: DOCUSIGN_FORM_URL, - permanent: true, - }, - { - source: "/incident", - destination: "https://forms.gle/A6BdsSzYSiyeTP8Y6", - permanent: true, - }, - { - source: "/devpost", - destination: "https://irvinehacks-2024.devpost.com", - permanent: true, - }, - { - source: "/feedback", - destination: "https://forms.gle/c154z45wRx7ARnrE9", - permanent: true, - }, + // { + // source: "/mentor", + // destination: "https://forms.gle/yCmXvG89ygvxUSCd7", + // permanent: true, + // }, + // { + // source: "/volunteer", + // destination: "https://forms.gle/erpJjErKLJkEZMw48", + // permanent: true, + // }, + // { + // source: "/waiver", + // destination: DOCUSIGN_FORM_URL, + // permanent: true, + // }, + // { + // source: "/incident", + // destination: "https://forms.gle/A6BdsSzYSiyeTP8Y6", + // permanent: true, + // }, + // { + // source: "/devpost", + // destination: "https://irvinehacks-2024.devpost.com", + // permanent: true, + // }, + // { + // source: "/feedback", + // destination: "https://forms.gle/c154z45wRx7ARnrE9", + // permanent: true, + // }, ]; }, }; diff --git a/apps/site/src/app/(main)/(home)/sections/Landing/Landing.module.css b/apps/site/src/app/(main)/(home)/sections/Landing/Landing.module.css index 823ffbca..ffeecdc6 100644 --- a/apps/site/src/app/(main)/(home)/sections/Landing/Landing.module.css +++ b/apps/site/src/app/(main)/(home)/sections/Landing/Landing.module.css @@ -1,29 +1,8 @@ .landingBackground { - background-image: url("~@/assets/backgrounds/landing-background.jpg"); + background-image: url("~@/assets/backgrounds/landing-background.png"); background-position: center bottom; background-repeat: no-repeat; background-size: cover; - mask-image: url("~@/assets/backgrounds/landing-background-mask.png"); - mask-position: center bottom; - mask-repeat: no-repeat; - mask-size: cover; -} - -.fogLeft, -.fogRight { - animation-delay: 2s; - animation-duration: 4s; - animation-fill-mode: forwards; - animation-timing-function: ease; - z-index: 1000; -} - -.fogLeft { - animation-name: slideOutLeft; -} - -.fogRight { - animation-name: slideOutRight; } @keyframes slideOutLeft { diff --git a/apps/site/src/app/(main)/(home)/sections/Landing/Landing.tsx b/apps/site/src/app/(main)/(home)/sections/Landing/Landing.tsx index c00c4fa8..dffb4f2e 100644 --- a/apps/site/src/app/(main)/(home)/sections/Landing/Landing.tsx +++ b/apps/site/src/app/(main)/(home)/sections/Landing/Landing.tsx @@ -1,16 +1,11 @@ "use client"; import { Suspense } from "react"; -import Image from "next/image"; import { PerspectiveCamera } from "@react-three/drei"; import hasDeadlinePassed from "@/lib/utils/hasDeadlinePassed"; import View from "@/components/canvas/View"; import Button from "@/lib/components/Button/Button"; -import Fireflies from "../../components/Fireflies"; - -import fogLeft from "@/assets/images/fog-left.png"; -import fogRight from "@/assets/images/fog-right.png"; import styles from "./Landing.module.css"; @@ -21,19 +16,16 @@ const Landing = () => {
-
- Fog - Fog -

- IrvineHacks 2024 +

January 24–26

+

+ IrvineHacks 2025

-

January 26–28

{deadlinePassed ? ( -
); } diff --git a/apps/site/src/app/(main)/resources/page.tsx b/apps/site/src/app/(main)/resources/page.tsx index 7a621d46..71eb0f7b 100644 --- a/apps/site/src/app/(main)/resources/page.tsx +++ b/apps/site/src/app/(main)/resources/page.tsx @@ -29,7 +29,7 @@ export default async function Resources() { ({ _id, iconUrl, title, description, resources }, i) => (
diff --git a/apps/site/src/assets/backgrounds/landing-background.png b/apps/site/src/assets/backgrounds/landing-background.png new file mode 100644 index 00000000..ccaf789c Binary files /dev/null and b/apps/site/src/assets/backgrounds/landing-background.png differ diff --git a/apps/site/src/assets/images/fog-left.png b/apps/site/src/assets/images/fog-left.png deleted file mode 100644 index f490c03f..00000000 Binary files a/apps/site/src/assets/images/fog-left.png and /dev/null differ diff --git a/apps/site/src/assets/images/fog-right.png b/apps/site/src/assets/images/fog-right.png deleted file mode 100644 index 1958d472..00000000 Binary files a/apps/site/src/assets/images/fog-right.png and /dev/null differ diff --git a/apps/site/src/assets/logos/hackuci-anteater.svg b/apps/site/src/assets/logos/hackuci-anteater.svg deleted file mode 100644 index 90cbcda1..00000000 --- a/apps/site/src/assets/logos/hackuci-anteater.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/site/src/assets/logos/hackuci-gear.svg b/apps/site/src/assets/logos/hackuci-gear.svg deleted file mode 100644 index a41393c4..00000000 --- a/apps/site/src/assets/logos/hackuci-gear.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/site/src/assets/logos/irvinehacks-logo.svg b/apps/site/src/assets/logos/irvinehacks-logo.svg new file mode 100644 index 00000000..893b8013 --- /dev/null +++ b/apps/site/src/assets/logos/irvinehacks-logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/apps/site/src/lib/components/Button/Button.module.css b/apps/site/src/lib/components/Button/Button.module.css index d5f57e17..8d5674b1 100644 --- a/apps/site/src/lib/components/Button/Button.module.css +++ b/apps/site/src/lib/components/Button/Button.module.css @@ -1,25 +1,16 @@ .button { - background-image: radial-gradient( - 50% 50% at 50% 50%, - #fff3d6 0%, - #ffda7b 51.04%, - #ffa700 100% - ); - box-shadow: 0px 0px 20px rgba(255, 252, 226, 0.5); - border-radius: 15px; - color: var(--color-brown); + background-color: var(--color-dark-blue); + color: var(--color-white); + border: 5px solid var(--color-white); font-size: calc(13px + 1vw); font-weight: 700; padding: 0.55rem 1.25rem; - transition: - filter 0.1s ease, - box-shadow 0.1s ease; display: block; width: max-content; margin: 0 auto; &:hover { - box-shadow: 0px 0px 20px #fffce2; + box-shadow: 8px 8px 0px var(--color-white); filter: brightness(1.05); } } @@ -28,7 +19,7 @@ padding: 0.15rem 1.15rem; border-radius: 10px; background-image: none; - background-color: var(--color-cream); + background-color: var(--color-white); margin: 0; font-size: 28px; diff --git a/apps/site/src/lib/components/Button/Button.tsx b/apps/site/src/lib/components/Button/Button.tsx index 9a8bb8b2..113e284b 100644 --- a/apps/site/src/lib/components/Button/Button.tsx +++ b/apps/site/src/lib/components/Button/Button.tsx @@ -42,7 +42,7 @@ const Button: React.FC = ({ return (
diff --git a/apps/site/tailwind.config.ts b/apps/site/tailwind.config.ts index 572cdfd0..721bf213 100644 --- a/apps/site/tailwind.config.ts +++ b/apps/site/tailwind.config.ts @@ -16,9 +16,9 @@ const config: Config = { "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", }, fontFamily: { - display: ["Alegreya"], - body: ["Mulish"], - sans: ["Mulish"], + display: ["Aref Ruqaa"], + body: ["Cantarell"], + sans: ["Cantarell"], }, }, screens: {