Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -5,9 +5,9 @@ import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureCardTwentyOne from '@/components/sections/feature/FeatureCardTwentyOne';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import PricingCardEight from '@/components/sections/pricing/PricingCardEight';
 import SplitAbout from '@/components/sections/about/SplitAbout';
 import TestimonialCardSix from '@/components/sections/testimonial/TestimonialCardSix';
@@ -28,18 +28,17 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarLayoutFloatingInline
       navItems={[
-        {
-          name: "Home",          id: "home"},
-        {
-          name: "Services",          id: "services"},
-        {
-          name: "Testimonials",          id: "testimonials"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "home" },
+        { name: "About", id: "about" },
+        { name: "Services", id: "services" },
+        { name: "Pricing", id: "pricing" },
+        { name: "Testimonials", id: "testimonials" },
+        { name: "Contact", id: "contact" },
       ]}
       brandName="Royal 88"
+      button={{ text: "Book Now", href: "#contact" }}
     />
   </div>
 
@@ -189,30 +188,13 @@ export default function LandingPage() {
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterSimple
-      columns={[
-        {
-          title: "Royal 88",          items: [
-            {
-              label: "About Us",              href: "#about"},
-            {
-              label: "Services",              href: "#services"},
-          ],
-        },
-        {
-          title: "Support",          items: [
-            {
-              label: "FAQ",              href: "#faq"},
-            {
-              label: "Contact",              href: "#contact"},
-          ],
-        },
-      ]}
-      bottomLeftText="© 2024 Royal 88 Beauty & Therapy. All rights reserved."
-      bottomRightText="Privacy Policy"
+      <FooterLogoReveal
+      logoText="Royal 88"
+      leftLink={{ text: "Privacy Policy", href: "#" }}
+      rightLink={{ text: "© 2024 Royal 88 Beauty & Therapy", href: "#" }}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}