Update src/app/about/page.tsx

Merge version_6 into main

src/app/about/page.tsx

@@ -1,8 +1,8 @@
 "use client";
 
 import ReactLenis from "lenis/react";
-import InlineImageSplitTextAbout from "@/components/sections/about/InlineImageSplitTextAbout";
-import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import TextAbout from "@/components/sections/about/TextAbout";
+import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 
 export default function AboutPage() {
@@ -20,22 +20,26 @@ export default function AboutPage() {
             headingFontWeight="medium"
         >
             <ReactLenis root>
-                <NavbarLayoutFloatingInline
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "About Us", id: "/about" },
-                    ]}
-                    brandName="NextGenBinCleaning"
-                    button={{ text: "Get Quote", href: "#contact" }}
-                />
-                <div id="about" className="min-h-screen pt-40">
-                    <InlineImageSplitTextAbout
-                        heading={[
-                            { type: "text", content: "About NextGenBinCleaning" },
+                <div id="nav" data-section="nav">
+                    <NavbarStyleCentered
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "About Us", id: "/about" }
                         ]}
-                        useInvertedBackground={false}
+                        brandName="NextGenBinCleaning"
+                        button={{ text: "Get Quote", href: "/#contact" }}
                     />
                 </div>
+                <div id="about" data-section="about" className="min-h-screen pt-40">
+                    <TextAbout
+                        title="About Us"
+                        useInvertedBackground={false}
+                        className="text-lg"
+                    />
+                    <div className="container mx-auto px-6">
+                        <p className="text-lg">Me and my friend Jordan are in middle school and this is NextGenBinCleaning we are in the Louisville, Ohio area</p>
+                    </div>
+                </div>
             </ReactLenis>
         </ThemeProvider>
     );

src/app/layout.tsx

@@ -18,7 +18,7 @@ const inter = Inter({
   subsets: ["latin"],
 });
 
-export const metadata: Metadata = { title: 'NextGenBinCleaning | Professional Bin Cleaning in Louisville, OH', description: 'NextGenBinCleaning provides affordable, professional trash can cleaning services for the Louisville, Ohio community.' };
+export const metadata: Metadata = { title: 'About Us | NextGenBinCleaning', description: 'Learn more about NextGenBinCleaning, a middle school run bin cleaning service in Louisville, Ohio.' };
 
 export default function RootLayout({
   children,

src/app/page.tsx

@@ -3,12 +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 FeatureCardMedia from "@/components/sections/feature/FeatureCardMedia";
-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, Instagram, Facebook } from "lucide-react";
+import { Sparkles, Instagram } from "lucide-react";
 
 export default function TrashCleaningPage() {
     return (
@@ -27,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,10 +50,10 @@ export default function TrashCleaningPage() {
                     className="pt-40"
                     useInvertedBackground={false}
                     heading={[
-                        { type: "text", content: "At NextGenBinCleaning, we are dedicated to providing the Louisville community with professional, reliable bin cleaning results. Our local team is committed to excellence, ensuring your bins are pristine, sanitized, and odor-free every single time." }
+                        { type: "text", content: "Reliable Bin Cleaning for Louisville" }
                     ]}
                 />
-                <FeatureCardOne
+                <FeatureCardThree
                     tag="Our Plans"
                     tagIcon={Sparkles}
                     title="NextGen BinCleaning"
@@ -64,37 +64,38 @@ export default function TrashCleaningPage() {
                     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
+                <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>