Merge version_4 into main

Merge version_4 into main

src/app/page.tsx

@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactText from '@/components/sections/contact/ContactText';
+import ContactSplit from '@/components/sections/contact/ContactSplit';
 import FaqDouble from '@/components/sections/faq/FaqDouble';
 import FeatureBento from '@/components/sections/feature/FeatureBento';
-import FooterSimple from '@/components/sections/footer/FooterSimple';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
 import HeroBillboard from '@/components/sections/hero/HeroBillboard';
 import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
@@ -104,12 +104,12 @@ export default function LandingPage() {
       gridVariant="four-items-2x2-equal-grid"
       useInvertedBackground={true}
       products={[
-        { id: "1", name: "Premium Series 01", price: "499 kr", imageSrc: "http://img.b2bpic.net/free-photo/luxury-perfume-fragrance-bottle_116380-80.jpg" },
+        { id: "1", name: "Premium Series 01", price: "499 kr", imageSrc: "http://img.b2bpic.net/free-photo/luxury-perfume-fragrance-bottle_116380-80.jpg", priceButtonProps: { text: "Köp nu" } },
-        { id: "2", name: "Premium Series 02", price: "499 kr", imageSrc: "http://img.b2bpic.net/free-photo/front-view-natural-self-care-products-assortment_23-2148980974.jpg" },
+        { id: "2", name: "Premium Series 02", price: "499 kr", imageSrc: "http://img.b2bpic.net/free-photo/front-view-natural-self-care-products-assortment_23-2148980974.jpg", priceButtonProps: { text: "Köp nu" } },
-        { id: "3", name: "Special Series A", price: "699 kr", imageSrc: "http://img.b2bpic.net/free-photo/close-up-perfume-floating-water_23-2150963110.jpg" },
+        { id: "3", name: "Special Series A", price: "699 kr", imageSrc: "http://img.b2bpic.net/free-photo/close-up-perfume-floating-water_23-2150963110.jpg", priceButtonProps: { text: "Köp nu" } },
-        { id: "4", name: "Special Series B", price: "699 kr", imageSrc: "http://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890514.jpg" },
+        { id: "4", name: "Special Series B", price: "699 kr", imageSrc: "http://img.b2bpic.net/free-photo/perfume-bottle-nature_23-2151890514.jpg", priceButtonProps: { text: "Köp nu" } },
-        { id: "5", name: "Niche Series Gold", price: "899 kr", imageSrc: "http://img.b2bpic.net/free-photo/bouquet-snowdrops-glass-vase-blurred-background_169016-51100.jpg" },
+        { id: "5", name: "Niche Series Gold", price: "899 kr", imageSrc: "http://img.b2bpic.net/free-photo/bouquet-snowdrops-glass-vase-blurred-background_169016-51100.jpg", priceButtonProps: { text: "Köp nu" } },
-        { id: "6", name: "Niche Series Silver", price: "899 kr", imageSrc: "http://img.b2bpic.net/free-photo/japanese-bottle-cups_23-2149869744.jpg" },
+        { id: "6", name: "Niche Series Silver", price: "899 kr", imageSrc: "http://img.b2bpic.net/free-photo/japanese-bottle-cups_23-2149869744.jpg", priceButtonProps: { text: "Köp nu" } },
       ]}
       title="Vår Kollektion"
       description="Från Premium-serien till våra nischade favoriter."
@@ -169,22 +169,22 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactText
+      <ContactSplit
-      useInvertedBackground={true}
+      tag="Kontakt"
+      title="Välkommen till D&P"
+      description="Låt oss guida dig till din nya favoritdoft. Skicka ett meddelande så hör vi av oss."
       background={{ variant: "plain" }}
-      text="Redo att hitta din signaturdoft? Kontakta oss för personlig doftrådgivning."
+      useInvertedBackground={false}
-      buttons={[{ text: "Skicka mejl", href: "mailto:info@dpfragrances.com" }]}
+      inputPlaceholder="Ange din e-post"
+      buttonText="Skicka förfrågan"
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterSimple
+      <FooterLogoReveal
-      columns={[
+      logoText="D&P Perfume"
-        { title: "D&P Perfume", items: [{ label: "Om oss", href: "#about" }, { label: "Kollektion", href: "#products" }] },
+      leftLink={{ text: "Om oss", href: "#about" }}
-        { title: "Kundservice", items: [{ label: "Kontakta oss", href: "#contact" }, { label: "Vanliga frågor", href: "#faq" }] },
+      rightLink={{ text: "Kontakt", href: "#contact" }}
-      ]}
-      bottomLeftText="© 1999-2024 D&P Perfume. Alla rättigheter reserverade."
-      bottomRightText="Integritetspolicy"
     />
   </div>
       </ReactLenis>