Skip to content
Merged

Dev #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
df0f151
Add: add About Card V2 component
enkoki Mar 22, 2026
b266c1b
Add: animations on About Card V2 Fix: missing animation package
enkoki Mar 22, 2026
c284d01
Feat: add About The Event Section V2
enkoki Mar 22, 2026
38e9255
Add: add new icon for software club card content
enkoki Mar 22, 2026
56c37f8
style: made code prettier
enkoki Mar 22, 2026
86abe17
Update: Hero Section Light Flicker and BlockChain Color Change
VaidyaIshan Mar 22, 2026
675750e
Merge branch 'main' of https://github.com/deerhack/deerhack26 into Ri…
VaidyaIshan Mar 22, 2026
820e842
Merge pull request #19 from deerhack/Ishan/AboutTheEvent
VaidyaIshan Mar 23, 2026
edfd079
Merge branch 'dev' of https://github.com/deerhack/deerhack26 into Rij…
VaidyaIshan Mar 23, 2026
def3225
Add: New Assets for About PAge
VaidyaIshan Mar 23, 2026
67a0499
Merge branch 'main' of https://github.com/deerhack/deerhack26 into Is…
VaidyaIshan Mar 27, 2026
81363c9
Update: Images Resized and Changes to AboutEvent Section
VaidyaIshan Mar 27, 2026
2551fb7
Update: new about the event section
enkoki Mar 27, 2026
1644ea2
update: svg decors position fixed
enkoki Mar 27, 2026
6750b19
add: animations to about card
enkoki Mar 27, 2026
2a2d6de
fix: ci fail
enkoki Mar 27, 2026
7c25aac
fix: build fail due to a wrong asset
enkoki Mar 27, 2026
4c97fd1
fix: wrong props type for navbar logo w and h
enkoki Mar 27, 2026
0d8f263
style: blockchain card color theme
enkoki Mar 27, 2026
a702b07
add: about section mobile first responsiveness
enkoki Mar 27, 2026
dfe464e
refactor: animation logic
enkoki Mar 27, 2026
5d28ef3
Changed color and alignments
Luyash Mar 29, 2026
ce9b1e7
changed logo of each
Luyash Mar 29, 2026
02e1435
Add borders
Luyash Mar 29, 2026
1c024f7
Added leaf inside
Luyash Mar 29, 2026
41e8148
fix: mobile hero page cut-off bush
enkoki Mar 29, 2026
6b5182f
add: responsive view for desktop about section
enkoki Mar 29, 2026
fd0d0b8
chore: file name for software club icon in about section
enkoki Mar 29, 2026
d081be3
error
Luyash Mar 29, 2026
f851ba1
feat: about the event section
enkoki Mar 29, 2026
3f4266e
fix: mini card border props
enkoki Mar 29, 2026
ac0cdfd
chore: changed file names
enkoki Mar 29, 2026
6637898
style: made code prettier
enkoki Mar 29, 2026
49eb980
Leaf inside Applicatants
Luyash Mar 29, 2026
f1b43a6
Merge pull request #22 from deerhack/Rijan/AboutTheEvent
enkoki Mar 29, 2026
e7e3435
Responsive
Luyash Mar 29, 2026
bb91bc7
fix: z-indexing of svgs
enkoki Mar 29, 2026
92128fe
update: darn animation smoother
enkoki Mar 29, 2026
5476ace
Merge pull request #23 from deerhack/Rijan/AboutTheEvent
VaidyaIshan Mar 30, 2026
7b3f611
Merge pull request #24 from deerhack/Luyash/Charts
VaidyaIshan Mar 30, 2026
99df652
add:add some new svg images and worked on border of benefits card
Mar 30, 2026
0888300
Merge pull request #25 from deerhack/Paritosh/BenefitsPage
VaidyaIshan Mar 30, 2026
7d14f99
fix:fix font colour for titles and removed svg image for mobile view
Mar 30, 2026
833898e
Fix alignments in mobile view and desktop too
Luyash Mar 30, 2026
44c2a6a
Merge pull request #27 from deerhack/Luyash/Charts
VaidyaIshan Mar 30, 2026
11002c7
Merge pull request #26 from deerhack/Paritosh/BenefitsPage
VaidyaIshan Mar 30, 2026
a82e946
update: text spacing and line height adjustment
enkoki Mar 30, 2026
791a3c1
Merge pull request #28 from deerhack/Rijan/AboutTheEvent
VaidyaIshan Mar 30, 2026
9f605bc
fix: fix button icons being flipped
enkoki Mar 30, 2026
2ff41cc
style: about event card padding
enkoki Mar 30, 2026
c31f0d5
fix:fix padding and margin in CardDark.tsx and CardLight.tsx
xDRzEDsTYv Mar 30, 2026
511ee76
Merge pull request #29 from deerhack/Paritosh/BenefitsPage
VaidyaIshan Mar 30, 2026
3082427
Merge pull request #30 from deerhack/Rijan/AboutTheEvent
VaidyaIshan Mar 31, 2026
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
11 changes: 11 additions & 0 deletions frontend/package-lock.json

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

1 change: 1 addition & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"deploy": "next build && cp -r .next/static .next/standalone/.next/ && cp -r public .next/standalone/"
},
"dependencies": {
"@gsap/react": "^2.1.2",
"@lottiefiles/dotlottie-react": "^0.18.3",
"@next/third-parties": "^14.1.0",
"@supabase/supabase-js": "^2.39.7",
Expand Down
Binary file modified frontend/public/carousel/processed/sized/1.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/carousel/processed/sized/14.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/carousel/processed/sized/5.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/public/carousel/processed/sized/7.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
157 changes: 128 additions & 29 deletions frontend/src/app/(pages)/AboutTheEventPage.tsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,134 @@
import React from "react";
"use client";
import React, { useRef } from "react";
import AboutTheEventCards from "../sections/AboutTheEvent/AboutTheEventCards";
import { cabinetExtraBold } from "@/fonts";
import Image from "next/image";
import about_right from "@/app/assets/images/AboutRight.svg";
import about_left from "@/app/assets/images/AboutLeft.svg";
import Laptop from "@/app/assets/icons/Laptop";
import CoffeCup from "@/app/assets/icons/CoffeeCup";
import DarinCup from "@/app/assets/icons/DarinCup";
import Guitar from "@/app/assets/icons/Guitar";

import gsap from "gsap";
import { ScrollTrigger } from "gsap/dist/ScrollTrigger";
import { useGSAP } from "@gsap/react";
import DarinCupPhone from "../assets/icons/DarinCupPhone";
import AboutVine from "../assets/icons/AboutVine";

if (typeof window !== "undefined") {
gsap.registerPlugin(ScrollTrigger);
}

export default function Home() {
const container = useRef<HTMLDivElement>(null);

useGSAP(
() => {
const allIcons = gsap.utils.toArray<HTMLElement>(
".phone-event-icon, .event-icon",
);

allIcons.forEach((icon) => {
const isMobile = window.innerWidth < 1280;
const targetRotate =
isMobile && icon.classList.contains("phone-event-icon") ? -15 : 0;

gsap.fromTo(
icon,
{ x: -600, rotate: -180, opacity: 0 },
{
x: 0,
rotate: targetRotate,
duration: 1,
opacity: 1,
ease: "expo.out",
scrollTrigger: {
trigger: icon,
start: isMobile ? "top 90%" : "top 95%",
toggleActions: "play none none reverse",
invalidateOnRefresh: true,
},
},
);
});

const tl = gsap.timeline({
scrollTrigger: {
trigger: container.current,
start: "top 75%",
toggleActions: "play none none reverse",
},
});

const tl_ph = gsap.timeline({
scrollTrigger: {
trigger: container.current,
start: "top 40%",
toggleActions: "play none none reverse",
},
});

tl_ph.fromTo(
".darin-anim-ph",
{ yPercent: 100, rotate: 20, opacity: 0 },
{
yPercent: 0,
rotate: 0,
opacity: 1,
duration: 1.5,
ease: "power2.out",
},
);
tl.fromTo(
".darin-anim",
{ yPercent: 100, rotate: 20, opacity: 0 },
{
yPercent: 0,
rotate: 0,
opacity: 1,
duration: 1.5,
ease: "power2.out",
},
);
},
{ scope: container },
);

const AboutTheEventPage = () => {
return (
<>
<div className="relative">
<Image
src={about_right}
alt="right leaf"
height={400}
className="absolute top-0 right-0 xl:block hidden"
/>
<Image
src={about_left}
alt="left leaf"
height={250}
className="absolute top-1/2 transform -translate-y-1/2 lg:block hidden"
/>
<div className="pb-20 pt-[100px]">
<h1 className={`${cabinetExtraBold.className} mb-[3rem] headings lg:text-[]`}>
About The Event
</h1>
<AboutTheEventCards />I
</div>
<div ref={container} className="relative overflow-hidden">
<AboutVine className="w-[102px] h-[232px] z-30 absolute top-[2px] lg:-top-[10%] lg:w-[189px] lg:h-[429px] right-0" />
<Laptop
height={306}
width={354}
className="phone-event-icon z-30 lg:event-icon absolute bottom-[120px] md:bottom-[7%] md:left-[28px] lg:-left-[5px] lg:bottom-[8%] w-[137px] h-[118px] md:w-[200px] md:h-[200px] lg:w-[354px] lg:h-[306px]"
/>
<CoffeCup
height={170}
width={124}
className="z-30 md:z-0 lg:z-30 phone-event-icon md:event-icon absolute bottom-[230px] md:bottom-[22.5%] lg:left-[38px] lg:bottom-[38%] w-[48px] h-[56px] md:w-[80px] md:h-[100px] lg:w-[124px] lg:h-[170px]"
/>

{/* For Large Screens */}
<DarinCup
height={843}
width={424}
className="darin-anim absolute z-30 -bottom-[100px] right-[-150px] hidden lg:block"
/>
{/* For Phone Screens */}
<DarinCupPhone className="darin-anim-ph absolute z-30 right-0 bottom-[50px] block lg:hidden" />

<div className="pb-[280px] pt-[100px]">
<h1
className={`${cabinetExtraBold.className} mb-[3rem] headings lg:text-[55px]`}
>
About The Event
</h1>
<AboutTheEventCards />
</div>
</>
);
};

export default AboutTheEventPage;
<Guitar
height={381}
width={358}
className="phone-event-icon lg:event-icon absolute left-[95px] bottom-[110px] md:bottom-[65px] md:left-[160px] lg:bottom-[-25px] lg:left-[200px] z-30 pointer-events-none w-[138px] h-[147px] lg:h-[381px] lg:w-[358px] md:h-[250px] md:w-[250px]"
/>
</div>
);
}
13 changes: 10 additions & 3 deletions frontend/src/app/(pages)/BenefitsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,16 @@ export default function BenefitsPage() {
className="absolute right-3 top-46 hidden xl:block -rotate-12"
/>
</div>
<div className={`${cabinetExtraBold.className} mb-[3rem] headings`}>
Benefits of Participating
</div>
<div
className={`${cabinetExtraBold.className} mb-[3rem] headings bg-clip-text text-transparent`}
style={{
background: "linear-gradient(155.54deg, #CEA33D 30.29%, #6633CC 97.7%)",
WebkitBackgroundClip: "text",
WebkitTextFillColor: "transparent",
}}
>
Benefits of Participating
</div>
<div className="flex justify-center mx-4">
<BenefitsCards />
</div>
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/app/(pages)/DeerhackStatsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import DeerHackStats from "../sections/DeerhackStats/DeerhackStats";
import Image from "next/image";

import leaf_deerhack2023_right from "@/app/assets/images/leaf_deerhack2023_right.svg";
import StatsSection from "../components/DeerhackStats/page";

export default function DeerhackStatsPage(): ReactElement {
return (
Expand All @@ -20,7 +21,8 @@ export default function DeerhackStatsPage(): ReactElement {
DeerHack Till Now
</div>
<div className="flex justify-center mt-10">
<DeerHackStats />
{/* <DeerHackStats /> */}
<StatsSection />
</div>
</div>
);
Expand Down
22 changes: 22 additions & 0 deletions frontend/src/app/assets/icons/AboutCollege.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
83 changes: 83 additions & 0 deletions frontend/src/app/assets/icons/AboutCollege.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
export default function AboutCollege({
width = 109,
height = 113,
className = ""
}:{
width?: number;
height?:number;
className?: string;

}) {
return (
<svg
width={width}
height={height}
viewBox="0 0 109 113"
fill="none"
xmlns="http://www.w3.org/2000/svg"
className={className}
>
<g filter="url(#filter0_d_355_80)">
<circle
cx="54.5032"
cy="53.5364"
r="50.5017"
transform="rotate(-3.55551 54.5032 53.5364)"
fill="#241A4A"
/>
<path
d="M30.9668 77.9981V41.4426H41.4112V30.9981H67.5224V51.887H77.9668V77.9981H57.0779V67.5537H51.8557V77.9981H30.9668ZM36.189 72.7759H41.4112V67.5537H36.189V72.7759ZM36.189 62.3315H41.4112V57.1093H36.189V62.3315ZM36.189 51.887H41.4112V46.6648H36.189V51.887ZM46.6335 62.3315H51.8557V57.1093H46.6335V62.3315ZM46.6335 51.887H51.8557V46.6648H46.6335V51.887ZM46.6335 41.4426H51.8557V36.2204H46.6335V41.4426ZM57.0779 62.3315H62.3001V57.1093H57.0779V62.3315ZM57.0779 51.887H62.3001V46.6648H57.0779V51.887ZM57.0779 41.4426H62.3001V36.2204H57.0779V41.4426ZM67.5224 72.7759H72.7446V67.5537H67.5224V72.7759ZM67.5224 62.3315H72.7446V57.1093H67.5224V62.3315Z"
fill="url(#paint0_linear_355_80)"
/>
</g>
<defs>
<filter
id="filter0_d_355_80"
x="0"
y="3.03306"
width="109.006"
height="109.007"
filterUnits="userSpaceOnUse"
color-interpolation-filters="sRGB"
>
<feFlood flood-opacity="0" result="BackgroundImageFix" />
<feColorMatrix
in="SourceAlpha"
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"
result="hardAlpha"
/>
<feOffset dy="4" />
<feGaussianBlur stdDeviation="2" />
<feComposite in2="hardAlpha" operator="out" />
<feColorMatrix
type="matrix"
values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"
/>
<feBlend
mode="normal"
in2="BackgroundImageFix"
result="effect1_dropShadow_355_80"
/>
<feBlend
mode="normal"
in="SourceGraphic"
in2="effect1_dropShadow_355_80"
result="shape"
/>
</filter>
<linearGradient
id="paint0_linear_355_80"
x1="22.4742"
y1="24.374"
x2="59.8663"
y2="69.4183"
gradientUnits="userSpaceOnUse"
>
<stop stop-color="#6633CC" />
<stop offset="1" stop-color="#F5C144" />
</linearGradient>
</defs>
</svg>
);
}
Loading
Loading