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

Compare commits

merge into: bender:version_26
Branches Tags
bender:main bender:version_27 bender:version_26 bender:version_24 bender:version_25 bender:version_23 bender:version_22 bender:version_21 bender:version_20 bender:version_19 bender:version_18 bender:version_17 bender:version_16 bender:version_15 bender:version_14 bender:version_13 bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_27 bender:version_26 bender:version_24 bender:version_25 bender:version_23 bender:version_22 bender:version_21 bender:version_20 bender:version_19 bender:version_18 bender:version_17 bender:version_16 bender:version_15 bender:version_14 bender:version_13 bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

7 Commits
version_26 ... main

Author SHA1 Message Date
bender
5777400e35 Merge version_27 into main 
Merge version_27 into main
 2026-04-18 17:29:18 +00:00
bender
4cb39cab76 Update src/app/page.tsx 2026-04-18 17:29:15 +00:00
bender
1e7657e1ab Merge version_27 into main 
Merge version_27 into main
 2026-04-18 17:28:50 +00:00
bender
730359966f Update src/app/page.tsx 2026-04-18 17:28:44 +00:00
bender
be4e29b5da Update src/app/about/page.tsx 2026-04-18 17:28:43 +00:00
bender
a55a30f79a Switch to version 25: modified src/app/page.tsx 2026-04-18 16:58:30 +00:00
bender
999b961e6d Merge version_26 into main 
Merge version_26 into main
 2026-04-18 16:57:56 +00:00
2 changed files with 8 additions and 8 deletions
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>

14
src/app/page.tsx
View File

@@ -2,13 +2,13 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
import TeamCardFive from '@/components/sections/team/TeamCardFive';
import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function LandingPage() {
return (
@@ -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"
@@ -147,7 +147,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>