Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
dde4b89
test
phlangiee Jan 15, 2026
5577e1b
images for testing
phlangiee Jan 15, 2026
dbd0a07
pictures function
phlangiee Jan 15, 2026
859ae1c
switcting the pictures
phlangiee Jan 15, 2026
e9ac384
words
phlangiee Jan 15, 2026
f4954ae
pictures and button
phlangiee Jan 15, 2026
8f63e8e
imports
phlangiee Jan 15, 2026
1797e81
scss
phlangiee Jan 15, 2026
8461186
packages?
phlangiee Jan 15, 2026
988620b
Name changes
phlangiee Jan 16, 2026
652d4e2
added another temp image
phlangiee Jan 18, 2026
8650e4f
another image?
phlangiee Jan 18, 2026
12cd816
nope sorry this is the image
phlangiee Jan 18, 2026
3d831f5
from the techathon
phlangiee Jan 19, 2026
08d604d
what happened to the semicolon
phlangiee Jan 22, 2026
8bbb9bb
animation....
phlangiee Jan 22, 2026
dc6bce4
going back to lowercase for now
phlangiee Jan 22, 2026
70cb100
fixed order and animation
phlangiee Jan 22, 2026
41f8415
just in case i need my previous code (ill delete later)
phlangiee Jan 22, 2026
5689d53
frog image :3
phlangiee Jan 22, 2026
8da29bd
YIPEEE POLISHED THE ANIMATION AND ENTIRE THING!!!
phlangiee Jan 22, 2026
efabeba
better animation
phlangiee Jan 22, 2026
261d42a
shorter pictures func
phlangiee Jan 22, 2026
ba8f1c2
no picture for images over order 5
phlangiee Jan 22, 2026
5330fc3
um i forgot but this is also apart of shotrer pictures
phlangiee Jan 22, 2026
a02d03d
fixed beginning glitch when swapping orders?
phlangiee Jan 22, 2026
20cb0eb
changed key for pictures
phlangiee Jan 22, 2026
cd2a5b8
no italiac for button (i dont like it)
phlangiee Jan 22, 2026
928fc20
more rounded
phlangiee Jan 24, 2026
7fcb10b
FIXED THE GLITCH IN THE LOOPING!!!
phlangiee Jan 24, 2026
e6cd628
only switches when animation completes
phlangiee Jan 24, 2026
5418894
faster animation for picture 1 going to the back
phlangiee Jan 24, 2026
de3ac53
cleaning up code
phlangiee Jan 24, 2026
8b89e41
different views :3
phlangiee Jan 24, 2026
1f21941
changed animation to percentages + deleted bunch of comments
phlangiee Jan 26, 2026
1cda0f3
a space (for lint)
phlangiee Jan 26, 2026
e5c2781
linting + changed to percentages
phlangiee Jan 26, 2026
9ab8add
capitalized celetebratepast
phlangiee Jan 26, 2026
f41d614
Updated ESLint errors, fixed layout.tsx
haylietan Feb 1, 2026
0706c1a
Update page.tsx
haylietan Feb 1, 2026
ca29a4d
Update tailwind config
haylietan Feb 1, 2026
f4fc0d8
Merge branch 'main' into come-celebrate-our-past
haylietan Feb 1, 2026
db73001
Fix dependencies
haylietan Feb 1, 2026
f560506
Build errors
haylietan Feb 1, 2026
933e61f
Working w. gltich
haylietan Feb 1, 2026
7c1d2d0
Added placeholder images
haylietan Feb 1, 2026
e7f2eaa
Linting
haylietan Feb 2, 2026
19d3346
Merge branch 'main' into come-celebrate-our-past
haylietan Feb 2, 2026
f9fce68
linting + errors
haylietan Feb 2, 2026
72f1bed
Update CarouselWindow.tsx
haylietan Feb 2, 2026
cb6f4a1
Updated images
haylietan Feb 3, 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
2 changes: 1 addition & 1 deletion app/(pages)/_globals/styles/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
/* About Us Text Colors */
--text-dark: #123041;
--text-extra-dark: #0E2535;
--text-black: #000000
--text-black: #000000;
--text-white: #FFFFFF;
--text-purple: #BE5BA8;

Expand Down
17 changes: 0 additions & 17 deletions app/(pages)/about-us/_components/Archives/CarouselWindow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,6 @@ export default function CarouselWindow({
bg-[length:100vw]
"
>
{/* bg color
<div
aria-hidden
className="
absolute
bottom-0
left-0
h-[40%]
w-full
bg-[#11043F]
-z-10
hidden
md:block
md:pb-[150px]
"
/>*/}

{/* pinned clouds (NOT inside the scroller) */}
<Image
src={LeftCloud}
Expand Down
111 changes: 111 additions & 0 deletions app/(pages)/about-us/_components/CelebratePast/celebratePast.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
'use client';

import React, { useEffect, useState } from 'react';
import Image from 'next/image';

type Img = { path: string; alt: string };

function Pictures({
path,
alt,
order,
}: {
path: string;
alt: string;
order: number;
}) {
if (order > 5) return null;

const animClass =
order === 1
? 'animate-picture1 bg-[#BDC7D0]'
: order === 2
? 'animate-picture2 bg-[#BDC7D0]'
: order === 3
? 'animate-picture3 bg-[#BDC7D0]'
: order === 4
? 'animate-picture4 bg-[#BDC7D0]'
: order === 5
? 'animate-picture5 bg-[#BDC7D0]'
: '';

return (
<div
className={`absolute left-1/2 top-1/2 will-change-transform flex justify-center items-center p-[0.8cqw] pb-[5cqw] ${animClass}`}
>
<div className="w-[18cqw] h-[18cqw] relative overflow-hidden">
<Image src={path} alt={alt} fill className="object-cover" />
</div>
</div>
);
}

export default function CelebratePast() {
const [images, setImages] = useState<Img[]>([
{ path: '/Images/celebrateus/One.jpeg', alt: 'i like among us' },
{ path: '/Images/celebrateus/Two.jpg', alt: 'its pretty cool' },
{ path: '/Images/celebrateus/Three.jpg', alt: 'cheese is also cool' },
{ path: '/Images/celebrateus/Four.jpg', alt: 'amongsus' },
{ path: '/Images/celebrateus/Five.jpg', alt: 'among us!!!' },
]);

useEffect(() => {
// match this interval to your CSS animation duration
const DURATION_MS = 3000;

const id = window.setInterval(() => {
setImages((prev) => {
const [first, ...rest] = prev;
return [...rest, first];
});
}, DURATION_MS);

return () => window.clearInterval(id);
}, []);

return (
<div className="m-[10%] container-type-inline-size py-[5%] rounded-[8cqw] shadow-[2cqw_2cqw_0_0_#A6BFC7] outline outline-[0.3cqw] outline-[#A6BFC7] md:outline-[0cqw] flex flex-col items-center bg-[#E5EEF1] place-content-center">
{/* text */}
<div className="flex flex-col items-center">
<div className="py-[0.5cqw] text-center">
<p className="text-[5cqw] md:text-[3cqw] leading-tight text-[#123041] font-bold font-montserrat">
Come celebrate
<br className="md:hidden" /> our past with us!
</p>
</div>
{/* paragraph */}
<div className="py-[0.5cqw] text-center ">
<p className="text-[2.4cqw] md:text-[1.2cqw] text-[#123041] font-jakarta">
We truly could not have done any of this
<br className="md:hidden" /> without you. Your support means the
world!
</p>
</div>
</div>

<div className="h-[40cqw] relative flex items-center justify-center">
{images.map((image, index) => (
<Pictures
// key={`${image.path}-${index}`}
key={image.path}
path={image.path}
alt={image.alt}
order={index + 1}
/>
))}
</div>

<button className="px-[3cqw] py-[1cqw] md:px-[1.5cqw] md:py-[.5cqw] rounded-full bg-[#123041] text-[#F9FBFC]">
<a
href="https://hackdavis-2025.devpost.com/project-gallery"
target="_blank"
rel="noopener noreferrer"
>
<p className="text-[3cqw] md:text-[1.3cqw] font-medium font-jakarta tracking-wide">
VIEW 2025 WINNERS
</p>
</a>
</button>
</div>
);
}
2 changes: 2 additions & 0 deletions app/(pages)/about-us/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Directors from './_components/Directors/directors';
import OurTeam from './_components/OurTeam/OurTeam';
import AllAbout from './_components/AllAbout/AllAbout';
import Archives from './_components/Archives/Archives';
import CelebratePast from './_components/CelebratePast/celebratePast';

export default function AboutUs() {
return (
Expand All @@ -13,6 +14,7 @@ export default function AboutUs() {
<AllAbout />
<Directors />
<OurTeam />
<CelebratePast />
<Archives />
</div>
);
Expand Down
Loading