Skip to content
Merged

Dev #34

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Deerhack 2025 Website
# DeerHack 2026 Website

## Please use Node Version 20.11.0
152 changes: 88 additions & 64 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
"@lottiefiles/dotlottie-react": "^0.18.3",
"@next/third-parties": "^14.1.0",
"@supabase/supabase-js": "^2.39.7",
"chart.js": "^4.5.1",
"gsap": "^3.14.2",
"lottie-react": "^2.4.1",
"next": "14.2.35",
"react": "^18",
"react-chartjs-2": "^5.3.1",
"react-dom": "^18",
"sharp": "^0.33.2"
},
Expand Down
21 changes: 21 additions & 0 deletions frontend/src/app/(pages)/ExpectationsV2.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { ReactElement } from "react";
import { cabinetExtraBold } from "../utils/fonts";
import ExpectationCards from "../sections/ExpectationsV2/ExpectationCards";
import ExpectationsVine from "../assets/icons/ExpectationsVine";
import Butterfly from "../assets/icons/Butterfly";

export default function ExpectationPageV2(): ReactElement {
return (
<div className="relative bg-dark-purple py-20 flex flex-col lg:gap-[20px] overflow-hidden md:overflow-visible">
<ExpectationsVine className="absolute -right-[24px] md:right-0 top-28 md:-top-8 lg:-top-16 w-[102px] h-[232px] md:w-[215px] md:h-[334px]" />
<div
className={`${cabinetExtraBold.className} headings px-2 md:px-0 mb-[3rem]`}
>
What Else Can You Expect at<br></br> DeerHack?
</div>
<Butterfly className="absolute w-[86px] h-[105px] top-32 left-8 md:w-[144px] md:h-[188px] md:top-[105px] lg:top-[180px] md:left-[60px] z-[45]" />
<ExpectationCards />
<ExpectationsVine className="absolute bottom-0 opacity-[35%] w-[102px] h-[232px] block md:hidden scale-y-[-1] scale-x-[-1]" />
</div>
);
}
4 changes: 3 additions & 1 deletion frontend/src/app/MainPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Judges from "@/app/(pages)/Judges";
import Mentors from "@/app/(pages)/Mentors";
import Navbar from "@/app/components/Navbar/Navbar";
import ExperiencePage from "./(pages)/DeerhackExperiencePage";
import ExpectationPageV2 from "./(pages)/ExpectationsV2";

export default function Home() {
return (
Expand All @@ -24,7 +25,8 @@ export default function Home() {
<BenefitsPage />
<PrizesPage />
<TrackPage />
<ExpectationsPage />
{/* <ExpectationsPage /> */}
<ExpectationPageV2 />
<DeerhackStatsPage />
<ImageCarouselPage />
<ExperiencePage />
Expand Down
Loading
Loading