Merge version_4 into main

Update src/app/page.tsx
2026-05-26 02:54:55 +00:00 · 2026-05-26 02:54:52 +00:00 · 2026-05-26 02:13:41 +00:00 · 2026-05-26 02:13:38 +00:00 · 2026-05-26 02:12:52 +00:00 · 2026-05-26 02:12:46 +00:00
4 changed files with 41 additions and 47 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,7 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Poppins } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -41,14 +42,12 @@ export const metadata: Metadata = {
  },
 };

-const poppins = Poppins({
-  variable: "--font-poppins",
-  subsets: ["latin"],
-  weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"],
+
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",  subsets: ["latin"],
 });
 const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+  variable: "--font-inter",  subsets: ["latin"],
 });

 export default function RootLayout({
@@ -59,7 +58,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${poppins.variable} ${inter.variable} antialiased`}>
+        <body className={`${dmSans.variable} ${inter.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -14,37 +14,37 @@ import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';

 export default function LandingPage() {
+  const navItems = [
+    { name: "Home", id: "#hero" },
+    { name: "Why Choose Us", id: "#trust" },
+    { name: "Services", id: "#services" },
+    { name: "Reviews", id: "#reviews" },
+    { name: "Before & After", id: "#before-after" },
+    { name: "About Us", id: "#about" },
+    { name: "Service Area", id: "#service-area" },
+    { name: "Emergency", id: "#emergency-cta" },
+    { name: "Contact", id: "#contact-final" }
+  ];
+
  return (
    <ThemeProvider
-        defaultButtonVariant="text-stagger"
-        defaultTextAnimation="entrance-slide"
+        defaultButtonVariant="hover-magnetic"
+        defaultTextAnimation="reveal-blur"
        borderRadius="rounded"
        contentWidth="mediumLarge"
-        sizing="largeSizeMediumTitles"
-        background="grid"
-        cardStyle="gradient-mesh"
+        sizing="mediumSizeLargeTitles"
+        background="noise"
+        cardStyle="soft-shadow"
        primaryButtonStyle="gradient"
-        secondaryButtonStyle="glass"
-        headingFontWeight="extrabold"
+        secondaryButtonStyle="solid"
+        headingFontWeight="semibold"
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
      <NavbarLayoutFloatingInline
-      navItems={[
-        {
-          name: "Home",          id: "#hero"},
-        {
-          name: "Services",          id: "#services"},
-        {
-          name: "Reviews",          id: "#reviews"},
-        {
-          name: "About",          id: "#about"},
-        {
-          name: "Contact",          id: "#contact-final"},
-      ]}
-      brandName="Good Day Plumbing | (801) 555-1234"
-      button={{
-        text: "Book Service",        href: "#contact-final"}}
+      navItems={navItems}
+      brandName=""
+      button={{ text: "Call Now", href: "tel:8015551234" }}
    />
  </div>

@@ -74,12 +74,7 @@ export default function LandingPage() {
      ]}
      testimonialRotationInterval={5000}
      tag="★★★★★ 4.8 Stars from 120+ Homeowners"
-      buttons={[
-        {
-          text: "Get a Free Estimate",          href: "#contact-final"},
-        {
-          text: "Call Now",          href: "tel:8015551234"},
-      ]}
+      buttons={[]}
      avatars={[
        {
          src: "http://img.b2bpic.net/free-photo/smiley-young-man-looking-camera_23-2148289275.jpg",          alt: "Satisfied customer Ryan"},
@@ -93,7 +88,7 @@ export default function LandingPage() {
          src: "http://img.b2bpic.net/free-photo/smiley-young-man-looking-camera_23-2148289280.jpg",          alt: "Happy customer John"},
      ]}
      avatarText="Trusted by 120+ Homeowners"
-      imageSrc="http://img.b2bpic.net/free-photo/pleased-young-male-builder-wearing-uniform-safety-helmet-holding-out-hand-camera-putting-hip-other-hand-pink_141793-74587.jpg"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EF1PbgzKTifojF3jxjAfTgUFdc/uploaded-1779760834340-gj6uam5d.png"
      imageAlt="Smiling plumber in uniform"
      marqueeItems={[
        {
@@ -174,9 +169,9 @@ export default function LandingPage() {
        {
          id: "3",          name: "Mark & Lisa D.",          date: "March 2024",          title: "Professional & Honest",          quote: "Our water heater died unexpectedly, and Good Day Plumbing responded fast. They explained all our options clearly and installed a new one at a very fair price. True professionals.",          tag: "Fair Pricing",          avatarSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-family-taking-selfie_23-2149514024.jpg",          avatarAlt: "Mark & Lisa D. avatar",          imageSrc: "http://img.b2bpic.net/free-photo/modern-white-laundry-room_23-2151983208.jpg",          imageAlt: "Utility room"},
        {
-          id: "4",          name: "Emily R.",          date: "Feb 2024",          title: "My Go-To Plumber!",          quote: "I've called Good Day Plumbing twice now for different issues, and both times they've exceeded expectations. They truly go above and beyond, making stressful situations easy.",          tag: "Goes Above & Beyond",          avatarSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-man-posing-indoors_23-2149883559.jpg",          avatarAlt: "Emily R. avatar",          imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-girl-posing-street-dress-with-backpack_1296-805.jpg",          imageAlt: "Modern home exterior"},
+          id: "4",          name: "William R.",          date: "Feb 2024",          title: "My Go-To Plumber!",          quote: "I've called Good Day Plumbing twice now for different issues, and both times they've exceeded expectations. They truly go above and beyond, making stressful situations easy.",          tag: "Goes Above & Beyond",          avatarSrc: "http://img.b2bpic.net/free-photo/front-view-smiley-man-posing-indoors_23-2149883559.jpg",          avatarAlt: "Emily R. avatar",          imageSrc: "http://img.b2bpic.net/free-photo/young-beautiful-girl-posing-street-dress-with-backpack_1296-805.jpg",          imageAlt: "Modern home exterior"},
        {
-          id: "5",          name: "David K.",          date: "Jan 2024",          title: "Exceptional Quality",          quote: "Had a complex basement finishing plumbing job. Good Day Plumbing handled it flawlessly. The quality of work is exceptional, and they communicated every step. Fantastic job!",          tag: "High Quality",          avatarSrc: "http://img.b2bpic.net/free-photo/professional-woman-standing-with-coffee-busy-street-smiling-camera_1258-123421.jpg",          avatarAlt: "David K. avatar",          imageSrc: "http://img.b2bpic.net/free-photo/picture-frame-by-velvet-armchair_53876-132788.jpg",          imageAlt: "Home living room"},
+          id: "5",          name: "Emily K.",          date: "Jan 2024",          title: "Exceptional Quality",          quote: "Had a complex basement finishing plumbing job. Good Day Plumbing handled it flawlessly. The quality of work is exceptional, and they communicated every step. Fantastic job!",          tag: "High Quality",          avatarSrc: "http://img.b2bpic.net/free-photo/professional-woman-standing-with-coffee-busy-street-smiling-camera_1258-123421.jpg",          avatarAlt: "David K. avatar",          imageSrc: "http://img.b2bpic.net/free-photo/picture-frame-by-velvet-armchair_53876-132788.jpg",          imageAlt: "Home living room"},
      ]}
      title="Trusted By Homeowners Across Utah"
      description="Hear directly from our satisfied customers about their experience with Good Day Plumbing – honesty, quality, and service you can rely on."
@@ -309,4 +304,4 @@ export default function LandingPage() {
      </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-poppins), 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: #F5F7FA;
-  --card: #FFFFFF;
-  --foreground: #0A2540;
-  --primary-cta: #FF7A00;
+  --background: #f5f5f5;
+  --card: #ffffff;
+  --foreground: #1c1c1c;
+  --primary-cta: #1f3251;
  --primary-cta-text: #FFFFFF;
-  --secondary-cta: #0B5FFF;
+  --secondary-cta: #ffffff;
  --secondary-cta-text: #FFFFFF;
-  --accent: #0B5FFF;
-  --background-accent: #0B5FFF;
+  --accent: #15479c;
+  --background-accent: #a8cce8;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	d444976693	Merge version_4 into main Merge version_4 into main	2026-05-26 02:54:55 +00:00
bender	9673dc12e7	Update src/app/page.tsx	2026-05-26 02:54:52 +00:00
bender	69ac90566d	Merge version_4 into main Merge version_4 into main	2026-05-26 02:13:41 +00:00
bender	706f2920e7	Update src/app/page.tsx	2026-05-26 02:13:38 +00:00
bender	11be9178ac	Merge version_4 into main Merge version_4 into main	2026-05-26 02:12:52 +00:00
bender	7b383ff6cc	Update src/app/page.tsx	2026-05-26 02:12:46 +00:00
bender	75ce34a241	Merge version_3 into main Merge version_3 into main	2026-05-26 02:10:16 +00:00
bender	dbc09158c5	Update src/app/page.tsx	2026-05-26 02:10:13 +00:00
bender	59dfe6d47c	Merge version_3 into main Merge version_3 into main	2026-05-26 02:09:50 +00:00
bender	88b60f0dbd	Update src/app/page.tsx	2026-05-26 02:09:44 +00:00
bender	e6097852d6	Merge version_3 into main Merge version_3 into main	2026-05-26 02:00:49 +00:00
bender	f8f8d8d21c	Update src/app/page.tsx	2026-05-26 02:00:46 +00:00
bender	29c40c4615	Merge version_3 into main Merge version_3 into main	2026-05-26 01:56:19 +00:00
bender	d183dfada2	Update src/app/page.tsx	2026-05-26 01:56:16 +00:00
bender	b6a152e677	Merge version_3 into main Merge version_3 into main	2026-05-26 01:55:29 +00:00
bender	a5447be79a	Update src/app/styles/variables.css	2026-05-26 01:55:26 +00:00
bender	945b11d943	Update src/app/styles/base.css	2026-05-26 01:55:25 +00:00
bender	5f422cc5e7	Update src/app/page.tsx	2026-05-26 01:55:25 +00:00
bender	2f2d85ce32	Update src/app/layout.tsx	2026-05-26 01:55:24 +00:00
bender	85eff8efee	Merge version_2 into main Merge version_2 into main	2026-05-26 01:49:00 +00:00
bender	44d0202aa7	Update src/app/page.tsx	2026-05-26 01:48:57 +00:00
bender	6ad89f5a33	Merge version_1 into main Merge version_1 into main	2026-05-26 01:43:54 +00:00