lamnding changes

src/App.jsx

@@ -232,9 +232,12 @@ function App() {
                </div>
          }
 
+         <ToTheTopComponent />
+
 
          {/* <LanguageComponent /> */}
-         <ToTheTopComponent />
+
+
          <MainPopup togglePopup={togglePopup} isPopupOpen={isPopupOpen} />
          <Korporativy toggleKorp={toggleKorp} isKorpOpen={isKorpOpen} />
 

src/common/Button.jsx

@@ -4,13 +4,13 @@ const Button = ({ children, className, onClick, style }) => {
       <div
          style={style}
          onClick={onClick}
-         className={`droid z-10 active:bg-slate-400 mt-10 flex min-h-[20px] text-center   sm:w-[270px] cursor-pointer  items-center justify-center gap-1 rounded-[100px] px-4  font-bold duration-500 hover:opacity-80 md:max-h-[75px]  ${className || ""
+         className={`z-10 active:bg-slate-400 mt-10 flex text-md min-h-[30px] text-center  w-[80%] sm:w-[270px] cursor-pointer  items-center justify-center gap-1 rounded-[100px] px-4  font-bold duration-500 hover:opacity-80  md:h-[40px]  ${className || ""
             } `}
       >
          {children}
          {/* <img src={arrow} alt="" /> */}
       </div>
-   );
-};
+   )
+}
 
-export default Button;
+export default Button

src/common/Footer.jsx

@@ -1,10 +1,9 @@
 /* eslint-disable react/prop-types */
-// import inst from "./../assets/inst.png";
-import { motion } from "framer-motion"
-import { useURLData } from "utils/URLData"
-import phone from "./../assets/phone.png"
+import inst from "./../assets/inst.png"
 import what from "./../assets/what.png"
-import { useTranslation } from 'react-i18next'
+import phone from "./../assets/phone.png"
+import { m } from "framer-motion"
+import { useURLData } from 'utils/URLData'
 
 const slideVariants = {
    initial: {
@@ -16,33 +15,42 @@ const slideVariants = {
       scale: 1,
    },
 }
-const Footer = ({ className }) => {
-   const { utm_source, phoneContent } = useURLData()
-   const matchingPhone = phoneContent.find(item => item.utm === utm_source)
-   const phoneNumber = matchingPhone ? '+' + matchingPhone.phone : '+74995055031'
-   const { t } = useTranslation()
+const Footer = ({ className, FooterLinks = [], isMediaOpen = true }) => {
+   const { utm_source } = useURLData()
+   // const matchingPhone = phoneContent.find(item => item.utm === utm_source)
+   // const phoneNumber = matchingPhone ? '+' + matchingPhone.phone : '+74995055031'
    return (
       <div className={`${className || ""}`}>
          <div className="wrapper  ">
-            <div className="flex justify-between gap-5 py-5">
-               <div className="flex w-full items-center justify-between text-white gap-5 md:justify-start">
-                  <div>{t('fullName')} 2023 </div>
-                  <div className="fixed bottom-5 md:bottom-[70px]  right-5 z-10 flex flex-col gap-5 md:left-5 md:flex-row">
-                     {/* <a
+            <div className="flex justify-between flex-col md:flex-row gap-5 py-5">
+               <div className="flex w-full items-center  justify-between gap-5 md:justify-start">
+                  <div className='flex gap-5 items-center'>
+
+                     <a className='underline font-bold' href='/'>Икша Кантри Kлаб 2023 </a>
+                     {FooterLinks.length !== 0 && FooterLinks.map((item, i) => {
+                        return (
+                           <div key={i}>
+                              <a className='underline' target='_blank' rel="noreferrer" href={item.link}>{item.title}</a>
+                           </div>
+                        )
+                     })}
+                  </div>
+                  {isMediaOpen && <div className="fixed bottom-5 md:bottom-[70px]  right-5 z-10 flex flex-col gap-5 md:left-5 md:flex-row">
+                     <a
                         target="_blank"
                         rel="noreferrer"
                         href="https://www.instagram.com/ikshacountryclub/"
                      >
                         <img className="z-10 h-9 w-9" src={inst} alt="" />
-                     </a> */}
+                     </a>
                      <a
-                        href={`https://wa.me/79859091202?text=${encodeURIComponent('Здравствуйте, меня интересует аренда домика')}`}
+                        href="https://wa.me/79859091202"
                         target="_blank"
                         rel="noreferrer"
                      >
                         <img className="z-10 h-9 w-9" src={what} alt="" />
                      </a>
-                     <motion.a
+                     <m.a
                         variants={slideVariants}
                         transition={{
                            repeat: Infinity,
@@ -53,15 +61,38 @@ const Footer = ({ className }) => {
                         }}
                         initial="initial"
                         animate="animate"
-                        href={`tel:${phoneNumber}`}
+                        href="tel:+7 (499) 505-50-31"
                      >
                         <img className="z-10 h-9 w-9" src={phone} alt="" />
-                     </motion.a>
-                  </div>
+                     </m.a>
+                  </div>}
+
                </div>
-               <a href={`tel:${phoneNumber}`} className="min-w-[160px] text-white">
-                  {phoneNumber}
-               </a>
+
+               {/* <div className="hidden  justify-center gap-10 md:flex">
+                  <a href="#Programa">Программа</a>
+                  <a href="#Tariff">Тарифы</a>
+                  <a href="tel:+7 (499) 505-50-31">Связаться со мной</a>
+               </div> */}
+               {/* <a href={`tel:${phoneNumber}`} className="min-w-[160px]">
+                  {phoneNumber} */}
+
+               {
+                  utm_source === 'yandex' ?
+                     <a href={'tel:+74995055067'}>
+                        <h4 className="min-w-[160px] underline cursor-pointer">+7(499) 505-50-67</h4>
+                     </a>
+                     : utm_source === 'vkontakte' ?
+                        <a href={'tel:+74995055087'}>
+                           <h4 className="min-w-[160px] underline cursor-pointer">+7(499) 505-50-87</h4>
+                        </a>
+                        :
+                        <a href={"tel:+74995055031"}>
+                           <h4 className="min-w-[160px] underline cursor-pointer">+7(499) 505-50-31</h4>
+                        </a>
+
+               }
+               {/* </a> */}
             </div>
          </div>
       </div>

src/components/Home/Main.jsx

@@ -1,5 +1,5 @@
 import { m } from "framer-motion"
-import nyLogo from 'icons/ny-logo.webp'
+import nyLogo from 'icons/events/active.png'
 import { useEffect } from "react"
 import { Link } from "react-router-dom"
 import { useURLData } from "utils/URLData"
@@ -193,7 +193,7 @@ const Main = () => {
    return (
       <div id='main' className='relative'>
          {/* <div className='fixed top-5 right-5 text-white font-bold rounded-full bg-slate-300 px-4 cursor-pointer z-[10000] text-md' onClick={toggleLanguage}>{i18n.language}</div> */}
-         <Link to="/New-Year" className="absolute right-10 top-20 z-[1000]">
+         <Link to="/active" className="absolute right-10 top-20 z-[1000]">
             <m.img
                transition={{
                   repeat: Infinity,
@@ -271,7 +271,7 @@ const Main = () => {
                to="/new-year"
                className="montery z-[1000] flex h-[60px] w-full items-center justify-between bg-gradient-to-t from-[#AB8E67]/[.6] to-[#4D382B]/[.6] px-5 py-3 text-[18px] font-[700] text-white backdrop-opacity-90 lg:text-[22px]"
             >
-                        <div>{t('call')} {phoneNumber}</div>
+               <div>{t('call')} {phoneNumber}</div>
                <div className="text-[#D3AE7C]">
                   {t('newYearAtIksha')}-{t('limitedSpots')}
                </div>

src/pages/banLanding/BanLanding.jsx

@@ -30,16 +30,7 @@ const BanLanding = () => {
    }
 
    const GetLinks = () => {
-      // const { t } = useTranslation()
-      // const links = [
-      //    { title: t('baning.header.Main'), link: "Programa" },
-      //    { title: t('baning.header.Gallery'), link: "Tariff" },
-      //    { title: t('baning.header.Price'), link: "Form" },
-      //    { title: t('baning.header.Terr'), link: "Form" },
-      //    { title: t('baning.header.Locations'), link: "Form" },
-      //    { title: t('baning.header.Call'), link: "Form" },
 
-      // ]
 
       const links = [
          { title: 'Главная', link: "Programa" },
@@ -54,6 +45,18 @@ const BanLanding = () => {
       return links
    }
 
+   const GetFooterLinks = () => {
+
+      const links = [
+         { title: 'Договор оферты', link: "public/pdf/oferta.pdf" },
+         { title: 'Правила проживания', link: "/rules" },
+
+      ]
+
+      return links
+   }
+   const footerLinks = GetFooterLinks()
+
    const links = GetLinks()
 
 
@@ -91,7 +94,7 @@ const BanLanding = () => {
             links={links}
             toggleMenu={toggleMenu}
             MenuClassName='bg-white text-black'
-            className=' font-bold text-black' />
+            className=' font-bold bg-[#221C1C] text-white' />
          <div className={` ${s.bg} relative  w-full h-full`}>
 
             {productId && <BanProgramPopup productId={productId} onClose={() => setProductId(undefined)} />}
@@ -110,7 +113,7 @@ const BanLanding = () => {
          </div>
          {/* </div> */}
 
-         <Footer className='bg-black text-white' />
+         <Footer FooterLinks={footerLinks} className='bg-black text-white' />
       </div>
    )
 }

src/pages/banLanding/ban.module.scss

@@ -1,5 +1,5 @@
 .bg {
-	background-image: url('public/image/ban/bg.png');
+	background-image: url('./../../../public/image/ban/bg.png');
 
 	background-position: center center;
 	background-repeat: no-repeat;
@@ -8,6 +8,10 @@
 	background-color: rgba(255, 255, 255, 0.499);
 }
 
+.banner {
+	background-color: #8bb26f8a;
+}
+
 @font-face {
 	font-family: 'Acari Sans';
 	font-display: swap;
@@ -39,17 +43,34 @@
 	background-position: center;
 }
 
+.services_wrapper:first-of-type {
+	border-top: 1px solid black;
+	/* border-bottom: 1px solid black; */
+}
 .services_wrapper:nth-of-type(2),
-.services_wrapper:nth-of-type(4),
-.services_wrapper:nth-of-type(6),
-.services_wrapper:nth-of-type(10),
-.services_wrapper:nth-of-type(12),
-.services_wrapper:nth-of-type(14),
-.services_wrapper:nth-of-type(8) {
+.services_wrapper:nth-of-type(3),
+.services_wrapper:nth-of-type(6) {
 	border-top: 1px solid black;
 	border-bottom: 1px solid black;
 }
 
-.services_wrapper:first-of-type {
-	border-top: 1px solid black;
+.services_wrapper:nth-of-type(5) {
+	border-bottom: 1px solid black;
+}
+
+@media (max-width: 767px) {
+	.services_wrapper:nth-of-type(2),
+	.services_wrapper:nth-of-type(4),
+	.services_wrapper:nth-of-type(6),
+	.services_wrapper:nth-of-type(10),
+	.services_wrapper:nth-of-type(12),
+	.services_wrapper:nth-of-type(14),
+	.services_wrapper:nth-of-type(8) {
+		border-top: 1px solid black;
+		border-bottom: 1px solid black;
+	}
+}
+
+.photoBg {
+	background-color: rgba(0, 0, 0, 0.434);
 }

src/pages/banLanding/components/BanContacts.jsx

@@ -4,13 +4,19 @@ import inst from 'images/icons/social/black/inst.png'
 import what from 'images/icons/social/black/what.png'
 import vk from 'images/icons/social/black/vk.png'
 import s from './../ban.module.scss'
+import { useURLData } from 'utils/URLData'
+
+const ChillContacts = () => {
+
+   const { utm_source } = useURLData()
 
-const FishContacts = () => {
    return (
-      <div className=' px-4 w-full text-black'>
-         <div className='text-black font-bold text-center mb-[5vh] text-36px'>Контакты</div>
-         <div className='flex w-full justify-between flex-col mb-10 gap-2 md:flex-row'>
-            <div className='w-[733.57px] text-black text-md font-semibold  leading-[44.80px] tracking-wide'>Мы находимся по адресу Московская область,<br /> городской округ Мытищи,<br /> посёлок Менжинец </div>
+      <div id='contacts' className=' mt-[70px] w-full text-black'>
+         <div className='text-black font-bold text-center mb-[5vh] text-lg'>Контакты</div>
+         <div className='flex w-full px-[20px] md:px-[40px] justify-between flex-col pb-10 gap-2 md:flex-row'>
+            <div className='md:w-[733.57px] text-black text-md font-semibold hidden md:block leading-[44.80px] tracking-wide'>Мы находимся по адресу Московская область,<br /> городской округ Мытищи,<br /> посёлок Менжинец </div>
+            <div className='md:w-[733.57px] text-black text-md font-semibold block md:hidden leading-[44.80px] tracking-wide'>Мы находимся по адресу Московская область, городской округ Мытищи, посёлок Менжинец </div>
+
 
             <div className='flex gap-2 flex-col text-left md:text-right'>
                <div className='flex justify-start md:justify-end gap-5'>
@@ -24,7 +30,22 @@ const FishContacts = () => {
                      <img className='w-[30px] md:w-[50px]' src={vk} alt="" />
                   </a>
                </div>
-               <div className={`text-black text-md- font-medium ${s.acariMedium}`}>+7 (499) 505 50 31</div>
+               {
+                  utm_source === 'yandex' ?
+                     <a href={'tel:+74995055067'}>
+                        <h4 className={`text-black text-md- font-medium underline ${s.acariMedium}`}>+7(499) 505-50-67</h4>
+                     </a>
+                     : utm_source === 'vkontakte' ?
+                        <a href={'tel:+74995055087'}>
+                           <h4 className={`text-black text-md- font-medium underline ${s.acariMedium}`}>+7(499) 505-50-87</h4>
+                        </a>
+                        :
+                        <a href={"tel:+74995055031"}>
+                           <h4 className={`text-black text-md- font-medium underline ${s.acariMedium}`}>+7(499) 505-50-31</h4>
+                        </a>
+
+               }
+               {/* <div className={`text-black text-md- font-medium ${s.acariMedium}`}>+7 (499) 505 50 31</div> */}
                <div className={`text-black text-md- font-medium ${s.acariMedium}`}>Время работы 24/7</div>
                <a rel="noreferrer" target='_blank' href='https://www.youtube.com/watch?v=m24zezD9fWs' className={`text-black cursor-pointer text-md- font-medium underline  ${s.acariMedium} `}>Как проехать</a>
             </div>
@@ -41,4 +62,4 @@ const FishContacts = () => {
    )
 }
 
-export default FishContacts
+export default ChillContacts

src/pages/banLanding/components/BanGuest.jsx

@@ -38,8 +38,8 @@ const guests = [
 const BanGuest = () => {
    const swiperRef = useRef()
    return (
-      <div className=" relative pt-[5vh] pb-[15vh] md:pb-[25vh]">
-         <div className='text-black font-bold text-center mb-[10vh] text-md+'>Почему нас выбирают</div>
+      <div className=" relative pt-[15vh] pb-[5vh] ">
+         <div className='text-black font-bold text-center mb-[10vh] text-lg'>Почему нас выбирают</div>
          <div className="">
             <Swiper
                // install Swiper modules