Update src/app/page.tsx

Merge version_18 into main

src/app/about/page.tsx

@@ -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?_wi=2"
+                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>
+  );
+}

src/app/page.tsx

@@ -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"},
@@ -51,7 +51,7 @@ export default function LandingPage() {
         { value: "100%", label: "Satisfaction"},
       ]}
       enableKpiAnimation={true}
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CRaO5i0elf1aDIpszoFKWNR31x/uploaded-1776352201800-hefnk77v.jpg"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CRaO5i0elf1aDIpszoFKWNR31x/uploaded-1776352201800-hefnk77v.jpg?_wi=1"
       imageAlt="Lackawanna Barber Shop"
       mediaAnimation="slide-up"
       avatars={[
@@ -71,25 +71,15 @@ 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"
       textboxLayout="default"
       useInvertedBackground={false}
       plans={[
-        { id: "basic", badge: "Classic", price: "$40", subtitle: "Precision Haircut", buttons: [{ text: "Visit Our Shop", href: "#contact" }], features: ["Classic Scissor Cut", "Modern Styling", "Expert Consultation"]},
-        { id: "pro", badge: "Premium", price: "$75", subtitle: "Full Grooming Experience", buttons: [{ text: "Visit Our Shop", href: "#contact" }], features: ["Precision Haircut", "Beard Trim", "Hot Towel Service", "Relaxed Refresh"]},
-        { id: "kids", badge: "Family", price: "$30", subtitle: "Youth Haircut", buttons: [{ text: "Visit Our Shop", href: "#contact" }], features: ["Gentle Scissor Cut", "Fast Friendly Service", "Classic Style"]},
+        { id: "basic", badge: "Classic", price: "$40", subtitle: "Precision Haircut", features: ["Classic Scissor Cut", "Modern Styling", "Expert Consultation"], buttons: [{text: "Book Now", href: "#contact"}]},
+        { id: "pro", badge: "Premium", price: "$75", subtitle: "Full Grooming Experience", features: ["Precision Haircut", "Beard Trim", "Hot Towel Service", "Relaxed Refresh"], buttons: [{text: "Book Now", href: "#contact"}]},
+        { id: "kids", badge: "Family", price: "$30", subtitle: "Youth Haircut", features: ["Gentle Scissor Cut", "Fast Friendly Service", "Classic Style"], buttons: [{text: "Book Now", href: "#contact"}]},
       ]}
       title="Quality Service, Transparent Price"
       description="Simple, honest pricing for the services you need."
@@ -138,9 +128,6 @@ export default function LandingPage() {
           { id: "q1", title: "Do you accept appointments?", content: "We operate primarily as a walk-in shop to maintain that classic, casual vibe." },
           { id: "q2", title: "Is it cash only?", content: "Yes, we are a classic cash-only establishment." },
         ]}
-        buttons={[
-          { text: "Get Directions", href: "#contact" }
-        ]}
         title="Common Questions"
         description="Everything you need to know about our barber shop services."
         faqsAnimation="slide-up"
@@ -166,8 +153,8 @@ export default function LandingPage() {
       <FooterLogoEmphasis
         logoText="Lackawanna Barber Shop"
         columns={[
-          { items: [{ label: "132 Morris St, Morristown, NJ" }, { label: "+1 (973) 538-1675" }] },
-          { items: [{ label: "Services" }, { label: "Team" }, { label: "FAQs" }] }
+          { 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>