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 "./globals.css";
+import { Inter } from "next/font/google";
+import "./styles/variables.css";
+import "./styles/base.css";
 
-const geist = Geist({
-  variable: "--font-geist-sans",  subsets: ["latin"],
-});
-
-const geistMono = Geist_Mono({
-  variable: "--font-geist-mono",  subsets: ["latin"],
+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."};
+  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={`${geist.variable} ${geistMono.variable}`}>
-        {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"
         />
@@ -196,4 +195,4 @@ export default function HomePage() {
       </div>
     </ThemeProvider>
   );
-}
+}