Merge version_3 into main

Update src/app/styles/base.css
2026-03-05 02:57:29 +00:00 · 2026-03-05 02:57:25 +00:00 · 2026-03-05 02:57:25 +00:00 · 2026-03-05 02:57:24 +00:00 · 2026-03-05 02:53:10 +00:00 · 2026-03-05 02:53:06 +00:00
3 changed files with 21 additions and 47 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,44 +1,25 @@
 import type { Metadata } from "next";
-import { Mulish } from "next/font/google";
-import { Inter } from "next/font/google";
+import { Poppins } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";

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

 export const metadata: Metadata = {
-  title: "Emergency Plumber Norwich | 24 Hour Service | Norfolk Plumbing",  description: "24/7 emergency plumber in Norwich. Fast, reliable plumbing services including blocked drains, leak repairs & tap replacement. Call 07950 471139 now.",  keywords: "emergency plumber Norwich, 24 hour plumber Norwich, blocked drain Norwich, plumbing services Norfolk, leak repair Norwich",  metadataBase: new URL("https://norfolkplumbing.co.uk"),
-  alternates: {
-    canonical: "https://norfolkplumbing.co.uk"},
-  openGraph: {
-    title: "Emergency Plumber Norwich | 24 Hour Plumbing Service",    description: "Fast, reliable emergency plumbing across Norwich and Norfolk. Available 24/7. Call 07950 471139.",    url: "https://norfolkplumbing.co.uk",    siteName: "Norfolk Plumbing",    type: "website"},
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Norfolk Plumbing - Emergency Plumbing Services",  description: "Fast, reliable plumbing services across Norfolk. 24 hour emergency service. No fuss. No hidden costs."};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${mulish.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${poppins.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1406,7 +1387,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -54,7 +54,7 @@ export default function LandingPage() {
          background={{ variant: "radial-gradient" }}
          buttons={[
            {
-              text: "📞 Call Now – 07950 471139",              href: "tel:07950471139"
+              text: "📞 Call Now",              href: "tel:07950471139"
            },
            {
              text: "Request a Call Back",              href: "#contact"
@@ -162,31 +162,25 @@ export default function LandingPage() {
          textboxLayout="default"
          animationType="slide-up"
          useInvertedBackground={false}
-          gridVariant="uniform-all-items-equal"
+          gridVariant="three-columns-all-equal-width"
          testimonials={[
            {
-              id: "1",              name: "Sarah Johnson",              role: "Homeowner",              company: "Norwich",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=1",              imageAlt: "Sarah Johnson testimonial"
+              id: "1",              name: "Sarah Johnson",              role: "Homeowner",              company: "Norwich",              rating: 5
            },
            {
-              id: "2",              name: "Michael Chen",              role: "Landlord",              company: "Norfolk Property",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=2",              imageAlt: "Michael Chen testimonial"
+              id: "2",              name: "Michael Chen",              role: "Landlord",              company: "Norfolk Property",              rating: 5
            },
            {
-              id: "3",              name: "Emily Rodriguez",              role: "Business Owner",              company: "Local Shop",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=3",              imageAlt: "Emily Rodriguez testimonial"
+              id: "3",              name: "Emily Rodriguez",              role: "Business Owner",              company: "Local Shop",              rating: 5
            },
            {
-              id: "4",              name: "David Kim",              role: "Elderly Resident",              company: "Norwich",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=4",              imageAlt: "David Kim testimonial"
+              id: "4",              name: "David Kim",              role: "Elderly Resident",              company: "Norwich",              rating: 5
            },
            {
-              id: "5",              name: "Jessica Brown",              role: "Family Home Owner",              company: "Norwich",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=5",              imageAlt: "Jessica Brown testimonial"
+              id: "5",              name: "Jessica Brown",              role: "Family Home Owner",              company: "Norwich",              rating: 5
            },
            {
-              id: "6",              name: "Robert Wilson",              role: "Property Manager",              company: "Norfolk Lettings",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=6",              imageAlt: "Robert Wilson testimonial"
+              id: "6",              name: "Robert Wilson",              role: "Property Manager",              company: "Norfolk Lettings",              rating: 5
            },
          ]}
        />
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-inter), sans-serif;
+  font-family: var(--font-poppins), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-mulish), sans-serif;
+  font-family: var(--font-poppins), sans-serif;
 }
Author	SHA1	Message	Date
bender	98d7331345	Merge version_3 into main Merge version_3 into main	2026-03-05 02:57:29 +00:00
bender	89d65904b9	Update src/app/styles/base.css	2026-03-05 02:57:25 +00:00
bender	f1993a9bd1	Update src/app/page.tsx	2026-03-05 02:57:25 +00:00
bender	71aba56c45	Update src/app/layout.tsx	2026-03-05 02:57:24 +00:00
bender	3512d0ac98	Merge version_2 into main Merge version_2 into main	2026-03-05 02:53:10 +00:00
bender	1148f9038e	Update src/app/page.tsx	2026-03-05 02:53:06 +00:00
bender	6a1ccd3adc	Update src/app/layout.tsx	2026-03-05 02:53:06 +00:00
bender	85c5197b11	Merge version_1 into main Merge version_1 into main	2026-03-05 02:51:26 +00:00
bender	00fade6fd2	Merge version_1 into main Merge version_1 into main	2026-03-05 02:50:41 +00:00
bender	754d68568e	Merge version_1 into main Merge version_1 into main	2026-03-05 02:49:41 +00:00