Merge version_2 into main

Merge version_2 into main

src/app/contact/page.tsx

@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
-import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import ContactForm from '@/components/form/ContactForm';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 
 export default function LandingPage() {
   return (
@@ -22,100 +22,62 @@ export default function LandingPage() {
         headingFontWeight="light"
     >
       <ReactLenis root>
-  <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
-      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Services",
-          id: "/services",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
-      ]}
-      brandName="Green Oregon Landscape LLC"
-    />
-  </div>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Services", id: "/services" },
+              { name: "Contact", id: "/contact" },
+            ]}
+            brandName="Green Oregon Landscape LLC"
+          />
+        </div>
 
-  <div id="contact-page-form" data-section="contact-page-form">
-      <ContactCTA
-      useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
-      tag="Get in touch"
-      title="Request Your Free Quote Today"
-      description="Let's make your lawn look its best. Send us your project details."
-      buttons={[
-        {
-          text: "Get My Free Quote",
-          href: "#",
-        },
-      ]}
-    />
-  </div>
+        <div id="contact-page-form" data-section="contact-page-form">
+          <ContactForm
+            title="Request Your Free Quote Today"
+            description="Let's make your lawn look its best. Send us your project details."
+            tag="Get in touch"
+            useInvertedBackground={false}
+            onSubmit={(email: string) => console.log("Form submitted with email:", email)}
+          />
+        </div>
 
-  <div id="about" data-section="about">
-      <MetricSplitMediaAbout
-      useInvertedBackground={false}
-      title="Available When You Need Us"
-      description="We are ready to transform your property throughout the Portland metropolitan area."
-      metrics={[
-        {
-          value: "24/7",
-          title: "Support Access",
-        },
-        {
-          value: "Fast",
-          title: "Quote Response",
-        },
-      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/gardener-growing-plants-pots-greenhouse-hands-gardener-cutting-branches-with-pruner-closeup-shot-gardening-job-concept_74855-12809.jpg"
-      imageAlt="Landscape maintenance team"
-    />
-  </div>
+        <div id="about" data-section="about">
+          <MetricCardSeven
+            title="Available When You Need Us"
+            description="We are ready to transform your property throughout the Portland metropolitan area."
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={false}
+            metrics={[
+              { id: "m1", value: "24/7", title: "Support Access", items: ["24/7 access", "Quick assistance"] },
+              { id: "m2", value: "Fast", title: "Quote Response", items: ["Fast response", "Free estimates"] },
+            ]}
+          />
+        </div>
 
-  <div id="footer" data-section="footer">
-      <FooterLogoEmphasis
-      columns={[
-        {
-          items: [
-            {
-              label: "Home",
-              href: "/",
-            },
-            {
-              label: "Services",
-              href: "/services",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-          ],
-        },
-        {
-          items: [
-            {
-              label: "(503) 737-8857",
-              href: "tel:5037378857",
-            },
-            {
-              label: "11427 SW 135th Ave, Portland, OR 97223",
-              href: "#",
-            },
-          ],
-        },
-      ]}
-      logoText="Green Oregon Landscape LLC"
-    />
-  </div>
+        <div id="footer" data-section="footer">
+          <FooterBaseCard
+            logoText="Green Oregon Landscape LLC"
+            columns={[
+              {
+                title: "Navigation",                items: [
+                  { label: "Home", href: "/" },
+                  { label: "Services", href: "/services" },
+                  { label: "Contact", href: "/contact" },
+                ],
+              },
+              {
+                title: "Contact",                items: [
+                  { label: "(503) 737-8857", href: "tel:5037378857" },
+                  { label: "11427 SW 135th Ave, Portland, OR 97223", href: "#" },
+                ],
+              },
+            ]}
+          />
+        </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/layout.tsx

@@ -10,8 +10,8 @@ import { Libre_Baskerville } from "next/font/google";
 
 
 export const metadata: Metadata = {
-  title: 'Premium Lawn Care Services in Portland | Green Oregon Landscape LLC',
-  description: 'Expert landscaping services in Portland, Oregon. Lawn mowing, garden cleanup, and professional yard care. Request your free quote today.',
+  title: 'Contact Us | Green Oregon Landscape LLC',
+  description: 'Get in touch with Green Oregon Landscape LLC for your landscaping and property maintenance needs in Portland, OR.',
   openGraph: {
     "title": "Green Oregon Landscape LLC",
     "description": "Professional Lawn Care & Landscaping Services in Portland.",