bender/b0daa5cf-c721-4663-8b76-5bea938ef607
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-10 22:25:12 +00:00
Conversation 0 Commits 2 Files Changed 2 +39 -52
2 changed files with 39 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/page.tsx
View File

@@ -19,7 +19,7 @@ export default function LandingPage() {
borderRadius="soft"
contentWidth="small"
sizing="mediumSizeLargeTitles"
background="noise"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="flat"
secondaryButtonStyle="solid"
@@ -46,7 +46,7 @@ export default function LandingPage() {
tag="Premium Local Barbershop"
tagIcon={Sparkles}
tagAnimation="slide-up"
background={{ variant: "noise" }}
background={{ variant: "animated-grid" }}
buttons={[
{ text: "Call Now", href: "tel:+18135551234" },
{ text: "Book Appointment", href: "#contact" }
@@ -57,16 +57,16 @@ export default function LandingPage() {
imageSrc: "http://img.b2bpic.net/free-photo/male-barber-sitting-his-shop_23-2149186515.jpg", imageAlt: "Professional barbershop interior with barbers at work"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/black-man-with-beard-looking-away_23-2148203662.jpg?_wi=1", imageAlt: "Fresh fade haircut by expert barber"
imageSrc: "http://img.b2bpic.net/free-photo/black-man-with-beard-looking-away_23-2148203662.jpg", imageAlt: "Fresh fade haircut by expert barber"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/close-up-male-customer-s-beard-barber-shop_23-2147839832.jpg?_wi=1", imageAlt: "Professional beard trim and styling"
imageSrc: "http://img.b2bpic.net/free-photo/close-up-male-customer-s-beard-barber-shop_23-2147839832.jpg", imageAlt: "Professional beard trim and styling"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/man-hair-salon-facing-camera_23-2148242763.jpg", imageAlt: "Premium barbershop interior design"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/front-view-hairstilyst-giving-haircut_23-2148506287.jpg?_wi=1", imageAlt: "Modern fade haircut with clean lines"
imageSrc: "http://img.b2bpic.net/free-photo/front-view-hairstilyst-giving-haircut_23-2148506287.jpg", imageAlt: "Modern fade haircut with clean lines"
}
]}
mediaAnimation="slide-up"
@@ -109,20 +109,16 @@ export default function LandingPage() {
tagAnimation="slide-up"
features={[
{
id: "haircuts", label: "Cuts", title: "Expert Haircuts & Styles", items: ["Classic cuts", "Modern fades", "Textured styles", "Custom designs"],
buttons: [{ text: "Book Now", href: "#contact" }]
id: "haircuts", label: "Cuts", title: "Expert Haircuts & Styles", items: ["Classic cuts", "Modern fades", "Textured styles", "Custom designs"], buttons: [{ text: "Book Now", href: "#contact" }]
},
{
id: "fades", label: "Fades", title: "Precision Fade Specialists", items: ["Skin fades", "Burst fades", "Line ups", "Edge work"],
buttons: [{ text: "Book Now", href: "#contact" }]
id: "fades", label: "Fades", title: "Precision Fade Specialists", items: ["Skin fades", "Burst fades", "Line ups", "Edge work"], buttons: [{ text: "Book Now", href: "#contact" }]
},
{
id: "beard", label: "Beard", title: "Beard Trimming & Grooming", items: ["Professional trim", "Shape & styling", "Hot towel finish", "Beard care tips"],
buttons: [{ text: "Book Now", href: "#contact" }]
id: "beard", label: "Beard", title: "Beard Trimming & Grooming", items: ["Professional trim", "Shape & styling", "Hot towel finish", "Beard care tips"], buttons: [{ text: "Book Now", href: "#contact" }]
},
{
id: "grooming", label: "Groom", title: "Complete Grooming", items: ["Eyebrow cleanup", "Neck shaping", "Ear trimming", "Facial care"],
buttons: [{ text: "Book Now", href: "#contact" }]
id: "grooming", label: "Groom", title: "Complete Grooming", items: ["Eyebrow cleanup", "Neck shaping", "Ear trimming", "Facial care"], buttons: [{ text: "Book Now", href: "#contact" }]
}
]}
animationType="opacity"
@@ -166,13 +162,13 @@ export default function LandingPage() {
tagAnimation="slide-up"
products={[
{
id: "1", name: "Fresh Fade", price: "Starting at $25", imageSrc: "http://img.b2bpic.net/free-photo/black-man-with-beard-looking-away_23-2148203662.jpg?_wi=2", imageAlt: "Professional fresh fade haircut"
id: "1", name: "Fresh Fade", price: "Starting at $25", imageSrc: "http://img.b2bpic.net/free-photo/black-man-with-beard-looking-away_23-2148203662.jpg", imageAlt: "Professional fresh fade haircut"
},
{
id: "2", name: "Modern Texture", price: "Starting at $30", imageSrc: "http://img.b2bpic.net/free-photo/front-view-hairstilyst-giving-haircut_23-2148506287.jpg?_wi=2", imageAlt: "Modern textured haircut"
id: "2", name: "Modern Texture", price: "Starting at $30", imageSrc: "http://img.b2bpic.net/free-photo/front-view-hairstilyst-giving-haircut_23-2148506287.jpg", imageAlt: "Modern textured haircut"
},
{
id: "3", name: "Beard Styling", price: "Starting at $15", imageSrc: "http://img.b2bpic.net/free-photo/close-up-male-customer-s-beard-barber-shop_23-2147839832.jpg?_wi=2", imageAlt: "Professional beard trim and styling"
id: "3", name: "Beard Styling", price: "Starting at $15", imageSrc: "http://img.b2bpic.net/free-photo/close-up-male-customer-s-beard-barber-shop_23-2147839832.jpg", imageAlt: "Professional beard trim and styling"
}
]}
gridVariant="three-columns-all-equal-width"

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

@@ -1,51 +1,42 @@
"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;
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 = 24,
fontFamily = 'Arial, sans-serif'
}) => {
const textWidth = text.length * fontSize * 0.6;
const textHeight = fontSize * 1.2;
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 ${textWidth} ${textHeight}`}
width={textWidth}
height={textHeight}
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={textWidth / 2}
y={fontSize}
fontSize={fontSize}
fontFamily={fontFamily}
textAnchor="middle"
dominantBaseline="middle"
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;