Merge version_23 into main

Merge version_23 into main

src/app/hedge-trimming/page.tsx

@@ -15,9 +15,7 @@ export default function HedgeTrimmingPage() {
           <NavbarLayoutFloatingInline
             navItems={[
               { name: "Home", id: "/" },
-              { name: "Services", id: "/" },
-              { name: "Why Us", id: "/" },
-              { name: "Reviews", id: "/" }
+              { name: "Services", id: "/#services" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}

src/app/irrigation/page.tsx

@@ -3,8 +3,8 @@
 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 FooterCard from '@/components/sections/footer/FooterCard';
-import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
 
 export default function IrrigationPage() {
   return (
@@ -14,34 +14,31 @@ export default function IrrigationPage() {
         borderRadius="pill"
         contentWidth="compact"
         sizing="mediumLargeSizeMediumTitles"
-        background="noiseDiagonalGradient"
-        cardStyle="gradient-bordered"
-        primaryButtonStyle="shadow"
+        background="circleGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="gradient"
         secondaryButtonStyle="glass"
-        headingFontWeight="bold"
+        headingFontWeight="normal"
     >
       <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" }}
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Services", id: "/#services" },
+          ]}
+          brandName="Ryan Brothers"
+          button={{ text: "Contact", href: "tel:4803279024" }}
         />
-        <FeatureCardSix
-            title="Irrigation Services"
-            description="Keep your landscape green with our professional irrigation installation and repair services."
-            textboxLayout="default"
-            useInvertedBackground={false}
-            features={[
-                { id: 1, title: "System Installation", description: "Efficient drip and sprinkler system installation.", imageSrc: "https://images.unsplash.com/photo-1558904528-7f938f36c53e?w=800" },
-                { id: 2, title: "Repairs & Maintenance", description: "Fixing leaks, broken heads, and optimizing timers.", imageSrc: "https://images.unsplash.com/photo-1605276374104-dee2a0d3dabb?w=800" }
-            ]}
+        <HeroLogoBillboard
+          logoText="Irrigation Services"
+          description="We provide comprehensive irrigation repair, maintenance, and installation to ensure your landscape remains lush and water-efficient all year round."
+          buttons={[{ text: "Get A Free Estimate", href: "tel:4803279024" }]}
+          background={{ variant: "plain" }}
+        />
+        <FooterCard
+          logoText="Ryan Brothers Lawn & Landscape"
+          copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
         />
-        <FooterCard logoText="Ryan Brothers Lawn & Landscape" />
       </ReactLenis>
     </ThemeProvider>
   );

src/app/page.tsx

@@ -29,10 +29,10 @@ export default function LandingPage() {
   <div id="nav" data-section="nav">
       <NavbarLayoutFloatingInline
       navItems={[
-        { name: "Home", id: "home" },
-        { name: "Services", id: "services" },
-        { name: "Why Us", id: "why-us" },
-        { name: "Reviews", id: "reviews" },
+        { name: "Home", id: "/" },
+        { name: "Services", id: "/#services" },
+        { name: "Why Us", id: "/#why-us" },
+        { name: "Reviews", id: "/#reviews" },
       ]}
       brandName="Ryan Brothers"
       button={{ text: "Get A Quote", href: "tel:4803279024" }}
@@ -60,9 +60,9 @@ export default function LandingPage() {
       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-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" },
+        { id: 2, title: "Irrigation Repair & Installation", description: "Professional irrigation system repair, troubleshooting, and custom installation.", buttons: [{ text: "View Details", href: "/irrigation" }], 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", description: "Transform your yard with professional rock and gravel services.", buttons: [{ text: "View Details", href: "/rock-and-gravel" }], 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.", buttons: [{ text: "View Details", href: "/tree-removal-trimming" }], 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."

src/app/rock-and-gravel/page.tsx

@@ -0,0 +1,45 @@
+"use client";
+
+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 FooterCard from '@/components/sections/footer/FooterCard';
+
+export default function RockAndGravelPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="background-highlight"
+        borderRadius="pill"
+        contentWidth="compact"
+        sizing="mediumLargeSizeMediumTitles"
+        background="circleGradient"
+        cardStyle="glass-elevated"
+        primaryButtonStyle="gradient"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <NavbarLayoutFloatingInline
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Services", id: "/#services" },
+          ]}
+          brandName="Ryan Brothers"
+          button={{ text: "Contact", href: "tel:4803279024" }}
+        />
+        <HeroLogoBillboard
+          logoText="Rock & Gravel Services"
+          description="Upgrade your yard with professional rock and gravel installation, or clear space with our efficient removal services. We handle the heavy lifting for your landscape project."
+          buttons={[{ text: "Get A Free Estimate", href: "tel:4803279024" }]}
+          background={{ variant: "plain" }}
+        />
+        <FooterCard
+          logoText="Ryan Brothers Lawn & Landscape"
+          copyrightText="© 2025 Ryan Brothers Lawn & Landscape"
+        />
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

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

@@ -24,9 +24,7 @@ export default function TreeRemovalPage() {
         <NavbarLayoutFloatingInline
             navItems={[
                 { name: "Home", id: "/" },
-                { name: "Services", id: "/" },
-                { name: "Why Us", id: "/" },
-                { name: "Reviews", id: "/" },
+                { name: "Services", id: "/#services" },
             ]}
             brandName="Ryan Brothers"
             button={{ text: "Get A Quote", href: "tel:4803279024" }}