Merge version_3 into main

Update src/app/portfolio/page.tsx
2026-04-24 23:39:46 +00:00 · 2026-04-24 23:39:43 +00:00 · 2026-04-24 23:39:42 +00:00 · 2026-04-24 23:39:42 +00:00 · 2026-04-24 23:39:21 +00:00 · 2026-04-24 23:39:18 +00:00
5 changed files with 258 additions and 8 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -0,0 +1,58 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import SplitAbout from '@/components/sections/about/SplitAbout';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="background-highlight"
+        borderRadius="rounded"
+        contentWidth="mediumSmall"
+        sizing="mediumLargeSizeMediumTitles"
+        background="aurora"
+        cardStyle="solid"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Service Areas", id: "/service-areas" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="GreenLeaf Landscapes"
+          />
+        </div>
+        <div id="about" data-section="about">
+          <SplitAbout
+            textboxLayout="split"
+            title="The Memphis Homeowners' Trust"
+            description="For over 15 years, we have served Memphis families by transforming ordinary yards into extraordinary sanctuaries. We understand that your home is your greatest investment, and our commitment is to provide the reliable, professional, and high-quality care that Memphis homeowners trust."
+            imageSrc="http://img.b2bpic.net/free-photo/medium-shot-people-watering-plants_23-2149098323.jpg?_wi=1"
+            bulletPoints={[]}
+            useInvertedBackground={false}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CpDU6ix5L1PPDWB68yZtqOu8VC/uploaded-1777073899769-nrz9tiwj.png"
+            logoText="GreenLeaf"
+            columns={[
+              { title: "Services", items: [{ label: "Lawn Care", href: "#" }, { label: "Hardscaping", href: "#" }] },
+              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Service Areas", href: "/service-areas" }] }
+            ]}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -32,8 +32,8 @@ export default function LandingPage() {
      <NavbarStyleApple
      navItems={[
        { name: "Home", id: "hero" },
-        { name: "About", id: "about" },
-        { name: "Services", id: "features" },
+        { name: "About", id: "/about" },
+        { name: "Service Areas", id: "/service-areas" },
        { name: "Contact", id: "contact" }
      ]}
      brandName="GreenLeaf Landscapes"
@@ -48,9 +48,9 @@ export default function LandingPage() {
      tag="Trusted Landscapes"
      mediaItems={[
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/worker-is-cutting-grass-with-hose_7502-9835.jpg",          imageAlt: "Landscaped garden path"},
+          imageSrc: "http://img.b2bpic.net/free-photo/worker-is-cutting-grass-with-hose_7502-9835.jpg?_wi=1",          imageAlt: "Landscaped garden path"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/road-surrounded-with-green-tropical-trees-leading-hotel_181624-49537.jpg",          imageAlt: "Lush garden design"}
+          imageSrc: "http://img.b2bpic.net/free-photo/road-surrounded-with-green-tropical-trees-leading-hotel_181624-49537.jpg?_wi=1",          imageAlt: "Lush garden design"}
      ]}
      mediaAnimation="slide-up"
      rating={5}
@@ -69,7 +69,7 @@ export default function LandingPage() {
        { title: "Sustainable Practices", description: "Eco-friendly planting and water management." },
        { title: "Expert Crew", description: "Certified gardeners and stone artisans." }
      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/medium-shot-people-watering-plants_23-2149098323.jpg"
+      imageSrc="http://img.b2bpic.net/free-photo/medium-shot-people-watering-plants_23-2149098323.jpg?_wi=2"
      imageAlt="Landscape design team"
      mediaAnimation="slide-up"
    />
@@ -82,7 +82,7 @@ export default function LandingPage() {
      useInvertedBackground={false}
      features={[
        { title: "Lawn Maintenance", description: "Weekly cuts, edging, and seasonal aeration.", imageSrc: "http://img.b2bpic.net/free-photo/close-up-male-female-worker-working-together-garden_23-2148165265.jpg", imageAlt: "Lawn care service" },
-        { title: "Hardscaping & Patios", description: "Custom stone installations and outdoor living.", imageSrc: "http://img.b2bpic.net/free-photo/stone-path-way-garden_74190-3631.jpg", imageAlt: "Stone patio" },
+        { title: "Hardscaping & Patios", description: "Custom stone installations and outdoor living.", imageSrc: "http://img.b2bpic.net/free-photo/stone-path-way-garden_74190-3631.jpg?_wi=1", imageAlt: "Stone patio" },
        { title: "Smart Irrigation", description: "Automated systems for efficient garden health.", imageSrc: "http://img.b2bpic.net/free-photo/woman-taking-photos-ceramic-kitchenware_23-2149060830.jpg", imageAlt: "Irrigation system" }
      ]}
      title="Comprehensive Landscaping Services"
@@ -163,10 +163,11 @@ export default function LandingPage() {

  <div id="footer" data-section="footer">
      <FooterBaseReveal
+      logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CpDU6ix5L1PPDWB68yZtqOu8VC/uploaded-1777073899769-nrz9tiwj.png"
      logoText="GreenLeaf"
      columns={[
        { title: "Services", items: [{ label: "Lawn Care", href: "#" }, { label: "Hardscaping", href: "#" }] },
-        { title: "Company", items: [{ label: "About Us", href: "#" }, { label: "Contact", href: "#" }] }
+        { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Service Areas", href: "/service-areas" }, { label: "Contact", href: "#contact" }] }
      ]}
      copyrightText="© 2024 GreenLeaf Landscapes. All rights reserved."
    />
@@ -174,4 +175,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/portfolio/page.tsx
+++ b/src/app/portfolio/page.tsx
@@ -0,0 +1,63 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ProductCardThree from '@/components/sections/product/ProductCardThree';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import ReactLenis from "lenis/react";
+
+export default function PortfolioPage() {
+  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>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
+              { name: "Portfolio", id: "/portfolio" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="GreenLeaf Landscapes"
+          />
+        </div>
+        <div id="products" data-section="products">
+          <ProductCardThree
+            title="Our Portfolio"
+            description="A curated selection of our work across diverse landscape categories."
+            animationType="slide-up"
+            gridVariant="three-columns-all-equal-width"
+            products={[
+              { id: "1", name: "Residential Patio", price: "Hardscape", imageSrc: "http://img.b2bpic.net/free-photo/stone-path-way-garden_74190-3631.jpg?_wi=2" },
+              { id: "2", name: "Commercial Garden", price: "Design", imageSrc: "http://img.b2bpic.net/free-photo/road-surrounded-with-green-tropical-trees-leading-hotel_181624-49537.jpg?_wi=2" },
+              { id: "3", name: "Lush Lawn", price: "Maintenance", imageSrc: "http://img.b2bpic.net/free-photo/worker-is-cutting-grass-with-hose_7502-9835.jpg?_wi=2" }
+            ]}
+            textboxLayout="default"
+            useInvertedBackground={false}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CpDU6ix5L1PPDWB68yZtqOu8VC/uploaded-1777073899769-nrz9tiwj.png"
+            logoText="GreenLeaf"
+            columns={[
+              { title: "Portfolio", items: [{ label: "View Gallery", href: "/portfolio" }] },
+              { title: "Company", items: [{ label: "Home", href: "/" }] }
+            ]}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/service-areas/page.tsx
+++ b/src/app/service-areas/page.tsx
@@ -0,0 +1,66 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import { MapPin } from 'lucide-react';
+
+export default function ServiceAreasPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="background-highlight"
+        borderRadius="rounded"
+        contentWidth="mediumSmall"
+        sizing="mediumLargeSizeMediumTitles"
+        background="aurora"
+        cardStyle="solid"
+        primaryButtonStyle="shadow"
+        secondaryButtonStyle="glass"
+        headingFontWeight="normal"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Service Areas", id: "/service-areas" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="GreenLeaf Landscapes"
+          />
+        </div>
+        <div id="features" data-section="features">
+          <FeatureBorderGlow
+            title="Our Service Areas"
+            description="We proudly serve the Greater Memphis area and surrounding communities."
+            useInvertedBackground={false}
+            animationType="slide-up"
+            textboxLayout="default"
+            features={[
+              { icon: MapPin, title: "Memphis", description: "Serving the heart of the city." },
+              { icon: MapPin, title: "Germantown", description: "High-end landscape design." },
+              { icon: MapPin, title: "Collierville", description: "Reliable maintenance services." },
+              { icon: MapPin, title: "Cordova", description: "Full service landscaping." },
+              { icon: MapPin, title: "Bartlett", description: "Professional garden care." },
+              { icon: MapPin, title: "Arlington", description: "Tailored outdoor solutions." }
+            ]}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CpDU6ix5L1PPDWB68yZtqOu8VC/uploaded-1777073899769-nrz9tiwj.png"
+            logoText="GreenLeaf"
+            columns={[
+              { title: "Services", items: [{ label: "Lawn Care", href: "#" }, { label: "Hardscaping", href: "#" }] },
+              { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Service Areas", href: "/service-areas" }] }
+            ]}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/services/page.tsx
+++ b/src/app/services/page.tsx
@@ -0,0 +1,62 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import FeatureCardSeven from '@/components/sections/feature/FeatureCardSeven';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+
+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>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
+              { name: "Portfolio", id: "/portfolio" },
+              { name: "Contact", id: "/contact" }
+            ]}
+            brandName="GreenLeaf Landscapes"
+          />
+        </div>
+        <div id="features" data-section="features">
+          <FeatureCardSeven
+            title="Our Services"
+            description="Expert landscape design and maintenance for your home."
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            features={[
+              { title: "Lawn Care", description: "Professional mowing and maintenance.", imageSrc: "http://img.b2bpic.net/free-photo/lawn-mower-grass.jpg" },
+              { title: "Hardscaping", description: "Custom patios and walkways.", imageSrc: "http://img.b2bpic.net/free-photo/stone-patio.jpg" },
+              { title: "Garden Design", description: "Expert planting and floral design.", imageSrc: "http://img.b2bpic.net/free-photo/garden-design.jpg" }
+            ]}
+          />
+        </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseReveal
+            logoSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CpDU6ix5L1PPDWB68yZtqOu8VC/uploaded-1777073899769-nrz9tiwj.png"
+            logoText="GreenLeaf"
+            columns={[
+              { title: "Services", items: [{ label: "Lawn Care", href: "#" }, { label: "Hardscaping", href: "#" }] },
+              { title: "Company", items: [{ label: "Home", href: "/" }] }
+            ]}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
Author	SHA1	Message	Date
bender	3875e80091	Merge version_3 into main Merge version_3 into main	2026-04-24 23:39:46 +00:00
bender	b06f236ebe	Update src/app/portfolio/page.tsx	2026-04-24 23:39:43 +00:00
bender	863f7003ed	Update src/app/page.tsx	2026-04-24 23:39:42 +00:00
bender	dfaacbf0ed	Update src/app/about/page.tsx	2026-04-24 23:39:42 +00:00
bender	b64aeaf9ed	Merge version_3 into main Merge version_3 into main	2026-04-24 23:39:21 +00:00
bender	85c99f4e07	Update src/app/services/page.tsx	2026-04-24 23:39:18 +00:00
bender	8d3479f1c8	Update src/app/service-areas/page.tsx	2026-04-24 23:39:18 +00:00
bender	7bf5d56e18	Update src/app/portfolio/page.tsx	2026-04-24 23:39:17 +00:00
bender	8d7a04e19f	Update src/app/page.tsx	2026-04-24 23:39:17 +00:00
bender	ac0ed481b7	Update src/app/about/page.tsx	2026-04-24 23:39:16 +00:00
bender	d586585db4	Merge version_3 into main Merge version_3 into main	2026-04-24 23:38:44 +00:00
bender	67a023adb0	Update src/app/services/page.tsx	2026-04-24 23:38:41 +00:00
bender	0dd3bb61d6	Update src/app/service-areas/page.tsx	2026-04-24 23:38:41 +00:00
bender	9e03a6170d	Update src/app/portfolio/page.tsx	2026-04-24 23:38:40 +00:00
bender	56e11af6fd	Update src/app/page.tsx	2026-04-24 23:38:40 +00:00
bender	fad7008aca	Update src/app/about/page.tsx	2026-04-24 23:38:40 +00:00
bender	faec2ebf91	Merge version_2 into main Merge version_2 into main	2026-04-24 23:37:10 +00:00
bender	20bb80c936	Update src/app/services/page.tsx	2026-04-24 23:37:07 +00:00
bender	98de8b7515	Merge version_2 into main Merge version_2 into main	2026-04-24 23:36:45 +00:00
bender	15eed80fae	Update src/app/service-areas/page.tsx	2026-04-24 23:36:39 +00:00
bender	1cb7bbb0e1	Update src/app/portfolio/page.tsx	2026-04-24 23:36:39 +00:00
bender	7fe3717904	Update src/app/about/page.tsx	2026-04-24 23:36:38 +00:00
bender	9682157b2e	Merge version_2 into main Merge version_2 into main	2026-04-24 23:36:12 +00:00
bender	ec0b1f3584	Add src/app/services/page.tsx	2026-04-24 23:36:09 +00:00
bender	9cc35f0ab3	Add src/app/service-areas/page.tsx	2026-04-24 23:36:09 +00:00
bender	064006762d	Add src/app/portfolio/page.tsx	2026-04-24 23:36:08 +00:00
bender	17ed368465	Update src/app/page.tsx	2026-04-24 23:36:08 +00:00
bender	bfae4546fb	Add src/app/about/page.tsx	2026-04-24 23:36:07 +00:00
bender	ae5dd8cfcb	Merge version_1 into main Merge version_1 into main	2026-04-24 23:35:03 +00:00