Update src/app/page.tsx

Merge version_16 into main

src/app/about/page.tsx

@@ -59,7 +59,6 @@ export default function AboutPage() {
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
           navItems={navItems}
-          brandName=""
           bottomLeftText="Ontario, Canada"
           bottomRightText="hello@schuitgeneral.com"
         />
@@ -87,16 +86,20 @@ export default function AboutPage() {
           features={[
             {
               id: 1,
-              title: "Quality Craftsmanship",              description: "Every project reflects our dedication to superior workmanship, attention to detail, and use of premium materials that stand the test of time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773020869056-oejcf067.jpg",              imageAlt: "skilled construction craftsmanship"},
+              title: "Quality Craftsmanship",              description: "Every project reflects our dedication to superior workmanship, attention to detail, and use of premium materials that stand the test of time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773020869056-oejcf067.jpg",              imageAlt: "skilled construction craftsmanship"
+            },
             {
               id: 2,
-              title: "Client-Centric Approach",              description: "We prioritize understanding your vision, maintaining transparent communication, and delivering results that exceed your expectations every time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-ob7ylpcq.jpg",              imageAlt: "collaborative client meetings"},
+              title: "Client-Centric Approach",              description: "We prioritize understanding your vision, maintaining transparent communication, and delivering results that exceed your expectations every time.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-ob7ylpcq.jpg",              imageAlt: "collaborative client meetings"
+            },
             {
               id: 3,
-              title: "Sustainable Innovation",              description: "We embrace modern building techniques and energy-efficient solutions to create spaces that are both beautiful and environmentally responsible.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-hp9oa4i7.jpg",              imageAlt: "sustainable green building practices"},
+              title: "Sustainable Innovation",              description: "We embrace modern building techniques and energy-efficient solutions to create spaces that are both beautiful and environmentally responsible.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-hp9oa4i7.jpg",              imageAlt: "sustainable green building practices"
+            },
             {
               id: 4,
-              title: "Proven Reliability",              description: "With 500+ completed projects and 98% client satisfaction, our track record speaks to our reliability and commitment to project success.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-u1d6o0w2.jpg?_wi=2",              imageAlt: "completed construction projects"},
+              title: "Proven Reliability",              description: "With 500+ completed projects and 98% client satisfaction, our track record speaks to our reliability and commitment to project success.",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-u1d6o0w2.jpg?_wi=2",              imageAlt: "completed construction projects"
+            },
           ]}
           textboxLayout="default"
           useInvertedBackground={false}
@@ -148,4 +151,4 @@ export default function AboutPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/layout.tsx

@@ -1,17 +1,14 @@
 import type { Metadata } from "next";
-import { Geist, Geist_Mono } from "next/font/google";
-import { Nunito_Sans } from "next/font/google";
-import "./globals.css";
-
+import { Inter } from "next/font/google";
+import "./styles/variables.css";
+import "./styles/base.css";
 
+const inter = Inter({
+  variable: "--font-inter",  subsets: ["latin"],
+});
 
 export const metadata: Metadata = {
-  title: "Schuit General - Premium Construction & Renovation Services",  description: "General contracting for residential, cottage, and mid-rise projects across Ontario. Expert exterior restorations and energy-efficient upgrades."};
-
-const nunitoSans = Nunito_Sans({
-  variable: "--font-nunito-sans",
-  subsets: ["latin"],
-});
+  title: "Schuit General - Construction & Renovation",  description: "Premium general contracting for residential, cottage, and mid-rise projects across Ontario."};
 
 export default function RootLayout({
   children,
@@ -19,9 +16,22 @@ export default function RootLayout({
   children: React.ReactNode;
 }) {
   return (
-    <html lang="en">
-      <body className={`${nunitoSans.variable} antialiased`}>
-        {children}
+    <html lang="en" suppressHydrationWarning>
+      <body className={`${inter.variable}`}>
+        <ServiceWrapper>
+          <Tag />
+          {children}
+        </ServiceWrapper>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `
+              (function() {
+                const theme = localStorage.getItem('theme') || 'light';
+                document.documentElement.setAttribute('data-theme', theme);
+              })();
+            `,
+          }}
+        />
       
         <script
           dangerouslySetInnerHTML={{
@@ -1393,3 +1403,11 @@ export default function RootLayout({
     </html>
   );
 }
+
+function ServiceWrapper({ children }: { children: React.ReactNode }) {
+  return <>{children}</>;
+}
+
+function Tag() {
+  return null;
+}

src/app/page.tsx

@@ -61,7 +61,6 @@ export default function HomePage() {
       <div id="nav" data-section="nav">
         <NavbarStyleFullscreen
           navItems={navItems}
-          brandName=""
           bottomLeftText="Ontario, Canada"
           bottomRightText="schuitgeneral@gmail.com"
         />
@@ -80,7 +79,7 @@ export default function HomePage() {
               imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773089402832-7kuv74bq.jpg?_wi=1",              imageAlt: "cottage renovation exterior improvement"
             },
             {
-              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773282065560-7cthd24z.jpg",              imageAlt: "construction project management team planning"
+              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773089372551-yp8c17sq.jpg?_wi=1",              imageAlt: "construction project management team planning"
             },
           ]}
           autoplayDelay={5000}
@@ -134,16 +133,16 @@ export default function HomePage() {
         <ProductCardFour
           products={[
             {
-              id: "project-1",              name: "Backyard deck and pergola renovation ",              price: "Completed 201",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081676-j07lq8jc.jpg",              imageAlt: "Burlington residence exterior renovation with modern updates and restored facade details"
+              id: "project-1",              name: "Backyard deck and pergola renovation ",              price: "Completed 2019",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081676-j07lq8jc.jpg",              imageAlt: "Burlington residence exterior renovation with modern updates and restored facade details"
             },
             {
-              id: "project-2",              name: "Exterior restoration  ",              price: "Completed 201",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-hp9oa4i7.jpg?_wi=2",              imageAlt: "Muskoka cottage featuring energy-efficient upgrades and sustainable building improvements"
+              id: "project-2",              name: "Exterior restoration  ",              price: "Completed 2019",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-hp9oa4i7.jpg?_wi=2",              imageAlt: "Muskoka cottage featuring energy-efficient upgrades and sustainable building improvements"
             },
             {
-              id: "project-3",              name: "Full Renovation Cedar Shake Siding",              price: "Completed 201",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-ob7ylpcq.jpg?_wi=2",              imageAlt: "Downtown office building showcasing mid-rise commercial construction with modern architectural design"
+              id: "project-3",              name: "Downtown Office Building - Mid-Rise",              price: "Completed 2022",              variant: "Commercial Construction",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-ob7ylpcq.jpg?_wi=2",              imageAlt: "Downtown office building showcasing mid-rise commercial construction with modern architectural design"
             },
             {
-              id: "project-4",              name: "Cedar Tongue and Groove Sauna ",              price: "Completed 201",              variant: "",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-u1d6o0w2.jpg?_wi=1",              imageAlt: "Heritage building facade restoration preserving historic character while updating structural integrity"
+              id: "project-4",              name: "Heritage Facade Restoration",              price: "Completed 2022",              variant: "Historic Preservation",              imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3AgOT4hEP92v0HRAH1gxSdj0hBl/uploaded-1773022081677-u1d6o0w2.jpg?_wi=1",              imageAlt: "Heritage building facade restoration preserving historic character while updating structural integrity"
             },
           ]}
           title="Featured Projects"
@@ -196,4 +195,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/styles/base.css

@@ -11,7 +11,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-nunito-sans), 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-nunito-sans), sans-serif;
+  font-family: var(--font-poppins), sans-serif;
 }