Merge version_10 into main

Merge version_10 into main

src/app/faq/page.tsx

@@ -0,0 +1,75 @@
+"use client";
+
+import ReactLenis from "lenis/react";
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
+import FaqSplitMedia from "@/components/sections/faq/FaqSplitMedia";
+import FooterCard from "@/components/sections/footer/FooterCard";
+import { Instagram, Twitter, Linkedin, Mail } from "lucide-react";
+
+export default function FaqPage() {
+    return (
+        <ThemeProvider
+            defaultButtonVariant="directional-hover"
+            defaultTextAnimation="background-highlight"
+            borderRadius="pill"
+            contentWidth="medium"
+            sizing="mediumLarge"
+            background="aurora"
+            cardStyle="gradient-bordered"
+            primaryButtonStyle="primary-glow"
+            secondaryButtonStyle="layered"
+            headingFontWeight="semibold"
+        >
+            <ReactLenis root>
+                <div id="nav" data-section="nav">
+                    <NavbarStyleFullscreen
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "About", id: "/#about" },
+                            { name: "Certifications", id: "/#achievements" },
+                            { name: "Services", id: "/#services" },
+                            { name: "FAQ", id: "/faq" },
+                        ]}
+                        brandName="Personal Trainer"
+                        bottomLeftText="Certified Professional"
+                        bottomRightText="contact@trainer.com"
+                    />
+                </div>
+
+                <div id="faq" data-section="faq">
+                    <FaqSplitMedia
+                        title="Frequently Asked Questions"
+                        description="Find answers to common questions about our training programs, sessions, and philosophy."
+                        tag="FAQ"
+                        mediaPosition="left"
+                        faqs={[
+                            { id: "1", title: "Do I need equipment to start?", content: "Not at all! We tailor every program to your access, whether you're at a gym or training from home." },
+                            { id: "2", title: "How long are the sessions?", content: "Most personal training sessions last between 45 to 60 minutes, depending on your goals and program intensity." },
+                            { id: "3", title: "What if I'm a beginner?", content: "We welcome everyone, regardless of fitness level. Our focus is on proper form and progressive development." },
+                            { id: "4", title: "How do I track progress?", content: "We use a combination of physical assessments, performance tracking, and regular check-ins to monitor your growth." }
+                        ]}
+                        faqsAnimation="slide-up"
+                        textboxLayout="default"
+                        useInvertedBackground={false}
+                        imageSrc="https://img.b2bpic.net/free-photo/people-training-athletics_23-2151077709.jpg?id=150856792&_wi=2"
+                        imageAlt="FAQ Support"
+                    />
+                </div>
+
+                <div id="footer" data-section="footer">
+                    <FooterCard
+                        logoText="Personal Trainer"
+                        copyrightText="© 2025 Professional Personal Training. All rights reserved."
+                        socialLinks={[
+                            { icon: Instagram, href: "https://instagram.com", ariaLabel: "Instagram" },
+                            { icon: Twitter, href: "https://twitter.com", ariaLabel: "Twitter" },
+                            { icon: Linkedin, href: "https://linkedin.com", ariaLabel: "LinkedIn" },
+                            { icon: Mail, href: "mailto:contact@trainer.com", ariaLabel: "Email" }
+                        ]}
+                    />
+                </div>
+            </ReactLenis>
+        </ThemeProvider>
+    );
+}

src/app/layout.tsx

@@ -6,20 +6,22 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
+import { Open_Sans } from "next/font/google";
+import { Montserrat } from "next/font/google";
+import { Roboto } from "next/font/google";
 
-const halant = Halant({
-  variable: "--font-halant",
-  subsets: ["latin"],
-  weight: ["300", "400", "500", "600", "700"],
-});
 
-const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
-});
 
 export const metadata: Metadata = { title: 'Elite Fitness Coaching | Transform Your Body & Mind', description: 'Achieve your peak performance with personalized fitness coaching, custom workout plans, and expert nutritional guidance tailored to your unique goals.' };
 
+
+
+const roboto = Roboto({
+  variable: "--font-roboto",
+  subsets: ["latin"],
+  weight: ["100", "300", "400", "500", "700", "900"],
+});
+
 export default function RootLayout({
   children,
 }: Readonly<{
@@ -28,9 +30,7 @@ export default function RootLayout({
   return (
     <html lang="en" suppressHydrationWarning>
       <ServiceWrapper>
-        <body
-          className={`${halant.variable} ${inter.variable} antialiased`}
-        >
+        <body className={`${roboto.variable} antialiased`}>
           <Tag />
           {children}
           <script

src/app/page.tsx

@@ -31,10 +31,11 @@ export default function PersonalTrainerPage() {
                 <div id="nav" data-section="nav">
                     <NavbarStyleFullscreen
                         navItems={[
-                            { name: "Home", id: "home" },
-                            { name: "About", id: "about" },
-                            { name: "Certifications", id: "achievements" },
-                            { name: "Services", id: "services" },
+                            { name: "Home", id: "/" },
+                            { name: "About", id: "#about" },
+                            { name: "Certifications", id: "#achievements" },
+                            { name: "Services", id: "#services" },
+                            { name: "FAQ", id: "/faq" },
                         ]}
                         brandName="Personal Trainer"
                         bottomLeftText="Certified Professional"
@@ -103,22 +104,13 @@ export default function PersonalTrainerPage() {
                         tagIcon={Dumbbell}
                         features={[
                             {
-                                title: "One-on-One Personal Training",
-                                description: "Individual coaching sessions focused entirely on your goals, form, and progression. Each workout is designed based on your fitness level, preferences, and objectives with real-time feedback and adjustments.",
-                                imageSrc: "https://img.b2bpic.net/free-photo/group-people-working-out-together-outdoors_23-2149891467.jpg?id=34137118",
-                                imageAlt: "One-on-one personal training session"
+                                title: "One-on-One Personal Training",                                description: "Individual coaching sessions focused entirely on your goals, form, and progression. Each workout is designed based on your fitness level, preferences, and objectives with real-time feedback and adjustments.",                                imageSrc: "https://img.b2bpic.net/free-photo/group-people-working-out-together-outdoors_23-2149891467.jpg?id=34137118",                                imageAlt: "One-on-one personal training session"
                             },
                             {
-                                title: "Small Group Training Classes",
-                                description: "Build community while reaching your fitness goals in small, focused groups. Receive personalized attention in a motivating environment with other like-minded individuals committed to transformation.",
-                                imageSrc: "https://img.b2bpic.net/premium-photo/coach-reviewing-playbook-with-team_1314467-168780.jpg?id=324598511",
-                                imageAlt: "Small group fitness class"
+                                title: "Small Group Training Classes",                                description: "Build community while reaching your fitness goals in small, focused groups. Receive personalized attention in a motivating environment with other like-minded individuals committed to transformation.",                                imageSrc: "https://img.b2bpic.net/premium-photo/coach-reviewing-playbook-with-team_1314467-168780.jpg?id=324598511",                                imageAlt: "Small group fitness class"
                             },
                             {
-                                title: "Online Coaching Programs",
-                                description: "Train from anywhere with customized workout plans, nutrition guidance, and video form checks. Stay connected with regular progress assessments and program adjustments based on your results and feedback.",
-                                imageSrc: "https://img.b2bpic.net/free-photo/people-training-athletics_23-2151077709.jpg?id=150856792",
-                                imageAlt: "Online fitness coaching platform"
+                                title: "Online Coaching Programs",                                description: "Train from anywhere with customized workout plans, nutrition guidance, and video form checks. Stay connected with regular progress assessments and program adjustments based on your results and feedback.",                                imageSrc: "https://img.b2bpic.net/free-photo/people-training-athletics_23-2151077709.jpg?id=150856792&_wi=1",                                imageAlt: "Online fitness coaching platform"
                             }
                         ]}
                         textboxLayout="default"
@@ -138,27 +130,17 @@ export default function PersonalTrainerPage() {
                         tagIcon={Compass}
                         features={[
                             {
-                                title: "Progressive Overload",
-                                description: "Systematically increase intensity and challenge to drive continuous improvement and prevent plateaus in your fitness journey",
-                                bentoComponent: "animated-bar-chart"
+                                title: "Progressive Overload",                                description: "Systematically increase intensity and challenge to drive continuous improvement and prevent plateaus in your fitness journey",                                bentoComponent: "animated-bar-chart"
                             },
                             {
-                                title: "Functional Fitness",
-                                description: "Training that improves real-world strength, mobility, and movement patterns for better performance in daily life",
-                                bentoComponent: "3d-stack-cards",
-                                items: [
+                                title: "Functional Fitness",                                description: "Training that improves real-world strength, mobility, and movement patterns for better performance in daily life",                                bentoComponent: "3d-stack-cards",                                items: [
                                     { icon: Dumbbell, title: "Strength", subtitle: "Build Power", detail: "Compound movements for lasting gains" },
                                     { icon: Heart, title: "Endurance", subtitle: "Boost Stamina", detail: "Cardiovascular and muscular conditioning" },
                                     { icon: Lightbulb, title: "Mobility", subtitle: "Improve Range", detail: "Enhanced flexibility and joint health" }
                                 ]
                             },
                             {
-                                title: "Sustainable Habits",
-                                description: "Build consistent routines that fit your lifestyle and lead to long-term results, not quick fixes",
-                                bentoComponent: "timeline",
-                                heading: "Your Training Journey",
-                                subheading: "Three phases to transformation",
-                                items: [
+                                title: "Sustainable Habits",                                description: "Build consistent routines that fit your lifestyle and lead to long-term results, not quick fixes",                                bentoComponent: "timeline",                                heading: "Your Training Journey",                                subheading: "Three phases to transformation",                                items: [
                                     { label: "Foundation", detail: "Building proper form and establishing baseline fitness" },
                                     { label: "Progression", detail: "Gradually increasing intensity and complexity" },
                                     { label: "Mastery", detail: "Peak performance and maintaining long-term results" }

src/app/styles/base.css

@@ -11,7 +11,7 @@ html {
 body {
   background-color: var(--background);
   color: var(--foreground);
-  font-family: var(--font-inter-tight), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
   position: relative;
   min-height: 100vh;
   overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-inter-tight), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
 }

src/app/styles/variables.css

@@ -11,9 +11,9 @@
   --background-accent: #ffffff; */
 
   --background: #ffffff;
-  --card: #e60909;
+  --card: #f9f9f9;
   --foreground: #000f06e6;
-  --primary-cta: #2be682;
+  --primary-cta: #0a7039;
   --primary-cta-text: #ffffff;
   --secondary-cta: #f9f9f9;
   --secondary-cta-text: #000f06e6;