Merge version_3 into main

Update src/app/page.tsx
2026-03-07 05:01:21 +00:00 · 2026-03-07 05:01:17 +00:00 · 2026-03-07 05:01:16 +00:00 · 2026-03-07 04:58:14 +00:00 · 2026-03-07 04:58:10 +00:00 · 2026-03-07 04:58:10 +00:00
2 changed files with 59 additions and 83 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,76 +1,29 @@
 import type { Metadata } from "next";
-import { Halant } from "next/font/google";
-import { Inter } from "next/font/google";
-import { Source_Sans_3 } from "next/font/google";
-import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import { Geist, Geist_Mono } from "next/font/google";
+import "@/styles/globals.css";

-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
+const geist = Geist({
+  variable: "--font-geist-sans",  subsets: ["latin"],
 });

-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});
-
-const sourceSans3 = Source_Sans_3({
-  variable: "--font-source-sans-3",
-  subsets: ["latin"],
+const geistMono = Geist_Mono({
+  variable: "--font-geist-mono",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "KY Auto | Trusted Car Repair & Servicing in Singapore",
-  description: "Professional automotive repair and car servicing in Singapore. Expert technicians, genuine parts, 100% satisfaction guaranteed. Call now for engine repair, aircon service, gearbox repair and more.",
-  keywords: "car repair Singapore, auto service near me, engine repair, car maintenance, vehicle servicing, accident repair, aircon service",
-  metadataBase: new URL("https://kyauto.sg"),
-  alternates: {
-    canonical: "https://kyauto.sg",
-  },
-  openGraph: {
-    title: "KY Auto | Expert Car Repair & Servicing",
-    description: "Professional automotive repair and servicing with 15+ years experience. Certified technicians, fair pricing, guaranteed quality.",
-    url: "https://kyauto.sg",
-    siteName: "KY Auto",
-    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/different-type-tools-especially-wrenches-are-hanging-wall-workshop_613910-15268.jpg",
-        alt: "KY Auto Professional Workshop",
-      },
-    ],
-    type: "website",
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "KY Auto | Trusted Car Repair & Servicing",
-    description: "Expert automotive repair services in Singapore. Call +65 6123 4567 for professional car servicing.",
-    images: [
-      "http://img.b2bpic.net/free-photo/different-type-tools-especially-wrenches-are-hanging-wall-workshop_613910-15268.jpg",
-    ],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
+  title: "KY Auto - Professional Car Repair & Servicing in Singapore",  description: "Trusted automotive repair and servicing experts with 15+ years of experience. Certified technicians, genuine parts, and 100% customer satisfaction."
 };

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} ${sourceSans3.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${geist.variable} ${geistMono.variable} antialiased`}>
+        {children}
+      
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1438,7 +1391,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -9,7 +9,7 @@ import FeatureCardTwentySix from "@/components/sections/feature/FeatureCardTwent
 import TestimonialCardTwo from "@/components/sections/testimonial/TestimonialCardTwo";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
-import { Award, CheckCircle, Star, ArrowRight, Phone, Sparkles } from "lucide-react";
+import { Award, CheckCircle, Star, ArrowRight, Phone, Sparkles, Zap } from "lucide-react";

 export default function HomePage() {
  return (
@@ -37,7 +37,8 @@ export default function HomePage() {
            { name: "Contact", id: "contact" },
          ]}
          button={{
-            text: "Call Now",            href: "tel:+6561234567"}}
+            text: "Call Now",            href: "tel:+6561234567"
+          }}
        />
      </div>

@@ -47,12 +48,15 @@ export default function HomePage() {
          logoText="KY AUTO"
          description="Trusted Car Repair & Servicing Experts. 15+ years serving Singapore with certified technicians, genuine parts, and 100% customer satisfaction. Your vehicle deserves expert care."
          background={{
-            variant: "radial-gradient"}}
+            variant: "radial-gradient"
+          }}
          buttons={[
            {
-              text: "Call Now: +65 6123 4567",              href: "tel:+6561234567"},
+              text: "Get Quick Repair",              href: "tel:+6561234567"
+            },
            {
-              text: "Book Service",              href: "/services"},
+              text: "Book Service",              href: "/services"
+            },
          ]}
          layoutOrder="default"
          imageSrc="http://img.b2bpic.net/free-photo/different-type-tools-especially-wrenches-are-hanging-wall-workshop_613910-15268.jpg"
@@ -78,6 +82,9 @@ export default function HomePage() {
            {
              id: "3",              value: "100",              title: "Satisfaction",              description: "customer satisfaction rate",              icon: Star,
            },
+            {
+              id: "4",              value: "500",              title: "Services",              description: "completed with excellence",              icon: Zap,
+            },
          ]}
          gridVariant="uniform-all-items-equal"
          textboxLayout="default"
@@ -95,22 +102,28 @@ export default function HomePage() {
          features={[
            {
              title: "Engine Diagnostics",              description: "Advanced computer diagnostics to identify any engine issues quickly and accurately",              imageSrc: "http://img.b2bpic.net/free-photo/female-mechanic-examining-car-engine-with-help-laptop_1170-1531.jpg?_wi=1",              imageAlt: "Engine diagnostics service",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
            {
              title: "Gearbox Repair",              description: "Expert gearbox and transmission repair services with genuine parts warranty",              imageSrc: "http://img.b2bpic.net/free-photo/female-mechanic-examining-car-engine_1170-1402.jpg?_wi=1",              imageAlt: "Gearbox repair service",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
            {
              title: "Car Aircon Service",              description: "Complete air conditioning servicing and maintenance for optimal cooling",              imageSrc: "http://img.b2bpic.net/free-photo/mechanic-checking-car_329181-11880.jpg?_wi=1",              imageAlt: "Car aircon servicing",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
            {
              title: "Battery Replacement",              description: "Quality battery replacement with professional installation and testing",              imageSrc: "http://img.b2bpic.net/free-photo/hand-mechanic-holding-tools_1170-1411.jpg?_wi=1",              imageAlt: "Battery replacement service",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
            {
              title: "Accident Repair",              description: "Professional accident repair and body work with insurance coordination",              imageSrc: "http://img.b2bpic.net/free-photo/car-detailing-concept-man-face-mask-with-orbital-polisher-repair-shop-polishing-orange-suv-car_627829-12610.jpg?_wi=1",              imageAlt: "Accident repair service",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
            {
              title: "Routine Maintenance",              description: "Regular maintenance packages to keep your vehicle running smoothly",              imageSrc: "http://img.b2bpic.net/free-photo/mechanics-repairing-car-workshop_329181-11848.jpg?_wi=1",              imageAlt: "Routine maintenance service",              buttonIcon: ArrowRight,
-              buttonHref: "/services"},
+              buttonHref: "/services"
+            },
          ]}
          textboxLayout="default"
          useInvertedBackground={true}
@@ -125,22 +138,28 @@ export default function HomePage() {
          testimonials={[
            {
              id: "1",              name: "David Tan",              role: "Car Owner",              testimonial: "Excellent service! The technicians were professional and thorough. My car runs perfectly now. Highly recommended.",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-handsome-confident-middle-aged-businessman-black-background_176420-5559.jpg",              imageAlt: "David Tan"},
+              imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-handsome-confident-middle-aged-businessman-black-background_176420-5559.jpg",              imageAlt: "David Tan"
+            },
            {
              id: "2",              name: "Sarah Lim",              role: "Regular Customer",              testimonial: "Fast turnaround and fair pricing. They explained every repair clearly. Best auto workshop in the area!",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/blond-business-woman-standing-with-crossed-arms_23-2148095775.jpg",              imageAlt: "Sarah Lim"},
+              imageSrc: "http://img.b2bpic.net/free-photo/blond-business-woman-standing-with-crossed-arms_23-2148095775.jpg",              imageAlt: "Sarah Lim"
+            },
            {
              id: "3",              name: "Michael Chen",              role: "Business Owner",              testimonial: "I trust KY Auto with all my company vehicles. Reliable, professional, and they always go the extra mile.",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-man-showing-approval_23-2148230800.jpg",              imageAlt: "Michael Chen"},
+              imageSrc: "http://img.b2bpic.net/free-photo/front-view-happy-man-showing-approval_23-2148230800.jpg",              imageAlt: "Michael Chen"
+            },
            {
              id: "4",              name: "Priya Sharma",              role: "First-Time Customer",              testimonial: "Very welcoming and transparent about costs. No hidden fees. Will definitely come back for maintenance.",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/confident-smartly-dressed-asian-woman-sitting-executive-chair-office_1098-20503.jpg",              imageAlt: "Priya Sharma"},
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-smartly-dressed-asian-woman-sitting-executive-chair-office_1098-20503.jpg",              imageAlt: "Priya Sharma"
+            },
            {
              id: "5",              name: "James Wong",              role: "Fleet Manager",              testimonial: "Perfect for fleet servicing. They handle multiple vehicles efficiently and maintain excellent documentation.",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/caucasian-brunette-male-portrait_158595-7921.jpg",              imageAlt: "James Wong"},
+              imageSrc: "http://img.b2bpic.net/free-photo/caucasian-brunette-male-portrait_158595-7921.jpg",              imageAlt: "James Wong"
+            },
            {
              id: "6",              name: "Lisa Ng",              role: "Loyal Customer",              testimonial: "Been bringing my car here for 5 years. Consistent quality service and genuine care for customers.",              icon: Sparkles,
-              imageSrc: "http://img.b2bpic.net/free-photo/attractive-european-girl-with-charming-smile-keeps-arms-folded-wears-round-spectacles_273609-18493.jpg",              imageAlt: "Lisa Ng"},
+              imageSrc: "http://img.b2bpic.net/free-photo/attractive-european-girl-with-charming-smile-keeps-arms-folded-wears-round-spectacles_273609-18493.jpg",              imageAlt: "Lisa Ng"
+            },
          ]}
          textboxLayout="default"
          useInvertedBackground={false}
@@ -157,12 +176,15 @@ export default function HomePage() {
          description="Schedule your appointment now. Our expert technicians are ready to keep your vehicle in top condition. Quick response, fair pricing, and guaranteed quality service."
          buttons={[
            {
-              text: "Call Now: +65 6123 4567",              href: "tel:+6561234567"},
+              text: "Call Now: +65 6123 4567",              href: "tel:+6561234567"
+            },
            {
-              text: "Book Online",              href: "/services"},
+              text: "Book Online",              href: "/services"
+            },
          ]}
          background={{
-            variant: "downward-rays-animated"}}
+            variant: "downward-rays-animated"
+          }}
          useInvertedBackground={true}
          buttonAnimation="slide-up"
          tagAnimation="slide-up"
@@ -174,9 +196,11 @@ export default function HomePage() {
        <FooterLogoReveal
          logoText="KY AUTO"
          leftLink={{
-            text: "Privacy Policy",            href: "/privacy"}}
+            text: "Privacy Policy",            href: "/privacy"
+          }}
          rightLink={{
-            text: "Terms of Service",            href: "/terms"}}
+            text: "Terms of Service",            href: "/terms"
+          }}
        />
      </div>
    </ThemeProvider>
Author	SHA1	Message	Date
bender	ba68139779	Merge version_3 into main Merge version_3 into main	2026-03-07 05:01:21 +00:00
bender	340117c2e1	Update src/app/page.tsx	2026-03-07 05:01:17 +00:00
bender	a9d6cff8a6	Update src/app/layout.tsx	2026-03-07 05:01:16 +00:00
bender	8472c2d0ff	Merge version_2 into main Merge version_2 into main	2026-03-07 04:58:14 +00:00
bender	b8a010cf91	Update src/app/page.tsx	2026-03-07 04:58:10 +00:00
bender	58caa3a1fe	Update src/app/layout.tsx	2026-03-07 04:58:10 +00:00
bender	ca537f65ff	Merge version_1 into main Merge version_1 into main	2026-03-07 04:57:24 +00:00
bender	d7fa071f48	Merge version_1 into main Merge version_1 into main	2026-03-07 04:56:28 +00:00
bender	09bc8be460	Merge version_1 into main Merge version_1 into main	2026-03-07 04:55:19 +00:00