Update src/app/page.tsx

Merge version_37 into main

src/app/page.tsx

@@ -15,19 +15,20 @@ import { useState, useEffect, useRef } from "react";
 export default function LandingPage() {
   const [showModal, setShowModal] = useState(false);
   const [showBackToTop, setShowBackToTop] = useState(false);
-  const [showViewMoreButton, setShowViewMoreButton] = useState(false);
+  const [showGalleryViewMore, setShowGalleryViewMore] = useState(false);
-  const [showShoesArrow, setShowShoesArrow] = useState(false);
+  const [showShoesViewMore, setShowShoesViewMore] = useState(false);
-  const [showShoesMoreButton, setShowShoesMoreButton] = useState(true);
+  const [showVeilsViewMore, setShowVeilsViewMore] = useState(false);
-  const [showVeilsMoreButton, setShowVeilsMoreButton] = useState(true);
   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);
   const veilsRef = useRef<HTMLDivElement>(null);
+  const galleryContainerRef = useRef<HTMLDivElement>(null);
   const shoesContainerRef = useRef<HTMLDivElement>(null);
   const veilsContainerRef = useRef<HTMLDivElement>(null);
+  const galleryButtonContainerRef = useRef<HTMLDivElement>(null);
+  const shoesButtonContainerRef = useRef<HTMLDivElement>(null);
+  const veilsButtonContainerRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
     let ticking = false;
@@ -44,24 +45,29 @@ export default function LandingPage() {
           } else {
             setScrollDirection('up');
           }
-          setLastScrollY(currentScrollY);
 
-          // Check if gallery is in view
+          // Check gallery section - show View More when visible
-          if (galleryRef.current) {
+          if (galleryContainerRef.current && galleryButtonContainerRef.current) {
-            const rect = galleryRef.current.getBoundingClientRect();
+            const rect = galleryButtonContainerRef.current.getBoundingClientRect();
-            const isInView = rect.top < window.innerHeight && rect.bottom > 0;
+            const isInViewport = rect.top < window.innerHeight && rect.bottom > 0;
-
+            setShowGalleryViewMore(isInViewport);
-            // 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 shoes section - show View More when visible
+          if (shoesContainerRef.current && shoesButtonContainerRef.current) {
+            const rect = shoesButtonContainerRef.current.getBoundingClientRect();
+            const isInViewport = rect.top < window.innerHeight && rect.bottom > 0;
+            setShowShoesViewMore(isInViewport);
+          }
+
+          // Check veils section - show View More when visible
+          if (veilsContainerRef.current && veilsButtonContainerRef.current) {
+            const rect = veilsButtonContainerRef.current.getBoundingClientRect();
+            const isInViewport = rect.top < window.innerHeight && rect.bottom > 0;
+            setShowVeilsViewMore(isInViewport);
+          }
+
+          setLastScrollY(currentScrollY);
           ticking = false;
         });
         ticking = true;
@@ -271,47 +277,6 @@ export default function LandingPage() {
         />
       </svg>
 
-      {/* 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"
-        aria-label="Go to Dresses"
-        title="Go to Dresses"
-      >
-        <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">Dresses</span>
-        </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 - Always visible */}
-      <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 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 */}
@@ -456,7 +421,7 @@ export default function LandingPage() {
       </div>
 
       <div id="gallery" data-section="gallery" className="relative z-10" ref={galleryRef}>
-        <div className="relative">
+        <div className="relative" ref={galleryContainerRef}>
           <ProductCardFour
             title="Our Dress Collection"
             description="Handpicked dresses for every bride, every style, every story. From classic elegance to modern minimalism. Some of these dresses are exquisitely and elegantly sewed and crafted by MARAL."
@@ -467,24 +432,25 @@ export default function LandingPage() {
             tagAnimation="slide-up"
             gridVariant="bento-grid"
             animationType="slide-up"
-            products={initialDresses}
+            products={initialDresses.map((dress, index) => ({
+              ...dress,
+              _key: `gallery-${index}`
+            }))}
           />
+        </div>
 
-          {/* More Button - Positioned after gallery section */}
+        {/* View More Button - Positioned at bottom right of gallery section */}
-          <div className="relative mt-0">
+        <div ref={galleryButtonContainerRef} className="flex justify-end px-8 lg:px-16 pt-8 pb-4">
-            {showViewMoreButton && (
+          {showGalleryViewMore && (
-              <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
-                <button
+              onClick={() => setShowModal(true)}
-                  onClick={() => setShowModal(true)}
+              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 animate-in fade-in slide-in-from-bottom-4 duration-300"
-                  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"
-                  aria-label="View More Dresses"
+            >
-                >
+              <span className="text-sm md:text-base">View More</span>
-                  <span className="text-sm md:text-base">View More</span>
+              <ChevronRight className="w-4 h-4 md:w-5 md:h-5 group-hover:translate-x-1 transition-transform" />
-                  <ChevronRight className="w-4 h-4 md:w-5 md:h-5 group-hover:translate-x-1 transition-transform" />
+            </button>
-                </button>
+          )}
-              </div>
-            )}
-          </div>
         </div>
 
         {/* Modal Gallery */}
@@ -617,18 +583,20 @@ export default function LandingPage() {
               }
             ]}
           />
+        </div>
 
-          {/* More Button for Shoes - Always visible */}
+        {/* View More Button for Shoes - Positioned at bottom right of shoes section */}
-          <div className="fixed right-6 bottom-8 z-30 flex justify-end">
+        <div ref={shoesButtonContainerRef} className="flex justify-end px-8 lg:px-16 pt-8 pb-4">
+          {showShoesViewMore && (
             <button
               onClick={scrollToVeils}
-              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"
+              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 animate-in fade-in slide-in-from-bottom-4 duration-300"
               aria-label="View More Shoes"
             >
               <span className="text-sm md:text-base">View More</span>
               <ChevronRight className="w-4 h-4 md:w-5 md:h-5 group-hover:translate-x-1 transition-transform" />
             </button>
-          </div>
+          )}
         </div>
       </div>
 
@@ -665,18 +633,20 @@ export default function LandingPage() {
               }
             ]}
           />
+        </div>
 
-          {/* More Button for Veils - Always visible */}
+        {/* View More Button for Veils - Positioned at bottom right of veils section */}
-          <div className="fixed right-6 bottom-8 z-30 flex justify-end">
+        <div ref={veilsButtonContainerRef} className="flex justify-end px-8 lg:px-16 pt-8 pb-4">
+          {showVeilsViewMore && (
             <button
-              onClick={scrollToVeils}
+              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 animate-in fade-in slide-in-from-bottom-4 duration-300"
-              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 Veils"
+              disabled
             >
               <span className="text-sm md:text-base">View More</span>
               <ChevronRight className="w-4 h-4 md:w-5 md:h-5 group-hover:translate-x-1 transition-transform" />
             </button>
-          </div>
+          )}
         </div>
       </div>