development/798b57d8-26de-4a44-9a58-d461b916e541
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #4

Merged
development merged 2 commits from version_5 into main 2026-02-10 04:49:52 +00:00
Conversation 0 Commits 2 Files Changed 2 +22 -32
2 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/layout.tsx
View File

@@ -1,46 +1,22 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Manrope } from "next/font/google"; import { Manrope } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const manrope = Manrope({ const manrope = Manrope({
variable: "--font-manrope", subsets: ["latin"], variable: "--font-manrope", subsets: ["latin"],
}); });
export const metadata: Metadata = { 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"), title: "FitPro Toronto - Personal Training", description: "Professional personal training in Toronto tailored to your unique goals."};
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
}
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={manrope.variable}>{children}
<body className={manrope.variable}>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1259,7 +1235,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

17
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -72,6 +72,21 @@ export default function LandingPage() {
/> />
</div> </div>
<div id="logo-ribbon" data-section="logo-ribbon" className="py-12 px-4 bg-background">
<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="flex flex-wrap justify-center items-center gap-8 md:gap-12">
<div className="flex items-center justify-center h-12 min-w-32 text-foreground/60 font-medium text-sm">Gold's Gym Partners</div>
<div className="flex items-center justify-center h-12 min-w-32 text-foreground/60 font-medium text-sm">Fitness Canada Certified</div>
<div className="flex items-center justify-center h-12 min-w-32 text-foreground/60 font-medium text-sm">NASM Certified</div>
<div className="flex items-center justify-center h-12 min-w-32 text-foreground/60 font-medium text-sm">ACE Certified</div>
<div className="flex items-center justify-center h-12 min-w-32 text-foreground/60 font-medium text-sm">ISSA Certified</div>
</div>
</div>
</div>
</div>
<div id="about" data-section="about" className="py-8"> <div id="about" data-section="about" className="py-8">
<TestimonialAboutCard <TestimonialAboutCard
tag="Meet Your Coach" tag="Meet Your Coach"