Merge version_4 into main

Merge version_4 into main

src/app/about/page.tsx

@@ -10,30 +10,34 @@ export default function AboutPage() {
   return (
     <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
             navItems={[
                 { name: "Home", id: "/" },
                 { name: "About", id: "/about" },
-                { name: "Gallery", id: "/gallery" },
                 { name: "Services", id: "/services" },
+                { name: "Location", id: "/location" },
                 { name: "Contact", id: "/contact" },
             ]}
-            brandName="Local Business"
-        />
-        <div className="pt-32">
-            <TextSplitAbout
-                title="About Our Company"
-                description={[
-                    "Founded in 2010, Local Business has grown into a cornerstone of our community. We believe in providing personalized service and quality products.",                    "Our team is dedicated to excellence and ensuring every customer has a great experience, whether in-store or online."
-                ]}
-                useInvertedBackground={false}
-            />
+          />
         </div>
-        <FooterMedia
-            imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=1"
+        <div id="about" data-section="about" className="pt-32 pb-20">
+          <TextSplitAbout
+            title="About Our Neighborhood Shop"
+            description={["Our journey began with a simple passion for high-quality artisan goods and a desire to bring our community together."]}
+            useInvertedBackground={false}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterMedia
             logoText="Local Business"
-            columns={[]}
-        />
+            imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=1"
+            columns={[
+                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
+                { title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/gallery/page.tsx

@@ -3,42 +3,34 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
 
 export default function GalleryPage() {
   return (
     <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
             navItems={[
                 { name: "Home", id: "/" },
                 { name: "About", id: "/about" },
-                { name: "Gallery", id: "/gallery" },
                 { name: "Services", id: "/services" },
+                { name: "Gallery", id: "/gallery" },
+                { name: "Location", id: "/location" },
                 { name: "Contact", id: "/contact" },
             ]}
-            brandName="Local Business"
-        />
-        <div className="pt-32">
-            <FeatureCardSeven
-                animationType="slide-up"
-                textboxLayout="default"
-                title="Business Gallery"
-                description="A showcase of our shop, products, and community moments."
-                features={[
-                    { title: "Storefront", description: "Our welcoming entrance", imageSrc: "http://img.b2bpic.net/free-photo/wedding-salon-with-white-gowns-mannequins_107791-15861.jpg" },
-                    { title: "Interior", description: "A look inside our shop", imageSrc: "http://img.b2bpic.net/free-photo/famous-fashion-designer-shopping-clothing-items-accessories-store_482257-93112.jpg?_wi=1" },
-                    { title: "Craftsmanship", description: "Detailing our work", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-old-vessels-second-hand-market_23-2149338478.jpg?_wi=1" },
-                ]}
-                useInvertedBackground={false}
-            />
+          />
         </div>
-        <FooterMedia
+        <div id="footer" data-section="footer">
+          <FooterMedia
             imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=2"
             logoText="Local Business"
-            columns={[]}
-        />
+            columns={[
+                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
+                { title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/location/page.tsx

@@ -1,51 +1,40 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import ReactLenis from "lenis/react";
 
 export default function LocationPage() {
   return (
     <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
             navItems={[
                 { name: "Home", id: "/" },
                 { name: "About", id: "/about" },
-                { name: "Gallery", id: "/gallery" },
                 { name: "Services", id: "/services" },
+                { name: "Location", id: "/location" },
                 { name: "Contact", id: "/contact" },
             ]}
-            brandName="Local Business"
-        />
-        <div className="pt-32 pb-20 px-6 max-w-4xl mx-auto text-center">
-            <h1 className="text-4xl font-bold mb-6">Visit Our Location</h1>
-            <p className="text-lg text-gray-600 mb-8">Find us in the heart of the community, ready to serve you.</p>
-            <div className="aspect-video bg-gray-200 rounded-2xl flex items-center justify-center overflow-hidden">
-                <p>Interactive Map Integration Coming Soon</p>
-            </div>
-            <div className="mt-10 text-left space-y-4">
-                <p><strong>Address:</strong> 123 Community Way, Neighborhood City</p>
-                <p><strong>Hours:</strong> Mon-Sat: 9am - 8pm</p>
-            </div>
+          />
         </div>
-        <ContactCTA 
-            tag="Contact" 
-            title="Questions about our location?" 
-            description="Reach out to us if you need help finding our shop!" 
-            buttons={[{ text: "Call Now", href: "tel:5550123" }]}
-            background={{ variant: "plain" }}
-            useInvertedBackground={false}
-        />
-        <FooterMedia
-            videoSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=4"
+        <div className="pt-32 pb-20 px-8 min-h-[60vh]">
+            <h1 className="text-4xl font-bold mb-6">Visit Us</h1>
+            <p className="text-lg mb-4">We are located in the heart of the neighborhood at 123 Artisan Way.</p>
+            <p className="text-lg">Our doors are open Monday through Saturday for all your home good needs.</p>
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterMedia
             logoText="Local Business"
+            imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=3"
             columns={[
-                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
+                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
+                { title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
             ]}
-        />
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );

src/app/page.tsx

@@ -33,6 +33,7 @@ export default function LandingPage() {
         { name: "Home", id: "/" },
         { name: "About", id: "/#about" },
         { name: "Services", id: "/services" },
+        { name: "Gallery", id: "/gallery" },
         { name: "Location", id: "/location" },
         { name: "Contact", id: "/#contact" },
       ]}
@@ -119,7 +120,7 @@ export default function LandingPage() {
       imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg"
       logoText="Local Business"
       columns={[
-        { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
+        { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
         { title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
       ]}
       copyrightText="© 2025 Local Business | All Rights Reserved"

src/app/services/page.tsx

@@ -1,46 +1,51 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
-import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
-import FooterMedia from '@/components/sections/footer/FooterMedia';
 import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+import FooterMedia from '@/components/sections/footer/FooterMedia';
 
 export default function ServicesPage() {
   return (
     <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
       <ReactLenis root>
-        <NavbarLayoutFloatingOverlay
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingOverlay
             navItems={[
                 { name: "Home", id: "/" },
                 { name: "About", id: "/about" },
-                { name: "Gallery", id: "/gallery" },
                 { name: "Services", id: "/services" },
+                { name: "Gallery", id: "/gallery" },
+                { name: "Location", id: "/location" },
                 { name: "Contact", id: "/contact" },
             ]}
-            brandName="Local Business"
-        />
-        <div className="pt-24">
-            <FeatureCardSeven
-                animationType="slide-up"
-                textboxLayout="split"
-                title="Our Services"
-                description="We provide a comprehensive range of professional services tailored to the needs of our local community."
-                features={[
-                    { title: "Premium Consulting", description: "Personalized guidance for all your local business needs.", imageSrc: "http://img.b2bpic.net/free-photo/famous-fashion-designer-shopping-clothing-items-accessories-store_482257-93112.jpg?_wi=2" },
-                    { title: "Custom Design", description: "High-quality design services focused on your unique style.", imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-senior-painter-indoors_23-2150182579.jpg" },
-                    { title: "Local Repairs", description: "Reliable repair services for your home and personal items.", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-old-vessels-second-hand-market_23-2149338478.jpg?_wi=2" }
-                ]}
-                useInvertedBackground={false}
-            />
+          />
         </div>
-        <FooterMedia
-            videoSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=3"
+        <div id="services" data-section="services" className="pt-32">
+          <FeatureCardMedia
+            title="Our Premium Services"
+            description="Discover the range of services we offer to help you and your home thrive."
+            animationType="slide-up"
+            features={[
+                { id: "f1", title: "Artisan Consulting", description: "Personalized guidance for your home interior.", tag: "Expert" },
+                { id: "f2", title: "Custom Gifting", description: "Bespoke gift baskets for every occasion.", tag: "Unique" },
+                { id: "f3", title: "Local Repairs", description: "High-quality repairs for your household goods.", tag: "Quality" }
+            ]}
+            textboxLayout="split"
+            useInvertedBackground={false}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterMedia
+            imageSrc="http://img.b2bpic.net/free-photo/man-growing-cultivating-plants-indoors_23-2149854844.jpg?_wi=4"
             logoText="Local Business"
             columns={[
-                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Location", href: "/location" }] },
+                { title: "Pages", items: [{ label: "Home", href: "/" }, { label: "Services", href: "/services" }, { label: "Gallery", href: "/gallery" }, { label: "Location", href: "/location" }] },
+                { title: "Contact", items: [{ label: "Call Us", href: "tel:5550123" }] },
             ]}
-        />
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );