diff --git a/wp-content/.htaccess b/wp-content/.htaccess
index 7bb2873..67c3297 100644
--- a/wp-content/.htaccess
+++ b/wp-content/.htaccess
@@ -1,7 +1 @@
-
-# BEGIN WebP Converter
-# ! --- DO NOT EDIT PREVIOUS LINE --- !
-# ! --- DO NOT EDIT NEXT LINE --- !
-# END WebP Converter
-
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/archive.php b/wp-content/themes/cosmopet/archive.php
new file mode 100644
index 0000000..1587666
--- /dev/null
+++ b/wp-content/themes/cosmopet/archive.php
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/functions.php b/wp-content/themes/cosmopet/functions.php
index 1cd6aa7..7633f58 100644
--- a/wp-content/themes/cosmopet/functions.php
+++ b/wp-content/themes/cosmopet/functions.php
@@ -45,12 +45,36 @@ function requireAjaxControllers($baseDir) {
}
}
-if( wp_doing_ajax() ){
+function requireShortcodes($baseDir) {
+ $modules = glob($baseDir . '/*', GLOB_ONLYDIR);
-requireAjaxControllers($modulesDir);
+ foreach ($modules as $module) {
+ $componentsDir = $module . '/shortcodes';
+ if (is_dir($componentsDir)) {
+ // Рекурсивно подключаем все shortcodes.php
+ requireShortcodesRecursive($componentsDir);
+ }
+ }
+}
+function requireShortcodesRecursive($dir) {
+ // Получаем все подпапки в текущем каталоге
+ $components = glob($dir . '/*', GLOB_ONLYDIR);
+
+ foreach ($components as $component) {
+ // Проверяем наличие файла shortcode.php в текущей подпапке
+ $componentController = $component . '/shortcode.php';
+ if (file_exists($componentController)) {
+ require_once $componentController;
+ }
+
+ // Рекурсивно вызываем функцию для каждой найденной подпапки
+ requireShortcodesRecursive($component);
+ }
}
+// Пример вызова функции
+
function includeFilesFromFolder($folder) {
// Проверяем, существует ли папка
if (is_dir($folder)) {
@@ -249,6 +273,16 @@ $modules_path = get_template_directory() . '/modules/*/editor-blocks/*/editor-bl
foreach (glob($modules_path) as $file) {
require_once $file; // Подключаем каждый найденный файл
}
+add_filter('timber/context', function($context) {
+ $context['current_lang'] = pll_current_language();
+
+ return $context;
+});
+
+requireShortcodes(get_template_directory() . '/modules');
+require_once('modules/blog/components/news-list/component-ajax-controller.php');
+require_once('modules/forms/module-ajax-controller.php');
+include_module('forms');
include_module('layout');
diff --git a/wp-content/themes/cosmopet/global-functions/multilang-functions.php b/wp-content/themes/cosmopet/global-functions/multilang-functions.php
index e69de29..09319fd 100644
--- a/wp-content/themes/cosmopet/global-functions/multilang-functions.php
+++ b/wp-content/themes/cosmopet/global-functions/multilang-functions.php
@@ -0,0 +1,26 @@
+скидку!', 'Узнайте о нас больше и получите скидку!');
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php b/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php
index 5851e80..afda2b7 100644
--- a/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php
+++ b/wp-content/themes/cosmopet/modules/blog/components/archive/component-controller.php
@@ -11,7 +11,8 @@ wp_localize_script('blog-archive-posts-ajax-js', 'ajax', array(
));
$context = Timber::get_context();
-
+$context['blog_title'] = get_field('blog_title', 'options');
+$context['blog_desc'] = get_field('blog_desc', 'options');
$context['post_count'] = wp_count_posts()->publish; // Количество опубликованных постов
$context['total_pages'] = ceil($context['post_count'] / get_option('posts_per_page')); // Общее количество страниц
diff --git a/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig b/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig
index c77e21f..4b99b09 100644
--- a/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig
+++ b/wp-content/themes/cosmopet/modules/blog/components/archive/component-template.twig
@@ -6,8 +6,8 @@
-
БЛОГ
-
Мы пишем про то, что нас по‑настоящему цепляет: биотехнологии, науку, здоровье и то, как этот мир сделать лучше. Мы не боимся сложных тем и неудобных вопросов, ведь именно с них начинается будущее
+
{{blog_title}}
+
{{blog_desc}}
{% include '/blog/components/featured-slider/component-template.twig' %}
@@ -20,7 +20,7 @@
{% include '/blog/components/most-read/component-template.twig' %}
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig b/wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig
index 29eacae..89e20a2 100644
--- a/wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig
+++ b/wp-content/themes/cosmopet/modules/blog/components/editorial/component-template.twig
@@ -4,7 +4,7 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css
index 3b2c455..ba9c6a8 100644
--- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/assets/css/style.css
@@ -20,24 +20,6 @@
text-transform: uppercase;
}
-.texts-description {
- display: flex;
- flex-direction: column;
- gap: 48px;
-}
-
-.texts-description p {
- color: var(--grey-black);
- font-size: 24px;
- line-height: 32px;
- font-weight: 500;
-}
-
-.texts-description a {
- display: inline;
- text-decoration: underline;
-}
-
.texts ol {
display: flex;
flex-direction: column;
@@ -46,15 +28,18 @@
line-height: 32px;
font-weight: 500;
color: #191919;
+ counter-reset: none;
}
.texts ol li {
display: flex;
align-items: center;
gap: 12px;
+ counter-increment: num;
}
-.texts ol h4 {
+.texts ol li::before {
+ content: counter(num);
background: var(--accent-1);
border-radius: 5.2px;
width: 32px;
@@ -96,6 +81,19 @@
}
+.texts p {
+ color: var(--grey-black);
+ font-size: 24px;
+ line-height: 32px;
+ font-weight: 500;
+}
+
+.texts a {
+ display: inline;
+ text-decoration: underline;
+}
+
+
@media only screen and (max-width: 992px) {
.texts h2 {
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/editor-block-controller.php b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/editor-block-controller.php
index c18aa0e..8410e80 100644
--- a/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/editor-block-controller.php
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/texts/editor-block-controller.php
@@ -25,7 +25,7 @@
'enqueue_assets' => function(){
wp_enqueue_style('gp_util_style', get_template_directory_uri() . '/modules/layout/assets/css/gp-style-core.css', array(), '1.0', 'all');
wp_enqueue_style('gp_normalize', get_template_directory_uri() . '/modules/layout/assets/css/gp-style-normalize.css', array(), '1.0', 'all');
- wp_enqueue_style('gp_texts_style', get_template_directory_uri() . '/modules/blog/editor-blocks/texts/assets/css/style.css', array(), '1.0', 'all');
+ wp_enqueue_style('gp_texts_style', get_template_directory_uri() . '/modules/blog/editor-blocks/texts/assets/css/style.css', array(), '2.0', 'all');
}
));
}
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/assets/css/style.css b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/assets/css/style.css
new file mode 100644
index 0000000..ceadf34
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/assets/css/style.css
@@ -0,0 +1,5 @@
+.video_block {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-controller.php b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-controller.php
new file mode 100644
index 0000000..3404be4
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-controller.php
@@ -0,0 +1,43 @@
+ 'gp_video',
+ 'title' => __('GP - video'),
+ 'description' => __('video block'),
+ 'render_callback' => 'video_render_callback',
+ 'category' => 'formatting',
+ 'icon' => 'admin-comments',
+ 'keywords' => array( 'video', 'gp-block',),
+ 'mode' => 'preview',
+ 'enqueue_assets' => function(){
+ wp_enqueue_style('gp_util_style', get_template_directory_uri() . '/modules/layout/assets/css/gp-style-core.css', array(), '1.0', 'all');
+ wp_enqueue_style('gp_normalize', get_template_directory_uri() . '/modules/layout/assets/css/gp-style-normalize.css', array(), '1.0', 'all');
+ wp_enqueue_style('gp_video_style', get_template_directory_uri() . '/modules/blog/editor-blocks/video/assets/css/style.css', array(), '2.0', 'all');
+ },
+ 'supports' => array(
+ 'align' => true,
+ 'multiple' => true,
+ 'jsx' => true,
+ '__experimentalInnerBlocks' => true, // Включение поддержки вложенных блоков
+ ),
+ ));
+ }
+});
+
+
+
+
+?>
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-template.twig b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-template.twig
new file mode 100644
index 0000000..88b7e01
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/editor-blocks/video/editor-block-template.twig
@@ -0,0 +1,3 @@
+
+ {{video}}
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/module-controller.php b/wp-content/themes/cosmopet/modules/blog/module-controller.php
index d3ce61c..7a1c97b 100644
--- a/wp-content/themes/cosmopet/modules/blog/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/blog/module-controller.php
@@ -20,7 +20,7 @@ class BlogPost extends \Timber\Post
$minutes = round($symb / $symb_per_minute);
/* translators: %s: Time duration in minute or minutes. */
- return sprintf(_n('%s мин.', '%s мин.', $minutes), (int) $minutes);
+ return sprintf(_n('%s ' . pll__('мин.'), '%s ' . pll__('мин.'), $minutes), (int) $minutes);
}
}
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.php b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.php
new file mode 100644
index 0000000..e7fb953
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.php
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.twig b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.twig
new file mode 100644
index 0000000..838e89f
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend/shortcode.twig
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.php b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.php
new file mode 100644
index 0000000..926e0bb
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.php
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.twig b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.twig
new file mode 100644
index 0000000..c63a94a
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/intend_close/shortcode.twig
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg-sm.png b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg-sm.png
new file mode 100644
index 0000000..4a2e4d3
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg-sm.png differ
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg.png b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg.png
new file mode 100644
index 0000000..1679df3
Binary files /dev/null and b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/assets/img/discount-bg.png differ
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.php b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.php
new file mode 100644
index 0000000..62f9b14
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.php
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.twig b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.twig
new file mode 100644
index 0000000..6bde05a
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form/shortcode.twig
@@ -0,0 +1,17 @@
+
+{% set current_path = '/wp-content/themes/cosmopet/modules/blog/shortcodes/subs_form' %}
+
+
{{ function('pll_e', 'Узнайте о нас больше и получите скидку!') }}
+
+
+
+
+
{{ function('pll_e', 'Подписываясь на рассылку, я даю согласие на обработку персональных данных, на получение рекламных сообщений и новостей о товарах и услугах') }}
+
{{ function('pll_e', 'Подпишитесь, чтобы быть в курсе деятельности Cosmopet и узнавать о наших, предложениях. Обещаем не заваливать вас бесполезными письмами. А за подписку дарим -25% на весь ассортимент нашей продукции', 'Подпишитесь, чтобы быть в курсе деятельности Cosmopet и узнавать о наших предложениях. Обещаем не заваливать вас бесполезными письмами. А за подписку дарим -25% на весь ассортимент нашей продукции') }}
+
+
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/example/components/example/component-ajax-controller.php b/wp-content/themes/cosmopet/modules/example/components/example/component-ajax-controller.php
index 0666218..e69de29 100644
--- a/wp-content/themes/cosmopet/modules/example/components/example/component-ajax-controller.php
+++ b/wp-content/themes/cosmopet/modules/example/components/example/component-ajax-controller.php
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/footer/module-controller.php b/wp-content/themes/cosmopet/modules/footer/module-controller.php
index 15c5adc..6b46b98 100644
--- a/wp-content/themes/cosmopet/modules/footer/module-controller.php
+++ b/wp-content/themes/cosmopet/modules/footer/module-controller.php
@@ -1,3 +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
index d878a2e..5574dc8 100644
--- a/wp-content/themes/cosmopet/modules/footer/module.template.twig
+++ b/wp-content/themes/cosmopet/modules/footer/module.template.twig
@@ -9,59 +9,43 @@
сosmopet
- 123182 г. Москва,
- 4-й Красногорский пр.,
- д. 2/4, стр. 1, этаж/ком. 3/1
+ {{adres}}
+
+
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/header/module.template_RU.twig b/wp-content/themes/cosmopet/modules/header/module.template_RU.twig
new file mode 100644
index 0000000..3d5da02
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/header/module.template_RU.twig
@@ -0,0 +1,150 @@
+
+
Мы пишем про то, что нас по‑настоящему цепляет: биотехнологии, науку, здоровье и то, как этот мир сделать лучше. Мы не боимся сложных тем и неудобных вопросов, ведь именно с них начинается будущее
+ {% include '/blog/components/featured-slider/component-template.twig' %}
+
+
+
+
+
+
+
+ {% include '/blog/components/themes/component-template.twig' %}
+ {% include '/blog/components/most-read/component-template.twig' %}
+ {% include '/blog/components/news-list/component-template.twig' %}
+
+
+
+
+ {% include '/blog/components/author-banner/component-template.twig' %}
+
+
+
+ {% include '/blog/components/editorial/component-template.twig' %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/popup/module-ajax-controller.php b/wp-content/themes/cosmopet/modules/popup/module-ajax-controller.php
new file mode 100644
index 0000000..e69de29
diff --git a/wp-content/themes/cosmopet/modules/popup/module-controller.php b/wp-content/themes/cosmopet/modules/popup/module-controller.php
new file mode 100644
index 0000000..6c04798
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/popup/module-controller.php
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/wp-content/themes/cosmopet/modules/popup/module.template.twig b/wp-content/themes/cosmopet/modules/popup/module.template.twig
new file mode 100644
index 0000000..80f3776
--- /dev/null
+++ b/wp-content/themes/cosmopet/modules/popup/module.template.twig
@@ -0,0 +1,60 @@
+{% set current_path = template_path ~ '/modules/footer' %}
+
+
\ No newline at end of file