+ 
+ 
+ 
+ 
{% endif %}
- 
{% endif %}
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/assets/img/preview.png b/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/assets/img/preview.png
new file mode 100644
index 0000000..77fb9e3
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/assets/img/preview.png differ
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/editor-block-controller.php b/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/editor-block-controller.php
index 3e54c9f..a689f71 100644
--- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/editor-block-controller.php
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/block_img/editor-block-controller.php
@@ -9,6 +9,11 @@
$context['img'] = get_field('img');
$context['plus_minus'] = get_field('plus_minus');
$context['content'] = get_field('content');
+ // Проверяем, есть ли картинка превью в блоке
+ if ($is_preview && !empty($block['data']['preview_image'])) {
+ echo '
+ 
+ 
-
diff --git a/wp-content/themes/cosmopet/modules/blog/components/archive/component-ajax-controller.php b/wp-content/themes/cosmopet/modules/example/module.template.twig
similarity index 100%
rename from wp-content/themes/cosmopet/modules/blog/components/archive/component-ajax-controller.php
rename to wp-content/themes/cosmopet/modules/example/module.template.twig
diff --git a/wp-content/themes/cosmopet/modules/footer/module-controller.php b/wp-content/themes/cosmopet/modules/footer/module-controller.php
index 6b46b98..389c8b6 100644
--- a/wp-content/themes/cosmopet/modules/footer/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/footer/module-controller.php
@@ -1,14 +1,14 @@
-
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/footer/module.template.twig b/wp-content/themes/cosmopet/modules/footer/module.template.twig
new file mode 100644
index 0000000..5574dc8
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/footer/module.template.twig
@@ -0,0 +1,52 @@
+{% set current_path = template_path ~ '/modules/footer' %}
+
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/forms/assets/js/form.js b/wp-content/themes/cosmopet/modules/forms/assets/js/form.js
index 4f137cf..d79f7aa 100644
--- a/wp-content/themes/cosmopet/modules/forms/assets/js/form.js
+++ b/wp-content/themes/cosmopet/modules/forms/assets/js/form.js
@@ -1,19 +1,90 @@
jQuery(document).ready(function($) {
+
+
$('.form-process').submit(function(event) {
event.preventDefault();
+ let validate = validateForm(this);
+ if (validate){
+ action = $(this).attr('action')
+ let formData = $(this).serialize();
+ $.ajax({
+ type: 'POST',
+ url: '/wp-admin/admin-ajax.php',
+ data: {
+ action: action,
+ formData: formData
+ },
+ success: function(response) {
+ alert(response.message);
+ }
+ });
+ }
+ });
+});
+
+const metaLocale = document.querySelector('meta[property="og:locale"]');
+const localeValue = metaLocale.getAttribute('content');
- let formData = $(this).serialize();
-
- $.ajax({
- type: 'POST',
- url: '/wp-admin/admin-ajax.php',
- data: {
- action: 'process_form',
- formData: formData
- },
- success: function(response) {
- alert(response.message);
+
+ // Функция валидации формы
+ function validateForm(form) {
+ // Очищаем предыдущие сообщения об ошибках внутри этой формы
+ clearErrorMessages(form);
+ let validated = true
+ // Валидация поля имени
+ const nameInput = form.querySelector('input[name="name"]');
+
+ if (nameInput && !nameInput.value.trim()) {
+ if(localeValue == 'en_US'){
+ showError(nameInput, 'The name is requeried field');
+ }
+ if(localeValue == 'ru_RU'){
+ showError(nameInput, 'Поле имени обязательно для заполнения.');
+ }
+ validated = false
}
- });
- });
-});
\ No newline at end of file
+
+ // Валидация поля email
+ const emailInput = form.querySelector('input[name="email"]');
+ const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+ if (emailInput && !emailPattern.test(emailInput.value.trim())) {
+
+ if(localeValue == 'en_US'){
+ showError(emailInput, 'Email is incorrect.');
+ }
+ if(localeValue == 'ru_RU'){
+ showError(emailInput, 'Введите корректный email.');
+ }
+ validated = false
+ }
+
+ // Валидация поля телефона
+ const phoneInput = form.querySelector('input[name="phone"]');
+ const phonePattern = /^\+?\d{10,15}$/;
+ if (phoneInput && !phonePattern.test(phoneInput.value.trim())) {
+ if(localeValue == 'en_US'){
+ showError(phoneInput, 'The phone is incorrect.');
+ }
+ if(localeValue == 'ru_RU'){
+ showError(phoneInput, 'Введите корректный номер телефона.');
+ }
+ validated = false
+ }
+ return validated
+ }
+
+ // Функция для отображения сообщения об ошибке
+ function showError(input, message) {
+ const errorMessage = document.createElement('div');
+ errorMessage.className = 'error-message';
+ errorMessage.textContent = message;
+ input.insertAdjacentElement('afterend', errorMessage);
+ }
+
+ // Функция для очистки сообщений об ошибках внутри конкретной формы
+ function clearErrorMessages(form) {
+ const errorMessages = form.querySelectorAll('.error-message');
+ errorMessages.forEach(errorMessage => {
+ errorMessage.remove();
+ });
+ }
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/forms/module-ajax-controller.php b/wp-content/themes/cosmopet/modules/forms/module-ajax-controller.php
index edf09f5..dacdfd5 100644
--- a/wp-content/themes/cosmopet/modules/forms/module-ajax-controller.php
+++ b/wp-content/themes/cosmopet/modules/forms/module-ajax-controller.php
@@ -2,18 +2,31 @@
require_once 'module-controller.php';
-add_action('wp_ajax_process_form', 'process_form');
-add_action('wp_ajax_nopriv_process_form', 'process_form');
+add_action('wp_ajax_contact_form', function() {
+ $enabledHandlers = ['b24', 'email'];
+ process_form($enabledHandlers);
+});
-function process_form() {
- $formData = $_POST['formData'];
+add_action('wp_ajax_nopriv_contact_form', function() {
+ $enabledHandlers = ['b24', 'email'];
+ process_form($enabledHandlers);
+});
- // Получаем обработчик с цепочкой декораторов
- $handler = FormHandlerFactory::getHandler();
-
- // Обрабатываем форму (отправляем в несколько сервисов)
- $response = $handler->handle($formData);
+add_action('wp_ajax_subscribe_form', function() {
+ $enabledHandlers = ['b24', 'email', 'mindbox'];
+ process_form($enabledHandlers);
+});
+
+add_action('wp_ajax_nopriv_subscribe_form', function() {
+ $enabledHandlers = ['b24', 'email', 'mindbox'];
+ process_form($enabledHandlers);
+});
+
+function process_form($enabledHandlers) {
+ $formData = $_POST['formData'];
+ $handler = FormHandlerFactory::getHandler($enabledHandlers);
+ $response = $handler->handle($formData);
wp_send_json($response);
}
diff --git a/wp-content/themes/cosmopet/modules/forms/module-controller.php b/wp-content/themes/cosmopet/modules/forms/module-controller.php
index 7017d69..7a16dc8 100644
--- a/wp-content/themes/cosmopet/modules/forms/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/forms/module-controller.php
@@ -38,35 +38,92 @@ class mindboxHandler extends FormHandler {
public function handle($data) {
// Отправка в стандартный обработчик (например, email)
error_log("Отправка в mindBox: " . json_encode($data));
-
+ // if (is_string($data)) {
+ // parse_str($data, $parsedData); // Преобразуем строку в массив
+ // $data = $parsedData;
+ // }
+
+ // $url = 'https://api.mindbox.ru/v3/operations/async?endpointId=cosmopet.Website&operation=DobavleniePolzovatelyaSSajta';
+
+ // $data = array(
+ // "email" => $data['email'],
+ // "subscriptions" => array(
+ // array(
+ // "pointOfContact"=> "Email"
+ // ),
+ // ),
+ // );
+
+ // $data_string = json_encode(array("customer" =>$data));
+
+ // $ch = curl_init($url);
+
+ // curl_setopt($ch, CURLOPT_POSTFIELDS, $data_string);
+
+ // curl_setopt($ch, CURLOPT_HTTPHEADER, array('Content-Type:application/json'));
+
+ // curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+
+ // $result = curl_exec($ch);
+
+ // curl_close($ch);
return parent::handle($data);
}
}
class emailHandler extends FormHandler {
public function handle($data) {
- $to = 'fcs.andrew@gmail.com';
- $subject = 'Test Email';
- $message = json_encode($data, JSON_PRETTY_PRINT); // Преобразуем данные в строку
- $headers = ['Content-Type: text/plain; charset=UTF-8'];
+
+ $to = 'fcs.andrew@gmail.com'; // Укажите email, на который нужно отправить данные
+ $subject = 'Форма обработана'; // Тема письма
+ $message = $this->formatData($data); // Форматируем данные
+
+ $headers = ['Content-Type: text/plain; charset=UTF-8']; // Заголовки письма
+
+ // Отправляем письмо
wp_mail($to, $subject, $message, $headers);
+
+ // Вызываем следующий обработчик в цепочке
return parent::handle($data);
}
+
+ private function formatData($data) {
+ if (is_string($data)) {
+ parse_str($data, $parsedData); // Преобразуем строку в массив
+ $data = $parsedData;
+ }
+ $formattedMessage = "Данные формы:\n\n";
+
+ // Проходим по всем полям данных и добавляем их в сообщение
+ foreach ($data as $key => $value) {
+ $formattedMessage .= sprintf("%s: %s\n", $key, $value);
+ }
+
+ return $formattedMessage;
+ }
}
class FormHandlerFactory {
- public static function getHandler() {
- // Базовый обработчик
- $handler = new emailHandler();
-
- // Добавляем в цепочку обработчиков
- $handler = new mindboxHandler($handler);
- $handler = new zohoHandler($handler);
- $handler = new b24Handler($handler);
- return $handler;
+ public static function getHandler(array $enabledHandlers) {
+ $handler = null;
+ if (in_array('email', $enabledHandlers)) {
+ $handler = new emailHandler($handler);
+ }
+ if (in_array('zoho', $enabledHandlers)) {
+ $handler = new zohoHandler($handler);
+ }
+ if (in_array('mindbox', $enabledHandlers)) {
+ $handler = new mindboxHandler($handler);
+ }
+ if (in_array('b24', $enabledHandlers)) {
+ $handler = new b24Handler($handler);
+ }
+
+
+ return $handler ?: new DefaultHandler();
}
}
-
?>
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/components/author-banner/component-ajax-controller.php b/wp-content/themes/cosmopet/modules/forms/module.template.twig
similarity index 100%
rename from wp-content/themes/cosmopet/modules/blog/components/author-banner/component-ajax-controller.php
rename to wp-content/themes/cosmopet/modules/forms/module.template.twig
diff --git a/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css b/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css
index 2a098d2..82761d5 100644
--- a/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css
+++ b/wp-content/themes/cosmopet/modules/header/assets/css/gp-style-desktop.css
@@ -321,7 +321,7 @@ display: none;
.header__menu-block{
position: absolute;
- top: 0;
+ top: 56px;
left: 0;
width: 100%;
@@ -342,6 +342,7 @@ display: none;
justify-content: center;
position: relative;
+
}
.header__pc-menu::before{
content: '';
@@ -524,11 +525,6 @@ background: #fff;
width: 0px;
}
-main{
-padding-top: 72px;
-}
-
-
.modal__login {
width: 412px;
}
@@ -684,9 +680,6 @@ padding-top: 72px;
/* Стили для планшетов */
@media only screen and (max-width: 1200px) {
/* header */
- main{
- padding-top: 64px;
- }
.main-menu{
display: none;
}
@@ -720,7 +713,7 @@ padding-top: 72px;
display: block;
}
.header__menu-block{
- top: 0;
+ top: 36px;
}
.header__content::after{
left: 0;
@@ -737,4 +730,3 @@ padding-top: 72px;
}
-
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/header/module-ajax-controller.php b/wp-content/themes/cosmopet/modules/header/module-ajax-controller.php
deleted file mode 100644
index e69de29..0000000
diff --git a/wp-content/themes/cosmopet/modules/header/module-controller.php b/wp-content/themes/cosmopet/modules/header/module-controller.php
index dc10d56..ca66363 100644
--- a/wp-content/themes/cosmopet/modules/header/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/header/module-controller.php
@@ -1,4 +1,69 @@
'page',
+ 'name' => 'o-kompanii',
+ 'limit' => 1
+ ]);
+
+ $production_page = Timber::get_post([
+ 'post_type' => 'page',
+ 'name' => 'proizvodstvo', // Обратите внимание на возможную опечатку в slug
+ 'limit' => 1
+ ]);
+
+ // Устанавливаем URL для страницы "О компании"
+ if ($about_page) {
+ $context['about_url'] = '/o-kompanii/';
+ $context['about_url_en'] = '/en/about-us/';
+ } else {
+ $context['about_url'] = 'https://cosmopet.shop/chto-takoe-entoprotein/';
+ $context['about_url_en'] = 'https://cosmopet.shop/en/about-2/';
+ }
+
+ // Устанавливаем URL для страницы "Производство"
+ if ($production_page) {
+ $context['production_url'] = '/proizvodstvo/';
+ $context['production_url_en'] = '/en/production/';
+ } else {
+ $context['production_url'] = 'https://cosmopet.shop/proizvodstvo/';
+ $context['production_url_en'] = 'https://cosmopet.shop/en/production/';
+ }
+ if (!is_home_page_posts_archive()) {
+ $context['front_url'] = "/";
+ $context['front_url_en'] = "/en/main/";
+ }
+ else{
+ $context['front_url'] = "https://cosmopet.shop/";
+ $context['front_url_en'] = "https://cosmopet.shop/en/main/";
+ }
+
+ return $context;
+});
?>
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css
index e2e7631..5767d4d 100644
--- a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css
+++ b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-core.css
@@ -153,4 +153,40 @@ textarea{
font-size: 18px;
line-height: 24px;
}
+}
+
+.main_link {
+ font-size: 24px;
+ font-weight: 500;
+ line-height: 28.8px;
+ color: var(--creme-white, #F4F1F0);
+ width: 221px;
+ height: 50px;
+ padding: 10px;
+ white-space: nowrap;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 48px;
+ border: 2px solid var(--creme-white, #F4F1F0);
+ transition: .3s ease all;
+}
+.main_link:hover {
+ background-color: #F4F1F0;
+ color: #121212;
+}
+
+
+.discount__sale .discount_form .discount_form-btn:hover {
+ color: #FFF;
+}
+
+@media only screen and (max-width: 576px) {
+ .main_link {
+ font-size: 12px;
+ line-height: 14.4px;
+ width: 129px;
+ height: 29px;
+ padding: 7px;
+ }
}
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css
index 5915fe0..c8dddf3 100644
--- a/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css
+++ b/wp-content/themes/cosmopet/modules/layout/assets/css/gp-style-full.css
@@ -919,7 +919,7 @@ body {
.article-home__card {
width: 100%;
- height: 500px;
+ aspect-ratio: 1223/500;
}
.article-home__card img {
@@ -1369,7 +1369,7 @@ body {
.article-home__card {
order: 2;
- height: 199px;
+
}
.article-home__card img {
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/fonts/Abel/Abel-Regular.ttf b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Abel/Abel-Regular.ttf
new file mode 100644
index 0000000..5245501
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Abel/Abel-Regular.ttf differ
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Bold.ttf b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Bold.ttf
new file mode 100644
index 0000000..9c62ebc
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Bold.ttf differ
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Medium.ttf b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Medium.ttf
new file mode 100644
index 0000000..b8629fc
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Medium.ttf differ
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Regular.ttf b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Regular.ttf
new file mode 100644
index 0000000..7298891
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-Regular.ttf differ
diff --git a/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-SemiBold.ttf b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-SemiBold.ttf
new file mode 100644
index 0000000..926c24f
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/layout/assets/fonts/Craftwork_Grotesk_Trial/CraftworkGrotesk-SemiBold.ttf differ
diff --git a/wp-content/themes/cosmopet/modules/blog/components/editorial/component-ajax-controller.php b/wp-content/themes/cosmopet/modules/layout/assets/js/core.js
similarity index 100%
rename from wp-content/themes/cosmopet/modules/blog/components/editorial/component-ajax-controller.php
rename to wp-content/themes/cosmopet/modules/layout/assets/js/core.js
diff --git a/wp-content/themes/cosmopet/modules/layout/module.template.twig b/wp-content/themes/cosmopet/modules/layout/module.template.twig
new file mode 100644
index 0000000..33532d3
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/layout/module.template.twig
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
-
+ {% for category in _post.categories %}
+
- + {{ category.name }} + + {% endfor %} +
{{_post.date}}
+ {{ function('pll_e', 'время чтения') }}: {{_post.reading_time}}
-
- {{_post.name}}
-
+ {{ function('pll_e', 'читать статью') }}
{{_post.excerpt}}
-
-
- -
- {% for category in _post.categories %}
-
- - {{ category.name }} - - {% endfor %} -
{{_post.date}}
- {{ function('pll_e', 'время чтения') }}: {{_post.reading_time}}
-
- {{ function('pll_e', 'читать статью') }}
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ {% endfor %}
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ {% endif %}
+ 