Merge version_18 into main #24

Merged
bender merged 2 commits from version_18 into main 2026-04-16 17:00:52 +00:00
2 changed files with 69 additions and 12 deletions

67
src/app/about/page.tsx Normal file
View File

@@ -0,0 +1,67 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import SplitAbout from '@/components/sections/about/SplitAbout';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function AboutPage() {
return (
<ThemeProvider
defaultButtonVariant="expand-hover"
defaultTextAnimation="background-highlight"
borderRadius="soft"
contentWidth="mediumSmall"
sizing="mediumLargeSizeMediumTitles"
background="blurBottom"
cardStyle="soft-shadow"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "About", id: "/about"},
{ name: "Services", id: "services"},
{ name: "Team", id: "team"},
{ name: "Testimonials", id: "testimonials"},
{ name: "FAQ", id: "faq"},
{ name: "Contact", id: "contact"},
]}
brandName="Lackawanna"
/>
</div>
<div id="about-content" className="pt-32 pb-24">
<SplitAbout
title="About Lackawanna Barber Shop"
description="At Lackawanna, we are dedicated to preserving the art of traditional barbering while serving the modern man. With over two decades of experience, our commitment to quality, community, and precision cuts has made us a cornerstone of Morristown."
textboxLayout="default"
useInvertedBackground={false}
bulletPoints={[
{ title: "Expert Precision", description: "Master barbers trained in both classic and contemporary styles." },
{ title: "Classic Atmosphere", description: "A warm, welcoming environment that honors the traditional barbershop experience." },
{ title: "Community Focused", description: "Proudly serving the Morristown area for over 20 years." }
]}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CRaO5i0elf1aDIpszoFKWNR31x/uploaded-1776352201800-hefnk77v.jpg"
imageAlt="Lackawanna Barber Shop Interior"
mediaAnimation="slide-up"
/>
</div>
<div id="footer">
<FooterLogoEmphasis
logoText="Lackawanna Barber Shop"
columns={[
{ items: [{ label: "132 Morris St, Morristown, NJ", href: "#contact" }, { label: "+1 (973) 538-1675" }] },
{ items: [{ label: "Services", href: "#services" }, { label: "Team", href: "#team" }, { label: "FAQs", href: "#faq" }] }
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}

View File

@@ -29,7 +29,7 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "About", id: "about"},
{ name: "About", id: "/about"},
{ name: "Services", id: "services"},
{ name: "Team", id: "team"},
{ name: "Testimonials", id: "testimonials"},
@@ -72,16 +72,6 @@ export default function LandingPage() {
/>
</div>
<div id="about" data-section="about" className="py-24 bg-background">
<div className="container mx-auto px-4">
<h2 className="text-3xl font-bold mb-12 text-center">Shop Contact Information</h2>
<div className="text-center py-10">
<p className="text-lg font-medium">Location: Morristown, NJ</p>
<p className="text-lg font-medium">Phone: +1 (973) 538-1675</p>
</div>
</div>
</div>
<div id="services" data-section="services">
<PricingCardEight
animationType="slide-up"
@@ -175,4 +165,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}