Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-12 16:28:22 +00:00
2 changed files with 27 additions and 41 deletions

View File

@@ -53,11 +53,11 @@ export default function LandingPage() {
testimonials={[
{
name: "Marcus Johnson", handle: "Regular Client", testimonial: "Best haircut I've had in years. The attention to detail is incredible.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/latino-hair-salon-owner-taking-care-client_23-2150286034.jpg?_wi=1"
imageSrc: "http://img.b2bpic.net/free-photo/latino-hair-salon-owner-taking-care-client_23-2150286034.jpg"
},
{
name: "David Chen", handle: "Satisfied Customer", testimonial: "GN Fades sets the standard for professional barbering in the area.", rating: 5,
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-business-woman-portrait_23-2149280717.jpg?_wi=1"
imageSrc: "http://img.b2bpic.net/free-photo/beautiful-business-woman-portrait_23-2149280717.jpg"
}
]}
imageSrc="http://img.b2bpic.net/free-photo/barber-shop-retro-vintage-style_1150-17931.jpg"
@@ -65,6 +65,7 @@ export default function LandingPage() {
imagePosition="right"
mediaAnimation="slide-up"
useInvertedBackground={false}
background={{ variant: "plain" }}
/>
</div>
@@ -134,10 +135,10 @@ export default function LandingPage() {
description="Real feedback from satisfied customers who trust GN Fades"
testimonials={[
{
id: "1", title: "Five Stars, Every Time", quote: "I've been going to GN Fades for three years now. Gregory and the team never disappoint. The quality of their work is unmatched.", name: "James Wilson", role: "Regular Client", imageSrc: "http://img.b2bpic.net/free-photo/latino-hair-salon-owner-taking-care-client_23-2150286034.jpg?_wi=2", imageAlt: "James Wilson"
id: "1", title: "Five Stars, Every Time", quote: "I've been going to GN Fades for three years now. Gregory and the team never disappoint. The quality of their work is unmatched.", name: "James Wilson", role: "Regular Client", imageSrc: "http://img.b2bpic.net/free-photo/latino-hair-salon-owner-taking-care-client_23-2150286034.jpg", imageAlt: "James Wilson"
},
{
id: "2", title: "Professional Excellence", quote: "The attention to detail is incredible. Every haircut feels fresh, and the barbers really take their time with each client.", name: "Robert Taylor", role: "Satisfied Customer", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-business-woman-portrait_23-2149280717.jpg?_wi=2", imageAlt: "Robert Taylor"
id: "2", title: "Professional Excellence", quote: "The attention to detail is incredible. Every haircut feels fresh, and the barbers really take their time with each client.", name: "Robert Taylor", role: "Satisfied Customer", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-business-woman-portrait_23-2149280717.jpg", imageAlt: "Robert Taylor"
},
{
id: "3", title: "Worth Every Penny", quote: "Best barbershop in town. Clean environment, friendly staff, and outstanding results. Highly recommend!", name: "Michael Anderson", role: "Loyal Customer", imageSrc: "http://img.b2bpic.net/free-photo/young-businessman-happy-expression_1194-1613.jpg", imageAlt: "Michael Anderson"

View File

@@ -1,51 +1,36 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
className?: string;
fontSize?: number;
dominantBaseline?: 'auto' | 'text-top' | 'middle' | 'central' | 'text-bottom' | 'hanging' | 'mathematical' | 'inherit';
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
export const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className = '',
fontSize = 24,
dominantBaseline = 'middle',
}) => {
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
role="img"
aria-label={`${logoText} logo`}
viewBox="0 0 200 60"
className={className}
xmlns="http://www.w3.org/2000/svg"
>
<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={dominantBaseline}
fontSize={fontSize}
fontWeight="bold"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;