Merge version_13 into main

Update src/app/page.tsx
2026-05-28 14:07:31 +00:00 · 2026-05-28 14:07:28 +00:00 · 2026-05-28 14:06:36 +00:00 · 2026-05-28 14:06:30 +00:00 · 2026-05-28 14:00:44 +00:00 · 2026-05-28 14:00:41 +00:00
3 changed files with 106 additions and 164 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -1,18 +1,54 @@
 "use client";

 import ReactLenis from "lenis/react";
-import BlogCardOne from "@/components/sections/blog/BlogCardOne";
+import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import { useBlogPosts } from "@/hooks/useBlogPosts";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import FooterMedia from '@/components/sections/footer/FooterMedia';

 const bookingUrl = "https://tinyurl.com/2kr8jy37";
-const franchisePagePath = "/franchise";

 export default function BlogPage() {
    const { posts, isLoading } = useBlogPosts();

+    const navItems = [
+      { name: "Home", id: "/" },
+      { name: "Services", id: "/services" },
+      { name: "Products", id: "/products" },
+      { name: "Prices", id: "/#pricing" },
+      { name: "Franchise", id: "/franchise" },
+      { name: "Blog", id: "/blog" },
+      { name: "Contact", id: "/#contact" },
+    ];
+
+    const footerColumns = [
+      {
+        title: "Services",        items: [
+          { label: "Gents Hair", href: "/services" },
+          { label: "Ladies Cut", href: "/services" },
+          { label: "Beard Grooming", href: "/services" },
+        ],
+      },
+      {
+        title: "Company",        items: [
+          { label: "About Us", href: "/#about" },
+          { label: "Contact", href: "/#contact" },
+          { label: "Book Now", href: bookingUrl },
+          { label: "Products", href: "/products" },
+          { label: "Blog", href: "/blog" },
+          { label: "Franchise", href: "/franchise" },
+        ],
+      },
+      {
+        title: "Social",        items: [
+          { label: "Instagram", href: "https://www.instagram.com/docbarnet?igsh=MWMwdHBnamFibXc3Yw%3D%3D&utm_source=qr" },
+          { label: "Facebook", href: "#" },
+          { label: "Privacy Policy", href: "#" },
+        ],
+      },
+    ];
+
    return (
        <ThemeProvider defaultButtonVariant="text-shift"
        defaultTextAnimation="entrance-slide"
@@ -27,21 +63,7 @@ export default function BlogPage() {
            <ReactLenis root>
                <div id="nav" data-section="nav">

-                    <NavbarLayoutFloatingOverlay navItems={[
-        {
-          name: "Home",          id: "/"},
-        {
-          name: "Services",          id: "/services"},
-        {
-          name: "Prices",          id: "/#pricing"},
-        {
-          name: "Contact",          id: "/#contact"},
-      
-          {
-            name: "Blog",            id: "/blog"},
-          {
-            name: "Franchise",            id: franchisePagePath},
-]}
+                    <NavbarLayoutFloatingOverlay navItems={navItems}
      brandName="Doc Barnet Grooming Salon"
      button={{
        text: "BOOK NOW",        href: bookingUrl}} />
@@ -69,42 +91,7 @@ export default function BlogPage() {

                        <FooterMedia imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg?_wi=1"
      logoText="DOC BARNET"
-      columns={[
-        {
-          title: "Services",          items: [
-            {
-              label: "Gents Hair",              href: "/services"},
-            {
-              label: "Ladies Cut",              href: "/services"},
-            {
-              label: "Beard Grooming",              href: "/services"},
-          ],
-        },
-        {
-          title: "Company",          items: [
-            {
-              label: "About Us",              href: "/#about"},
-            {
-              label: "Contact",              href: "/#contact"},
-            {
-              label: "Book Now",              href: bookingUrl},
-            {
-              label: "Blog",              href: "/blog"},
-            {
-              label: "Franchise",              href: franchisePagePath},
-          ],
-        },
-        {
-          title: "Social",          items: [
-            {
-              label: "Instagram",              href: "https://www.instagram.com/docbarnet?igsh=MWMwdHBnamFibXc3Yw%3D%3D&utm_source=qr"},
-            {
-              label: "Facebook",              href: "#"},
-            {
-              label: "Privacy Policy",              href: "#"},
-          ],
-        },
-      ]} />
+      columns={footerColumns} />
                    </div>
            </ReactLenis>
        </ThemeProvider>
--- a/src/app/franchise/page.tsx
+++ b/src/app/franchise/page.tsx
@@ -9,6 +9,43 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
 export default function FranchisePage() {
  const bookingUrl = "https://tinyurl.com/2kr8jy37";

+  const navItems = [
+    { name: "Home", id: "/" },
+    { name: "Services", id: "/services" },
+    { name: "Products", id: "/products" },
+    { name: "Prices", id: "/#pricing" },
+    { name: "Franchise", id: "/franchise" },
+    { name: "Blog", id: "/blog" },
+    { name: "Contact", id: "/#contact" },
+  ];
+
+  const footerColumns = [
+    {
+      title: "Services",      items: [
+        { label: "Gents Hair", href: "/services" },
+        { label: "Ladies Cut", href: "/services" },
+        { label: "Beard Grooming", href: "/services" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/#about" },
+        { label: "Contact", href: "/#contact" },
+        { label: "Book Now", href: bookingUrl },
+        { label: "Products", href: "/products" },
+        { label: "Blog", href: "/blog" },
+        { label: "Franchise", href: "/franchise" },
+      ],
+    },
+    {
+      title: "Social",      items: [
+        { label: "Instagram", href: "https://www.instagram.com/docbarnet?igsh=MWMwdHBnamFibXc3Yw%3D%3D&utm_source=qr" },
+        { label: "Facebook", href: "#" },
+        { label: "Privacy Policy", href: "#" },
+      ],
+    },
+  ];
+
  return (
    <ThemeProvider
        defaultButtonVariant="text-shift"
@@ -25,20 +62,7 @@ export default function FranchisePage() {
      <ReactLenis root>
        <div id="nav" data-section="nav">
            <NavbarLayoutFloatingOverlay
-            navItems={[
-                {
-                    name: "Home",                    id: "/"},
-                {
-                    name: "Services",                    id: "/services"},
-                {
-                    name: "Prices",                    id: "/#pricing"},
-                {
-                    name: "Franchise",                    id: "/franchise"},
-                {
-                    name: "Contact",                    id: "/#contact"},
-              
-                    { name: "Blog", id: "/blog" },
-            ]}
+            navItems={navItems}
            brandName="Doc Barnet Grooming Salon"
            button={{
                text: "BOOK NOW",                href: bookingUrl}}
@@ -67,44 +91,9 @@ export default function FranchisePage() {

        <div id="footer" data-section="footer">
            <FooterMedia
-            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg?_wi=2"
+            imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg?_wi=1"
            logoText="DOC BARNET"
-            columns={[
-                {
-                    title: "Services",                    items: [
-                        {
-                            label: "Gents Hair",                            href: "/services"},
-                        {
-                            label: "Ladies Cut",                            href: "/services"},
-                        {
-                            label: "Beard Grooming",                            href: "/services"},
-                    ],
-                },
-                {
-                    title: "Company",                    items: [
-                        {
-                            label: "About Us",                            href: "/#about"},
-                        {
-                            label: "Contact",                            href: "/#contact"},
-                        {
-                            label: "Book Now",                            href: bookingUrl},
-                        {
-                            label: "Blog",                            href: "/blog"},
-                        {
-                            label: "Franchise",                            href: "/franchise"},
-                    ],
-                },
-                {
-                    title: "Social",                    items: [
-                        {
-                            label: "Instagram",                            href: "https://www.instagram.com/docbarnet?igsh=MWMwdHBnamFibXc3Yw%3D%3D&utm_source=qr"},
-                        {
-                            label: "Facebook",                            href: "#"},
-                        {
-                            label: "Privacy Policy",                            href: "#"},
-                    ],
-                },
-            ]}
+            columns={footerColumns}
            />
        </div>
      </ReactLenis>
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,7 +6,7 @@ import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
 import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
 import FooterMedia from '@/components/sections/footer/FooterMedia';
-import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
+import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
 import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import PricingCardTwo from '@/components/sections/pricing/PricingCardTwo';
@@ -34,18 +34,20 @@ export default function LandingPage() {
      <NavbarLayoutFloatingOverlay
      navItems={[
        {
-          name: "Home",          id: "hero"},
+          name: "Home",          id: "/"},
        {
-          name: "Services",          id: "services"},
+          name: "Services",          id: "/services"},
        {
-          name: "Prices",          id: "pricing"},
+          name: "Products",          id: "/products"},
+        {
+          name: "Prices",          id: "/#pricing"},
        {
          name: "Franchise",          id: "/franchise"},
        {
-          name: "Contact",          id: "contact"},
-      
-          { name: "Blog", id: "/blog" },
-]}
+          name: "Blog", id: "/blog" },
+        {
+          name: "Contact",          id: "/#contact"}
+      ]}
      brandName="Doc Barnet Grooming Salon"
      button={{
        text: "BOOK NOW",        href: bookingUrl}}
@@ -53,61 +55,19 @@ export default function LandingPage() {
  </div>

  <div id="hero" data-section="hero">
-      <HeroBillboardTestimonial
-      useInvertedBackground={false}
+      <HeroBillboardScroll
      background={{
        variant: "gradient-bars"}}
-      title="NOW OPEN AT GLOUCESTER QUAYS"
-      description="Premium Grooming. Expert Styling. Experience the pinnacle of grooming excellence."
-      testimonials={[
-        {
-          name: "James R.",          handle: "@jamesr",          testimonial: "Best haircut I've had in years. Professional and high quality.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portriat-beautiful-business-woman-standing_23-2148317282.jpg"},
-        {
-          name: "Sophie M.",          handle: "@sophiem",          testimonial: "Amazing Balayage treatment, truly premium experience.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/attractive-woman-dark-wall_329181-7280.jpg"},
-        {
-          name: "Mark D.",          handle: "@markd",          testimonial: "The attention to detail on the fade was spot on. 5 stars.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-bearded-man-barbershop-barber-work_627829-7351.jpg"},
-        {
-          name: "Elena P.",          handle: "@elenap",          testimonial: "Professional, welcoming, and perfectly styled. Highly recommend.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-woman-with-dandruff-looking-mirror_23-2149311387.jpg"},
-        {
-          name: "Chris W.",          handle: "@chrisw",          testimonial: "Classic barbering with a modern, luxury edge. Exceptional.",          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/stylish-room-with-blurred-effect_1203-554.jpg"},
-      ]}
+      title="Experience Our Full Range of Premium Grooming Services"
+      description="From precision gentlemen's haircuts and elegant ladies' styling to expert beard grooming and rejuvenating facial treatments, discover unparalleled quality and care          at Doc Barnet Grooming Salon."
      buttons={[
        {
          text: "BOOK NOW",          href: bookingUrl},
        {
-          text: "VIEW PRICES",          href: "#pricing"},
+          text: "VIEW SERVICES",          href: "#services"},
      ]}
      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778093237434-05qgab2c.jpg"
      imageAlt="Doc Barnet Luxury Salon"
-      avatars={[
-        {
-          src: "https://img.b2bpic.net/free-photo/high-fashion-portrait-young-elegant-blonde-woman-black-wool-hat-wearing-oversize-white-fringe-poncho-with-long-grey-dress_273443-3799.jpg?id=11195909",          alt: "Shaving process"},
-        {
-          src: "https://img.b2bpic.net/free-photo/fashion-studio-image-two-young-women-stylish-casual-spring-outfit-having-fun-show-tongue-bright-trendy-colors-stylish-hairstyle-with-buns-cool-sunglasses-friends-portrait_273443-1142.jpg?id=9331369",          alt: "Haircut process"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1779125338765-fdbqo198.jpg",          alt: "Creative content"},
-        {
-          src: "https://img.b2bpic.net/free-photo/three-young-beautiful-smiling-girls-trendy-summer-casual-jeans-clothes-sexy-carefree-women-posing-positive-models-sunglasses_158538-4730.jpg?id=6601657",          alt: "Washing process"},
-        {
-          src: "http://img.b2bpic.net/free-photo/handsome-afro-american-traveler-brown-jacket-hat-with-backpack-stands-studio-isolated-dark-background_613910-6586.jpg",          alt: "Stylish traveler"},
-      ]}
-      marqueeItems={[
-        {
-          type: "text",          text: "PRECISION CUTS"},
-        {
-          type: "text",          text: "LUXURY COLOR"},
-        {
-          type: "text",          text: "EXPERT STYLING"},
-        {
-          type: "text",          text: "PREMIUM BEARD"},
-        {
-          type: "text",          text: "MODERN SALON"},
-      ]}
    />
  </div>

@@ -281,27 +241,33 @@ export default function LandingPage() {

  <div id="footer" data-section="footer">
      <FooterMedia
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg?_wi=1"
      logoText="DOC BARNET"
      columns={[
        {
          title: "Services",          items: [
            {
-              label: "Gents Hair",              href: "#services"},
+              label: "Gents Hair",              href: "/services"},
            {
-              label: "Ladies Cut",              href: "#services"},
+              label: "Ladies Cut",              href: "/services"},
            {
-              label: "Beard Grooming",              href: "#services"},
+              label: "Beard Grooming",              href: "/services"},
          ],
        },
        {
          title: "Company",          items: [
            {
-              label: "About Us",              href: "#about"},
+              label: "About Us",              href: "/#about"},
            {
-              label: "Contact",              href: "#contact"},
+              label: "Contact",              href: "/#contact"},
            {
              label: "Book Now",              href: bookingUrl},
+            {
+              label: "Products",              href: "/products"},
+            {
+              label: "Blog",              href: "/blog"},
+            {
+              label: "Franchise",              href: "/franchise"},
          ],
        },
        {
Author	SHA1	Message	Date
bender	bdc24590a6	Merge version_13 into main Merge version_13 into main	2026-05-28 14:07:31 +00:00
bender	98d9bda710	Update src/app/page.tsx	2026-05-28 14:07:28 +00:00
bender	d3deee0989	Merge version_13 into main Merge version_13 into main	2026-05-28 14:06:36 +00:00
bender	b047fd38e4	Update src/app/page.tsx	2026-05-28 14:06:30 +00:00
bender	a8bec17928	Merge version_13 into main Merge version_13 into main	2026-05-28 14:00:44 +00:00
bender	998c756459	Update src/app/page.tsx	2026-05-28 14:00:41 +00:00
bender	e3a6516ee9	Merge version_12 into main Merge version_12 into main	2026-05-28 13:54:22 +00:00
bender	477c43fd00	Update src/app/franchise/page.tsx	2026-05-28 13:54:19 +00:00
bender	2d1383abb9	Update src/app/blog/page.tsx	2026-05-28 13:54:19 +00:00
bender	4e95b3fe95	Merge version_11 into main Merge version_11 into main	2026-05-28 13:39:15 +00:00
bender	a54ab6dac7	Update src/app/page.tsx	2026-05-28 13:39:12 +00:00
bender	6f305e19cd	Merge version_11 into main Merge version_11 into main	2026-05-28 13:38:34 +00:00
bender	5952db5a3b	Update src/app/page.tsx	2026-05-28 13:38:28 +00:00
bender	ef5cb55f4e	Update src/app/franchise/page.tsx	2026-05-28 13:38:27 +00:00
bender	31ccd59e3a	Update src/app/blog/page.tsx	2026-05-28 13:38:27 +00:00
bender	19cf49451a	Merge version_10 into main Merge version_10 into main	2026-05-28 13:30:12 +00:00
bender	a96af19063	Merge version_10 into main Merge version_10 into main	2026-05-26 18:43:30 +00:00
bender	3aefcb56e9	Merge version_10 into main Merge version_10 into main	2026-05-26 18:43:06 +00:00