Update src/app/page.tsx

Merge version_18 into main

src/app/hedge-trimming/page.tsx

@@ -4,31 +4,20 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
-import ContactFaq from '@/components/sections/contact/ContactFaq';
+import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 import FooterCard from '@/components/sections/footer/FooterCard';
-import { Phone } from 'lucide-react';
 
 export default function HedgeTrimmingPage() {
   return (
-    <ThemeProvider
-        defaultButtonVariant="hover-magnetic"
-        defaultTextAnimation="background-highlight"
-        borderRadius="pill"
-        contentWidth="compact"
-        sizing="mediumLargeSizeMediumTitles"
-        background="noiseDiagonalGradient"
-        cardStyle="gradient-bordered"
-        primaryButtonStyle="shadow"
-        secondaryButtonStyle="glass"
-        headingFontWeight="bold"
-    >
+    <ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
       <ReactLenis root>
         <div id="nav" data-section="nav">
           <NavbarLayoutFloatingInline
             navItems={[
               { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Services", id: "/tree-removal-trimming" },
+              { name: "Services", id: "/" },
+              { name: "Why Us", id: "/" },
+              { name: "Reviews", id: "/" }
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
@@ -36,25 +25,26 @@ export default function HedgeTrimmingPage() {
         </div>
         <div id="home" data-section="home">
           <HeroLogoBillboard
-            logoText="Professional Hedge Trimming"
-            description="Keep your hedges healthy, clean, and perfectly shaped with our professional trimming services."
-            buttons={[{ text: "Request a Quote", href: "tel:4803279024" }]}
-            background={{ variant: "glowing-orb" }}
+            logoText="Expert Hedge Trimming"
+            description="Keep your property lines clean and your landscaping sharp with our professional hedge and shrub trimming services."
+            buttons={[{ text: "Get A Quote", href: "tel:4803279024" }]}
+            background={{ variant: "plain" }}
           />
         </div>
-        <div id="contact" data-section="contact">
-          <ContactFaq
-            ctaTitle="Book Your Trimming Service"
-            ctaDescription="Contact us today to schedule your hedge trimming."
-            ctaButton={{ text: "Call Now", href: "tel:4803279024" }}
-            ctaIcon={Phone}
+        <div id="services" data-section="services">
+          <FeatureCardSix
+            title="Our Trimming Process"
+            description="Precision trimming to enhance the beauty and health of your greenery."
+            textboxLayout="default"
             useInvertedBackground={false}
-            animationType="slide-up"
-            faqs={[{ id: "1", title: "How often should I trim?", content: "Generally twice a year depending on the species." }]}
+            features={[
+              { id: 1, title: "Shaping", description: "Detailed shaping for a polished look.", imageSrc: "https://images.unsplash.com/photo-1598440947619-2c35fd95604d?w=800" },
+              { id: 2, title: "Height Reduction", description: "Controlled cutting for growth management.", imageSrc: "https://images.unsplash.com/photo-1589476993168-f52b36a21908?w=800" }
+            ]}
           />
         </div>
         <div id="footer" data-section="footer">
-          <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
+          <FooterCard />
         </div>
       </ReactLenis>
     </ThemeProvider>

src/app/irrigation/page.tsx

@@ -0,0 +1,49 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterCard from '@/components/sections/footer/FooterCard';
+import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+
+export default function IrrigationPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="mediumLargeSizeMediumTitles"
+        background="noiseDiagonalGradient"
+        cardStyle="gradient-bordered"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="bold"
+    >
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline
+            navItems={[
+                { name: "Home", id: "/" },
+                { name: "Services", id: "/" },
+                { name: "Why Us", id: "/" },
+                { name: "Reviews", id: "/" },
+            ]}
+            brandName="Ryan Brothers"
+            button={{ text: "Get A Quote", href: "tel:4803279024" }}
+        />
+        <FeatureCardMedia
+            title="Irrigation Services"
+            description="Keep your landscape green with our professional irrigation installation and repair services."
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+                { id: "1", title: "System Installation", description: "Efficient drip and sprinkler system installation.", tag: "Service" },
+                { id: "2", title: "Repairs & Maintenance", description: "Fixing leaks, broken heads, and optimizing timers.", tag: "Service" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -31,8 +31,6 @@ export default function LandingPage() {
       navItems={[
         { name: "Home", id: "home" },
         { name: "Services", id: "services" },
-        { name: "Irrigation", id: "irrigation" },
-        { name: "Rock & Gravel", id: "rock-gravel" },
         { name: "Why Us", id: "why-us" },
         { name: "Reviews", id: "reviews" },
       ]}
@@ -44,12 +42,12 @@ export default function LandingPage() {
   <div id="home" data-section="home">
       <HeroLogoBillboard
       logoText="Professional Lawn & Landscaping"
-      description="Ryan Brothers Lawn & Landscape delivers efficient, high-quality lawn care and landscaping for East Valley homeowners who want their property looking sharp—without the hassle."
+      description="Ryan Brothers Lawn & Landscape is a family driven service dedicated to delivering clean, reliable, and high-quality maintenance. We combine professional workmanship with a personal touch, serving residential and commercial properties throughout the community with integrity, consistency, and pride."
       buttons={[
         { text: "Request a Free Quote", href: "tel:4803279024" },
         { text: "Call Now", href: "tel:4803279024" },
       ]}
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683172804-an6fhagl.png"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775057266123-d83jg5bo.png"
       imageAlt="Professional lawn service"
       mediaAnimation="slide-up"
       background={{ variant: "plain" }}
@@ -61,9 +59,10 @@ export default function LandingPage() {
       textboxLayout="default"
       useInvertedBackground={false}
       features={[
-        { id: 1, title: "Lawn Maintenance", description: "Weekly, bi-weekly & monthly mowing, edging, trimming, blowing & more.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774756198244-5vkzgw2u.png", imageAlt: "Lawn mowing service" },
-        { id: 2, title: "Irrigation Repair & Installation", description: "Professional irrigation system repair, troubleshooting, and custom installation to keep your landscape lush and healthy.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683217001-qyt5vvru.png", imageAlt: "Irrigation services" },
-        { id: 3, title: "Rock & Gravel Installation & Removal", description: "Transform your yard with professional rock and gravel services, including new installations and total removal.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683236779-lfs0cx8c.png", imageAlt: "Rock installation" },
+        { id: 1, title: "Lawn Maintenance", description: "Weekly, bi-weekly & monthly mowing, edging, trimming, blowing & more.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775057118800-uyvjzg87.png", imageAlt: "Lawn mowing service" },
+        { id: 2, title: "Irrigation Repair & Installation", description: "Professional irrigation system repair, troubleshooting, and custom installation to keep your landscape lush and healthy.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775234863417-0ibz0t9t.png?_wi=1", imageAlt: "Irrigation services" },
+        { id: 3, title: "Rock & Gravel Installation & Removal", description: "Transform your yard with professional rock and gravel services, including new installations and total removal.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683236779-lfs0cx8c.png?_wi=1", imageAlt: "Rock installation" },
+        { id: 4, title: "Tree Care & Removal", description: "Safe, professional tree trimming, removal, and maintenance to protect your home and enhance your landscape.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1775234863417-0ibz0t9t.png?_wi=2", imageAlt: "Tree care service" },
       ]}
       title="Our Services"
       description="Clean, sharp, and consistent results for every property we serve."
@@ -91,10 +90,10 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         { id: "t1", title: "Great Results", quote: "My lawn has never looked better. Highly recommend the Ryan Brothers team!", name: "Sarah Miller", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774683259302-to7hsomj.png" },
-        { id: "t2", title: "Very Reliable", quote: "They show up on time every time. Efficient and very professional.", name: "David Thompson", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/woman-making-massage-his-man_23-2148231869.jpg" },
-        { id: "t3", title: "Excellent Service", quote: "Attention to detail is unmatched. My yard is finally usable again.", name: "Emily Johnson", role: "HOA Member", imageSrc: "http://img.b2bpic.net/free-photo/boy-taking-pictures-his-sister_23-2147636705.jpg" },
-        { id: "t4", title: "Highly Professional", quote: "They treated my property with care. I love the recurring schedule.", name: "Mark Stevens", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/smiley-couple-receiving-keys-their-new-home-from-realtor_23-2148895469.jpg" },
-        { id: "t5", title: "Best in the Valley", quote: "A truly professional team that goes above and beyond every week.", name: "Jessica Reed", role: "Homeowner", imageSrc: "http://img.b2bpic.net/free-photo/happy-young-woman-feeling-carefree-walking-green-park-playing-ukulele-singing-along_1258-200627.jpg?_wi=2" },
+        { id: "t2", title: "Very Reliable", quote: "They show up on time every time. Efficient and very professional.", name: "David Thompson", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774840747162-bs3qvg9d.png" },
+        { id: "t3", title: "Excellent Service", quote: "Attention to detail is unmatched. My yard is finally usable again.", name: "Emily Johnson", role: "HOA Member", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774840768645-n1apiwhb.png" },
+        { id: "t4", title: "Highly Professional", quote: "They treated my property with care. I love the recurring schedule.", name: "Mark Stevens", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774841515733-94z2uagh.png" },
+        { id: "t5", title: "Best in the Valley", quote: "A truly professional team that goes above and beyond every week.", name: "Jessica Reed", role: "Homeowner", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3BXDFgC7Q1QH0RYIW8wS68MTMTG/uploaded-1774841501548-thlcce9g.png" },
       ]}
       title="What Clients Say"
       description="Why 50+ local East Valley homeowners trust us with their yards."

src/app/rock-gravel/page.tsx

@@ -0,0 +1,49 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import FooterCard from '@/components/sections/footer/FooterCard';
+import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
+
+export default function RockGravelPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="mediumLargeSizeMediumTitles"
+        background="noiseDiagonalGradient"
+        cardStyle="gradient-bordered"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="bold"
+    >
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline
+            navItems={[
+                { name: "Home", id: "/" },
+                { name: "Services", id: "/" },
+                { name: "Why Us", id: "/" },
+                { name: "Reviews", id: "/" },
+            ]}
+            brandName="Ryan Brothers"
+            button={{ text: "Get A Quote", href: "tel:4803279024" }}
+        />
+        <FeatureCardMedia
+            title="Rock & Gravel Services"
+            description="Transform your curb appeal with our expert rock installation and site prep services."
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+                { id: "1", title: "New Installation", description: "High quality rock and gravel installation for any landscape design.", tag: "Service" },
+                { id: "2", title: "Removal & Refresh", description: "Full removal of old gravel or refreshing your existing look.", tag: "Service" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/tree-removal-trimming/page.tsx

@@ -3,12 +3,10 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
-import ContactFaq from '@/components/sections/contact/ContactFaq';
 import FooterCard from '@/components/sections/footer/FooterCard';
-import { Phone } from 'lucide-react';
+import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 
-export default function TreeServicesPage() {
+export default function TreeRemovalPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="hover-magnetic"
@@ -23,39 +21,28 @@ export default function TreeServicesPage() {
         headingFontWeight="bold"
     >
       <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
+        <NavbarLayoutFloatingInline
             navItems={[
-              { name: "Home", id: "/" },
-              { name: "Hedge Trimming", id: "/hedge-trimming" },
-              { name: "Tree Services", id: "/tree-removal-trimming" },
+                { name: "Home", id: "/" },
+                { name: "Services", id: "/" },
+                { name: "Why Us", id: "/" },
+                { name: "Reviews", id: "/" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}
-          />
-        </div>
-        <div id="home" data-section="home">
-          <HeroLogoBillboard
-            logoText="Tree Removal & Trimming"
-            description="Safe tree removal and professional trimming services to enhance yard safety and aesthetics."
-            buttons={[{ text: "Request a Quote", href: "tel:4803279024" }]}
-            background={{ variant: "glowing-orb" }}
-          />
-        </div>
-        <div id="contact" data-section="contact">
-          <ContactFaq
-            ctaTitle="Book Your Tree Service"
-            ctaDescription="Contact us today to discuss your tree service needs."
-            ctaButton={{ text: "Call Now", href: "tel:4803279024" }}
-            ctaIcon={Phone}
-            useInvertedBackground={false}
+        />
+        <FeatureCardMedia
+            title="Tree Care & Removal"
+            description="Expert tree services to maintain safety, health, and beauty of your landscape."
             animationType="slide-up"
-            faqs={[{ id: "1", title: "Is tree removal safe?", content: "Yes, our team is certified and insured for safe removals." }]}
-          />
-        </div>
-        <div id="footer" data-section="footer">
-          <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
-        </div>
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+                { id: "1", title: "Tree Trimming", description: "Precision trimming to improve tree health and structure.", tag: "Service" },
+                { id: "2", title: "Tree Removal", description: "Safe and efficient removal for dangerous or unwanted trees.", tag: "Service" }
+            ]}
+        />
+        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
       </ReactLenis>
     </ThemeProvider>
   );