Merge version_11 into main

Update src/app/page.tsx
2026-02-10 05:18:22 +00:00 · 2026-02-10 05:18:17 +00:00 · 2026-02-10 05:18:16 +00:00 · 2026-02-10 05:18:14 +00:00 · 2026-02-10 05:12:49 +00:00 · 2026-02-10 05:12:44 +00:00
2 changed files with 112 additions and 37 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,46 +1,22 @@
 import type { Metadata } from "next";
 import { Manrope } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";

 const manrope = Manrope({
  variable: "--font-manrope",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "Personal Trainer Toronto | FitPro Certified Fitness Coaching",  description: "Professional personal training in Toronto with 8+ years experience. Strength training, nutrition coaching, and online fitness programs for real results.",  keywords: "personal trainer Toronto, fitness coaching, strength training, nutrition planning, certified personal trainer",  metadataBase: new URL("https://fitpro-toronto.com"),
-  alternates: {
-    canonical: "https://fitpro-toronto.com"
-  },
-  openGraph: {
-    title: "Personal Trainer Toronto | FitPro Certified Fitness Coaching",    description: "Transform your fitness with expert personal training in Toronto. Customized programs for strength, cardio, and nutrition.",    url: "https://fitpro-toronto.com",    siteName: "FitPro Toronto",    type: "website",    images: [
-      {
-        url: "https://fitpro-toronto.com/og-image.jpg",        alt: "FitPro Toronto Personal Training"
-      }
-    ]
-  },
-  twitter: {
-    card: "summary_large_image",    title: "Personal Trainer Toronto | FitPro Certified Fitness Coaching",    description: "Professional fitness coaching and personalized training programs in Toronto.",    images: ["https://fitpro-toronto.com/twitter-image.jpg"]
-  },
-  robots: {
-    index: true,
-    follow: true
-  }
-};
+  title: "FitPro Toronto - Personal Training",  description: "Professional personal training in Toronto tailored to your unique goals."};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body className={manrope.variable}>
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={manrope.variable}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1259,7 +1235,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,4 @@
-"use client"
+"use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -11,9 +11,63 @@ import TestimonialCardFifteen from '@/components/sections/testimonial/Testimonia
 import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
 import ContactFaq from '@/components/sections/contact/ContactFaq';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import { Award, Dumbbell, Phone, Trophy, Zap } from "lucide-react";
+import { Award, Dumbbell, Phone, Trophy, Zap, Clock } from "lucide-react";
+import { useEffect, useRef, useState } from "react";

 export default function LandingPage() {
+  const brandListRef = useRef<HTMLDivElement>(null);
+  const [timeLeft, setTimeLeft] = useState<string>("5:00");
+
+  useEffect(() => {
+    if (!brandListRef.current) return;
+
+    const scrollContainer = brandListRef.current.querySelector('.brand-scroll-container') as HTMLElement;
+    if (!scrollContainer) return;
+
+    const items = scrollContainer.querySelectorAll('.brand-item');
+    const itemCount = items.length;
+    if (itemCount === 0) return;
+
+    let scrollPosition = 0;
+    const itemWidth = (items[0] as HTMLElement).offsetWidth + 32; // includes gap
+    const containerWidth = scrollContainer.offsetWidth;
+    const totalWidth = itemWidth * itemCount;
+
+    const animateScroll = () => {
+      scrollPosition += 0.5;
+      if (scrollPosition >= totalWidth / 2) {
+        scrollPosition = 0;
+      }
+      scrollContainer.scrollLeft = scrollPosition;
+      requestAnimationFrame(animateScroll);
+    };
+
+    animateScroll();
+  }, []);
+
+  useEffect(() => {
+    const startTime = Date.now();
+    const durationMs = 5 * 60 * 1000; // 5 minutes
+
+    const updateTimer = () => {
+      const elapsed = Date.now() - startTime;
+      const remaining = Math.max(0, durationMs - elapsed);
+      const minutes = Math.floor(remaining / 60000);
+      const seconds = Math.floor((remaining % 60000) / 1000);
+      setTimeLeft(`${minutes}:${seconds.toString().padStart(2, '0')}`);
+
+      if (remaining > 0) {
+        requestAnimationFrame(updateTimer);
+      }
+    };
+
+    updateTimer();
+  }, []);
+
+  const brands = [
+    "Gold's Gym Partners",    "Fitness Canada Certified",    "NASM Certified",    "ACE Certified",    "ISSA Certified",    "IIFYM Certified",    "PN Level 1 Certified",    "TRX Certified",    "CrossFit Level 1",    "NCCPT Certified"
+  ];
+
  return (
    <ThemeProvider
      defaultButtonVariant="directional-hover"
@@ -72,6 +126,28 @@ export default function LandingPage() {
        />
      </div>

+      <div id="logo-ribbon" data-section="logo-ribbon" className="py-8 px-4 bg-background" ref={brandListRef}>
+        <div className="w-content-width mx-auto">
+          <div className="flex flex-col items-center justify-center gap-8">
+            <h3 className="text-center text-lg font-semibold text-foreground">Trusted by Leading Fitness Brands</h3>
+            <div className="brand-scroll-container w-full overflow-x-hidden">
+              <div className="flex gap-8 md:gap-12 whitespace-nowrap">
+                {brands.map((brand, index) => (
+                  <div key={`${index}-1`} className="brand-item flex items-center justify-center h-12 min-w-max px-4 py-2 text-foreground/60 font-medium text-sm flex-shrink-0 rounded-theme border border-card bg-card/40 backdrop-blur-sm">
+                    {brand}
+                  </div>
+                ))}
+                {brands.map((brand, index) => (
+                  <div key={`${index}-2`} className="brand-item flex items-center justify-center h-12 min-w-max px-4 py-2 text-foreground/60 font-medium text-sm flex-shrink-0 rounded-theme border border-card bg-card/40 backdrop-blur-sm">
+                    {brand}
+                  </div>
+                ))}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
      <div id="about" data-section="about" className="py-8">
        <TestimonialAboutCard
          tag="Meet Your Coach"
@@ -106,10 +182,6 @@ export default function LandingPage() {
            {
              id: 3,
              tag: "Nutrition",              title: "Nutrition Planning",              subtitle: "Fuel your body for optimal results",              description: "Science-backed nutrition guidance and meal planning tailored to your fitness goals. Learn sustainable eating habits that complement your training program.",              imageSrc: "https://img.b2bpic.net/free-photo/healthy-menu-recipe-food-diet_53876-122837.jpg",              imageAlt: "Healthy nutrition meal planning consultation"
-            },
-            {
-              id: 4,
-              tag: "Digital Coaching",              title: "Online Training Programs",              subtitle: "Train anywhere, anytime with expert guidance",              description: "Flexible online coaching programs with customized workouts, progress tracking, and ongoing support. Perfect for busy Toronto professionals.",              imageSrc: "https://img.b2bpic.net/free-photo/happy-athletic-woman-using-laptop-while-having-online-exercise-class-home_637285-5355.jpg",              imageAlt: "Virtual fitness coaching session"
            }
          ]}
        />
@@ -174,6 +246,34 @@ export default function LandingPage() {
        />
      </div>

+      <style jsx>{`
+        @keyframes countdown-pulse {
+          0%, 100% { opacity: 1; }
+          50% { opacity: 0.7; }
+        }
+        .limited-offer-tag {
+          position: absolute;
+          top: 12px;
+          right: 12px;
+          background: linear-gradient(135deg, #ff3d4a 0%, #e63946 100%);
+          color: white;
+          padding: 6px 12px;
+          border-radius: 6px;
+          display: flex;
+          align-items: center;
+          gap: 6px;
+          font-size: 12px;
+          font-weight: 600;
+          z-index: 10;
+          animation: countdown-pulse 1s ease-in-out infinite;
+          box-shadow: 0 4px 12px rgba(230, 57, 70, 0.4);
+        }
+        .timer-text {
+          font-family: 'Courier New', monospace;
+          letter-spacing: 0.5px;
+        }
+      `}</style>
+
      <div id="testimonials" data-section="testimonials">
        <TestimonialCardFifteen
          testimonial="Working with this trainer completely changed my life. I went from zero fitness experience to running a 5K and feeling stronger than ever. The personalized approach and constant encouragement made all the difference."
Author	SHA1	Message	Date
development	e17f22ad65	Merge version_11 into main Merge version_11 into main	2026-02-10 05:18:22 +00:00
development	e4ee55de26	Update src/app/page.tsx	2026-02-10 05:18:17 +00:00
development	9d09e9595e	Update src/app/layout.tsx	2026-02-10 05:18:16 +00:00
development	bdd544dab8	Update src/app/blog/page.tsx	2026-02-10 05:18:14 +00:00
development	00a53de631	Merge version_10 into main Merge version_10 into main	2026-02-10 05:12:49 +00:00
development	c5c7a25877	Update src/app/page.tsx	2026-02-10 05:12:44 +00:00
development	98f8bfe312	Merge version_9 into main Merge version_9 into main	2026-02-10 05:06:50 +00:00
development	31d4011b15	Update src/app/page.tsx	2026-02-10 05:06:45 +00:00
development	a1c09c70ec	Merge version_8 into main Merge version_8 into main	2026-02-10 05:03:23 +00:00
development	bc60a5ec07	Update src/app/page.tsx	2026-02-10 05:03:18 +00:00
development	7926a580db	Update src/app/layout.tsx	2026-02-10 05:03:17 +00:00
development	e0b315a31c	Merge version_7 into main Merge version_7 into main	2026-02-10 04:57:43 +00:00
development	537bca95c1	Update src/app/page.tsx	2026-02-10 04:57:39 +00:00
development	db5da97c9e	Update src/app/layout.tsx	2026-02-10 04:57:37 +00:00
development	2f5121c397	Update src/app/blog/page.tsx	2026-02-10 04:57:36 +00:00
development	b5ad703896	Merge version_6 into main Merge version_6 into main	2026-02-10 04:54:01 +00:00
development	e1c8282bbf	Update src/app/page.tsx	2026-02-10 04:53:56 +00:00
development	209ee1020b	Merge version_5 into main Merge version_5 into main	2026-02-10 04:49:52 +00:00
development	a6f56780d0	Update src/app/page.tsx	2026-02-10 04:49:47 +00:00
development	91dc5bc122	Update src/app/layout.tsx	2026-02-10 04:49:46 +00:00
development	8f14fc74f4	Merge version_4 into main Merge version_4 into main	2026-02-10 04:46:12 +00:00
development	fc7ee7496c	Merge version_3 into main Merge version_3 into main	2026-02-10 04:41:34 +00:00
development	2294b56ccf	Merge version_2 into main Merge version_2 into main	2026-02-10 04:35:00 +00:00