bender/892c9658-6bd6-43c2-adf6-c44fba8fde09
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-12 09:07:40 +00:00
Conversation 0 Commits 2 Files Changed 2 +54 -58
2 changed files with 54 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/page.tsx
View File

@@ -44,14 +44,14 @@ export default function SalonPage() {
description="Professional beauty care with 4.9⭐ trusted reviews. Transform your look at Touch N Glow Beauty Saloon."
tag="Beauty Excellence"
tagIcon={Sparkles}
tagAnimation="entrance-slide"
tagAnimation="slide-up"
background={{ variant: "plain" }}
mediaItems={[
{
imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-woman-black-sweater-standing-posing_114579-58746.jpg", imageAlt: "Luxury salon interior"
},
{
imageSrc: "http://img.b2bpic.net/free-photo/male-make-up-artist-putting-make-up-female-client_23-2150166198.jpg?_wi=1", imageAlt: "Professional makeup service"
imageSrc: "http://img.b2bpic.net/free-photo/male-make-up-artist-putting-make-up-female-client_23-2150166198.jpg", imageAlt: "Professional makeup service"
}
]}
rating={5}
@@ -60,8 +60,8 @@ export default function SalonPage() {
{ text: "Call Now", href: "tel:07051092878" },
{ text: "Book Appointment", href: "#contact" }
]}
buttonAnimation="entrance-slide"
mediaAnimation="entrance-slide"
buttonAnimation="slide-up"
mediaAnimation="slide-up"
/>
</div>
@@ -74,6 +74,7 @@ export default function SalonPage() {
{ text: "Learn More", href: "#services" },
{ text: "Get Directions", href: "https://maps.google.com/?q=Touch+N+Glow+Beauty+Saloon+Srinagar" }
]}
buttonAnimation="slide-up"
/>
</div>
@@ -83,25 +84,25 @@ export default function SalonPage() {
description="Complete beauty solutions for every need"
tag="Service Categories"
tagIcon={Heart}
tagAnimation="entrance-slide"
tagAnimation="slide-up"
features={[
{
title: "Hair Services", description: "Professional haircuts, styling, extensions, and treatments", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg?_wi=1", imageAlt: "Professional hair styling", buttonIcon: Scissors
title: "Hair Services", description: "Professional haircuts, styling, extensions, and treatments", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg", imageAlt: "Professional hair styling", buttonIcon: Scissors
},
{
title: "Skin Care", description: "Facials, acne treatments, and skincare solutions", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194220.jpg?_wi=1", imageAlt: "Professional skincare treatment", buttonIcon: Sparkles
title: "Skin Care", description: "Facials, acne treatments, and skincare solutions", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194220.jpg", imageAlt: "Professional skincare treatment", buttonIcon: Sparkles
},
{
title: "Makeup Services", description: "Professional makeup and bridal makeup expertise", imageSrc: "http://img.b2bpic.net/free-photo/male-make-up-artist-putting-make-up-female-client_23-2150166198.jpg?_wi=2", imageAlt: "Professional makeup service", buttonIcon: Palette
title: "Makeup Services", description: "Professional makeup and bridal makeup expertise", imageSrc: "http://img.b2bpic.net/free-photo/male-make-up-artist-putting-make-up-female-client_23-2150166198.jpg", imageAlt: "Professional makeup service", buttonIcon: Palette
},
{
title: "Nail Services", description: "Acrylic nails, nail art, and professional manicures", imageSrc: "http://img.b2bpic.net/free-photo/young-hispanic-man-relaxed-having-manicure-session-beauty-center_839833-1625.jpg?_wi=1", imageAlt: "Professional nail salon service", buttonIcon: Sparkles
title: "Nail Services", description: "Acrylic nails, nail art, and professional manicures", imageSrc: "http://img.b2bpic.net/free-photo/young-hispanic-man-relaxed-having-manicure-session-beauty-center_839833-1625.jpg", imageAlt: "Professional nail salon service", buttonIcon: Sparkles
},
{
title: "Waxing & Threading", description: "Hair removal and shaping services", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-bathtub-shaving-her-legs_23-2148389894.jpg?_wi=1", imageAlt: "Professional waxing service", buttonIcon: Wind
title: "Waxing & Threading", description: "Hair removal and shaping services", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-bathtub-shaving-her-legs_23-2148389894.jpg", imageAlt: "Professional waxing service", buttonIcon: Wind
},
{
title: "Bridal Services", description: "Complete bridal packages and wedding day beauty", imageSrc: "http://img.b2bpic.net/free-photo/bride-getting-hair-done-side-view_23-2149860771.jpg?_wi=1", imageAlt: "Professional bridal makeup", buttonIcon: Crown
title: "Bridal Services", description: "Complete bridal packages and wedding day beauty", imageSrc: "http://img.b2bpic.net/free-photo/bride-getting-hair-done-side-view_23-2149860771.jpg", imageAlt: "Professional bridal makeup", buttonIcon: Crown
}
]}
textboxLayout="default"
@@ -109,7 +110,7 @@ export default function SalonPage() {
buttons={[
{ text: "View All Services", href: "#popular-services" }
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -119,35 +120,35 @@ export default function SalonPage() {
description="Our most requested beauty treatments and packages"
tag="Best Sellers"
tagIcon={TrendingUp}
tagAnimation="entrance-slide"
tagAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={false}
animationType="slide-up"
gridVariant="three-columns-all-equal-width"
products={[
{
id: "1", name: "Bridal Makeup", price: "₹3,000+", imageSrc: "http://img.b2bpic.net/free-photo/bride-getting-hair-done-side-view_23-2149860771.jpg?_wi=2", imageAlt: "Bridal makeup service"
id: "1", name: "Bridal Makeup", price: "₹3,000+", imageSrc: "http://img.b2bpic.net/free-photo/bride-getting-hair-done-side-view_23-2149860771.jpg", imageAlt: "Bridal makeup service"
},
{
id: "2", name: "Hair Spa", price: "₹1,200+", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg?_wi=2", imageAlt: "Hair spa treatment"
id: "2", name: "Hair Spa", price: "₹1,200+", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg", imageAlt: "Hair spa treatment"
},
{
id: "3", name: "Hair Extensions", price: "₹2,500+", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg?_wi=3", imageAlt: "Hair extension service"
id: "3", name: "Hair Extensions", price: "₹2,500+", imageSrc: "http://img.b2bpic.net/free-photo/brunette-woman-with-mobile-phone-getting-her-hair-done_23-2148108788.jpg", imageAlt: "Hair extension service"
},
{
id: "4", name: "Acrylic Nails", price: "₹500+", imageSrc: "http://img.b2bpic.net/free-photo/young-hispanic-man-relaxed-having-manicure-session-beauty-center_839833-1625.jpg?_wi=2", imageAlt: "Acrylic nail service"
id: "4", name: "Acrylic Nails", price: "₹500+", imageSrc: "http://img.b2bpic.net/free-photo/young-hispanic-man-relaxed-having-manicure-session-beauty-center_839833-1625.jpg", imageAlt: "Acrylic nail service"
},
{
id: "5", name: "Threading", price: "₹100+", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-bathtub-shaving-her-legs_23-2148389894.jpg?_wi=2", imageAlt: "Threading service"
id: "5", name: "Threading", price: "₹100+", imageSrc: "http://img.b2bpic.net/free-photo/high-angle-woman-bathtub-shaving-her-legs_23-2148389894.jpg", imageAlt: "Threading service"
},
{
id: "6", name: "Facial Treatment", price: "₹800+", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194220.jpg?_wi=2", imageAlt: "Facial treatment service"
id: "6", name: "Facial Treatment", price: "₹800+", imageSrc: "http://img.b2bpic.net/free-photo/girl-receiving-facial-treatment-beauty-salon_23-2148194220.jpg", imageAlt: "Facial treatment service"
}
]}
buttons={[
{ text: "Book Now", href: "#contact" }
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -157,7 +158,7 @@ export default function SalonPage() {
description="Real reviews from satisfied customers"
tag="Client Testimonials"
tagIcon={Star}
tagAnimation="entrance-slide"
tagAnimation="slide-up"
textboxLayout="default"
useInvertedBackground={false}
animationType="slide-up"
@@ -187,7 +188,7 @@ export default function SalonPage() {
buttons={[
{ text: "View on Google", href: "https://google.com/search?q=Touch+N+Glow+Beauty+Saloon+Srinagar" }
]}
buttonAnimation="entrance-slide"
buttonAnimation="slide-up"
/>
</div>
@@ -197,7 +198,7 @@ export default function SalonPage() {
title="Find Us at Our Srinagar Location"
description="Opposite Unani Hospital, Habak, Nasim Bagh, Srinagar, Jammu and Kashmir 190006"
tagIcon={MapPin}
tagAnimation="entrance-slide"
tagAnimation="slide-up"
background={{ variant: "plain" }}
useInvertedBackground={false}
inputPlaceholder="Your phone number"

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

@@ -1,51 +1,46 @@
"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;
letterSpacing?: 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 = 'Logo',
className = '',
fontSize = 32,
fontWeight = '700',
letterSpacing = '0',
}) => {
const textLength = text.length;
const charWidth = fontSize * 0.6;
const width = textLength * charWidth + 20;
const height = fontSize + 20;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
viewBox={`0 0 ${width} ${height}`}
className={className}
aria-label={text}
role="img"
aria-label={`${logoText} logo`}
>
<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={width / 2}
y={height / 2 + fontSize / 3}
textAnchor="middle"
dominantBaseline="middle"
fontSize={fontSize}
fontWeight={fontWeight}
letterSpacing={letterSpacing}
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;