From 33a98095e5edc8a56a326c0458864db599592056 Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:43 +0000 Subject: [PATCH 1/8] Update src/app/beard/page.tsx --- src/app/beard/page.tsx | 147 ++++++----------------------------------- 1 file changed, 19 insertions(+), 128 deletions(-) diff --git a/src/app/beard/page.tsx b/src/app/beard/page.tsx index 6311ad8..cc828fb 100644 --- a/src/app/beard/page.tsx +++ b/src/app/beard/page.tsx @@ -2,12 +2,11 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import ReactLenis from "lenis/react"; -import ContactText from '@/components/sections/contact/ContactText'; -import FooterSimple from '@/components/sections/footer/FooterSimple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; -import PricingCardThree from '@/components/sections/pricing/PricingCardThree'; +import HeroLogo from '@/components/sections/hero/HeroLogo'; +import FooterSimple from '@/components/sections/footer/FooterSimple'; -export default function LandingPage() { +export default function BeardPage() { return ( - - -
- -
- -
- -
- - + + +
); -} +} \ No newline at end of file -- 2.49.1 From 6331924db6ba11e83a607d999f5ee09c0e66feca Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:43 +0000 Subject: [PATCH 2/8] Update src/app/booking/page.tsx --- src/app/booking/page.tsx | 156 +++++---------------------------------- 1 file changed, 20 insertions(+), 136 deletions(-) diff --git a/src/app/booking/page.tsx b/src/app/booking/page.tsx index abba869..006e118 100644 --- a/src/app/booking/page.tsx +++ b/src/app/booking/page.tsx @@ -1,145 +1,29 @@ "use client"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; -import ReactLenis from "lenis/react"; -import ContactText from '@/components/sections/contact/ContactText'; -import FooterSimple from '@/components/sections/footer/FooterSimple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; -import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo'; -export default function LandingPage() { +export default function BookingPage() { return ( - - - - -
- -
- -
- -
- - -
+ navItems={[ + { name: "Home", id: "/" }, + { name: "Services", id: "/services" }, + { name: "Cart", id: "/cart" }, + { name: "Booking", id: "/booking" }, + { name: "Contact", id: "/contact" }, + ]} + brandName="FOXY'S" + /> +
+

Complete Booking

+
+
+

Select Date & Time and confirm your grooming session.

+
+
+
); -} +} \ No newline at end of file -- 2.49.1 From 9918f9c9bdd5981ed4d06d16b542ae86dc7aba19 Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:44 +0000 Subject: [PATCH 3/8] Add src/app/cart/page.tsx --- src/app/cart/page.tsx | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/app/cart/page.tsx diff --git a/src/app/cart/page.tsx b/src/app/cart/page.tsx new file mode 100644 index 0000000..dd832e9 --- /dev/null +++ b/src/app/cart/page.tsx @@ -0,0 +1,27 @@ +"use client"; + +import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; +import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; + +export default function CartPage() { + return ( + + +
+

Your Selection

+
+

Cart functionality connected to global state.

+
+
+
+ ); +} \ No newline at end of file -- 2.49.1 From c4bf70533b82ecdaf4dc5f4b8f9b55191f0a9421 Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:44 +0000 Subject: [PATCH 4/8] Update src/app/contact/page.tsx --- src/app/contact/page.tsx | 117 ++++++++------------------------------- 1 file changed, 23 insertions(+), 94 deletions(-) diff --git a/src/app/contact/page.tsx b/src/app/contact/page.tsx index 83dc9b1..1b3ead6 100644 --- a/src/app/contact/page.tsx +++ b/src/app/contact/page.tsx @@ -2,12 +2,12 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import ReactLenis from "lenis/react"; -import ContactCTA from '@/components/sections/contact/ContactCTA'; -import ContactText from '@/components/sections/contact/ContactText'; -import FooterSimple from '@/components/sections/footer/FooterSimple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; +import ContactForm from '@/components/form/ContactForm'; +import FooterSimple from '@/components/sections/footer/FooterSimple'; +import ContactText from '@/components/sections/contact/ContactText'; -export default function LandingPage() { +export default function ContactPage() { return ( - - -
- -
- -
- -
- - + + + +
); -} +} \ No newline at end of file -- 2.49.1 From a7dbea93bfa4ead497107df50f1678bf6a8ae691 Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:45 +0000 Subject: [PATCH 5/8] Update src/app/haircuts/page.tsx --- src/app/haircuts/page.tsx | 171 +++++++------------------------------- 1 file changed, 28 insertions(+), 143 deletions(-) diff --git a/src/app/haircuts/page.tsx b/src/app/haircuts/page.tsx index 377004a..8c57b23 100644 --- a/src/app/haircuts/page.tsx +++ b/src/app/haircuts/page.tsx @@ -2,153 +2,38 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import ReactLenis from "lenis/react"; -import ContactText from '@/components/sections/contact/ContactText'; -import FooterSimple from '@/components/sections/footer/FooterSimple'; import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple'; -import PricingCardThree from '@/components/sections/pricing/PricingCardThree'; +import PricingCardNine from '@/components/sections/pricing/PricingCardNine'; -export default function LandingPage() { +export default function HaircutsPage() { return ( - + - - -
- -
- -
- -
- - + +
+ +
); -} +} \ No newline at end of file -- 2.49.1 From 356ae166d3086e9bd1744be18f1ce05997dcda3d Mon Sep 17 00:00:00 2001 From: bender Date: Tue, 14 Apr 2026 06:53:45 +0000 Subject: [PATCH 6/8] Update src/app/page.tsx --- src/app/page.tsx | 83 ++++++++++++------------------------------------ 1 file changed, 21 insertions(+), 62 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index af5c27f..0f09abc 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -27,18 +27,11 @@ export default function LandingPage() { @@ -127,20 +98,8 @@ export default function LandingPage() {