Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -2,13 +2,13 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCenter from '@/components/sections/contact/ContactCenter';
+import ContactText from '@/components/sections/contact/ContactText';
 import FeatureCardOne from '@/components/sections/feature/FeatureCardOne';
-import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import HeroBillboardScroll from '@/components/sections/hero/HeroBillboardScroll';
 import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
 import ProductCardThree from '@/components/sections/product/ProductCardThree';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
@@ -23,14 +23,16 @@ export default function LandingPage() {
         contentWidth="compact"
         sizing="largeSmallSizeMediumTitles"
         background="circleGradient"
-        cardStyle="gradient-mesh"
+        cardStyle="glass-elevated"
         primaryButtonStyle="shadow"
-        secondaryButtonStyle="radial-glow"
+        secondaryButtonStyle="glass"
         headingFontWeight="bold"
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleFullscreen
+      <NavbarLayoutFloatingInline
+      logoSrc="http://img.b2bpic.net/free-photo/golden-bar_53876-167086.jpg"
+      brandName="شركة الاحجار الثمينة"
       navItems={[
         {
           name: "الرئيسية",          id: "/"},
@@ -41,7 +43,7 @@ export default function LandingPage() {
         {
           name: "تواصل معنا",          id: "#contact"},
       ]}
-      brandName="شركة الاحجار الثمينة"
+      button={{ text: "تسوق الآن", href: "#products" }}
     />
   </div>
 
@@ -171,21 +173,22 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCenter
+      <ContactText
-      tag="تواصل معنا"
+      text="تواصل معنا في مقرنا بالعامرية - شارع العمل الشعبي" 
-      title="هل لديك استفسار؟"
-      description="نحن هنا لخدمتك. تواصل معنا في مقرنا بالعامرية - شارع العمل الشعبي."
       background={{
         variant: "sparkles-gradient"}}
-      useInvertedBackground={false}
+      useInvertedBackground={true}
+      className="backdrop-blur-sm bg-white/10"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterLogoReveal
+      <FooterBaseReveal
       logoText="شركة الاحجار الثمينة"
-      leftLink={{ text: "الرئيسية", href: "/" }}
+      columns={[
-      rightLink={{ text: "تواصل معنا", href: "#contact" }}
+        { title: "الشركة", items: [{ label: "الرئيسية", href: "/" }, { label: "عن الشركة", href: "#about" }] },
+        { title: "خدماتنا", items: [{ label: "المنتجات", href: "#products" }, { label: "تواصل معنا", href: "#contact" }] }
+      ]}
     />
   </div>
       </ReactLenis>