bender/95cbdce0-6e4f-4f55-af10-68757fe3ce27
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_3 into main #2

Merged
bender merged 5 commits from version_3 into main 2026-02-18 02:28:27 +00:00
Conversation 0 Commits 5 Files Changed 5 +193 -22
5 changed files with 193 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/blog/page.tsx
View File

@@ -31,7 +31,7 @@ export default function BlogPage() {
brandName="ORIBLENDZ"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "gallery" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" }
@@ -71,8 +71,8 @@ export default function BlogPage() {
columns={[
{
title: "Studio", items: [
{ label: "Home", href: "hero" },
{ label: "Services", href: "services" },
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Gallery", href: "gallery" }
]
},

53
src/app/page.tsx
View File

@@ -30,7 +30,7 @@ export default function LandingPage() {
brandName="ORIBLENDZ"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Services", id: "services" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "gallery" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" }
@@ -41,6 +41,41 @@ export default function LandingPage() {
/>
</div>
<div id="hero" data-section="hero">
<div className="relative w-full py-20 px-vw-1_5">
<div className="mx-auto w-content-width">
<div className="grid grid-cols-1 md:grid-cols-2 gap-8">
{/* Barber Setup Image 1 */}
<div className="relative rounded-theme overflow-hidden">
<img
src="/barber-setup-1.jpg"
alt="Barber Setup 1"
className="w-full h-96 object-cover opacity-60"
/>
<div className="absolute inset-0 flex items-center justify-center">
<h1 className="text-4xl md:text-5xl font-bold text-foreground text-center drop-shadow-lg">ORIBLENDZ</h1>
</div>
</div>
{/* Barber Setup Image 2 */}
<div className="relative rounded-theme overflow-hidden">
<img
src="/barber-setup-2.jpg"
alt="Barber Setup 2"
className="w-full h-96 object-cover opacity-60"
/>
<div className="absolute inset-0 flex items-center justify-center">
<h1 className="text-4xl md:text-5xl font-bold text-foreground text-center drop-shadow-lg">ORIBLENDZ</h1>
</div>
</div>
</div>
<div className="mt-8 text-center">
<p className="text-lg text-foreground/80">Elite Private Grooming Studio</p>
<p className="text-sm text-foreground/60">Precision Crafted Experience • Appointment Only</p>
</div>
</div>
</div>
</div>
<div id="services" data-section="services">
<PricingCardFive
title="Premium Services"
@@ -129,22 +164,22 @@ export default function LandingPage() {
gridVariant="three-columns-all-equal-width"
products={[
{
id: "1", name: "Mid Fade with Textured Top", price: "$20", imageSrc: "https://img.b2bpic.net/free-photo/professional-barber-working-with-client-hairdressing-salon-styling-beard-with-comb_613910-5069.jpg", imageAlt: "mid-fade textured-top haircut barbershop grooming"
id: "1", name: "Mid Fade with Textured Top", price: "$20", imageSrc: "/gallery-1.jpg", imageAlt: "mid-fade textured-top haircut barbershop grooming"
},
{
id: "2", name: "Clean Taper Fade", price: "$20", imageSrc: "https://img.b2bpic.net/free-photo/portrait-man-barbershop-with-classic-styling_618663-34.jpg", imageAlt: "clean-taper-fade haircut barbershop precision design"
id: "2", name: "Clean Taper Fade", price: "$20", imageSrc: "/gallery-2.jpg", imageAlt: "clean-taper-fade haircut barbershop precision design"
},
{
id: "3", name: "Sharp Lineup with Edge Detail", price: "$25", imageSrc: "https://img.b2bpic.net/free-photo/european-brutal-man-with-beard-cut-barbershop_343596-4667.jpg", imageAlt: "sharp-lineup edge-detail haircut barbershop precision"
id: "3", name: "Sharp Lineup with Edge Detail", price: "$25", imageSrc: "/gallery-3.jpg", imageAlt: "sharp-lineup edge-detail haircut barbershop precision"
},
{
id: "4", name: "Curly Top Fade", price: "$20", imageSrc: "https://img.b2bpic.net/free-photo/man-getting-his-hairstyle-done_23-2148465240.jpg", imageAlt: "curly-top-fade textured haircut barbershop grooming"
id: "4", name: "Curly Top Fade", price: "$20", imageSrc: "/gallery-4.jpg", imageAlt: "curly-top-fade textured haircut barbershop grooming"
},
{
id: "5", name: "High Taper Precision Cut", price: "$20", imageSrc: "https://img.b2bpic.net/free-photo/european-brutal-man-with-beard-cut-barbershop_343596-4661.jpg", imageAlt: "high-taper precision-cut haircut barbershop design"
id: "5", name: "High Taper Precision Cut", price: "$20", imageSrc: "/gallery-5.jpg", imageAlt: "high-taper precision-cut haircut barbershop design"
},
{
id: "6", name: "Modern Crop Fade", price: "$20", imageSrc: "https://img.b2bpic.net/free-photo/attractive-pensive-man-is-waiting-his-turn-get-haircut-busy-barbershop_613910-21489.jpg", imageAlt: "modern-crop-fade haircut barbershop grooming style"
id: "6", name: "Modern Crop Fade", price: "$20", imageSrc: "/gallery-6.jpg", imageAlt: "modern-crop-fade haircut barbershop grooming style"
}
]}
/>
@@ -190,8 +225,8 @@ export default function LandingPage() {
columns={[
{
title: "Studio", items: [
{ label: "Home", href: "hero" },
{ label: "Services", href: "services" },
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Gallery", href: "gallery" }
]
},

136
src/app/services/page.tsx Normal file
View File

@@ -0,0 +1,136 @@
"use client"
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import PricingCardFive from "@/components/sections/pricing/PricingCardFive";
import FooterBase from "@/components/sections/footer/FooterBase";
import { Sparkles } from "lucide-react";
const FRESHA_BOOKING_URL = "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true&cartId=f8ebd1d7-ee19-40d7-830a-50d2e8282b16";
export default function ServicesPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="reveal-blur"
borderRadius="pill"
contentWidth="small"
sizing="largeSmallSizeLargeTitles"
background="grid"
cardStyle="gradient-radial"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="radial-glow"
headingFontWeight="normal"
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="ORIBLENDZ"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "gallery" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" }
]}
button={{
text: "Book Now", href: FRESHA_BOOKING_URL
}}
/>
</div>
<div id="services" data-section="services">
<PricingCardFive
title="Premium Services"
description="Precision crafted experiences for the discerning gentleman. All services priced competitively with expert execution."
tag="Exclusive Offerings"
textboxLayout="default"
animationType="slide-up"
useInvertedBackground={false}
plans={[
{
id: "haircut", tag: "Haircut", price: "$20", period: "", description: "Professional precision cut tailored to your style", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"45 minute appointment", "Expert consultation", "Custom fade work", "Line up detail"
]
},
{
id: "design", tag: "Design", price: "$25", period: "", description: "Intricate design work and custom patterns", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"30 minute appointment", "Custom design creation", "Precision toolwork", "Professional execution"
]
},
{
id: "eyebrows", tag: "Eyebrows", price: "$20", period: "", description: "Meticulous eyebrow shaping and grooming", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"20 minute appointment", "Expert shaping", "Precise trimming", "Refined finishing"
]
},
{
id: "lineup", tag: "Lineup", price: "$15", period: "", description: "Clean, sharp edge details and precision lines", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"15 minute appointment", "Sharp edge work", "Precise line creation", "Clean finish"
]
},
{
id: "beard", tag: "Beard", price: "$20", period: "", description: "Expert beard shaping and maintenance", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"20 minute appointment", "Professional trimming", "Shape refinement", "Clean edges"
]
},
{
id: "full-experience", tag: "FULL EXPERIENCE", tagIcon: Sparkles,
price: "$65", period: "+", description: "Complete grooming package with haircut and detailed work", button: {
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "Complete Package:", features: [
"Professional haircut", "Design or detail work", "Eyebrow shaping", "Sharp line up", "Beard grooming", "Expert finishing touches"
]
}
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBase
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{
title: "Studio", items: [
{ label: "Home", href: "/" },
{ label: "Services", href: "/services" },
{ label: "Gallery", href: "gallery" }
]
},
{
title: "Connect", items: [
{
label: "Book Now", href: FRESHA_BOOKING_URL
},
{ label: "Phone", href: "tel:754-837-0279" },
{ label: "TikTok", href: "https://www.tiktok.com/@oriblendz" }
]
},
{
title: "Location", items: [
{ label: "3127 Northwest 84th Way", href: "#" },
{ label: "Pembroke Pines, Florida", href: "#" },
{ label: "Appointment Only", href: "#" }
]
}
]}
/>
</div>
</ThemeProvider>
);
}

12
src/app/shop/[id]/page.tsx
View File

@@ -88,7 +88,7 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="ORIBLENDZ"
navItems={[
{"name":"Home","id":"/"},
{"name":"Services","id":"services"},
{"name":"Services","id":"/services"},
{"name":"Gallery","id":"gallery"},
{"name":"About","id":"about"},
{"name":"Contact","id":"contact"},
@@ -105,7 +105,7 @@ export default function ProductPage({ params }: ProductPageProps) {
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Studio","items":[{"label":"Home","href":"/"},{"label":"Services","href":"/services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":FRESHA_BOOKING_URL},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"title":"Location","items":[{"label":"3127 Northwest 84th Way","href":"#"},{"label":"Pembroke Pines, Florida","href":"#"},{"label":"Appointment Only","href":"#"}]}
]}
@@ -136,7 +136,7 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="ORIBLENDZ"
navItems={[
{"name":"Home","id":"/"},
{"name":"Services","id":"services"},
{"name":"Services","id":"/services"},
{"name":"Gallery","id":"gallery"},
{"name":"About","id":"about"},
{"name":"Contact","id":"contact"},
@@ -161,7 +161,7 @@ export default function ProductPage({ params }: ProductPageProps) {
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Studio","items":[{"label":"Home","href":"/"},{"label":"Services","href":"/services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":FRESHA_BOOKING_URL},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"title":"Location","items":[{"label":"3127 Northwest 84th Way","href":"#"},{"label":"Pembroke Pines, Florida","href":"#"},{"label":"Appointment Only","href":"#"}]}
]}
@@ -191,7 +191,7 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="ORIBLENDZ"
navItems={[
{"name":"Home","id":"/"},
{"name":"Services","id":"services"},
{"name":"Services","id":"/services"},
{"name":"Gallery","id":"gallery"},
{"name":"About","id":"about"},
{"name":"Contact","id":"contact"},
@@ -241,7 +241,7 @@ export default function ProductPage({ params }: ProductPageProps) {
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Studio","items":[{"label":"Home","href":"/"},{"label":"Services","href":"/services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":FRESHA_BOOKING_URL},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"title":"Location","items":[{"label":"3127 Northwest 84th Way","href":"#"},{"label":"Pembroke Pines, Florida","href":"#"},{"label":"Appointment Only","href":"#"}]}
]}

8
src/app/shop/page.tsx
View File

@@ -41,7 +41,7 @@ export default function ShopPage() {
brandName="ORIBLENDZ"
navItems={[
{"name":"Home","id":"/"},
{"name":"Services","id":"services"},
{"name":"Services","id":"/services"},
{"name":"Gallery","id":"gallery"},
{"name":"About","id":"about"},
{"name":"Contact","id":"contact"},
@@ -58,7 +58,7 @@ export default function ShopPage() {
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Studio","items":[{"label":"Home","href":"/"},{"label":"Services","href":"/services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":FRESHA_BOOKING_URL},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"title":"Location","items":[{"label":"3127 Northwest 84th Way","href":"#"},{"label":"Pembroke Pines, Florida","href":"#"},{"label":"Appointment Only","href":"#"}]}
]}
@@ -88,7 +88,7 @@ export default function ShopPage() {
brandName="ORIBLENDZ"
navItems={[
{"name":"Home","id":"/"},
{"name":"Services","id":"services"},
{"name":"Services","id":"/services"},
{"name":"Gallery","id":"gallery"},
{"name":"About","id":"about"},
{"name":"Contact","id":"contact"},
@@ -113,7 +113,7 @@ export default function ShopPage() {
logoText="ORIBLENDZ"
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Studio","items":[{"label":"Home","href":"/"},{"label":"Services","href":"/services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":FRESHA_BOOKING_URL},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"title":"Location","items":[{"label":"3127 Northwest 84th Way","href":"#"},{"label":"Pembroke Pines, Florida","href":"#"},{"label":"Appointment Only","href":"#"}]}
]}