Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -5,14 +5,13 @@ import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
-import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
+import FooterSimple from '@/components/sections/footer/FooterSimple';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import PricingCardThree from '@/components/sections/pricing/PricingCardThree';
 import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
-import TextAbout from '@/components/sections/about/TextAbout';
 import FeatureCardTwentyThree from '@/components/sections/feature/FeatureCardTwentyThree';
 import TestimonialCardOne from '@/components/sections/testimonial/TestimonialCardOne';
 import { Award, Cog, Flashlight, Headphones, Layers, MessageCircle, Package, Sparkles } from "lucide-react";
@@ -36,29 +35,29 @@ export default function LandingPage() {
       <NavbarStyleApple
       navItems={[
         {
-          name: "Home",          id: "#home"},
+          name: "Home",          id: "/"},
         {
-          name: "About",          id: "#about"},
+          name: "About Us",          id: "/about-us"},
         {
-          name: "Why Choose Us",          id: "#why-choose-us"},
+          name: "Why Choose Us",          id: "/#why-choose-us"},
         {
-          name: "Services",          id: "#services"},
+          name: "Services",          id: "/#services"},
         {
-          name: "Products",          id: "#products"},
+          name: "Products",          id: "/#products"},
         {
-          name: "Pricing",          id: "#pricing"},
+          name: "Pricing",          id: "/#pricing"},
         {
-          name: "Client Stories",          id: "#testimonials"},
+          name: "Client Stories",          id: "/#testimonials"},
         {
-          name: "Customer Reviews",          id: "#customer-reviews"},
+          name: "Customer Reviews",          id: "/#customer-reviews"},
         {
-          name: "Our Partners",          id: "#social-proof"},
+          name: "Our Partners",          id: "/#social-proof"},
         {
-          name: "Brands We Carry",          id: "#our-new-partners"},
+          name: "Brands We Carry",          id: "/#our-new-partners"},
         {
-          name: "FAQ",          id: "#faq"},
+          name: "FAQ",          id: "/#faq"},
         {
-          name: "Contact",          id: "#contact"},
+          name: "Contact",          id: "/#contact"},
       ]}
       brandName="Sanimart Sdn Bhd"
     />
@@ -72,9 +71,9 @@ export default function LandingPage() {
       description="Sanimart Sdn Bhd is your trusted partner for premium bathroom supplies and expert installation services in Ipoh, Perak. Elevate your space with quality and style."
       buttons={[
         {
-          text: "Explore Products",          href: "#products"},
+          text: "Explore Products",          href: "/#products"},
         {
-          text: "Get a Quote",          href: "#contact"},
+          text: "Get a Quote",          href: "/#contact"},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/view-small-bathroom-interior-with-modern-style-furniture-decor_23-2150864598.jpg?_wi=1"
       imageAlt="Luxurious modern bathroom interior"
@@ -107,19 +106,6 @@ export default function LandingPage() {
     />
   </div>
 
-  <div id="about" data-section="about">
-      <TextAbout
-      useInvertedBackground={false}
-      tag="About Sanimart"
-      title="Trusted for Quality Bathroom Solutions Since 2005"
-      buttons={[
-        {
-          text: "Our Story",          href: "#about"},
-        {
-          text: "See Our Work",          href: "#products"},
-      ]}
-    />
-  </div>
 
   <div id="why-choose-us" data-section="why-choose-us">
       <FeatureCardTwentyThree
@@ -228,7 +214,7 @@ export default function LandingPage() {
             "Single WC / Basin Installation",            "Standard Fixture Setup",            "1-Month Workmanship Warranty"],
           buttons: [
             {
-              text: "Select Basic",              href: "#contact"},
+              text: "Select Basic",              href: "/#contact"},
           ],
         },
         {
@@ -237,7 +223,7 @@ export default function LandingPage() {
             "WC + Basin + Shower System Installation",            "Complex Fixture Setup",            "3-Month Workmanship Warranty",            "Post-Installation Check-up"],
           buttons: [
             {
-              text: "Select Premium",              href: "#contact"},
+              text: "Select Premium",              href: "/#contact"},
           ],
         },
         {
@@ -246,7 +232,7 @@ export default function LandingPage() {
             "Full Bathroom Renovation",            "Integrated Design Solutions",            "Extended Warranty Options",            "Personalized Consultation"],
           buttons: [
             {
-              text: "Request Quote",              href: "#contact"},
+              text: "Request Quote",              href: "/#contact"},
           ],
         },
       ]}
@@ -355,31 +341,30 @@ export default function LandingPage() {
         {
           text: "Call Us Now",          href: "tel:0125061800"},
         {
-          text: "Get a Free Quote",          href: "#"},
+          text: "Get a Free Quote",          href: "/#contact"},
       ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBaseReveal
-      logoText="Sanimart Sdn Bhd"
+      <FooterSimple
       columns={[
         {
           title: "Company",          items: [
             {
-              label: "About Us",              href: "#about"},
+              label: "About Us",              href: "/about-us"},
             {
-              label: "Our Services",              href: "#services"},
+              label: "Our Services",              href: "/#services"},
             {
-              label: "Our Products",              href: "#products"},
+              label: "Our Products",              href: "/#products"},
           ],
         },
         {
           title: "Support",          items: [
             {
-              label: "FAQ",              href: "#faq"},
+              label: "FAQ",              href: "/#faq"},
             {
-              label: "Contact",              href: "#contact"},
+              label: "Contact",              href: "/#contact"},
           ],
         },
         {
@@ -391,10 +376,11 @@ export default function LandingPage() {
           ],
         },
       ]}
-      copyrightText="© 2024 Sanimart Sdn Bhd. All rights reserved."
+      bottomLeftText="Sanimart Sdn Bhd"
+      bottomRightText="© 2024 Sanimart Sdn Bhd. All rights reserved."
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}