bender/6e666cfb-c88f-402a-9506-8e938beb4044
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #4

Merged
bender merged 2 commits from version_3 into main 2026-03-07 06:50:24 +00:00
Conversation 0 Commits 2 Files Changed 2 +29 -56
2 changed files with 29 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/layout.tsx
View File

@@ -1,49 +1,23 @@
import type { Metadata } from "next";
import { Mulish } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
});
import "./styles/variables.css";
import "./styles/base.css";
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "JrBlendz - Premium Barbershop Haircuts & Grooming", description: "Expert barbershop services in precision cuts, fades, and beard grooming. Book your appointment at JrBlendz today.", keywords: "barbershop, haircuts, barber, fade cuts, beard grooming, mens grooming", metadataBase: new URL("https://jrblendz.com"),
alternates: {
canonical: "https://jrblendz.com"
},
openGraph: {
title: "JrBlendz - Premium Barbershop", description: "Expert barbershop services specializing in precision cuts and grooming", url: "https://jrblendz.com", siteName: "JrBlendz", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/front-view-hairstyling-using-hairdryer_23-2148506236.jpg", alt: "JrBlendz Premium Barbershop"
}
]
},
twitter: {
card: "summary_large_image", title: "JrBlendz - Premium Barbershop", description: "Expert barbershop services specializing in precision cuts and grooming", images: ["http://img.b2bpic.net/free-photo/front-view-hairstyling-using-hairdryer_23-2148506236.jpg"]
}
};
title: "JrBlendz | Solo Barber Excellence", description: "Premium barbershop services by a solo barber. Expert cuts, precise fades, and premium beard care tailored to your style."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${mulish.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1411,7 +1385,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

44
src/app/page.tsx
View File

@@ -41,8 +41,8 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroSplitDoubleCarousel
title="Premium Barbershop Excellence"
description="Experience professional grooming at JrBlendz. Expert cuts, precise fades, and premium beard care tailored to your style."
title="Premium Solo Barber Excellence"
description="Experience professional grooming by JrBlendz, a dedicated solo barber. Expert cuts, precise fades, and premium beard care tailored to your unique style and preferences."
tag="Welcome to JrBlendz"
tagIcon={Scissors}
tagAnimation="slide-up"
@@ -71,21 +71,21 @@ export default function LandingPage() {
<div id="services" data-section="services">
<FeatureCardTwentyFour
title="Our Services"
description="Premium grooming services crafted for the modern man. Each service is tailored to your unique style and preferences."
description="Premium grooming services crafted by a dedicated solo barber. Each service is tailored to your unique style and preferences with personalized attention."
tag="Services"
tagIcon={Scissors}
tagAnimation="slide-up"
features={[
{
id: "1", title: "Classic Haircut", author: "JrBlendz Team", description: "Traditional and timeless haircuts that suit any face shape. Precision cutting with expert fade techniques.", tags: ["Popular", "30 min"],
id: "1", title: "Classic Haircut", author: "JrBlendz", description: "Traditional and timeless haircuts that suit any face shape. Precision cutting with expert fade techniques customized for you.", tags: ["Popular", "30 min"],
imageSrc: "https://images.unsplash.com/photo-1585747860715-cd4628902d4a?w=800&q=80&_wi=2", imageAlt: "Classic haircut service"
},
{
id: "2", title: "Beard Grooming", author: "JrBlendz Team", description: "Complete beard care including trim, shape, and detailing. We use premium products for a fresh, clean look.", tags: ["Premium", "20 min"],
id: "2", title: "Beard Grooming", author: "JrBlendz", description: "Complete beard care including trim, shape, and detailing. I use premium products for a fresh, clean look tailored to your beard style.", tags: ["Premium", "20 min"],
imageSrc: "https://images.unsplash.com/photo-1603881613716-d5c45fbb4d41?w=800&q=80&_wi=2", imageAlt: "Beard grooming service"
},
{
id: "3", title: "Fade & Line-up", author: "JrBlendz Team", description: "Sharp, precise fades with clean line-ups. Perfect for those seeking a modern, polished appearance.", tags: ["Expert", "25 min"],
id: "3", title: "Fade & Line-up", author: "JrBlendz", description: "Sharp, precise fades with clean line-ups. Perfect for those seeking a modern, polished appearance with expert attention to detail.", tags: ["Expert", "25 min"],
imageSrc: "https://images.unsplash.com/photo-1521590832167-7bcce28519e9?w=800&q=80&_wi=2", imageAlt: "Fade cut service"
}
]}
@@ -98,15 +98,15 @@ export default function LandingPage() {
<div id="about" data-section="about">
<SplitAbout
title="About JrBlendz"
description="Founded with a passion for precision and excellence, JrBlendz is your go-to destination for quality barbershop services. We combine traditional barbering techniques with modern styling expertise."
description="I'm a dedicated solo barber with a passion for precision and excellence. JrBlendz is built on providing quality barbershop services with personalized attention to every client. I combine traditional barbering techniques with modern styling expertise to give you the perfect cut every time."
tag="Our Story"
tagIcon={Heart}
tagAnimation="slide-up"
bulletPoints={[
{ title: "Expert Barbers", description: "Trained professionals with years of experience in classic and contemporary cuts.", icon: UserCheck },
{ title: "Premium Products", description: "We use only the finest grooming products to ensure quality results and healthy hair.", icon: Sparkles },
{ title: "Clean Environment", description: "Maintained to the highest standards with a welcoming, modern barbershop atmosphere.", icon: Home },
{ title: "Customer First", description: "Your satisfaction is our priority. We listen to your style preferences and deliver exactly what you want.", icon: Smile }
{ title: "Expert Barber", description: "Years of experience in classic and contemporary cuts with personalized service.", icon: UserCheck },
{ title: "Premium Products", description: "I use only the finest grooming products to ensure quality results and healthy hair.", icon: Sparkles },
{ title: "Clean Sanctuary", description: "My barbershop is maintained to the highest standards with a welcoming, modern atmosphere.", icon: Home },
{ title: "Personalized Attention", description: "Your satisfaction is my priority. I listen to your style preferences and deliver exactly what you want.", icon: Smile }
]}
imageSrc="https://images.unsplash.com/photo-1605629921902-378fa7787c5f?w=800&q=80&_wi=2"
imageAlt="JrBlendz barbershop interior"
@@ -120,22 +120,22 @@ export default function LandingPage() {
<div id="gallery" data-section="gallery">
<BlogCardOne
title="Gallery"
description="Check out our latest work and get inspired by the transformations we create every day."
description="Check out my latest work and get inspired by the transformations I create every day with dedicated craftsmanship."
tag="Portfolio"
tagIcon={Image}
tagAnimation="slide-up"
blogs={[
{
id: "1", category: "Haircuts", title: "Sharp Modern Fade", excerpt: "Clean lines and precision execution. A modern fade that stands out.", imageSrc: "https://images.unsplash.com/photo-1621905251022-48416b8ba58e?w=800&q=80&_wi=2", imageAlt: "Modern fade haircut", authorName: "JrBlendz Team", authorAvatar: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=96&h=96&fit=crop&q=80", date: "Recent"
id: "1", category: "Haircuts", title: "Sharp Modern Fade", excerpt: "Clean lines and precision execution. A modern fade that stands out.", imageSrc: "https://images.unsplash.com/photo-1621905251022-48416b8ba58e?w=800&q=80&_wi=2", imageAlt: "Modern fade haircut", authorName: "JrBlendz", authorAvatar: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=96&h=96&fit=crop&q=80", date: "Recent"
},
{
id: "2", category: "Styling", title: "Contemporary Cut", excerpt: "Combining classic technique with modern style elements for a unique look.", imageSrc: "https://images.unsplash.com/photo-1592975769127-3c23bb3c2343?w=800&q=80&_wi=2", imageAlt: "Contemporary haircut style", authorName: "JrBlendz Team", authorAvatar: "https://images.unsplash.com/photo-1506794778202-cad84cf45f1d?w=96&h=96&fit=crop&q=80", date: "Recent"
id: "2", category: "Styling", title: "Contemporary Cut", excerpt: "Combining classic technique with modern style elements for a unique look.", imageSrc: "https://images.unsplash.com/photo-1592975769127-3c23bb3c2343?w=800&q=80&_wi=2", imageAlt: "Contemporary haircut style", authorName: "JrBlendz", authorAvatar: "https://images.unsplash.com/photo-1506794778202-cad84cf45f1d?w=96&h=96&fit=crop&q=80", date: "Recent"
},
{
id: "3", category: "Precision", title: "Perfect Fade Lines", excerpt: "Expert fade with crisp details. This is barbershop precision at its finest.", imageSrc: "https://images.unsplash.com/photo-1605629921902-378fa7787c5f?w=800&q=80&_wi=3", imageAlt: "Precision fade haircut", authorName: "JrBlendz Team", authorAvatar: "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?w=96&h=96&fit=crop&q=80", date: "Recent"
id: "3", category: "Precision", title: "Perfect Fade Lines", excerpt: "Expert fade with crisp details. This is barbershop precision at its finest.", imageSrc: "https://images.unsplash.com/photo-1605629921902-378fa7787c5f?w=800&q=80&_wi=3", imageAlt: "Precision fade haircut", authorName: "JrBlendz", authorAvatar: "https://images.unsplash.com/photo-1500648767791-00dcc994a43e?w=96&h=96&fit=crop&q=80", date: "Recent"
},
{
id: "4", category: "Grooming", title: "Beard Perfection", excerpt: "Detailed beard work with clean lines and expert shaping for a polished look.", imageSrc: "https://images.unsplash.com/photo-1612139473076-1ef86e1a0b8e?w=800&q=80&_wi=2", imageAlt: "Professional beard grooming", authorName: "JrBlendz Team", authorAvatar: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=96&h=96&fit=crop&q=80", date: "Recent"
id: "4", category: "Grooming", title: "Beard Perfection", excerpt: "Detailed beard work with clean lines and expert shaping for a polished look.", imageSrc: "https://images.unsplash.com/photo-1612139473076-1ef86e1a0b8e?w=800&q=80&_wi=2", imageAlt: "Professional beard grooming", authorName: "JrBlendz", authorAvatar: "https://images.unsplash.com/photo-1507003211169-0a1dd7228f2d?w=96&h=96&fit=crop&q=80", date: "Recent"
}
]}
animationType="slide-up"
@@ -148,7 +148,7 @@ export default function LandingPage() {
<div id="testimonials" data-section="testimonials">
<TestimonialCardSixteen
title="Client Love"
description="See what our satisfied customers have to say about their JrBlendz experience."
description="See what my satisfied customers have to say about their JrBlendz experience and the personalized service they receive."
tag="Reviews"
tagIcon={Star}
tagAnimation="slide-up"
@@ -184,14 +184,14 @@ export default function LandingPage() {
<div id="contact" data-section="contact">
<ContactSplitForm
title="Book Your Appointment"
description="Ready to experience JrBlendz? Schedule your appointment today and get the perfect cut. We look forward to seeing you soon."
description="Ready to experience JrBlendz? Schedule your appointment today with me and get the perfect cut. I look forward to seeing you soon."
inputs={[
{ name: "name", type: "text", placeholder: "Your Name", required: true },
{ name: "email", type: "email", placeholder: "Email Address", required: true },
{ name: "phone", type: "tel", placeholder: "Phone Number", required: true },
{ name: "service", type: "text", placeholder: "Service (e.g., Haircut, Fade, Beard Trim)", required: true }
]}
textarea={{ name: "message", placeholder: "Tell us your preferred time and any special requests...", rows: 4, required: true }}
textarea={{ name: "message", placeholder: "Tell me your preferred time and any special requests...", rows: 4, required: true }}
useInvertedBackground={true}
imageSrc="https://images.unsplash.com/photo-1599912676244-ba1e1a1bb738?w=800&q=80&_wi=2"
imageAlt="JrBlendz barbershop"
@@ -214,7 +214,7 @@ export default function LandingPage() {
},
{
title: "Company", items: [
{ label: "About Us", href: "#about" },
{ label: "About Me", href: "#about" },
{ label: "Gallery", href: "#gallery" },
{ label: "Contact", href: "#contact" },
{ label: "Testimonials", href: "#testimonials" }
@@ -229,9 +229,9 @@ export default function LandingPage() {
]
}
]}
copyrightText="© 2025 JrBlendz Barbershop. All rights reserved."
copyrightText="© 2025 JrBlendz Solo Barber. All rights reserved."
/>
</div>
</ThemeProvider>
);
}
}