bender/5c90a7bd-e770-42d0-9e34-13f070bf8cd1
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_10 into main #27

Merged
bender merged 2 commits from version_10 into main 2026-05-26 18:43:06 +00:00
Conversation 0 Commits 2 Files Changed 2 +21 -15
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/blog/page.tsx
View File

@@ -7,8 +7,8 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FooterMedia from '@/components/sections/footer/FooterMedia';
const bookingUrl = "/contact";
const franchisePagePath = "/franchise-doc-barnet-grooming-salon";
const bookingUrl = "https://tinyurl.com/2kr8jy37";
const franchisePagePath = "/franchise";
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -31,7 +31,7 @@ export default function BlogPage() {
{
name: "Home", id: "/"},
{
name: "Services", id: "/#services"},
name: "Services", id: "/services"},
{
name: "Prices", id: "/#pricing"},
{
@@ -73,11 +73,11 @@ export default function BlogPage() {
{
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"},
],
},
{
@@ -88,6 +88,8 @@ export default function BlogPage() {
label: "Contact", href: "/#contact"},
{
label: "Book Now", href: bookingUrl},
{
label: "Blog", href: "/blog"},
{
label: "Franchise", href: franchisePagePath},
],

22
src/app/franchise/page.tsx
View File

@@ -27,15 +27,15 @@ export default function FranchisePage() {
<NavbarLayoutFloatingOverlay
navItems={[
{
name: "Home", id: "hero"},
name: "Home", id: "/"},
{
name: "Services", id: "services"},
name: "Services", id: "/services"},
{
name: "Prices", id: "pricing"},
name: "Prices", id: "/#pricing"},
{
name: "Franchise", id: "/franchise"},
{
name: "Contact", id: "contact"},
name: "Contact", id: "/#contact"},
{ name: "Blog", id: "/blog" },
]}
@@ -73,21 +73,25 @@ export default function FranchisePage() {
{
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: "Blog", href: "/blog"},
{
label: "Franchise", href: "/franchise"},
],
},
{