bender/b26883c2-6df2-499c-bb35-2aaa426cf0fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_27 into main #38

Merged
bender merged 2 commits from version_27 into main 2026-04-18 17:28:50 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ export default function AboutPage() {
logoText="Lackawanna Barber Shop"
columns={[
{ items: [{ label: "132 Morris St, Morristown, NJ", href: "/contact" }, { label: "+1 (973) 538-1675", href: "tel:+19735381675" }] },
{ items: [{ label: "Services", href: "/#services" }, { label: "Team", href: "/#team" }, { label: "FAQs", href: "/#faq" }] }
{ items: [{ label: "Services", href: "/services" }, { label: "Team", href: "/team" }, { label: "FAQs", href: "/faq" }] }
]}
/>
</div>

10
src/app/page.tsx
View File

@@ -29,10 +29,10 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "About", id: "/about"},
{ name: "Services", id: "#services"},
{ name: "Team", id: "#team"},
{ name: "Testimonials", id: "#testimonials"},
{ name: "FAQ", id: "#faq"},
{ name: "Services", id: "/services"},
{ name: "Team", id: "/team"},
{ name: "Testimonials", id: "/testimonials"},
{ name: "FAQ", id: "/faq"},
{ name: "Contact", id: "/contact"},
]}
brandName="Lackawanna"
@@ -146,7 +146,7 @@ export default function LandingPage() {
logoText="Lackawanna Barber Shop"
columns={[
{ items: [{ label: "132 Morris St, Morristown, NJ", href: "/contact" }, { label: "+1 (973) 538-1675", href: "/contact" }] },
{ items: [{ label: "Services", href: "/#services" }, { label: "Team", href: "/#team" }, { label: "FAQs", href: "/#faq" }] }
{ items: [{ label: "Services", href: "/services" }, { label: "Team", href: "/team" }, { label: "FAQs", href: "/faq" }] }
]}
/>
</div>