Merge version_6_1782128709285 into main

Merge version_6_1782128709285 into main

src/components/Layout.tsx

@@ -1,11 +1,14 @@
 import FooterSimpleCard from '@/components/sections/footer/FooterSimpleCard';
-import NavbarFloatingLogo from '@/components/ui/NavbarFloatingLogo';
 import SectionErrorBoundary from "@/components/ui/SectionErrorBoundary";
 import SiteBackgroundSlot from "@/components/ui/SiteBackgroundSlot";
 import { Outlet } from 'react-router-dom';
 import { StyleProvider } from "@/components/ui/StyleProvider";
+import { useState, useEffect } from 'react';
+import { motion } from 'motion/react';
 
 export default function Layout() {
+  const [activeTab, setActiveTab] = useState("hero");
+
   const navItems = [
   {
     "name": "Home",
@@ -41,18 +44,67 @@ export default function Layout() {
   }
 ];
 
+  useEffect(() => {
+    const handleScroll = () => {
+      const sections = navItems.map(item => item.href.slice(1));
+      let current = "hero";
+      for (const section of sections) {
+        const el = document.getElementById(section);
+        if (el && window.scrollY >= el.offsetTop - 200) {
+          current = section;
+        }
+      }
+      setActiveTab(current);
+    };
+    window.addEventListener("scroll", handleScroll);
+    return () => window.removeEventListener("scroll", handleScroll);
+  }, []);
+
   return (
-    <StyleProvider buttonVariant="default" siteBackground="gridDots" heroBackground="gradientBars">
+    <StyleProvider buttonVariant="default" siteBackground="none" heroBackground="none">
       <SiteBackgroundSlot />
       <SectionErrorBoundary name="navbar">
-        <NavbarFloatingLogo
-      logo="Fourieearthworks"
-      logoImageSrc="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782127565329-9f81y6uc.png"
-      ctaButton={{
-        text: "Get Quote",
-        href: "#contact",
-      }}
-     navItems={navItems} />
+        <div className="fixed top-6 left-1/2 -translate-x-1/2 z-50 hidden md:flex items-center gap-2 p-1.5 card rounded-full shadow-lg">
+          <img src="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782127565329-9f81y6uc.png" alt="Logo" className="h-8 w-8 rounded-full object-cover ml-2" />
+          <div className="flex items-center gap-1">
+            {navItems.map(item => (
+              <button
+                key={item.name}
+                onClick={() => {
+                  setActiveTab(item.href.slice(1));
+                  document.getElementById(item.href.slice(1))?.scrollIntoView({ behavior: 'smooth' });
+                }}
+                className={`relative px-4 py-2 text-sm font-medium rounded-full transition-colors ${activeTab === item.href.slice(1) ? 'text-primary-cta-text' : 'text-foreground hover:text-accent'}`}
+              >
+                {activeTab === item.href.slice(1) && (
+                  <motion.div layoutId="nav-tab" className="absolute inset-0 bg-primary-cta rounded-full -z-10" />
+                )}
+                {item.name}
+              </button>
+            ))}
+          </div>
+        </div>
+        
+        <div className="fixed top-4 left-4 right-4 z-50 md:hidden flex items-center p-2 card rounded-2xl shadow-lg overflow-x-auto">
+          <img src="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782127565329-9f81y6uc.png" alt="Logo" className="h-8 w-8 rounded-full object-cover shrink-0 mr-4 ml-1" />
+          <div className="flex items-center gap-1 shrink-0">
+            {navItems.map(item => (
+              <button
+                key={item.name}
+                onClick={() => {
+                  setActiveTab(item.href.slice(1));
+                  document.getElementById(item.href.slice(1))?.scrollIntoView({ behavior: 'smooth' });
+                }}
+                className={`relative px-3 py-1.5 text-xs font-medium rounded-full transition-colors whitespace-nowrap ${activeTab === item.href.slice(1) ? 'text-primary-cta-text' : 'text-foreground'}`}
+              >
+                {activeTab === item.href.slice(1) && (
+                  <motion.div layoutId="nav-tab-mobile" className="absolute inset-0 bg-primary-cta rounded-full -z-10" />
+                )}
+                {item.name}
+              </button>
+            ))}
+          </div>
+        </div>
       </SectionErrorBoundary>
       <main className="flex-grow">
         <Outlet />

src/pages/HomePage.tsx

@@ -14,18 +14,35 @@ import FaqSection from './HomePage/sections/Faq';
 import ContactSection from './HomePage/sections/Contact';
 
 
-import PricingSection from './HomePage/sections/Pricing';export default function HomePage(): React.JSX.Element {
+import PricingSection from './HomePage/sections/Pricing';
+
+const SectionBg = ({ children, src }: { children: React.ReactNode, src: string }) => (
+  <div className="relative bg-cover bg-center" style={{ backgroundImage: `url('${src}')` }}>
+    <div className="absolute inset-0 bg-background/80"></div>
+    <div className="relative z-10 [&>section]:!bg-transparent [&>div]:!bg-transparent">
+      {children}
+    </div>
+  </div>
+);
+
+export default function HomePage(): React.JSX.Element {
   return (
 <>
-  <HeroSection />
+  <SectionBg src="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782128289234-2l64vswo.jpg">
+    <HeroSection />
+  </SectionBg>
 
   <AboutSection />
 
-  <FeaturesSection />
+  <SectionBg src="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782128289235-iu181g1w.jpg">
+    <FeaturesSection />
+  </SectionBg>
 
   <ProductSection />
 
-  <MetricsSection />
+  <SectionBg src="https://storage.googleapis.com/webild/users/user_3FUQa0ZWeM3nmyILoJWMMWG8CWg/uploaded-1782128289235-56h4behn.jpg">
+    <MetricsSection />
+  </SectionBg>
       <PricingSection />
 
   <TestimonialsSection />