bender/3a6e61c2-f89f-4247-95f5-2fbdc2b689c4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 4 commits from version_2 into main 2026-02-18 15:54:03 +00:00
Conversation 0 Commits 4 Files Changed 4 +11 -8
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },

7
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroCentered from '@/components/sections/hero/HeroCentered';
import HeroBillboard from '@/components/sections/hero/HeroBillboard';
import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
import SplitAbout from '@/components/sections/about/SplitAbout';
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
@@ -43,7 +43,7 @@ export default function LandingPage() {
</div>
<div id="hero" data-section="hero">
<HeroCentered
<HeroBillboard
title="Premium Barbershop Experience"
description="Expertly crafted grooming services in a refined atmosphere. From classic haircuts to precision beard work, we deliver timeless style with modern expertise."
background={{
@@ -69,6 +69,9 @@ export default function LandingPage() {
text: "View Services", href: "services"
}
]}
imageSrc="https://img.b2bpic.net/free-photo/handsome-man-hair-salon-facing-camera_23-2148242826.jpg"
imageAlt="Premium barbershop experience"
mediaAnimation="slide-up"
/>
</div>

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

@@ -85,7 +85,7 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -125,7 +125,7 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -172,7 +172,7 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}

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

@@ -35,7 +35,7 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
@@ -74,7 +74,7 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}