Merge version_13 into main

Merge version_13 into main

src/app/blog/page.tsx

@@ -8,11 +8,47 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
 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={[
+                    <NavbarLayoutFloatingOverlay navItems={navItems}
-        {
-          name: "Home",          id: "/"},
-        {
-          name: "Services",          id: "/services"},
-        {
-          name: "Prices",          id: "/#pricing"},
-        {
-          name: "Contact",          id: "/#contact"},
-      
-          {
-            name: "Blog",            id: "/blog"},
-          {
-            name: "Franchise",            id: franchisePagePath},
-]}
       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={[
+      columns={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: "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: "#"},
-          ],
-        },
-      ]} />
                     </div>
             </ReactLenis>
         </ThemeProvider>

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={[
+            navItems={navItems}
-                {
-                    name: "Home",                    id: "/"},
-                {
-                    name: "Services",                    id: "/services"},
-                {
-                    name: "Prices",                    id: "/#pricing"},
-                {
-                    name: "Franchise",                    id: "/franchise"},
-                {
-                    name: "Contact",                    id: "/#contact"},
-              
-                    { name: "Blog", id: "/blog" },
-            ]}
             brandName="Doc Barnet Grooming Salon"
             button={{
                 text: "BOOK NOW",                href: bookingUrl}}
@@ -69,42 +93,7 @@ export default function FranchisePage() {
             <FooterMedia
             imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg?_wi=1"
             logoText="DOC BARNET"
-            columns={[
+            columns={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: "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: "#"},
-                    ],
-                },
-            ]}
             />
         </div>
       </ReactLenis>

src/app/page.tsx

@@ -37,15 +37,17 @@ export default function LandingPage() {
           name: "Home",          id: "/"},
         {
           name: "Services",          id: "/services"},
+        {
+          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}}
@@ -57,7 +59,7 @@ export default function LandingPage() {
       background={{
         variant: "gradient-bars"}}
       title="Experience Our Full Range of Premium Grooming Services"
-      description="From precision gents haircuts and elegant ladies styling to expert beard grooming and rejuvenating facial treatments, discover unparalleled quality and care at Doc Barnet Grooming Salon."
+      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},
@@ -260,6 +262,8 @@ export default function LandingPage() {
               label: "Contact",              href: "/#contact"},
             {
               label: "Book Now",              href: bookingUrl},
+            {
+              label: "Products",              href: "/products"},
             {
               label: "Blog",              href: "/blog"},
             {