Merge version_2 into main

Merge version_2 into main

src/app/page.tsx

@@ -2,10 +2,10 @@
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import ContactCTA from '@/components/sections/contact/ContactCTA';
+import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FaqSplitText from '@/components/sections/faq/FaqSplitText';
 import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
-import FooterBase from '@/components/sections/footer/FooterBase';
+import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
 import HeroLogo from '@/components/sections/hero/HeroLogo';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
 import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
@@ -32,25 +32,15 @@ export default function LandingPage() {
       <NavbarStyleCentered
       navItems={[
         {
-          name: "Bosh Sahifa",
-          id: "hero",
-        },
+          name: "Bosh Sahifa",          id: "hero"},
         {
-          name: "Tarix",
-          id: "about",
-        },
+          name: "Tarix",          id: "about"},
         {
-          name: "Topilmalar",
-          id: "features",
-        },
+          name: "Topilmalar",          id: "features"},
         {
-          name: "Jamoa",
-          id: "team",
-        },
+          name: "Jamoa",          id: "team"},
         {
-          name: "Aloqa",
-          id: "contact",
-        },
+          name: "Aloqa",          id: "contact"},
       ]}
       brandName="ArxeoO'zbek"
     />
@@ -62,9 +52,7 @@ export default function LandingPage() {
       description="O'zbekistonning boy tarixiy va madaniy merosini arxeologik tadqiqotlar orqali qayta kashf etamiz."
       buttons={[
         {
-          text: "Qazishmalarni ko'rish",
-          href: "#features",
-        },
+          text: "Qazishmalarni ko'rish",          href: "#features"},
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/high-angle-shot-rock-surface-with-beautiful-scenery-sunset-clear-blue-sky_181624-21866.jpg"
     />
@@ -84,26 +72,11 @@ export default function LandingPage() {
       useInvertedBackground={true}
       features={[
         {
-          id: "f1",
-          title: "Hududiy tadqiqotlar",
-          description: "Qadimiy turar joylarni o'rganish.",
-          tag: "Tahlil",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-flipping-pages-notebook_23-2147844836.jpg",
-        },
+          id: "f1",          title: "Hududiy tadqiqotlar",          description: "Qadimiy turar joylarni o'rganish.",          tag: "Tahlil",          imageSrc: "http://img.b2bpic.net/free-photo/man-flipping-pages-notebook_23-2147844836.jpg"},
         {
-          id: "f2",
-          title: "Artefaktlar xazinasi",
-          description: "Topilgan nodir oltin va bronza buyumlar.",
-          tag: "Topilma",
-          imageSrc: "http://img.b2bpic.net/free-photo/neolithic-period-elements_23-2151786571.jpg",
-        },
+          id: "f2",          title: "Artefaktlar xazinasi",          description: "Topilgan nodir oltin va bronza buyumlar.",          tag: "Topilma",          imageSrc: "http://img.b2bpic.net/free-photo/neolithic-period-elements_23-2151786571.jpg"},
         {
-          id: "f3",
-          title: "Kulolchilik san'ati",
-          description: "Qadimgi sopol buyumlar ustida tadqiqot.",
-          tag: "San'at",
-          imageSrc: "http://img.b2bpic.net/free-photo/sandcastle-warm-beach_53876-31338.jpg",
-        },
+          id: "f3",          title: "Kulolchilik san'ati",          description: "Qadimgi sopol buyumlar ustida tadqiqot.",          tag: "San'at",          imageSrc: "http://img.b2bpic.net/free-photo/sandcastle-warm-beach_53876-31338.jpg"},
       ]}
       title="Tadqiqot yo'nalishlari"
       description="Biz amalga oshirayotgan asosiy arxeologik qazishmalar va tahlillar."
@@ -117,20 +90,11 @@ export default function LandingPage() {
       tag="Yutuqlarimiz"
       metrics={[
         {
-          id: "m1",
-          value: "150+",
-          description: "Topilgan artefaktlar",
-        },
+          id: "m1",          value: "150+",          description: "Topilgan artefaktlar"},
         {
-          id: "m2",
-          value: "20+",
-          description: "Yillik qazishmalar",
-        },
+          id: "m2",          value: "20+",          description: "Yillik qazishmalar"},
         {
-          id: "m3",
-          value: "5000+",
-          description: "O'rganilgan hududlar",
-        },
+          id: "m3",          value: "5000+",          description: "O'rganilgan hududlar"},
       ]}
       metricsAnimation="slide-up"
     />
@@ -144,33 +108,13 @@ export default function LandingPage() {
       useInvertedBackground={true}
       members={[
         {
-          id: "t1",
-          name: "Ahror Ahmedov",
-          role: "Bosh Arxeolog",
-          description: "30 yillik tajribaga ega ekspert.",
-          imageSrc: "http://img.b2bpic.net/free-photo/headshot-attractive-scientist-with-stubble-standing-outdoors-rocks-while-conducting-scientific-study-field-work-nature-park_273609-6418.jpg",
-        },
+          id: "t1",          name: "Ahror Ahmedov",          role: "Bosh Arxeolog",          description: "30 yillik tajribaga ega ekspert.",          imageSrc: "http://img.b2bpic.net/free-photo/headshot-attractive-scientist-with-stubble-standing-outdoors-rocks-while-conducting-scientific-study-field-work-nature-park_273609-6418.jpg"},
         {
-          id: "t2",
-          name: "Laylo Karimova",
-          role: "Laboratoriya rahbari",
-          description: "Artefaktlarni ta'mirlash bo'yicha mutaxassis.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-taking-photos_23-2148228548.jpg",
-        },
+          id: "t2",          name: "Laylo Karimova",          role: "Laboratoriya rahbari",          description: "Artefaktlarni ta'mirlash bo'yicha mutaxassis.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-man-taking-photos_23-2148228548.jpg"},
         {
-          id: "t3",
-          name: "Sardor Yusupov",
-          role: "Daladagi tadqiqotchi",
-          description: "Yangi hududlarni topish bo'yicha mas'ul.",
-          imageSrc: "http://img.b2bpic.net/free-photo/cheerful-teenage-girl-straw-hat-holding-corn-hands-while-happily-looking-camera-picnic-city-park_574295-1213.jpg",
-        },
+          id: "t3",          name: "Sardor Yusupov",          role: "Daladagi tadqiqotchi",          description: "Yangi hududlarni topish bo'yicha mas'ul.",          imageSrc: "http://img.b2bpic.net/free-photo/cheerful-teenage-girl-straw-hat-holding-corn-hands-while-happily-looking-camera-picnic-city-park_574295-1213.jpg"},
         {
-          id: "t4",
-          name: "Dilshod O'rinov",
-          role: "Tarixshunos",
-          description: "Qadimgi matnlarni tarjima qiladi.",
-          imageSrc: "http://img.b2bpic.net/free-photo/man-with-binocular-map-standing-landscape_107420-9783.jpg",
-        },
+          id: "t4",          name: "Dilshod O'rinov",          role: "Tarixshunos",          description: "Qadimgi matnlarni tarjima qiladi.",          imageSrc: "http://img.b2bpic.net/free-photo/man-with-binocular-map-standing-landscape_107420-9783.jpg"},
       ]}
       title="Bizning Arxeologlar Jamoasi"
       description="Tajribali olimlar va yosh tadqiqotchilar."
@@ -185,45 +129,20 @@ export default function LandingPage() {
       useInvertedBackground={false}
       testimonials={[
         {
-          id: "1",
-          name: "Aziza Karimova",
-          role: "Muzey xodimi",
-          company: "Davlat muzeyi",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-people-clay-sculpting_23-2149730863.jpg",
-        },
+          id: "1",          name: "Aziza Karimova",          role: "Muzey xodimi",          company: "Davlat muzeyi",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-people-clay-sculpting_23-2149730863.jpg"},
         {
-          id: "2",
-          name: "Bekzod Umarov",
-          role: "Talaba",
-          company: "Tarix fakulteti",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/front-view-male-student-holding-yellow-backpack-copybook-smiling-blue-wall_140725-46591.jpg",
-        },
+          id: "2",          name: "Bekzod Umarov",          role: "Talaba",          company: "Tarix fakulteti",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/front-view-male-student-holding-yellow-backpack-copybook-smiling-blue-wall_140725-46591.jpg"},
         {
-          id: "3",
-          name: "Guli Saidova",
-          role: "Kurator",
-          company: "Madaniy meros",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-adult-woman-reading-her-notes-holding-notebook-smiling-relaxing-home_1258-199901.jpg",
-        },
+          id: "3",          name: "Guli Saidova",          role: "Kurator",          company: "Madaniy meros",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/portrait-young-adult-woman-reading-her-notes-holding-notebook-smiling-relaxing-home_1258-199901.jpg"},
         {
-          id: "4",
-          name: "Rustam Azizov",
-          role: "Mahalliy aholi",
-          company: "Farg'ona",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-people-outdoors_23-2149535696.jpg",
-        },
+          id: "4",          name: "Rustam Azizov",          role: "Mahalliy aholi",          company: "Farg'ona",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/medium-shot-smiley-people-outdoors_23-2149535696.jpg"},
         {
-          id: "5",
-          name: "Nodira Ziyodova",
-          role: "Tadqiqotchi",
-          company: "Xalqaro guruh",
-          rating: 5,
-          imageSrc: "http://img.b2bpic.net/free-photo/specialist-doctor-looking-medical-slice-analyzing-blood-smaple-virus-investigation-working-vaccine-development-agaisnt-coronavirus-microbiology-laboratory-biomedicine-experiment_482257-32372.jpg",
-        },
+          id: "5",          name: "Nodira Ziyodova",          role: "Tadqiqotchi",          company: "Xalqaro guruh",          rating: 5,
+          imageSrc: "http://img.b2bpic.net/free-photo/specialist-doctor-looking-medical-slice-analyzing-blood-smaple-virus-investigation-working-vaccine-development-agaisnt-coronavirus-microbiology-laboratory-biomedicine-experiment_482257-32372.jpg"},
       ]}
       title="Tashrif buyuruvchilar fikri"
       description="Bizning ishlarimizga berilgan baholar."
@@ -235,20 +154,11 @@ export default function LandingPage() {
       useInvertedBackground={true}
       faqs={[
         {
-          id: "q1",
-          title: "Qazishmalarga qanday qo'shilish mumkin?",
-          content: "Biz bilan bog'lanish orqali ko'ngilli sifatida qatnashishingiz mumkin.",
-        },
+          id: "q1",          title: "Qazishmalarga qanday qo'shilish mumkin?",          content: "Biz bilan bog'lanish orqali ko'ngilli sifatida qatnashishingiz mumkin."},
         {
-          id: "q2",
-          title: "Topilgan artefaktlar qayerda saqlanadi?",
-          content: "Barcha topilmalar davlat muzeylariga topshiriladi.",
-        },
+          id: "q2",          title: "Topilgan artefaktlar qayerda saqlanadi?",          content: "Barcha topilmalar davlat muzeylariga topshiriladi."},
         {
-          id: "q3",
-          title: "Ekskursiyalar tashkil etasizmi?",
-          content: "Ha, guruhlar uchun maxsus ekskursiyalar tashkil etamiz.",
-        },
+          id: "q3",          title: "Ekskursiyalar tashkil etasizmi?",          content: "Ha, guruhlar uchun maxsus ekskursiyalar tashkil etamiz."},
       ]}
       sideTitle="Ko'p so'raladigan savollar"
       faqsAnimation="slide-up"
@@ -256,54 +166,32 @@ export default function LandingPage() {
   </div>
 
   <div id="contact" data-section="contact">
-      <ContactCTA
-      useInvertedBackground={false}
-      background={{
-        variant: "plain",
-      }}
+      <ContactCenter
       tag="Aloqa"
       title="Hamkorlik qilishni istaysizmi?"
-      description="Bizga xabar qoldiring, biz siz bilan bog'lanamiz."
-      buttons={[
-        {
-          text: "Xabar yuborish",
-          href: "#",
-        },
-      ]}
+      description="Biz bilan bog'lanish uchun xabar yuboring."
+      background={{ variant: "plain" }}
+      useInvertedBackground={false}
     />
   </div>
 
   <div id="footer" data-section="footer">
-      <FooterBase
+      <FooterBaseReveal
+      logoText="ArxeoO'zbek"
       columns={[
         {
-          title: "Sahifalar",
-          items: [
-            {
-              label: "Asosiy",
-              href: "#",
-            },
-            {
-              label: "Tarix",
-              href: "#about",
-            },
+          title: "Sahifalar",          items: [
+            { label: "Asosiy", href: "#hero" },
+            { label: "Tarix", href: "#about" },
           ],
         },
         {
-          title: "Biz haqimizda",
-          items: [
-            {
-              label: "Jamoa",
-              href: "#team",
-            },
-            {
-              label: "Aloqa",
-              href: "#contact",
-            },
+          title: "Biz haqimizda",          items: [
+            { label: "Jamoa", href: "#team" },
+            { label: "Aloqa", href: "#contact" },
           ],
         },
       ]}
-      logoText="ArxeoO'zbek"
     />
   </div>
       </ReactLenis>

src/app/styles/variables.css

@@ -10,15 +10,15 @@
   --accent: #ffffff;
   --background-accent: #ffffff; */
 
-  --background: #f5f4f0;
-  --card: #ffffff;
-  --foreground: #1a1a1a;
-  --primary-cta: #2c2c2c;
+  --background: #f5f4ef;
+  --card: #dad6cd;
+  --foreground: #2a2928;
+  --primary-cta: #2a2928;
   --primary-cta-text: #f5f4f0;
-  --secondary-cta: #f5f4f0;
+  --secondary-cta: #ecebea;
   --secondary-cta-text: #1a1a1a;
-  --accent: #8a8a8a;
-  --background-accent: #e8e6e1;
+  --accent: #ffffff;
+  --background-accent: #c6b180;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);