Update src/app/page.tsx

Merge version_3 into main
2026-04-15 19:12:52 +00:00 · 2026-04-15 19:08:02 +00:00 · 2026-04-15 19:07:59 +00:00 · 2026-04-15 19:07:58 +00:00 · 2026-04-15 19:06:11 +00:00 · 2026-04-15 19:06:05 +00:00
4 changed files with 44 additions and 36 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,8 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Open_Sans } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -14,6 +16,12 @@ export const metadata: Metadata = {
  description: "Generated by create next app",
 };

+
+
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",
+  subsets: ["latin"],
+});
 const inter = Inter({
  variable: "--font-inter",
  subsets: ["latin"],
@@ -27,7 +35,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${inter.variable} antialiased`}>
+        <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,15 +2,15 @@

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FaqSplitText from '@/components/sections/faq/FaqSplitText';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
 import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
+import FooterCard from '@/components/sections/footer/FooterCard';
 import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
 import MetricCardSeven from '@/components/sections/metrics/MetricCardSeven';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
 import TestimonialAboutCard from '@/components/sections/about/TestimonialAboutCard';
-import { Leaf } from "lucide-react";
+import { Leaf, Phone, MapPin, Mail, Instagram, Facebook, Twitter } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -119,15 +119,18 @@ export default function LandingPage() {
  </div>

  <div id="faq" data-section="faq">
-      <FaqSplitText
+      <FaqSplitMedia
      useInvertedBackground={false}
      faqs={[
        { id: "q1", title: "Do you serve outside Bend?", content: "We primarily serve Bend and surrounding communities." },
        { id: "q2", title: "Are estimates free?", content: "Yes, we provide free onsite consultations." },
        { id: "q3", title: "What is your warranty?", content: "We offer a 12-month craftsmanship warranty." },
      ]}
-      sideTitle="Common Questions | Preguntas Frecuentes"
+      title="Common Questions | Preguntas Frecuentes"
+      description="Find answers to our most popular questions."
      faqsAnimation="slide-up"
+      textboxLayout="split"
+      imageSrc="http://img.b2bpic.net/free-photo/two-gardeners-discussing-work_23-2148165261.jpg"
    />
  </div>

@@ -147,37 +150,34 @@ export default function LandingPage() {
  </div>

  <div id="contact" data-section="contact">
-      <ContactCenter
+      <ContactSplitForm
      useInvertedBackground={false}
-      background={{ variant: "gradient-bars" }}
-      tag="Get in Touch | Contáctanos"
      title="Start Your Project | Inicie su Proyecto"
      description="Fill out the form to schedule a site visit today."
+      inputs={[
+        { name: "name", type: "text", placeholder: "Full Name", required: true },
+        { name: "email", type: "email", placeholder: "Email Address", required: true }
+      ]}
+      textarea={{ name: "message", placeholder: "Describe your landscaping project...", rows: 4, required: true }}
+      imageSrc="http://img.b2bpic.net/free-photo/gardener-woman-working-garden-greenhouse_23-2148165251.jpg"
+      buttonText="Send Request"
+      mediaAnimation="slide-up"
    />
  </div>

  <div id="footer" data-section="footer">
-      <FooterSimple
-      columns={[
-        {
-          title: "Quick Links",          items: [
-            { label: "Services", href: "#services" },
-            { label: "Process", href: "#process" },
-            { label: "Contact", href: "#contact" },
-          ],
-        },
-        {
-          title: "Legal",          items: [
-            { label: "Privacy Policy", href: "#" },
-            { label: "Terms of Use", href: "#" },
-          ],
-        },
+      <FooterCard
+      logoText="Junior Construction LLC"
+      socialLinks={[
+        { icon: Phone, href: "tel:+15410000000", ariaLabel: "Phone" },
+        { icon: Mail, href: "mailto:info@junior-construction.com", ariaLabel: "Email" },
+        { icon: Instagram, href: "#", ariaLabel: "Instagram" },
+        { icon: Facebook, href: "#", ariaLabel: "Facebook" }
      ]}
-      bottomLeftText="© 2024 Junior Construction LLC"
-      bottomRightText="Bend, Oregon"
+      copyrightText="© 2025 | Junior Construction LLC. All rights reserved."
    />
  </div>
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-inter), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #fafffb;
-  --card: #f7fffa;
-  --foreground: #001a0a;
-  --primary-cta: #0a7039;
+  --background: #fdfdfb;
+  --card: #f2f4f1;
+  --foreground: #1a2e1d;
+  --primary-cta: #2d5a36;
  --primary-cta-text: #fafffb;
-  --secondary-cta: #ffffff;
+  --secondary-cta: #e8ebe9;
  --secondary-cta-text: #001a0a;
-  --accent: #a8d9be;
-  --background-accent: #6bbf8e;
+  --accent: #b8c9b8;
+  --background-accent: #d6e0d6;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	454eee3d49	Update src/app/page.tsx	2026-04-15 19:12:52 +00:00
bender	289b2afb21	Merge version_3 into main Merge version_3 into main	2026-04-15 19:08:02 +00:00
bender	1e9ccceb50	Update src/app/styles/variables.css	2026-04-15 19:07:59 +00:00
bender	f135615dff	Update src/app/page.tsx	2026-04-15 19:07:58 +00:00
bender	eab2f4a3ff	Merge version_2 into main Merge version_2 into main	2026-04-15 19:06:11 +00:00
bender	a1636c3120	Update theme fonts	2026-04-15 19:06:05 +00:00
bender	4103f95ab4	Update theme fonts	2026-04-15 19:06:04 +00:00
bender	9f3330aa99	Merge version_2 into main Merge version_2 into main	2026-04-15 19:05:21 +00:00
bender	85dcc9236b	Update theme fonts	2026-04-15 19:05:15 +00:00
bender	68877a7e0d	Update theme fonts	2026-04-15 19:05:15 +00:00
bender	544b64ff28	Merge version_2 into main Merge version_2 into main	2026-04-15 19:02:33 +00:00
bender	4d39fe9ab7	Update src/app/page.tsx	2026-04-15 19:02:27 +00:00
bender	ed7498fad0	Merge version_2 into main Merge version_2 into main	2026-04-15 19:01:56 +00:00
bender	6d9ce8e58a	Update src/app/page.tsx	2026-04-15 19:01:53 +00:00
bender	870b973be5	Merge version_1 into main Merge version_1 into main	2026-04-15 18:55:23 +00:00