Merge version_2 into main

Merge version_2 into main

src/app/about/page.tsx

@@ -0,0 +1,93 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import ContactCenter from '@/components/sections/contact/ContactCenter';
+import FaqBase from '@/components/sections/faq/FaqBase';
+import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNineteen';
+import FooterMedia from '@/components/sections/footer/FooterMedia';
+import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
+import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import ProductCardThree from '@/components/sections/product/ProductCardThree';
+import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
+import TestimonialCardTwelve from '@/components/sections/testimonial/TestimonialCardTwelve';
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="expand-hover"
+      defaultTextAnimation="reveal-blur"
+      borderRadius="pill"
+      contentWidth="smallMedium"
+      sizing="largeSmallSizeMediumTitles"
+      background="circleGradient"
+      cardStyle="gradient-bordered"
+      primaryButtonStyle="flat"
+      secondaryButtonStyle="solid"
+      headingFontWeight="bold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "About", id: "/about" },
+              { name: "Collection", id: "#products" },
+              { name: "Testimonials", id: "#testimonials" },
+              { name: "FAQ", id: "#faq" },
+              { name: "Contact", id: "#contact" }
+            ]}
+            brandName="Star One Smoke Shop"
+          />
+        </div>
+
+        <div id="about-content" data-section="about-content">
+          <InlineImageSplitTextAbout
+            useInvertedBackground={false}
+            heading={[
+              { type: "text", content: "About Star One Smoke Shop" }
+            ]}
+            description="At Star One Smoke Shop, we believe in elevating the ritual. We are dedicated to providing discerning connoisseurs with an unparalleled selection of premium smoking accessories, rare tobacco blends, and expert guidance. Our passion lies in the craftsmanship, quality, and timeless elegance of every product we offer. Founded on principles of integrity and excellence, Star One is more than a shop – it’s a destination where tradition meets sophistication. Join us in celebrating the finer aspects of life."
+            buttons={[
+              { text: "Contact Us", href: "#contact" }
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterMedia
+            imageSrc="http://img.b2bpic.net/free-photo/man-smoke-electronic-cigarette-vape-shop-vape-bar_639032-325.jpg"
+            imageAlt="Elegant smoke shop interior at night"
+            logoText="STAR ONE"
+            columns={[
+              {
+                title: "Company",                items: [
+                  { label: "About Us", href: "/about" },
+                  { label: "Our Philosophy", href: "/about" },
+                  { label: "Careers", href: "#" }
+                ]
+              },
+              {
+                title: "Products",                items: [
+                  { label: "Cigars", href: "#products" },
+                  { label: "Pipes", href: "#products" },
+                  { label: "Accessories", href: "#products" },
+                  { label: "Rare Blends", href: "#products" }
+                ]
+              },
+              {
+                title: "Support",                items: [
+                  { label: "FAQ", href: "#faq" },
+                  { label: "Contact Us", href: "#contact" },
+                  { label: "Store Location", href: "#contact" }
+                ]
+              }
+            ]}
+            copyrightText="© 2024 Star One Smoke Shop. All rights reserved."
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -32,9 +32,9 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",          id: "#hero"},
+          name: "Home",          id: "/"},
         {
-          name: "About",          id: "#about"},
+          name: "About",          id: "/about"},
         {
           name: "Collection",          id: "#products"},
         {
@@ -83,7 +83,7 @@ export default function LandingPage() {
       ]}
       buttons={[
         {
-          text: "Learn More",          href: "#faq"},
+          text: "Learn More",          href: "/about"},
       ]}
     />
   </div>
@@ -205,9 +205,9 @@ export default function LandingPage() {
         {
           title: "Company",          items: [
             {
-              label: "About Us",              href: "#about"},
+              label: "About Us",              href: "/about"},
             {
-              label: "Our Philosophy",              href: "#about"},
+              label: "Our Philosophy",              href: "/about"},
             {
               label: "Careers",              href: "#"},
           ],