Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
2026-03-11 22:49:14 +00:00
2 changed files with 40 additions and 53 deletions

View File

@@ -11,7 +11,7 @@ import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
import ContactText from '@/components/sections/contact/ContactText';
import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
import FooterBase from '@/components/sections/footer/FooterBase';
import { Lotus, Wind, Moon, Zap, Flame, Shield, Heart, Sparkles, BookOpen } from 'lucide-react';
import { Wind, Moon, Zap, Flame, Shield, Heart, Sparkles, BookOpen } from 'lucide-react';
export default function LandingPage() {
return (
@@ -48,7 +48,6 @@ export default function LandingPage() {
title="Where every breath is welcome, and every body belongs."
description="Yoga, movement & wellness classes in Monroe, WA — for every body, every season of life."
tag="Bliss Yoga Studios"
tagIcon={Lotus}
tagAnimation="slide-up"
background={{ variant: "radial-gradient" }}
imageSrc="http://img.b2bpic.net/free-photo/woman-doing-yoga-roof-skyscraper-big-city_1153-4547.jpg"
@@ -62,12 +61,10 @@ export default function LandingPage() {
buttonAnimation="slide-up"
testimonials={[
{
name: "Sarah M.", handle: "Local Yoga Student", testimonial: "Bliss is a sanctuary. Every class leaves me feeling more like myself.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg"
name: "Sarah M.", handle: "Local Yoga Student", testimonial: "Bliss is a sanctuary. Every class leaves me feeling more like myself.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg"
},
{
name: "Michael K.", handle: "New to Yoga", testimonial: "No judgment, just pure welcome. This is the community I needed.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg"
name: "Michael K.", handle: "New to Yoga", testimonial: "No judgment, just pure welcome. This is the community I needed.", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg"
}
]}
testimonialRotationInterval={5000}
@@ -97,7 +94,6 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-vector/hand-drawn-international-day-yoga_23-2148546516.jpg"
},
items: [
{ icon: Lotus, text: "Hatha & Vinyasa" },
{ icon: Wind, text: "Breathwork & Sound Bath" },
{ icon: Moon, text: "Yin & Yoga Nidra" }
],
@@ -153,13 +149,13 @@ export default function LandingPage() {
description="Explore our upcoming classes and find the perfect session for your practice."
blogs={[
{
id: "1", category: "Hatha Yoga", title: "Morning Flow", excerpt: "Monday - Friday, 6:00 AM - 7:15 AM. Start your day with grounding energy.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=1", authorName: "Instructor Sarah", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg", date: "Daily"
id: "1", category: "Hatha Yoga", title: "Morning Flow", excerpt: "Monday - Friday, 6:00 AM - 7:15 AM. Start your day with grounding energy.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg", authorName: "Instructor Sarah", authorAvatar: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg", date: "Daily"
},
{
id: "2", category: "Vinyasa", title: "Power Hour", excerpt: "Tuesday & Thursday, 5:30 PM - 6:45 PM. Build strength and connection.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=2", authorName: "Instructor James", authorAvatar: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg", date: "2x Weekly"
id: "2", category: "Vinyasa", title: "Power Hour", excerpt: "Tuesday & Thursday, 5:30 PM - 6:45 PM. Build strength and connection.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg", authorName: "Instructor James", authorAvatar: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg", date: "2x Weekly"
},
{
id: "3", category: "Yin Yoga", title: "Slow Restoration", excerpt: "Wednesday & Sunday, 6:00 PM - 7:30 PM. Deep release and meditation.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=3", authorName: "Instructor Maya", authorAvatar: "http://img.b2bpic.net/free-photo/happy-woman-sitting-yoga-mat-posing_23-2148478591.jpg", date: "2x Weekly"
id: "3", category: "Yin Yoga", title: "Slow Restoration", excerpt: "Wednesday & Sunday, 6:00 PM - 7:30 PM. Deep release and meditation.", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg", authorName: "Instructor Maya", authorAvatar: "http://img.b2bpic.net/free-photo/happy-woman-sitting-yoga-mat-posing_23-2148478591.jpg", date: "2x Weekly"
}
]}
animationType="slide-up"
@@ -211,21 +207,20 @@ export default function LandingPage() {
description="Real voices from our Bliss community."
testimonials={[
{
id: "1", name: "Sarah Johnson, Studio Member", date: "Date: March 2025", title: "This is more than yoga", quote: "I came for the classes and stayed for the community. Every time I walk through the door at Bliss, I feel the care and intention. The instructors truly know me and my practice.", tag: "Dedicated Practitioner", avatarSrc: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=4"
id: "1", name: "Sarah Johnson, Studio Member", date: "Date: March 2025", title: "This is more than yoga", quote: "I came for the classes and stayed for the community. Every time I walk through the door at Bliss, I feel the care and intention. The instructors truly know me and my practice.", tag: "Dedicated Practitioner", avatarSrc: "http://img.b2bpic.net/free-photo/attractive-yogi-woman-group-people-matsyendrasana_1163-4950.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg"
},
{
id: "2", name: "Michael Chen, New to Yoga", date: "Date: February 2025", title: "A welcoming home", quote: "I was nervous about trying yoga for the first time, but the atmosphere at Bliss immediately put me at ease. I felt accepted and encouraged. I'm back every week.", tag: "First-Time Student", avatarSrc: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=5"
id: "2", name: "Michael Chen, New to Yoga", date: "Date: February 2025", title: "A welcoming home", quote: "I was nervous about trying yoga for the first time, but the atmosphere at Bliss immediately put me at ease. I felt accepted and encouraged. I'm back every week.", tag: "First-Time Student", avatarSrc: "http://img.b2bpic.net/free-photo/woman-home-reading_23-2148933630.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg"
},
{
id: "3", name: "Emily Rodriguez, Teacher Training Graduate", date: "Date: January 2025", title: "Life-changing education", quote: "The 200-hour program transformed not just my understanding of yoga, but my entire life perspective. The teachers are deeply knowledgeable and genuinely invested in your growth.", tag: "Yoga Teacher", avatarSrc: "http://img.b2bpic.net/free-photo/happy-woman-sitting-yoga-mat-posing_23-2148478591.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=6"
id: "3", name: "Emily Rodriguez, Teacher Training Graduate", date: "Date: January 2025", title: "Life-changing education", quote: "The 200-hour program transformed not just my understanding of yoga, but my entire life perspective. The teachers are deeply knowledgeable and genuinely invested in your growth.", tag: "Yoga Teacher", avatarSrc: "http://img.b2bpic.net/free-photo/happy-woman-sitting-yoga-mat-posing_23-2148478591.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg"
},
{
id: "4", name: "David Kim, Wellness Seeker", date: "Date: December 2024", title: "Found my peace", quote: "In a busy life, Bliss is my sanctuary. The variety of classes means I never get bored, and the calming environment helps me disconnect from stress and reconnect with myself.", tag: "Regular Member", avatarSrc: "http://img.b2bpic.net/free-photo/ambitious-businesswoman-with-arms-crossed-looking-forward-future_1163-4333.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg?_wi=7"
id: "4", name: "David Kim, Wellness Seeker", date: "Date: December 2024", title: "Found my peace", quote: "In a busy life, Bliss is my sanctuary. The variety of classes means I never get bored, and the calming environment helps me disconnect from stress and reconnect with myself.", tag: "Regular Member", avatarSrc: "http://img.b2bpic.net/free-photo/ambitious-businesswoman-with-arms-crossed-looking-forward-future_1163-4333.jpg", imageSrc: "http://img.b2bpic.net/free-photo/happy-students-holding-hands-together-after-yoga-class_1262-20244.jpg"
}
]}
textboxLayout="default"
useInvertedBackground={true}
animationType="slide-up"
/>
</div>

View File

@@ -1,51 +1,43 @@
"use client";
import React, { SVGProps } from "react";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
className?: string;
interface SvgTextLogoProps extends SVGProps<SVGSVGElement> {
text: string;
size?: number;
color?: string;
fontWeight?: number | string;
fontSize?: number;
fontFamily?: string;
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
size = 200,
color = "#000000", fontWeight = 700,
fontSize = 24,
fontFamily = "Arial, sans-serif", ...props
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
width={size}
height={size}
viewBox={`0 0 ${size} ${size}`}
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x="50%"
y="50%"
textAnchor="middle"
dominantBaseline="middle"
fill={color}
fontSize={fontSize}
fontWeight={fontWeight}
fontFamily={fontFamily}
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
};
export default SvgTextLogo;