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

Merge version_2 into main #1

Merged
bender merged 5 commits from version_2 into main 2026-02-18 02:20:57 +00:00
Conversation 0 Commits 5 Files Changed 5 +59 -35
5 changed files with 59 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,8 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
import { useBlogPosts } from "@/hooks/useBlogPosts";
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 BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -35,7 +37,7 @@ export default function BlogPage() {
{ name: "Contact", id: "contact" }
]}
button={{
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
}}
/>
</div>
@@ -76,7 +78,7 @@ export default function BlogPage() {
},
{
title: "Connect", items: [
{ label: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true" },
{ label: "Book Now", href: FRESHA_BOOKING_URL },
{ label: "Phone", href: "tel:754-837-0279" },
{ label: "TikTok", href: "https://www.tiktok.com/@oriblendz" }
]
@@ -94,4 +96,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/layout.tsx
View File

@@ -1323,4 +1323,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

66
src/app/page.tsx
View File

@@ -7,7 +7,9 @@ import ProductCardOne from "@/components/sections/product/ProductCardOne";
import PricingCardFive from "@/components/sections/pricing/PricingCardFive";
import ContactText from "@/components/sections/contact/ContactText";
import FooterBase from "@/components/sections/footer/FooterBase";
import { Scissors, Award, Sparkles } from "lucide-react";
import { Scissors, Award, Sparkles, Phone, MapPin } 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 LandingPage() {
return (
@@ -34,7 +36,7 @@ export default function LandingPage() {
{ name: "Contact", id: "contact" }
]}
button={{
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
}}
/>
</div>
@@ -50,7 +52,7 @@ export default function LandingPage() {
plans={[
{
id: "haircut", tag: "Haircut", price: "$20", period: "", description: "Professional precision cut tailored to your style", button: {
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"45 minute appointment", "Expert consultation", "Custom fade work", "Line up detail"
@@ -58,7 +60,7 @@ export default function LandingPage() {
},
{
id: "design", tag: "Design", price: "$25", period: "", description: "Intricate design work and custom patterns", button: {
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"30 minute appointment", "Custom design creation", "Precision toolwork", "Professional execution"
@@ -66,7 +68,7 @@ export default function LandingPage() {
},
{
id: "eyebrows", tag: "Eyebrows", price: "$20", period: "", description: "Meticulous eyebrow shaping and grooming", button: {
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"20 minute appointment", "Expert shaping", "Precise trimming", "Refined finishing"
@@ -74,7 +76,7 @@ export default function LandingPage() {
},
{
id: "lineup", tag: "Lineup", price: "$15", period: "", description: "Clean, sharp edge details and precision lines", button: {
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"15 minute appointment", "Sharp edge work", "Precise line creation", "Clean finish"
@@ -82,7 +84,7 @@ export default function LandingPage() {
},
{
id: "beard", tag: "Beard", price: "$20", period: "", description: "Expert beard shaping and maintenance", button: {
text: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
text: "Book Now", href: FRESHA_BOOKING_URL
},
featuresTitle: "What's Included:", features: [
"20 minute appointment", "Professional trimming", "Shape refinement", "Clean edges"
@@ -91,7 +93,7 @@ export default function LandingPage() {
{
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: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
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"
@@ -149,20 +151,36 @@ export default function LandingPage() {
</div>
<div id="contact" data-section="contact">
<ContactText
text="Ready to experience elite grooming? Book your appointment at ORIBLENDZ today and discover precision crafted excellence."
animationType="reveal-blur"
buttons={[
{
text: "Book Appointment", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
},
{
text: "Get in Touch", href: "tel:754-837-0279"
}
]}
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
<div className="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 md:gap-12">
<div className="flex flex-col gap-6">
<div className="flex items-start gap-4">
<Phone className="w-6 h-6 text-primary-cta mt-1 flex-shrink-0" />
<div>
<h3 className="font-semibold text-foreground mb-2">Phone</h3>
<a href="tel:754-837-0279" className="text-foreground/80 hover:text-primary-cta transition">754-837-0279</a>
</div>
</div>
<div className="flex items-start gap-4">
<MapPin className="w-6 h-6 text-primary-cta mt-1 flex-shrink-0" />
<div>
<h3 className="font-semibold text-foreground mb-2">Address</h3>
<p className="text-foreground/80">3127 Northwest 84th Way</p>
<p className="text-foreground/80">Pembroke Pines, Florida</p>
</div>
</div>
</div>
<div className="flex flex-col justify-center gap-4">
<p className="text-foreground/90">Ready to experience elite grooming? Book your appointment at ORIBLENDZ today and discover precision crafted excellence.</p>
<div className="flex flex-col gap-3">
<a href={FRESHA_BOOKING_URL} className="bg-primary-cta text-background px-6 py-3 rounded-theme text-center font-semibold hover:opacity-90 transition">Book Appointment</a>
<a href="tel:754-837-0279" className="border border-primary-cta text-primary-cta px-6 py-3 rounded-theme text-center font-semibold hover:bg-primary-cta hover:text-background transition">Call Now</a>
</div>
</div>
</div>
</div>
</div>
</div>
<div id="footer" data-section="footer">
@@ -180,7 +198,7 @@ export default function LandingPage() {
{
title: "Connect", items: [
{
label: "Book Now", href: "https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"
label: "Book Now", href: FRESHA_BOOKING_URL
},
{ label: "Phone", href: "tel:754-837-0279" },
{ label: "TikTok", href: "https://www.tiktok.com/@oriblendz" }
@@ -198,4 +216,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

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

@@ -12,6 +12,8 @@ import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
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";
interface ProductPageProps {
params: Promise<{ id: string }>;
}
@@ -104,7 +106,7 @@ export default function ProductPage({ params }: ProductPageProps) {
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":"https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"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":"#"}]}
]}
/>
@@ -160,7 +162,7 @@ export default function ProductPage({ params }: ProductPageProps) {
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":"https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"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":"#"}]}
]}
/>
@@ -240,7 +242,7 @@ export default function ProductPage({ params }: ProductPageProps) {
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":"https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"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":"#"}]}
]}
/>
@@ -248,4 +250,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

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

@@ -8,6 +8,8 @@ import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog
import { useProductCatalog } from "@/hooks/useProductCatalog";
import { useState } from "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 ShopPage() {
const {
products,
@@ -57,7 +59,7 @@ export default function ShopPage() {
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":"https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"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":"#"}]}
]}
/>
@@ -112,7 +114,7 @@ export default function ShopPage() {
copyrightText="© 2025 ORIBLENDZ | Private Luxury Studio"
columns={[
{"title":"Studio","items":[{"label":"Home","href":"hero"},{"label":"Services","href":"services"},{"label":"Gallery","href":"gallery"}]},
{"title":"Connect","items":[{"label":"Book Now","href":"https://www.fresha.com/a/oriblendz-pembroke-pines-3127-northwest-84th-way-mc1s2lzu/booking?menu=true&share=true"},{"label":"Phone","href":"tel:754-837-0279"},{"label":"TikTok","href":"https://www.tiktok.com/@oriblendz"}]},
{"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":"#"}]}
]}
/>
@@ -120,4 +122,4 @@ export default function ShopPage() {
</ReactLenis>
</ThemeProvider>
);
}
}