bender/6e46261a-863b-4bd5-8a96-ca274df13566
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #5

Merged
bender merged 5 commits from version_2 into main 2026-04-14 06:54:25 +00:00
Conversation 0 Commits 5 Files Changed 5 +10 -8
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
export default function BookingPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },

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

@@ -5,7 +5,7 @@ import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleAp
export default function CartPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },

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

@@ -23,17 +23,19 @@ export default function ContactPage() {
>
<ReactLenis root>
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/services" }, { name: "Haircuts", id: "/haircuts" }, { name: "Beard & Shave", id: "/beard" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]}
navItems={[{ name: "Home", id: "/" }, { name: "Services", id: "/services" }, { name: "Haircuts", id: "/haircuts" }, { name: "Booking", id: "/booking" }, { name: "Contact", id: "/contact" }]}
brandName="FOXY'S"
/>
<ContactText
text="Get in Touch"
background={{ variant: "animated-grid" }}
useInvertedBackground={false}
/>
<ContactForm
title="Send us a Message"
description="Have questions about our studio or services? Drop us a note."
tag="Support"
useInvertedBackground={false}
/>
<FooterSimple
columns={[{ title: "Studio", items: [{ label: "About", href: "#" }, { label: "Team", href: "#" }] }, { title: "Booking", items: [{ label: "Appointments", href: "/booking" }] }]}

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

@@ -7,7 +7,7 @@ import PricingCardNine from '@/components/sections/pricing/PricingCardNine';
export default function HaircutsPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[

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

@@ -7,7 +7,7 @@ import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwe
export default function ServicesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleApple
navItems={[
@@ -27,9 +27,9 @@ export default function ServicesPage() {
title="Our Services"
description="Discover our range of premium grooming services tailored for you."
features={[
{ id: "s1", title: "Precision Haircuts", tags: ["Styling", "Fade"], description: "Expert scissor and clipper work for a perfect look." },
{ id: "s2", title: "Beard Grooming", tags: ["Razor", "Beard Oil"], description: "Professional beard shaping and hot towel shaves." },
{ id: "s3", title: "Facial Treatments", tags: ["Skincare", "Relax"], description: "Refreshing treatments to keep your skin revitalized." }
{ id: "s1", title: "Precision Haircuts", tags: ["Styling", "Fade"] },
{ id: "s2", title: "Beard Grooming", tags: ["Razor", "Beard Oil"] },
{ id: "s3", title: "Facial Treatments", tags: ["Skincare", "Relax"] }
]}
/>
</div>