Compare commits

...

9 Commits

Author SHA1 Message Date
0847c98641 Update src/app/page.tsx 2026-03-21 22:46:14 +00:00
574e17251e Merge version_31 into main
Merge version_31 into main
2026-03-21 22:34:46 +00:00
82edf03cf2 Update src/app/page.tsx 2026-03-21 22:34:42 +00:00
7569facec5 Merge version_30 into main
Merge version_30 into main
2026-03-21 22:30:41 +00:00
daab93c9f3 Update src/app/page.tsx 2026-03-21 22:30:37 +00:00
a2228ca537 Merge version_29 into main
Merge version_29 into main
2026-03-21 22:24:31 +00:00
68094e5592 Add src/hooks/useScrollDetection.ts 2026-03-21 22:24:27 +00:00
6dd47629e6 Update src/app/page.tsx 2026-03-21 22:24:27 +00:00
ab485b0d30 Merge version_28 into main
Merge version_28 into main
2026-03-21 22:16:05 +00:00
2 changed files with 201 additions and 28 deletions

View File

@@ -16,35 +16,72 @@ export default function LandingPage() {
const [showModal, setShowModal] = useState(false);
const [showBackToTop, setShowBackToTop] = useState(false);
const [showViewMoreButton, setShowViewMoreButton] = useState(false);
const [showShoesArrow, setShowShoesArrow] = useState(false);
const [scrollDirection, setScrollDirection] = useState<'up' | 'down'>('down');
const [lastScrollY, setLastScrollY] = useState(0);
const viewMoreButtonRef = useRef<HTMLDivElement>(null);
const sixthItemRef = useRef<HTMLDivElement>(null);
const galleryRef = useRef<HTMLDivElement>(null);
const shoesRef = useRef<HTMLDivElement>(null);
useEffect(() => {
let ticking = false;
const handleScroll = () => {
setShowBackToTop(window.scrollY > 300);
if (!ticking) {
window.requestAnimationFrame(() => {
const currentScrollY = window.scrollY;
setShowBackToTop(currentScrollY > 300);
// Determine scroll direction
if (currentScrollY > lastScrollY) {
setScrollDirection('down');
} else {
setScrollDirection('up');
}
setLastScrollY(currentScrollY);
// Check if gallery is in view
if (galleryRef.current) {
const rect = galleryRef.current.getBoundingClientRect();
const isInView = rect.top < window.innerHeight && rect.bottom > 0;
// Show button when gallery is scrolled past (user scrolls down past gallery)
// Hide button when user scrolls back to gallery area
if (!isInView && currentScrollY > lastScrollY) {
// We've scrolled past the gallery, show the up arrow
setShowViewMoreButton(true);
} else if (isInView && currentScrollY < lastScrollY) {
// We're back at or above the gallery, hide the button
setShowViewMoreButton(false);
}
}
// Check if shoes section is in view for arrow detection
if (shoesRef.current) {
const shoesRect = shoesRef.current.getBoundingClientRect();
const shoesInView = shoesRect.top < window.innerHeight && shoesRect.bottom > 0;
// Show up arrow when scrolled past shoes section
// Show down arrow when above shoes section
if (!shoesInView && currentScrollY > lastScrollY) {
// We've scrolled past the shoes section, show the up arrow
setShowShoesArrow(true);
} else if (shoesInView) {
// We're at or above the shoes section
setShowShoesArrow(false);
}
}
ticking = false;
});
ticking = true;
}
};
window.addEventListener('scroll', handleScroll);
return () => window.removeEventListener('scroll', handleScroll);
}, []);
useEffect(() => {
const observer = new IntersectionObserver(
([entry]) => {
setShowViewMoreButton(entry.isIntersecting);
},
{ threshold: 0.1 }
);
if (viewMoreButtonRef.current) {
observer.observe(viewMoreButtonRef.current);
}
return () => {
if (viewMoreButtonRef.current) {
observer.unobserve(viewMoreButtonRef.current);
}
};
}, []);
}, [lastScrollY]);
const scrollToGallery = () => {
const gallerySectionElement = document.getElementById('gallery');
@@ -56,6 +93,16 @@ export default function LandingPage() {
}
};
const scrollToShoes = () => {
const shoesSectionElement = document.getElementById('shoes');
if (shoesSectionElement) {
shoesSectionElement.scrollIntoView({
behavior: 'smooth',
block: 'start'
});
}
};
const scrollToTop = () => {
const heroSectionElement = document.getElementById('hero');
if (heroSectionElement) {
@@ -225,7 +272,7 @@ export default function LandingPage() {
/>
</svg>
{/* Fixed "Go to Dresses" Button */}
{/* Fixed "Go to Dresses" Button - Only visible on home page */}
<button
onClick={scrollToGallery}
className="fixed right-6 bottom-32 z-40 w-12 h-12 rounded-full bg-gradient-to-r from-[#D4AF37] to-[#D4AF37] text-black shadow-lg hover:shadow-2xl transition-all duration-300 ease-out flex items-center justify-center hover:scale-110 active:scale-95"
@@ -238,6 +285,51 @@ export default function LandingPage() {
</div>
</button>
{/* Fixed "Back to Dresses" Button - Appears when scrolled past gallery */}
{showViewMoreButton && (
<button
onClick={scrollToGallery}
className="fixed right-6 bottom-32 z-40 w-12 h-12 rounded-full bg-gradient-to-r from-[#D4AF37] to-[#D4AF37] text-black shadow-lg hover:shadow-2xl transition-all duration-300 ease-out flex items-center justify-center hover:scale-110 active:scale-95 animate-in fade-in slide-in-from-bottom-4"
aria-label="Back to Dresses"
title="Back to Dresses"
>
<div className="flex flex-col items-center justify-center gap-0.5">
<ArrowUp className="w-4 h-4" />
<span className="text-xs font-semibold text-center leading-tight">Dress</span>
</div>
</button>
)}
{/* Fixed "Go to Shoes" Button - With scroll detection */}
{!showShoesArrow && (
<button
onClick={scrollToShoes}
className="fixed right-6 bottom-20 z-40 w-12 h-12 rounded-full bg-gradient-to-r from-[#D4AF37] to-[#D4AF37] text-black shadow-lg hover:shadow-2xl transition-all duration-300 ease-out flex items-center justify-center hover:scale-110 active:scale-95"
aria-label="Go to Shoes"
title="Go to Shoes"
>
<div className="flex flex-col items-center justify-center gap-0.5">
<ArrowDown className="w-4 h-4" />
<span className="text-xs font-semibold text-center leading-tight">Shoes</span>
</div>
</button>
)}
{/* Fixed "Back to Shoes" Button - Appears when scrolled past shoes */}
{showShoesArrow && (
<button
onClick={scrollToShoes}
className="fixed right-6 bottom-20 z-40 w-12 h-12 rounded-full bg-gradient-to-r from-[#D4AF37] to-[#D4AF37] text-black shadow-lg hover:shadow-2xl transition-all duration-300 ease-out flex items-center justify-center hover:scale-110 active:scale-95 animate-in fade-in slide-in-from-bottom-4"
aria-label="Back to Shoes"
title="Back to Shoes"
>
<div className="flex flex-col items-center justify-center gap-0.5">
<ArrowUp className="w-4 h-4" />
<span className="text-xs font-semibold text-center leading-tight">Shoes</span>
</div>
</button>
)}
{/* Fixed Top Social & Contact Bar */}
<div className="fixed top-0 left-0 right-0 z-50 bg-[#D4AF37] text-black py-3 px-4 flex items-center justify-center gap-6">
{/* Instagram */}
@@ -381,7 +473,7 @@ export default function LandingPage() {
/>
</div>
<div id="gallery" data-section="gallery" className="relative z-10">
<div id="gallery" data-section="gallery" className="relative z-10" ref={galleryRef}>
<div className="relative">
<ProductCardFour
title="Our Dress Collection"
@@ -396,8 +488,8 @@ export default function LandingPage() {
products={initialDresses}
/>
{/* View More Button - Positioned after 6th picture, visible when 6th item is in view */}
<div ref={viewMoreButtonRef} className="relative mt-0">
{/* More Button - Positioned after gallery section */}
<div className="relative mt-0">
{showViewMoreButton && (
<div className="absolute -top-[280px] right-8 lg:right-16 z-30 flex justify-end animate-in fade-in slide-in-from-bottom-4 duration-300">
<button
@@ -405,7 +497,7 @@ export default function LandingPage() {
className="group relative inline-flex items-center gap-2 px-4 md:px-6 py-2 md:py-3 bg-gradient-to-r from-[#D4AF37] to-[#D4AF37] text-black rounded-lg font-semibold hover:shadow-lg transition-all duration-300 ease-out shadow-lg"
aria-label="View More Dresses"
>
<span className="text-sm md:text-base">View More Dresses</span>
<span className="text-sm md:text-base">More</span>
<ChevronRight className="w-4 h-4 md:w-5 md:h-5 group-hover:translate-x-1 transition-transform" />
</button>
</div>
@@ -507,7 +599,7 @@ export default function LandingPage() {
/>
</div>
<div id="shoes" data-section="shoes" className="relative z-10">
<div id="shoes" data-section="shoes" className="relative z-10" ref={shoesRef}>
<ProductCardFour
title="Bridal Shoes"
description="Complete your wedding day look with stunning shoes designed for comfort and elegance. From classic heels to modern designs."
@@ -518,6 +610,9 @@ export default function LandingPage() {
tagAnimation="slide-up"
gridVariant="three-columns-all-equal-width"
animationType="slide-up"
buttons={[
{ text: "Explore All Shoes", onClick: scrollToShoes }
]}
products={[
{
id: "shoe-1", name: "Classic Satin Heels", price: "Starting at $250", variant: "White", imageSrc: "http://img.b2bpic.net/free-photo/elegant-beautiful-fashionable-woman-blonde-long-white-dre_7502-4897.jpg?_wi=2", imageAlt: "Classic white satin bridal heels"
@@ -634,4 +729,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -0,0 +1,78 @@
import { useEffect, useRef, useState } from 'react';
interface UseScrollDetectionOptions {
targetElementId: string;
scrollThreshold?: number;
onStateChange?: (state: {
isScrollingPastTarget: boolean;
isScrollingBack: boolean;
scrollProgress: number;
}) => void;
}
interface UseScrollDetectionReturn {
isScrollingPastTarget: boolean;
isScrollingBack: boolean;
scrollProgress: number;
}
export function useScrollDetection({
targetElementId,
scrollThreshold = 0.3,
onStateChange,
}: UseScrollDetectionOptions): UseScrollDetectionReturn {
const [isScrollingPastTarget, setIsScrollingPastTarget] = useState(false);
const [isScrollingBack, setIsScrollingBack] = useState(false);
const [scrollProgress, setScrollProgress] = useState(0);
const lastScrollYRef = useRef(0);
const targetElementRef = useRef<HTMLElement | null>(null);
useEffect(() => {
// Get target element
targetElementRef.current = document.getElementById(targetElementId);
const handleScroll = () => {
if (!targetElementRef.current) return;
const targetRect = targetElementRef.current.getBoundingClientRect();
const windowHeight = window.innerHeight;
const scrollY = window.scrollY;
const currentScrollDirection = scrollY > lastScrollYRef.current ? 'down' : 'up';
// Calculate if we've scrolled past the target element
const targetTop = targetRect.top + scrollY;
const thresholdDistance = window.innerHeight * scrollThreshold;
const isPastTarget = scrollY > targetTop - thresholdDistance;
// Determine scroll direction
const isScrollingBackward = currentScrollDirection === 'up';
// Calculate scroll progress (0 to 1)
const progress = Math.min(scrollY / (targetTop + thresholdDistance), 1);
setIsScrollingPastTarget(isPastTarget);
setIsScrollingBack(isScrollingBackward);
setScrollProgress(progress);
// Call callback if provided
if (onStateChange) {
onStateChange({
isScrollingPastTarget: isPastTarget,
isScrollingBack: isScrollingBackward,
scrollProgress: progress,
});
}
lastScrollYRef.current = scrollY;
};
window.addEventListener('scroll', handleScroll, { passive: true });
return () => window.removeEventListener('scroll', handleScroll);
}, [targetElementId, scrollThreshold, onStateChange]);
return {
isScrollingPastTarget,
isScrollingBack,
scrollProgress,
};
}