Switch to version 5: remove src/app/social-media/page.tsx

Merge version_6 into main

src/app/about/page.tsx

@@ -0,0 +1,44 @@
+"use client";
+
+import ReactLenis from "lenis/react";
+import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
+import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+
+export default function AboutPage() {
+    return (
+        <ThemeProvider
+            defaultButtonVariant="icon-arrow"
+            defaultTextAnimation="entrance-slide"
+            borderRadius="rounded"
+            contentWidth="medium"
+            sizing="medium"
+            background="none"
+            cardStyle="solid"
+            primaryButtonStyle="shadow"
+            secondaryButtonStyle="solid"
+            headingFontWeight="medium"
+        >
+            <ReactLenis root>
+                <NavbarLayoutFloatingInline
+                    navItems={[
+                        { name: "Home", id: "/" },
+                        { name: "About Us", id: "/about" },
+                        { name: "Pricing", id: "/pricing" },
+                        { name: "Social Media", id: "social" },
+                    ]}
+                    brandName="NextGenBinCleaning"
+                    button={{ text: "Get Quote", href: "/#contact" }}
+                />
+                <div id="about" className="min-h-screen pt-40">
+                    <InlineImageSplitTextAbout
+                        useInvertedBackground={false}
+                        heading={[
+                            { type: "text", content: "Your Committed Local Cleaning Experts" },
+                        ]}
+                    />
+                </div>
+            </ReactLenis>
+        </ThemeProvider>
+    );
+}

src/app/page.tsx

@@ -3,15 +3,12 @@
 import ReactLenis from "lenis/react";
 import HeroCarouselLogo from "@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo";
 import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
-import FeatureCardOne from "@/components/sections/feature/FeatureCardOne";
-import FeatureCardNine from "@/components/sections/feature/FeatureCardNine";
-import FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
-import TestimonialCardFive from "@/components/sections/testimonial/TestimonialCardFive";
-import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
-import FooterCard from "@/components/sections/footer/FooterCard";
+import FeatureCardThree from "@/components/sections/feature/featureCardThree/FeatureCardThree";
+import FeatureCardThree_2 from "@/components/sections/feature/featureCardThree/FeatureCardThree";
+import FooterMedia from "@/components/sections/footer/FooterMedia";
 import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import { Sparkles, Phone, Users, Instagram, Facebook } from "lucide-react";
+import { Sparkles, Instagram } from "lucide-react";
 
 export default function TrashCleaningPage() {
     return (
@@ -30,8 +27,8 @@ export default function TrashCleaningPage() {
             <ReactLenis root>
                 <NavbarLayoutFloatingInline
                     navItems={[
-                        { name: "About Us", id: "about" },
-                        { name: "Pricing", id: "pricing" },
+                        { name: "About Us", id: "/about" },
+                        { name: "Pricing", id: "/pricing" },
                         { name: "Social Media", id: "social" },
                     ]}
                     brandName="NextGenBinCleaning"
@@ -50,16 +47,13 @@ export default function TrashCleaningPage() {
                     showDimOverlay={true}
                 />
                 <InlineImageSplitTextAbout
-                    id="about"
                     className="pt-40"
+                    useInvertedBackground={false}
                     heading={[
-                        { type: "text", content: "Me and my friend Jordan are in middle school and this is " },
-                        { type: "text", content: "NextGenBinCleaning " },
-                        { type: "text", content: "we are in the Louisville, Ohio area." }
+                        { type: "text", content: "Reliable Bin Cleaning for Louisville" }
                     ]}
                 />
-                <FeatureCardOne
-                    id="pricing"
+                <FeatureCardThree
                     tag="Our Plans"
                     tagIcon={Sparkles}
                     title="NextGen BinCleaning"
@@ -67,39 +61,41 @@ export default function TrashCleaningPage() {
                     textboxLayout="default"
                     animationType="slide-up"
                     gridVariant="uniform-all-items-equal"
+                    useInvertedBackground={false}
                     features={[
                         {
-                            title: "One Time Service",                            description: "1 bin: $15 | 2 bins: $25",                            imageSrc: "http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg",                            imageAlt: "One time bin service"
+                            title: "One Time Service",                            description: "1 bin: $15 | 2 bins: $25",                            imageSrc: "http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg?_wi=1",                            imageAlt: "One time bin service"
                         },
                         {
                             title: "Monthly Service",                            description: "1 bin: $30/mo | 2 bins: $35/mo",                            imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-using-dry-shampoo_23-2150704974.jpg",                            imageAlt: "Monthly bin service"
                         }
                     ]}
                 />
-                <FeatureCardMedia
-                    id="social"
+                <FeatureCardThree_2
                     tag="Social"
                     tagIcon={Instagram}
                     title="Social Media"
                     description="Connect with us on our social platforms."
                     textboxLayout="default"
                     animationType="slide-up"
+                    gridVariant="uniform-all-items-equal"
+                    useInvertedBackground={false}
                     features={[
                         {
-                            id: "fb",                            title: "Facebook",                            description: "Follow our latest cleaning results!",                            tag: "Facebook",                            imageSrc: "http://img.b2bpic.net/free-photo/3d-facebook-logo-with-colorful-elements_23-2152000293.jpg",                            imageAlt: "Facebook"
+                            title: "Facebook",                            description: "Follow our latest cleaning results!",                            imageSrc: "http://img.b2bpic.net/free-photo/3d-facebook-logo-with-colorful-elements_23-2152000293.jpg",                            imageAlt: "Facebook"
                         },
                         {
-                            id: "ig",                            title: "Instagram",                            description: "See the shine on every bin we clean!",                            tag: "Instagram",                            imageSrc: "http://img.b2bpic.net/free-photo/branding-strategy-marketing-business-graphic-design_53876-125554.jpg",                            imageAlt: "Instagram"
+                            title: "Instagram",                            description: "See the shine on every bin we clean!",                            imageSrc: "http://img.b2bpic.net/free-photo/branding-strategy-marketing-business-graphic-design_53876-125554.jpg",                            imageAlt: "Instagram"
                         }
                     ]}
                 />
-                <FooterCard
+                <FooterMedia
                     logoText="NextGenBinCleaning"
                     copyrightText="© 2025 NextGenBinCleaning | Louisville, OH"
-                    socialLinks={[
-                        { icon: Instagram, href: "#", ariaLabel: "Instagram" },
-                        { icon: Facebook, href: "#", ariaLabel: "Facebook" },
+                    columns={[
+                        { title: "Navigation", items: [{ label: "About Us", href: "/about" }, { label: "Pricing", href: "#pricing" }] }
                     ]}
+                    imageSrc="http://img.b2bpic.net/free-photo/digital-art-with-recycle-bin_23-2151064538.jpg?_wi=2"
                 />
             </ReactLenis>
         </ThemeProvider>

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #f6f0e9;
-  --card: #efe7dd;
-  --foreground: #2b180a;
-  --primary-cta: #2b180a;
-  --primary-cta-text: #f6f0e9;
-  --secondary-cta: #efe7dd;
-  --secondary-cta-text: #2b180a;
-  --accent: #94877c;
-  --background-accent: #afa094;
+  --background: #ffffff;
+  --card: #f9f9f9;
+  --foreground: #000f06e6;
+  --primary-cta: #0a7039;
+  --primary-cta-text: #ffffff;
+  --secondary-cta: #f9f9f9;
+  --secondary-cta-text: #000f06e6;
+  --accent: #e2e2e2;
+  --background-accent: #c4c4c4;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);