Update src/app/page.tsx

Merge version_2 into main

src/app/page.tsx

@@ -3,17 +3,17 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import AboutMetric from '@/components/sections/about/AboutMetric';
-import ContactCenter from '@/components/sections/contact/ContactCenter';
-import FaqDouble from '@/components/sections/faq/FaqDouble';
+import ContactText from '@/components/sections/contact/ContactText';
+import FaqBase from '@/components/sections/faq/FaqBase';
 import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNineteen';
-import FooterCard from '@/components/sections/footer/FooterCard';
+import FooterBase from '@/components/sections/footer/FooterBase';
 import HeroLogoBillboard from '@/components/sections/hero/HeroLogoBillboard';
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
 import PricingCardFive from '@/components/sections/pricing/PricingCardFive';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import TeamCardFive from '@/components/sections/team/TeamCardFive';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
-import { CheckCircle, Instagram, MessageCircle, Sparkles, Star, TrendingUp, Twitter, Users, Zap } from "lucide-react";
+import { CheckCircle, Sparkles, Star, TrendingUp, Users, Zap } from "lucide-react";
 
 export default function LandingPage() {
   return (
@@ -217,7 +217,7 @@ export default function LandingPage() {
   </div>
 
   <div id="faq" data-section="faq">
-      <FaqDouble
+      <FaqBase
       textboxLayout="default"
       useInvertedBackground={true}
       faqs={[
@@ -237,38 +237,50 @@ export default function LandingPage() {
       title="Često Postavljana Pitanja"
       description="Pronađite odgovore na najčešća pitanja o našim proizvodima i uslugama."
       faqsAnimation="slide-up"
+      showCard={true}
     />
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCenter
+      <ContactText
       useInvertedBackground={false}
       background={{
         variant: "plain"}}
-      tag="Kontakt"
-      title="Imate Pitanja? Javite Nam Se!"
-      description="Popunite formu ispod i naš tim će vam se javiti u najkraćem mogućem roku. Stojimo vam na raspolaganju za sve upite."
-      tagAnimation="slide-up"
-      inputPlaceholder="Vaša email adresa"
-      buttonText="Pošalji Upit"
-      termsText="Klikom na 'Pošalji Upit' potvrđujete da se slažete sa našim Uslovima Korišćenja."
+      text="Imate Pitanja? Javite Nam Se! Popunite formu ispod i naš tim će vam se javiti u najkraćem mogućem roku. Stojimo vam na raspolaganju za sve upite."
+      animationType="entrance-slide"
+      buttons={[
+        {
+          text: "Pošalji Upit",          href: "mailto:info@ixegvimpi.com"
+        }
+      ]}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterCard
+      <FooterBase
       logoText="IXE & Gvimpi Resale"
       copyrightText="© 2024 IXE & Gvimpi Resale. Sva prava zadržana."
-      socialLinks={[
+      columns={[
         {
-          icon: Twitter,
-          href: "#",          ariaLabel: "Posetite naš Twitter profil"},
+          title: "Kompanija",          items: [
+            { label: "Početna", href: "#hero" },
+            { label: "O Nama", href: "#about" },
+            { label: "Kontakt", href: "#contact" }
+          ]
+        },
         {
-          icon: MessageCircle,
-          href: "#",          ariaLabel: "Pridružite se našem Discord serveru"},
+          title: "Ponuda",          items: [
+            { label: "Naša Ponuda", href: "#features" },
+            { label: "Proizvodi", href: "#products" },
+            { label: "Cene", href: "#pricing" }
+          ]
+        },
         {
-          icon: Instagram,
-          href: "#",          ariaLabel: "Posetite naš Instagram profil"},
+          title: "Pravno",          items: [
+            { label: "Politika Privatnosti", href: "#" },
+            { label: "Uslovi Korišćenja", href: "#" }
+          ]
+        }
       ]}
     />
   </div>