Merge version_4 into main

Merge version_4 into main

src/app/about/page.tsx

@@ -13,7 +13,7 @@ const navItems = [
   { name: "Home", id: "/" },
   { name: "Services", id: "/services" },
   { name: "Membership", id: "/membership" },
-  { name: "About", id: "/about" },
+  { name: "Assessment", id: "/#fitness-assessment" },
   { name: "Contact", id: "/contact" },
 ];
 
@@ -103,19 +103,16 @@ export default function AboutPage() {
           features={[
             {
               id: 1,
-              title: "Quality Equipment",              description:
-                "We invest in the latest, state-of-the-art fitness equipment to ensure our members have access to world-class training tools.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/still-life-gym-equipment_23-2148197736.jpg?_wi=2"},
+              title: "Quality Equipment",              description: "We invest in the latest, state-of-the-art fitness equipment to ensure our members have access to world-class training tools.",              imageSrc: "http://img.b2bpic.net/free-photo/still-life-gym-equipment_23-2148197736.jpg?_wi=2"
+            },
             {
               id: 2,
-              title: "Expert Trainers",              description:
-                "Our certified fitness professionals bring years of experience and genuine passion for helping you achieve your goals.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=2"},
+              title: "Expert Trainers",              description: "Our certified fitness professionals bring years of experience and genuine passion for helping you achieve your goals.",              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=2"
+            },
             {
               id: 3,
-              title: "Community Spirit",              description:
-                "We foster an inclusive, energetic environment where members motivate each other and celebrate collective success.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/young-woman-gym-fitnes_624325-2383.jpg?_wi=2"},
+              title: "Community Spirit",              description: "We foster an inclusive, energetic environment where members motivate each other and celebrate collective success.",              imageSrc: "http://img.b2bpic.net/free-photo/young-woman-gym-fitnes_624325-2383.jpg?_wi=2"
+            },
           ]}
           textboxLayout="default"
           animationType="blur-reveal"
@@ -159,4 +156,4 @@ export default function AboutPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/contact/page.tsx

@@ -11,7 +11,7 @@ const navItems = [
   { name: "Home", id: "/" },
   { name: "Services", id: "/services" },
   { name: "Membership", id: "/membership" },
-  { name: "About", id: "/about" },
+  { name: "Assessment", id: "/#fitness-assessment" },
   { name: "Contact", id: "/contact" },
 ];
 
@@ -131,4 +131,4 @@ export default function ContactPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/membership/page.tsx

@@ -12,7 +12,7 @@ const navItems = [
   { name: "Home", id: "/" },
   { name: "Services", id: "/services" },
   { name: "Membership", id: "/membership" },
-  { name: "About", id: "/about" },
+  { name: "Assessment", id: "/#fitness-assessment" },
   { name: "Contact", id: "/contact" },
 ];
 
@@ -144,4 +144,4 @@ export default function MembershipPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/services/page.tsx

@@ -12,7 +12,7 @@ const navItems = [
   { name: "Home", id: "/" },
   { name: "Services", id: "/services" },
   { name: "Membership", id: "/membership" },
-  { name: "About", id: "/about" },
+  { name: "Assessment", id: "/#fitness-assessment" },
   { name: "Contact", id: "/contact" },
 ];
 
@@ -102,19 +102,16 @@ export default function ServicesPage() {
           features={[
             {
               id: 1,
-              title: "Weight Training Programs",              description:
-                "Build strength and muscle with our comprehensive weight training programs. Our certified trainers create personalized routines using modern equipment and proven techniques.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/still-life-gym-equipment_23-2148197736.jpg?_wi=3"},
+              title: "Weight Training Programs",              description: "Build strength and muscle with our comprehensive weight training programs. Our certified trainers create personalized routines using modern equipment and proven techniques.",              imageSrc: "http://img.b2bpic.net/free-photo/still-life-gym-equipment_23-2148197736.jpg?_wi=3"
+            },
             {
               id: 2,
-              title: "Cardio & Endurance",              description:
-                "Improve cardiovascular health and stamina with premium cardio equipment including treadmills, rowing machines, and ellipticals guided by fitness experts.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/young-woman-gym-fitnes_624325-2383.jpg?_wi=3"},
+              title: "Cardio & Endurance",              description: "Improve cardiovascular health and stamina with premium cardio equipment including treadmills, rowing machines, and ellipticals guided by fitness experts.",              imageSrc: "http://img.b2bpic.net/free-photo/young-woman-gym-fitnes_624325-2383.jpg?_wi=3"
+            },
             {
               id: 3,
-              title: "One-on-One Personal Training",              description:
-                "Get dedicated attention from certified trainers who design custom workout plans, monitor form, and adjust intensity to match your progress and goals.",              imageSrc:
-                "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=3"},
+              title: "One-on-One Personal Training",              description: "Get dedicated attention from certified trainers who design custom workout plans, monitor form, and adjust intensity to match your progress and goals.",              imageSrc: "http://img.b2bpic.net/free-photo/young-sports-people-training-morning-gym_1157-32133.jpg?_wi=3"
+            },
           ]}
           textboxLayout="default"
           animationType="blur-reveal"
@@ -148,4 +145,4 @@ export default function ServicesPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/styles/variables.css

@@ -2,23 +2,23 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120a00e6;;
-  --primary-cta: #ff8c42;;
-  --secondary-cta: #f9f9f9;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;; */
+  /* --background: #0a1f3d;;
+  --card: #0f2f52;;
+  --foreground: #e6f0ff;;
+  --primary-cta: #106EFB;;
+  --secondary-cta: #0e1a29;;
+  --accent: #3f5c79;;
+  --background-accent: #004a93;; */
 
-  --background: #ffffff;;
-  --card: #f9f9f9;;
-  --foreground: #120a00e6;;
-  --primary-cta: #ff8c42;;
+  --background: #0a1f3d;;
+  --card: #0f2f52;;
+  --foreground: #e6f0ff;;
+  --primary-cta: #106EFB;;
   --primary-cta-text: #ffffff;;
-  --secondary-cta: #f9f9f9;;
+  --secondary-cta: #0e1a29;;
   --secondary-cta-text: #120a00e6;;
-  --accent: #e2e2e2;;
-  --background-accent: #c4c4c4;;
+  --accent: #3f5c79;;
+  --background-accent: #004a93;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);