Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-12 23:14:36 +00:00
2 changed files with 20 additions and 42 deletions

View File

@@ -18,7 +18,7 @@ export default function LandingPage() {
borderRadius="rounded"
contentWidth="mediumSmall"
sizing="mediumLargeSizeMediumTitles"
background="blurBottom"
background="circleGradient"
cardStyle="inset"
primaryButtonStyle="gradient"
secondaryButtonStyle="radial-glow"
@@ -50,13 +50,13 @@ export default function LandingPage() {
{ text: "View Services", href: "services" }
]}
buttonAnimation="slide-up"
background={{ variant: "blurBottom" }}
background={{ variant: "plain" }}
carouselItems={[
{ id: "carousel-1", imageSrc: "http://img.b2bpic.net/free-photo/full-body-portrait-stylish-male-who-himself-shaving-while-sitting-barber-chair-hairdressing-salon_613910-18655.jpg", imageAlt: "modern barbershop interior professional" },
{ id: "carousel-2", imageSrc: "http://img.b2bpic.net/free-photo/working-process-barbershop_1163-2025.jpg", imageAlt: "professional barber cutting hair scissors" },
{ id: "carousel-3", imageSrc: "http://img.b2bpic.net/free-photo/close-up-barber-combing-moustache-client_23-2147778838.jpg", imageAlt: "professional barber straight razor shave" },
{ id: "carousel-4", imageSrc: "http://img.b2bpic.net/free-photo/young-bearded-man-getting-shaved-by-hairdresser-barbershop_1153-9486.jpg", imageAlt: "barber trimming beard styling professional" },
{ id: "carousel-5", imageSrc: "http://img.b2bpic.net/free-photo/angry-dad-staring-nasty-children-frowning-crossing-arms-bearded-macho-man-with-furious-displeased-expression-posing-with-arms-folded-demonstrating-hostility-disrespect_343059-1677.jpg?_wi=1", imageAlt: "professional barber portrait male studio" },
{ id: "carousel-5", imageSrc: "http://img.b2bpic.net/free-photo/angry-dad-staring-nasty-children-frowning-crossing-arms-bearded-macho-man-with-furious-displeased-expression-posing-with-arms-folded-demonstrating-hostility-disrespect_343059-1677.jpg", imageAlt: "professional barber portrait male studio" },
{ id: "carousel-6", imageSrc: "http://img.b2bpic.net/free-photo/portrait-serious-middle-age-bearded-male-dressed-plaid-flannel-shirt-grey-background_613910-10927.jpg", imageAlt: "experienced barber professional portrait" }
]}
autoPlay={true}
@@ -102,9 +102,10 @@ export default function LandingPage() {
{ value: "500+", title: "Satisfied Clients" },
{ value: "10+ yrs", title: "Combined Expertise" }
]}
imageSrc="http://img.b2bpic.net/free-photo/angry-dad-staring-nasty-children-frowning-crossing-arms-bearded-macho-man-with-furious-displeased-expression-posing-with-arms-folded-demonstrating-hostility-disrespect_343059-1677.jpg?_wi=2"
imageSrc="http://img.b2bpic.net/free-photo/angry-dad-staring-nasty-children-frowning-crossing-arms-bearded-macho-man-with-furious-displeased-expression-posing-with-arms-folded-demonstrating-hostility-disrespect_343059-1677.jpg"
imageAlt="Experienced barber at work"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
useInvertedBackground={true}
/>
</div>

View File

@@ -1,51 +1,28 @@
"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;
}
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 = '' }) => {
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 ${text.length * 60} 100`}
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="central"
fontSize="48"
fontWeight="bold"
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
};