bender/40505dfc-e547-4926-8fdf-85f753e29529
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 4 commits from version_2 into main 2026-04-09 01:48:19 +00:00
Conversation 0 Commits 4 Files Changed 4 +20 -18
4 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/about/page.tsx
View File

@@ -8,18 +8,16 @@ import FooterSimple from "@/components/sections/footer/FooterSimple";
export default function AboutUsPage() {
return (
<ThemeProvider>
<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>
<NavbarStyleFullscreen
brandName="GreenScape"
navItems={[
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Appointments", id: "/appointments" },
{ name: "Contact", id: "/contact" },
]}
button={{ text: "Call Now", href: "/#contact" }}
/>
<div className="pt-24">
<TextSplitAbout
@@ -31,6 +29,7 @@ export default function AboutUsPage() {
<FooterSimple
columns={[]}
bottomLeftText="© 2026 GreenScape Landscaping"
bottomRightText="All rights reserved"
/>
</ReactLenis>
</ThemeProvider>

8
src/app/appointments/page.tsx
View File

@@ -8,12 +8,13 @@ import ReactLenis from "lenis/react";
export default function AppointmentsPage() {
return (
<ThemeProvider>
<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>
<NavbarStyleFullscreen
brandName="GreenScape"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Appointments", id: "/appointments" },
{ name: "Contact", id: "/contact" },
]}
@@ -28,6 +29,7 @@ export default function AppointmentsPage() {
]}
textarea={{ name: "details", placeholder: "What services do you need?", rows: 4 }}
buttonText="Confirm Booking"
useInvertedBackground={false}
/>
</div>
<FooterSimple
@@ -38,4 +40,4 @@ export default function AppointmentsPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

7
src/app/contact/page.tsx
View File

@@ -7,12 +7,13 @@ import ReactLenis from "lenis/react";
export default function ContactPage() {
return (
<ThemeProvider>
<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>
<NavbarStyleFullscreen
brandName="GreenScape"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Appointments", id: "/appointments" },
{ name: "Contact", id: "/contact" },
]}
@@ -39,4 +40,4 @@ export default function ContactPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

14
src/app/services/page.tsx
View File

@@ -9,18 +9,16 @@ import { Leaf } from "lucide-react";
export default function ServicesPage() {
return (
<ThemeProvider>
<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>
<NavbarStyleFullscreen
brandName="GreenScape"
navItems={[
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Appointments", id: "/appointments" },
{ name: "Contact", id: "/contact" },
]}
button={{ text: "Call Now", href: "/#contact" }}
/>
<div className="pt-24">
<FeatureCardNineteen
@@ -29,17 +27,19 @@ export default function ServicesPage() {
title="Professional Landscaping Services"
description="We provide a comprehensive range of services to transform and maintain your outdoor spaces."
textboxLayout="default"
useInvertedBackground={false}
features={[
{
tag: "Design", title: "Landscape Design", subtitle: "Custom Plans", description: "Tailored designs reflecting your style.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/landscaping/img-2.jpg"},
tag: "Design", title: "Landscape Design", subtitle: "Custom Plans", description: "Tailored designs reflecting your style.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/landscaping/img-2.jpg"},
{
tag: "Installation", title: "Hardscape & Softscape", subtitle: "Full Installation", description: "Patios, walkways, and garden installations.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/landscaping/img-3.jpg"}
tag: "Installation", title: "Hardscape & Softscape", subtitle: "Full Installation", description: "Patios, walkways, and garden installations.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/default/templates/landscaping/img-3.jpg"}
]}
/>
</div>
<FooterSimple
columns={[]}
bottomLeftText="© 2026 GreenScape Landscaping"
bottomRightText="All rights reserved"
/>
</ReactLenis>
</ThemeProvider>