8 Commits

Author SHA1 Message Date
629c354467 Merge version_3 into main
Merge version_3 into main
2026-01-17 17:45:50 +00:00
0cdef0b0af Update src/app/page.tsx 2026-01-17 17:45:45 +00:00
4c18065cac Update src/app/layout.tsx 2026-01-17 17:45:45 +00:00
9d27c1880b Update src/app/globals.css 2026-01-17 17:45:44 +00:00
ea98b2ff9f Merge version_2 into main
Merge version_2 into main
2026-01-17 17:43:44 +00:00
f444cecfc9 Update src/app/page.tsx 2026-01-17 17:43:39 +00:00
cf67dc6f47 Update src/app/layout.tsx 2026-01-17 17:43:38 +00:00
c6275514ae Update src/app/globals.css 2026-01-17 17:43:37 +00:00
3 changed files with 46 additions and 46 deletions

View File

@@ -4,21 +4,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5f5f5;; /* --background: #0a0a0a;;
--card: #ffffff;; --card: #1a1a1a;;
--foreground: #1c1c1c;; --foreground: #ffffffe6;;
--primary-cta: #1f3251;; --primary-cta: #cee7ff;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;
--accent: #15479c;; --accent: #737373;;
--background-accent: #a8cce8;; */ --background-accent: #737373;; */
--background: #f5f5f5;; --background: #0a0a0a;;
--card: #ffffff;; --card: #1a1a1a;;
--foreground: #1c1c1c;; --foreground: #ffffffe6;;
--primary-cta: #1f3251;; --primary-cta: #cee7ff;;
--secondary-cta: #ffffff;; --secondary-cta: #1a1a1a;;
--accent: #15479c;; --accent: #737373;;
--background-accent: #a8cce8;; --background-accent: #737373;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
@@ -509,7 +509,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-fira-code), sans-serif; font-family: var(--font-inter), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -522,5 +522,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-fira-code), sans-serif; font-family: var(--font-inter), sans-serif;
} }

View File

@@ -1,11 +1,11 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Fira_Code } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag"; import Tag from "@/tag/Tag";
const firaCode = Fira_Code({ const inter = Inter({
variable: "--font-fira-code", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
}); });
export const metadata: Metadata = { export const metadata: Metadata = {
@@ -36,7 +36,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body <body
className={firaCode.variable} className={inter.variable}
> >
<Tag /> <Tag />
{children} {children}

View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
@@ -13,16 +13,16 @@ import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
export default function ActivateHousePage() { export default function ActivateHousePage() {
return ( return (
<ThemeProvider <ThemeProvider
defaultButtonVariant="hover-bubble" defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide" defaultTextAnimation="reveal-blur"
borderRadius="sharp" borderRadius="soft"
contentWidth="mediumSmall" contentWidth="mediumLarge"
sizing="mediumSizeLargeTitles" sizing="largeSizeMediumTitles"
background="floatingGradient" background="aurora"
cardStyle="glass-elevated" cardStyle="glass-depth"
primaryButtonStyle="flat" primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid" secondaryButtonStyle="glass"
headingFontWeight="medium" headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
@@ -50,7 +50,7 @@ export default function ActivateHousePage() {
layoutOrder="default" layoutOrder="default"
imageSrc="https://img.b2bpic.net/free-photo/young-athletic-woman-exercising-strength-gymnastic-rings-cross-training-fitness-center_637285-447.jpg" imageSrc="https://img.b2bpic.net/free-photo/young-athletic-woman-exercising-strength-gymnastic-rings-cross-training-fitness-center_637285-447.jpg"
imageAlt="Activate House fitness studio" imageAlt="Activate House fitness studio"
frameStyle="card" frameStyle="browser"
logoLineHeight={1.1} logoLineHeight={1.1}
ariaLabel="Activate House hero section" ariaLabel="Activate House hero section"
/> />
@@ -71,7 +71,7 @@ export default function ActivateHousePage() {
id: "community", label: "Community", description: "Join a vibrant wellness community dedicated to supporting each other's fitness journey. From beginner to advanced, our studio is a place where everyone belongs and progresses together." id: "community", label: "Community", description: "Join a vibrant wellness community dedicated to supporting each other's fitness journey. From beginner to advanced, our studio is a place where everyone belongs and progresses together."
} }
]} ]}
imageSrc="https://img.b2bpic.net/free-photo/side-view-people-training-together_23-2150912364.jpg" imageSrc="https://img.b2bpic.net/free-photo/young-sportswoman-having-cross-training-with-weight-plate-gym_637285-8530.jpg"
imageAlt="Activate House community" imageAlt="Activate House community"
imagePosition="right" imagePosition="right"
useInvertedBackground="invertDefault" useInvertedBackground="invertDefault"
@@ -100,7 +100,7 @@ export default function ActivateHousePage() {
id: "5", title: "Mat Pilates", content: "Experience the benefits of pilates using just your body weight. Mat pilates builds functional strength, improves flexibility, and enhances body awareness through precise, controlled movements." id: "5", title: "Mat Pilates", content: "Experience the benefits of pilates using just your body weight. Mat pilates builds functional strength, improves flexibility, and enhances body awareness through precise, controlled movements."
} }
]} ]}
imageSrc="https://img.b2bpic.net/free-photo/young-sportswoman-cleaning-sweat-with-towel-after-exhausting-training-gym_637285-8532.jpg" imageSrc="https://img.b2bpic.net/free-photo/group-people-exercising-with-dumbbells-fitness-club-gym_613910-18615.jpg"
imageAlt="Yoga class at Activate House" imageAlt="Yoga class at Activate House"
useInvertedBackground="noInvert" useInvertedBackground="noInvert"
mediaPosition="left" mediaPosition="left"
@@ -117,19 +117,19 @@ export default function ActivateHousePage() {
tag="Pricing" tag="Pricing"
plans={[ plans={[
{ {
id: "intro", title: "2-Week Intro", price: "$29", period: "/2 weeks", imageSrc: "https://img.b2bpic.net/free-photo/young-women-taking-part-spinning-class_23-2149332072.jpg", imageAlt: "Intro plan pilates class", button: { text: "Get Started", href: "#contact" }, id: "intro", title: "2-Week Intro", price: "$29", period: "/2 weeks", imageSrc: "https://img.b2bpic.net/free-photo/athlete-swings-triceps-with-dumbbells-gym-healthy-sports-lifestyle_169016-59110.jpg", imageAlt: "Intro plan pilates class", button: { text: "Get Started", href: "#contact" },
features: [ features: [
"Unlimited classes for 2 weeks", "Access to all class types", "Member community access", "No commitment required" "Unlimited classes for 2 weeks", "Access to all class types", "Member community access", "No commitment required"
] ]
}, },
{ {
id: "monthly", title: "Monthly", price: "$129", period: "/month", imageSrc: "https://img.b2bpic.net/free-photo/group-people-exercising-with-dumbbells-fitness-club-gym_613910-18615.jpg", imageAlt: "Monthly plan sculpt class", button: { text: "Choose Plan", href: "#contact" }, id: "monthly", title: "Monthly", price: "$129", period: "/month", imageSrc: "https://img.b2bpic.net/free-photo/woman-taking-break-gym_23-2148024282.jpg", imageAlt: "Monthly plan sculpt class", button: { text: "Choose Plan", href: "#contact" },
features: [ features: [
"Unlimited classes", "All class types included", "Member community", "Download app access", "Flexible cancellation" "Unlimited classes", "All class types included", "Member community", "Download app access", "Flexible cancellation"
] ]
}, },
{ {
id: "quarterly", title: "Quarterly", price: "$349", period: "/3 months", imageSrc: "https://img.b2bpic.net/free-photo/young-happy-sportswoman-getting-ready-workout-tying-shoelace-fitness-center_637285-470.jpg", imageAlt: "Quarterly plan spin class", button: { text: "Choose Plan", href: "#contact" }, id: "quarterly", title: "Quarterly", price: "$349", period: "/3 months", imageSrc: "https://img.b2bpic.net/free-photo/woman-exercising-step-machine_23-2147789596.jpg", imageAlt: "Quarterly plan spin class", button: { text: "Choose Plan", href: "#contact" },
features: [ features: [
"Unlimited classes", "All class types included", "Member community", "App access", "Priority booking", "15% savings" "Unlimited classes", "All class types included", "Member community", "App access", "Priority booking", "15% savings"
] ]
@@ -145,22 +145,22 @@ export default function ActivateHousePage() {
<TestimonialCardTwelve <TestimonialCardTwelve
testimonials={[ testimonials={[
{ {
id: "1", name: "Sarah Johnson", imageSrc: "https://img.b2bpic.net/free-photo/side-view-people-training-together_23-2150912372.jpg", imageAlt: "Sarah Johnson" id: "1", name: "Sarah Johnson", imageSrc: "https://img.b2bpic.net/free-photo/young-girl-black-sport-outfits-feels-confident_114579-18791.jpg", imageAlt: "Sarah Johnson"
}, },
{ {
id: "2", name: "Emma Davis", imageSrc: "https://img.b2bpic.net/free-photo/group-people-exercising-together-outdoors_23-2151061442.jpg", imageAlt: "Emma Davis" id: "2", name: "Emma Davis", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-sportive-girl-posing-with-crossed-arms-dark-wall_176420-620.jpg", imageAlt: "Emma Davis"
}, },
{ {
id: "3", name: "Michael Chen", imageSrc: "https://img.b2bpic.net/free-photo/side-view-people-training-together_23-2150912368.jpg", imageAlt: "Michael Chen" id: "3", name: "Michael Chen", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-sportive-girl-posing-with-crossed-arms-dark-wall_176420-622.jpg", imageAlt: "Michael Chen"
}, },
{ {
id: "4", name: "Jessica Martinez", imageSrc: "https://img.b2bpic.net/free-photo/group-active-people-zumba-class_23-2149074929.jpg", imageAlt: "Jessica Martinez" id: "4", name: "Jessica Martinez", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-sportive-girl-posing-with-crossed-arms-dark-wall_176420-625.jpg", imageAlt: "Jessica Martinez"
}, },
{ {
id: "5", name: "David Thompson", imageSrc: "https://img.b2bpic.net/free-photo/side-view-people-training-together_23-2150912372.jpg", imageAlt: "David Thompson" id: "5", name: "David Thompson", imageSrc: "https://img.b2bpic.net/free-photo/sporty-smiling-female-with-crossed-arms-white-t-shirt-grey-background_613910-13675.jpg", imageAlt: "David Thompson"
}, },
{ {
id: "6", name: "Lisa Wang", imageSrc: "https://img.b2bpic.net/free-photo/group-people-exercising-together-outdoors_23-2151061442.jpg", imageAlt: "Lisa Wang" id: "6", name: "Lisa Wang", imageSrc: "https://img.b2bpic.net/free-photo/sporty-smiling-female-with-crossed-arms-white-t-shirt-grey-background_613910-1624.jpg", imageAlt: "Lisa Wang"
} }
]} ]}
cardTitle="Join thousands of members who've transformed their wellness journey at Activate House" cardTitle="Join thousands of members who've transformed their wellness journey at Activate House"
@@ -182,7 +182,7 @@ export default function ActivateHousePage() {
required: true required: true
}} }}
useInvertedBackground="invertDefault" useInvertedBackground="invertDefault"
imageSrc="https://img.b2bpic.net/free-photo/gym-with-indoor-cycling-equipment_23-2149270209.jpg" imageSrc="https://img.b2bpic.net/free-photo/people-doing-indoor-cycling_23-2149270229.jpg"
imageAlt="Activate House studio" imageAlt="Activate House studio"
mediaPosition="right" mediaPosition="right"
buttonText="Send Message" buttonText="Send Message"