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

Merge version_3 into main #4

Merged
bender merged 3 commits from version_3 into main 2026-02-18 15:57:45 +00:00
Conversation 0 Commits 3 Files Changed 3 +30 -18
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/app/page.tsx
View File

@@ -3,8 +3,8 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import HeroBillboard from '@/components/sections/hero/HeroBillboard';
import FeatureHoverPattern from '@/components/sections/feature/featureHoverPattern/FeatureHoverPattern';
import SplitAbout from '@/components/sections/about/SplitAbout';
import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
import TestimonialAboutCard from '@/components/sections/testimonial/TestimonialAboutCard';
import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
import TeamCardSix from '@/components/sections/team/TeamCardSix';
@@ -76,7 +76,7 @@ export default function LandingPage() {
</div>
<div id="services" data-section="services">
<FeatureHoverPattern
<FeatureCardOne
title="Our Services"
description="A complete range of grooming services designed to keep you looking sharp"
tag="Premium Grooming"
@@ -114,31 +114,28 @@ export default function LandingPage() {
</div>
<div id="about" data-section="about">
<SplitAbout
<TestimonialAboutCard
title="Refined Barbershop Heritage"
description="With over 15 years in the grooming industry, we've perfected the art of classic barbering combined with modern expertise. Our shop is a sanctuary where tradition meets innovation."
tag="Our Story"
tagIcon={History}
bulletPoints={[
testimonials={[
{
title: "Master Craftsmen", description: "Our barbers are certified professionals with decades of combined experience in traditional and modern grooming techniques.", icon: Award
id: "1", name: "Master Craftsmen", handle: "Certified Professionals", testimonial: "Our barbers are certified professionals with decades of combined experience in traditional and modern grooming techniques.", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg", imageAlt: "Master Craftsmen", icon: Award
},
{
title: "Premium Products", description: "We use only the finest grooming products from trusted international brands to ensure superior results and client satisfaction.", icon: Zap
id: "2", name: "Premium Products", handle: "Quality Assurance", testimonial: "We use only the finest grooming products from trusted international brands to ensure superior results and client satisfaction.", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg", imageAlt: "Premium Products", icon: Zap
},
{
title: "Comfortable Atmosphere", description: "Step into a relaxing environment designed for comfort, featuring vintage barbershop aesthetics and modern amenities.", icon: Home
id: "3", name: "Comfortable Atmosphere", handle: "Relaxing Environment", testimonial: "Step into a relaxing environment designed for comfort, featuring vintage barbershop aesthetics and modern amenities.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg", imageAlt: "Comfortable Atmosphere", icon: Home
},
{
title: "Personalized Service", description: "Every client receives customized attention. We listen to your preferences and deliver results that exceed expectations."
id: "4", name: "Personalized Service", handle: "Custom Care", testimonial: "Every client receives customized attention. We listen to your preferences and deliver results that exceed expectations.", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg", imageAlt: "Personalized Service", icon: Star
}
]}
imageSrc="https://img.b2bpic.net/free-photo/handsome-man-hair-salon-facing-camera_23-2148242826.jpg"
imageAlt="Refined barbershop interior"
mediaAnimation="slide-up"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
imagePosition="right"
buttons={[
{
text: "Meet the Team", href: "team"

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

@@ -86,7 +86,10 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },
{ name: "Testimonials", id: "testimonials" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -126,7 +129,10 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },
{ name: "Testimonials", id: "testimonials" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -173,7 +179,10 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },
{ name: "Testimonials", id: "testimonials" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -36,7 +36,10 @@ export default function ShopPage() {
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },
{ name: "Testimonials", id: "testimonials" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -75,7 +78,10 @@ export default function ShopPage() {
brandName="Refined Barber"
navItems={[
{ name: "Home", id: "hero" },
{ name: "Shop", id: "/shop" }
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Team", id: "team" },
{ name: "Testimonials", id: "testimonials" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>