Skip to content

mobile, border, and infinite scroll #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JayJ104 merged 3 commits into from
Feb 17, 2025
Merged

mobile, border, and infinite scroll #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1168ca
mobile, border, and infinite scroll
winzamark123 Feb 17, 2025
4ebc8cc
Merge branch 'main' into fix/recap_carousel_mobile
JayJ104 Feb 17, 2025
ffe9193
typo fix
JayJ104 Feb 17, 2025
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)/(index-page)/_components/SandCastle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function WhatIsHackDavisText() {
</h1>
<p className="text-base sm:text-xl md:text-2xl lg:text-3xl 2xl:text-5xl">
is one of the
<strong> largest collegiate hackathon </strong> in California, where
<strong> largest collegiate hackathons </strong> in California, where
over 850 students, creators, and leaders come together to{' '}
<strong>create for social good</strong>.
</p>
Expand Down
2 changes: 1 addition & 1 deletion app/(pages)/about-us/_components/Recap/Recap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Recap() {
<div className="w-full md:w-[90%]">
<h2 className="text-2xl font-bold">HackDavis 2024 Recap</h2>
</div>
<div className="flex flex-col gap-12 sm:items-center md:flex-row md:gap-4">
<div className="flex flex-col gap-12 sm:items-center md:gap-4 min-[900px]:flex-row">
<div className="w-full">
<RecapCarousel />
</div>
Expand Down
40 changes: 29 additions & 11 deletions app/(pages)/about-us/_components/Recap/recap_carousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,29 @@ export default function RecapCarousel() {
const [position, setPosition] = useState(2);
const [touchStart, setTouchStart] = useState(0);
const [touchEnd, setTouchEnd] = useState(0);
const [xOffset, setXOffset] = useState(-250);

useEffect(() => {
const interval = setInterval(() => {
setPosition((prev) => (prev >= 5 ? 1 : prev + 1));
}, 5000); // Increased to 5 seconds for slower rotation
setPosition((prev) => (prev + 1) % images.length);
}, 5000);

return () => clearInterval(interval);
// Handle the initial window width and subsequent resizes
const handleResize = () => {
setXOffset(window.innerWidth < 400 ? -100 : -250);
};

// Set initial value
handleResize();

// Add event listener for window resize
window.addEventListener('resize', handleResize);

// Cleanup
return () => {
clearInterval(interval);
window.removeEventListener('resize', handleResize);
};
}, []);

const handleTouchStart = (e: React.TouchEvent) => {
Expand All @@ -57,12 +73,12 @@ export default function RecapCarousel() {
const handleTouchEnd = () => {
if (touchStart - touchEnd > 75) {
// Swipe left
setPosition((prev) => (prev >= 5 ? 1 : prev + 1));
setPosition((prev) => (prev + 1) % images.length);
}

if (touchStart - touchEnd < -75) {
// Swipe right
setPosition((prev) => (prev <= 1 ? 5 : prev - 1));
setPosition((prev) => (prev - 1 + images.length) % images.length);
}
};

Expand All @@ -76,18 +92,20 @@ export default function RecapCarousel() {
onTouchEnd={handleTouchEnd}
>
{images.map((image, index) => {
const offset = index + 1;
const r = position - offset;
const absR = Math.max(Math.abs(r), r);
const zIndex = position - absR;
const totalImages = images.length;
const r =
((position - index + totalImages / 2) % totalImages) -
totalImages / 2;
const absR = Math.abs(r);
const zIndex = totalImages / 2 - absR;

return (
<motion.div
key={index}
className="absolute aspect-video h-full w-full max-w-[90%] border-[#9EE7E5] md:rounded-[35px] md:border-4"
className="absolute aspect-video h-full w-full max-w-[90%] rounded-[35px] border-4 border-[#9EE7E5]"
animate={{
rotateY: -20 * r,
x: -250 * r,
x: xOffset * r,
zIndex,
scale: r === 0 ? 1 : 0.8,
}}
Expand Down