Fix | js and layout bugs fix

Co-authored-by: Your Name <you@example.com>
Reviewed-on: #16

wp-content/themes/cosmopet/modules/author/assets/css/gp-style-desktop.css

@@ -313,10 +313,6 @@
 
 
 
-/* Home */
-.home {
-    padding: 140px 0 68px;
-}
 
 .home-title {
     font-size: 82px;

wp-content/themes/cosmopet/modules/header/module-controller.php

@@ -43,7 +43,7 @@ add_filter('timber/context', function($context) {
         $context['about_url_en'] = '/en/about-us/';
     } 
     else if (SITE_DOMAIN == 'AE'){
-        $context['about_url_en'] = '/en/about-us/';
+        $context['about_url_en'] = '/about-us/';
     }
     else {
         $context['about_url'] = 'https://cosmopet.shop/chto-takoe-entoprotein/';
@@ -54,7 +54,11 @@ add_filter('timber/context', function($context) {
     if ($production_page) {
         $context['production_url'] = '/proizvodstvo/';
         $context['production_url_en'] = '/en/production/';
-    } else {
+    } 
+    else if (SITE_DOMAIN == 'AE'){
+       $context['production_url_en'] = '/production/';
+    }
+    else {
         $context['production_url'] = 'https://cosmopet.shop/proizvodstvo/';
         $context['production_url_en'] = 'https://cosmopet.shop/en/production/';
     }
@@ -66,7 +70,9 @@ add_filter('timber/context', function($context) {
         $context['front_url'] = "https://cosmopet.shop/";
         $context['front_url_en'] = "https://cosmopet.shop/en/main/";
     }
-
+    if (SITE_DOMAIN == 'AE'){
+      $context['front_url_en'] = "/";
+    }
     return $context;
 });
 

wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css

@@ -104,7 +104,6 @@
     --background: #F4F1F0;
     --placeholder: #999999;
     /* Fonts */
-    --font-craftwork: 'Craftwork Grotest', sans-serif;
     --font-abel: 'Abel', serif;
     --text-dark: #2b2b3b;
     --text-red: #fa0505;
@@ -137,7 +136,7 @@
 
 body {
     background: var(--radial);
-    font-family: var(--font-craftwork);
+    font-family: var( --font-family);
     font-weight: 500;
 }
 
@@ -1790,4 +1789,76 @@ textarea{
 
 .order-contacts__delivery{
   padding-bottom: 3rem;
+}
+
+
+/* breadcrumbs */
+.breadcrumbs{
+  margin: 24px;
+ padding-top: 30px;
+  display: flex;
+  align-items: center;
+}
+.breadcrumbs__item{
+  display: block;
+
+  padding: 0px 16px;
+
+  font-family: var(--font-family);
+  font-weight: 700;
+  font-size: 16px;
+  line-height: 125%;
+  color: var(--text-6);
+
+  text-decoration: none;
+
+  position: relative;
+}
+.breadcrumbs__item:first-child{
+  padding-left: 0;
+}
+.breadcrumbs__item:nth-child(n+2)::before{
+  content: '';
+
+  position: absolute;
+  top: -2px;
+  left: -12px;
+
+  width: 24px;
+  aspect-ratio: 1;
+
+  background-image: url(../img/svg/main/arrow-breadcrumbs.svg);
+  background-repeat: no-repeat;
+  background-size: contain;
+}
+/* breadcrumbs */
+
+.home {
+    padding: 60px 0 68px;
+}
+
+.wc-block-components-checkout-place-order-button{
+      background: var(--gradient-turquoise);
+    border: none;
+    transition: opacity .2s ease-out;
+     font-size: 20px;
+    line-height: 120%;
+    color: var(--text-black);
+    border-radius: 20px;
+}
+
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=email], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=number], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=password], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=tel], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=text], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=url], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=email], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=number], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=password], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=tel], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=text], 
+.wc-block-checkout__form.wc-block-components-form .wc-block-components-text-input input[type=url],
+.wc-block-checkout__form.wc-block-components-form .wc-blocks-components-select .wc-blocks-components-select__select{
+  border-radius: 10px;
 }

wp-content/themes/cosmopet/modules/layout/module.template.twig

@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html lang="ru">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title></title>
-        <meta name="description" content="">
-
-        <!-- Яндекс.Вебмастер + Google Search Console -->
-
-        <!-- /Яндекс.Вебмастер + Google Search Console -->
-
-        <!-- Yandex.Metrika counter -->
-       
-        <!-- /Yandex.Metrika counter -->
-        {{ function('wp_head') }} 
-    </head>
-
-    <body>
-
-        
-        {% if current_lang == 'en' %}
-           {% include 'header/module.template_ENG.twig' %}
-        {% elseif current_lang == 'fr' %}
-        {% else %}
-           {% include 'header/module.template_RU.twig' %}
-        {% endif %}
-        
-            
-        <main class="{{ bodyClass }}">
-            {% block content %}
-            {% endblock %}
-        </main>
-        
-        {% include 'footer/module.template.twig' %}
-        </div>
-            {{ function('wp_footer') }} 
-    </body>
-</html>

wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-core.css

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *{
   margin: 0;
   padding: 0;
@@ -53,6 +54,8 @@ a{
     --gradient-red: linear-gradient(22deg, #f44242 0%, #569ef0 100%);
 } 
 
+=======
+>>>>>>> 219d098 (Fix | bugfix after restructurization)
 
 /* общие */
 button{
@@ -470,10 +473,3 @@ button{
   line-height: 120%;
   color: var(--text-black);
 }
-/* toggle */
-
-/* checkbox */
-/* checkbox */
-
-/* radio */
-/* radio */

wp-content/themes/cosmopet/modules/shop/components/single-product/assets/css/gp-style-order.css

@@ -1,241 +0,0 @@
-.order{
-    display: flex;
-}
-.order__title{
-    font-family: var(--font-family);
-    font-weight: 700;
-    font-size: 24px;
-    line-height: 117%;
-    text-transform: uppercase;
-    color: var(--text-black);
-}
-.order__contacts{
-    width: calc(50% - 0.5px);
-
-    padding: 24px;
-
-    border-right: 1px solid #121212;
-}
-.order-contacts__header{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-.order-contacts__form{
-    margin-top: 24px;
-}
-.order-contacts__delivery{
-    margin-top: 47.5px;
-
-    padding-top: 48px;
-
-    border-top: 1px solid var(--background-grey);
-}
-
-.order-contacts-deliver__item{
-    margin-top: 24px;
-}
-.order-contacts-deliver__date{
-    padding: 8px;
-
-    border-radius: 24px;
-
-    background: var(--background-grey);
-}
-.order-contacts-deliver__date .form-input-radio__item{
-    margin-top: 24px;
-}
-.order-contacts-deliver__date .form-input-radio__item:first-child{
-    margin-top: 0;
-}
-.order__your{  
-    width: calc(50% - 0.5px);
-
-    padding: 24px 24px 24px 48px;
-
-    background: var(--background-grey);
-}
-.order-your__products{
-    margin-top: 48px;
-}
-.order-your-products__item{
-    margin-top: 16px;
-
-    display: flex;
-    justify-content: space-between;
-}
-.order-your-products__left{
-    display: flex;
-}
-.order-your-products__img{
-    width: 40px;
-    aspect-ratio: 1;
-
-    border-radius: 16px;
-}
-.order-your-products__content{
-    margin-left: 16px;
-}
-.order-your-products__name{
-    font-family: var(--font-family);
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 133%;
-    color: var(--text-black);
-
-    text-decoration: none;
-}
-.order-your-products__description{
-    margin-top: 8px;
-
-    font-family: var(--font-family);
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 133%;
-    color: var(--text-6);
-}
-.order-your-products__description span{
-    font-weight: 700;
-}
-.order-your-products__description span::before{
-    margin-left: 3px;
-
-    content: 'x ';
-}
-.order-your-products__right{
-    display: flex;
-}
-.order-your-products__count{
-    font-family: var(--font-family);
-    font-weight: 700;
-    font-size: 12px;
-    line-height: 133%;
-    text-align: right;
-    color: var(--text-6);
-}
-.order-your-products__count::before{
-    content: 'x';
-}
-.order-your-products__price{
-    margin-left: 16px;
-
-    font-family: var(--font-family);
-    font-weight: 700;
-    font-size: 12px;
-    line-height: 133%;
-    text-align: right;
-    color: var(--text-black);
-}
-.order-your-products__price::after{
-    content: 'Р';
-}
-.order-your__calculation{
-    margin-top: 48px;
-}
-.order-your__promo{
-    display: flex;
-}
-.order-your-promo__button{
-    margin-left: 8px;
-}
-.order-your-calculation__item{
-    margin-top: 24px;
-
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-.order-your-calculation__title{
-    font-family: var(--font-family);
-    font-weight: 500;
-    font-size: 20px;
-    line-height: 120%;
-    color: var(--text-black);
-}
-.order-your-calculation__value{
-    font-family: var(--font-family);
-    font-weight: 700;
-    font-size: 20px;
-    line-height: 200%;
-    text-transform: uppercase;
-    text-align: right;
-    color: var(--text-black);
-}
-.order-your-calculation__value--price::after{
-    content: ' ₽';
-}
-.order-your-calculation__value--discount{
-    background: var(--gradient-red);
-    background-clip: text;
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-}
-.order-your-calculation__value--discount::before{
-    content: '- ';
-}
-.order-your-calculation__description{
-    font-family: var(--font-family);
-    font-weight: 500;
-    font-size: 12px;
-    line-height: 133%;
-    text-align: right;
-    color: var(--text-9);
-}
-.order-your-calculation__line{
-    margin-top: 23px;
-    border: 1px solid var(--background-9);
-}
-.order-your-calculation__result{
-    font-family: var(--font-family);
-    font-weight: 700;
-    font-size: 24px;
-    line-height: 117%;
-    text-transform: uppercase;
-    color: var(--text-black);
-}
-.order-your-calculation__submit{
-    margin-top: 48px;
-}
-
-@media only screen and (max-width: 1200px) {
-.order{
-    display: block;
-}
-.order__contacts, .order__your{
-    border: none;
-    width: 100%;
-}
-}
-
-@media only screen and (max-width: 720px) {
-.order__title{
-    max-width: 181px;
-
-    font-size: 20px;
-    line-height: 120%;
-}
-.order__your{
-    margin-top: 16px;
-}
-.order__contacts{
-    padding: 24px 16px;
-}
-.order__your{
-    padding: 40px 16px 9px 16px;
-}
-.order-your__promo{
-    display: block;
-}
-.order-your-promo__button{
-    margin-left: 0;
-    margin-top: 24px;
-
-    width: 100%;
-}
-.order-your-products__content{
-    max-width: 164px;
-}
-.order-your-products__count, .order-your-products__price{
-    flex-shrink: 0;
-}
-}

wp-content/themes/cosmopet/modules/shop/module-ajax-controller.php

@@ -119,7 +119,6 @@ function enqueue_woocommerce_ajax_scripts() {
         'ajax_url' => admin_url('admin-ajax.php'),
         'currency_symbol' => get_woocommerce_currency_symbol(),
         'currency_format' => str_replace(array('%1$s', '%2$s'), array('%s', '%v'), get_woocommerce_price_format()),
-        'i18n_restore_item' => pll_e('Восстановить', 'woocommerce')
     ));
 }
 

wp-content/themes/cosmopet/modules/shop/module-controller.php

@@ -377,3 +377,11 @@ function auto_fill_shipping_fields_from_billing( $order_id ) {
         return $context;
     }); 
 
+function conditional_dequeue_woocommerce_styles() {
+    if (function_exists('is_woocommerce') && !is_woocommerce() && !is_cart() && !is_checkout() && !is_account_page()) {
+        wp_dequeue_style('woocommerce-general');
+        wp_dequeue_style('woocommerce-layout');
+        wp_dequeue_style('woocommerce-smallscreen');
+    }
+}
+add_action('wp_enqueue_scripts', 'conditional_dequeue_woocommerce_styles', 999);

wp-content/themes/cosmopet/static/front-page/css/style.css

@@ -429,7 +429,7 @@ border-bottom: 2px solid var(--interface-main_black, rgba(18, 18, 18, 1))
 }
 .reviews .reviews_title{
     color: var(--grey-black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 79px;
     font-style: normal;
     font-weight: 700;
@@ -1510,7 +1510,7 @@ justify-content: center;
 
 .discount__sale .discount_title {
     color: var(--interface-main_black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 82px;
     font-style: normal;
     font-weight: 700;
@@ -1545,7 +1545,7 @@ justify-content: center;
 
 .discount__sale .discount_form-text {
     color: var(--interface-main_black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 14px;
     font-style: normal;
     font-weight: 500;
@@ -1558,7 +1558,7 @@ justify-content: center;
 .discount__sale .discount_text {
     margin-top: 27px;
     color: var(--interface-main_black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 20px;
     font-style: normal;
     font-weight: 500;
@@ -1648,7 +1648,7 @@ justify-content: center;
 .blog__card-btn {
     margin-top: 24px;
     color: #000;
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 12px;
     font-style: normal;
     font-weight: 500;
@@ -1710,7 +1710,7 @@ justify-content: center;
 
 .truth__end-promo {
     color: var(--grey-black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 24px;
     font-style: normal;
     font-weight: 900;
@@ -1726,7 +1726,7 @@ justify-content: center;
 
 .truth__end-btn {
     padding: 10px 10px 11px 10px;
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 24px;
     font-style: normal;
     font-weight: 500;
@@ -1822,7 +1822,7 @@ justify-content: center;
 
 .home__title {
     color: var(--interface-background, #F2F2F2);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 48px;
     font-style: normal;
     font-weight: 700;
@@ -1839,7 +1839,7 @@ justify-content: center;
 }
 .home__subtitle {
     color: var(--interface-background, #F2F2F2);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     margin-top: 32px;
     font-size: 20px;
     font-style: normal;
@@ -1852,7 +1852,7 @@ justify-content: center;
     background: var(--interface-main_white, #FFF);
     padding: 12px 24px;
     color: var(--interface-main_black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 20px;
     font-style: normal;
     font-weight: 600;
@@ -1952,7 +1952,7 @@ justify-content: center;
 
 .cosmopet-x__title {
     color: var(--creme-white, #F4F1F0);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 82px;
     font-style: normal;
     font-weight: 700;
@@ -2006,7 +2006,7 @@ justify-content: center;
 
 .cosmopet-x__heading {
     color: var(--grey-black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 22px;
     font-style: normal;
     font-weight: 700;
@@ -2019,7 +2019,7 @@ justify-content: center;
     max-width: max-content;
     margin-top: 7px;
     color: #000;
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 12px;
     font-style: normal;
     font-weight: 500;
@@ -2081,7 +2081,7 @@ justify-content: center;
 
 .reviews_item-top + span {
     color: var(--creme-white, #F4F1F0);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 12px;
     font-style: normal;
     font-weight: 500;
@@ -2157,7 +2157,7 @@ justify-content: center;
 
 .blogosphere__name {
     color: #FFF;
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 16.8px;
     font-style: normal;
     font-weight: 700;
@@ -2216,7 +2216,7 @@ justify-content: center;
 
 .marketplace__title {
     color: var(--grey-black, #121212);
-    font-family: "Craftwork Grotest";
+    font-family: "Craftwork Grotesk";
     font-size: 36px;
     font-style: normal;
     font-weight: 700;

wp-content/themes/cosmopet/templates/front-page/front-page.twig

@@ -5,9 +5,7 @@
             
 {% block content %}
 
-
+    <section class="home">
-
-    <section class="home test">
         <div class="container">
             <div class="home__swiper">
                 <div class="swiper-wrapper">
@@ -30,7 +28,7 @@
         </div>
     </section>
 
-
+    {% if show_about %}
     <section id="about" class="about">
         <div class="container">
             <div class="about_info-wrap">
@@ -74,7 +72,7 @@
                 </div>
             </div>
         </div>
-
+        {% if about_rev %}
         <div class="marketplace">
             <div class="container">
                 <div class="marketplace__title">{{about_rev_title}}</div>
@@ -92,9 +90,10 @@
                 </div>
             </div>
         </div>
+        {% endif %}
     </section>
-
+    {% endif %}
-
+{% if show_rev %}
 <section class="reviews">
     <div class="container">
         <h2 class="reviews_title">{{reviews_title}}</h2>
@@ -139,7 +138,8 @@
         </div>
     </div>
 </section>
-
+{% endif %}
+{% if show_q %}
 <section class="truth sec-bf">
         <div class="container">
             <div class="truth_top">
@@ -536,7 +536,8 @@
             </div>
         </div>
     </section>
-
+{% endif %}
+{% if post.meta('cosmopet_x_slider') %}
     <div class="section_wrap">
         <section class="cosmopet-x">
             <div class="container">
@@ -565,7 +566,8 @@
             </div>
         </section>
     </div>
-
+{% endif %}
+{% if show_blog %}
 <section class="blog">
     <div class="container">
         <div class="blog_block">
@@ -578,7 +580,6 @@
             </div>
         </div>
     </div>
-    
     <div class="blog_slider">
         <div class="swiper blogSlider">
             <div class="swiper-wrapper">
@@ -607,9 +608,11 @@
         </div>
     </div>
 </section>
-    </div>
 
+{% endif %}
+    </div>
+{% if show_promo %}
     {% include 'forms/discount.twig' %}
-
+{% endif %}
 
 {% endblock %}

wp-content/themes/cosmopet/templates/front-page/template-front-page.php

@@ -72,6 +72,12 @@ $context['q_5'] = get_field('q_5');
 $context['promo'] = get_field('promo');
 $context['promo_text'] = get_field('promo_text');
 
+$context['show_about'] = get_field('about_show');
+$context['show_promo'] = get_field('promo_show');
+$context['show_rev'] = get_field('vet_show');
+$context['show_q'] = get_field('quiz_show');
+$context['show_blog'] = get_field('blog_show');
+
 $context['sub_title'] = get_field('sub_title');
 $context['sub_text'] = get_field('sub_text');
 Timber::render('templates/front-page/front-page.twig', $context);

wp-content/themes/cosmopet/templates/header.twig

@@ -207,6 +207,7 @@
         </ul>
 
         <div class="mini-profile">
+        {% if CONSTANTS.DOMAIN != 'AE' %}
             <div class="mini-profile__item">
                 <div class="lang">
                     <button class="lang__open">
@@ -233,6 +234,7 @@
                     </div>
                 </div>
             </div>
+        {% endif %}
             <div class="mini-profile__item">
                 <button class="mini-profile__button basket-open" data-modal-target=".modal__basket">
                     <img src="https://cosmopet.ru/wp-content/themes/woodmart/gp-include/assets/core/img/svg/mini-profile/basket.svg" alt="" class="mini-profile__icon black">

wp-content/themes/cosmopet/woocommerce/assets/css/gp-style-core.css

@@ -907,46 +907,6 @@ button{
 /* social media */
 
 
-/* breadcrumbs */
-.breadcrumbs{
-  margin: 24px;
-
-  display: flex;
-  align-items: center;
-}
-.breadcrumbs__item{
-  display: block;
-
-  padding: 0px 16px;
-
-  font-family: var(--font-family);
-  font-weight: 700;
-  font-size: 16px;
-  line-height: 125%;
-  color: var(--text-6);
-
-  text-decoration: none;
-
-  position: relative;
-}
-.breadcrumbs__item:first-child{
-  padding-left: 0;
-}
-.breadcrumbs__item:nth-child(n+2)::before{
-  content: '';
-
-  position: absolute;
-  top: -2px;
-  left: -12px;
-
-  width: 24px;
-  aspect-ratio: 1;
-
-  background-image: url(../img/svg/main/arrow-breadcrumbs.svg);
-  background-repeat: no-repeat;
-  background-size: contain;
-}
-/* breadcrumbs */
 
 /* compound */
 .compound{