bender/2a09d4e6-b23c-4336-aaf2-1228aa042f90
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 2 commits from version_1 into main 2026-03-11 04:53:53 +00:00
Conversation 0 Commits 2 Files Changed 2 +40 -42
2 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/page.tsx
View File

@@ -20,7 +20,7 @@ export default function LandingPage() {
borderRadius="soft"
contentWidth="small"
sizing="mediumLargeSizeLargeTitles"
background="grid"
background="circleGradient"
cardStyle="outline"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="glass"
@@ -46,7 +46,7 @@ export default function LandingPage() {
title="Sharp Cuts. Clean Style."
description="Roseville's trusted barbershop with a 4.7-star reputation. Expert barbers, relaxed atmosphere, and cuts that make you feel fresh."
tag="⭐ 4.7 Rating • 115+ Reviews"
background={{ variant: "grid" }}
background={{ variant: "animated-grid" }}
buttons={[
{ text: "Book Appointment", href: "#contact" },
{ text: "Call Now", href: "tel:(916) 708-8538" }
@@ -62,10 +62,10 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-photo/old-customer-getting-haircut-hair-salon_23-2148181960.jpg", imageAlt: "Professional beard trim and grooming service"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-grooming-their-client_23-2149205873.jpg?_wi=1", imageAlt: "Modern, clean barbershop interior"
imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-grooming-their-client_23-2149205873.jpg", imageAlt: "Modern, clean barbershop interior"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/top-view-scissors-dispenser_23-2148108757.jpg?_wi=1", imageAlt: "Professional barber tools and equipment"
imageSrc: "http://img.b2bpic.net/free-photo/top-view-scissors-dispenser_23-2148108757.jpg", imageAlt: "Professional barber tools and equipment"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/kid-getting-haircut-salon-side-view_23-2149870368.jpg", imageAlt: "Friendly barber cutting children's hair"
@@ -86,6 +86,7 @@ export default function LandingPage() {
imageSrc="http://img.b2bpic.net/free-photo/hair-stylist-trimming-beard-aged-male-salon_23-2148181981.jpg"
imageAlt="Friendly barber team at Scissors & Blades"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
@@ -188,10 +189,10 @@ export default function LandingPage() {
id: "2", name: "Beard Grooming", price: "Premium Detail", variant: "Sharp Lines", imageSrc: "http://img.b2bpic.net/free-photo/professional-hairdresser-modeling-beard-barbershop-close-up-photo_613910-18422.jpg", imageAlt: "Professional beard trim result"
},
{
id: "3", name: "Barbershop Interior", price: "Clean Space", variant: "Professional Atmosphere", imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-grooming-their-client_23-2149205873.jpg?_wi=2", imageAlt: "Modern barbershop interior design"
id: "3", name: "Barbershop Interior", price: "Clean Space", variant: "Professional Atmosphere", imageSrc: "http://img.b2bpic.net/free-photo/hairdresser-grooming-their-client_23-2149205873.jpg", imageAlt: "Modern barbershop interior design"
},
{
id: "4", name: "Premium Tools", price: "Expert Equipment", variant: "Quality Guaranteed", imageSrc: "http://img.b2bpic.net/free-photo/top-view-scissors-dispenser_23-2148108757.jpg?_wi=2", imageAlt: "Professional barber tools collection"
id: "4", name: "Premium Tools", price: "Expert Equipment", variant: "Quality Guaranteed", imageSrc: "http://img.b2bpic.net/free-photo/top-view-scissors-dispenser_23-2148108757.jpg", imageAlt: "Professional barber tools collection"
}
]}
/>

69
src/components/shared/SvgTextLogo/SvgTextLogo.tsx
View File

@@ -1,51 +1,48 @@
"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;
fontWeight?: string | number;
fill?: string;
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,
className = '',
fontSize = 48,
fontWeight = 700,
fill = 'currentColor',
fontFamily = 'system-ui, -apple-system, sans-serif',
}) => {
const textLength = text.length;
const estimatedWidth = textLength * (fontSize * 0.6);
const estimatedHeight = fontSize * 1.5;
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 ${estimatedWidth} ${estimatedHeight}`}
className={className}
width={estimatedWidth}
height={estimatedHeight}
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%"
fontSize={fontSize}
fontWeight={fontWeight}
fill={fill}
fontFamily={fontFamily}
textAnchor="middle"
dominantBaseline="central"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;