core-maugli 1.2.72 → 1.2.74

package/package.json

@@ -2,7 +2,7 @@
     "name": "core-maugli",
     "description": "Astro & Tailwind CSS blog theme for Maugli.",
     "type": "module",
-    "version": "1.2.72",
+    "version": "1.2.74",
     "license": "GPL-3.0-or-later OR Commercial",
     "repository": {
         "type": "git",

package/scripts/test-pwa-update.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+
+import { readFile } from 'fs/promises';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+async function testPWAConfig() {
+  try {
+    const configPath = join(__dirname, '..', 'astro.config.mjs');
+    const configContent = await readFile(configPath, 'utf-8');
+    
+    console.log('🔍 Проверяем PWA конфигурацию в astro.config.mjs...\n');
+    
+    // Проверяем наличие VitePWA
+    const hasVitePWA = configContent.includes('VitePWA');
+    const hasPWAImport = configContent.includes('vite-plugin-pwa');
+    
+    console.log(`✅ VitePWA plugin: ${hasVitePWA ? '✅ Найден' : '❌ Не найден'}`);
+    console.log(`✅ vite-plugin-pwa import: ${hasPWAImport ? '✅ Найден' : '❌ Не найден'}`);
+    
+    // Проверяем manifest
+    const hasManifest = configContent.includes('manifest');
+    console.log(`✅ Manifest config: ${hasManifest ? '✅ Найден' : '❌ Не найден'}`);
+    
+    // Проверяем service worker (workbox config)
+    const hasWorkbox = configContent.includes('workbox');
+    console.log(`✅ Workbox config: ${hasWorkbox ? '✅ Найден' : '❌ Не найден'}`);
+    
+    // Проверяем pwaOptions
+    const hasPWAOptions = configContent.includes('pwaOptions');
+    console.log(`✅ PWA Options: ${hasPWAOptions ? '✅ Найден' : '❌ Не найден'}`);
+    
+    // Проверяем registerType
+    const hasRegisterType = configContent.includes('registerType');
+    console.log(`✅ Register Type: ${hasRegisterType ? '✅ Найден' : '❌ Не найден'}`);
+    
+    if (hasVitePWA && hasPWAImport && hasManifest && hasWorkbox && hasPWAOptions) {
+      console.log('\n🚀 PWA конфигурация полная и готова к развертыванию!');
+      console.log('💡 Эта конфигурация будет принудительно обновлена в пользовательских блогах');
+    } else {
+      console.log('\n⚠️  PWA конфигурация неполная');
+    }
+    
+  } catch (error) {
+    console.error('❌ Ошибка при проверке PWA:', error.message);
+  }
+}
+
+testPWAConfig();

package/scripts/update-all-blogs.js

@@ -10,11 +10,11 @@
  * node scripts/update-all-blogs.js /path/to/blogs/project1 /path/to/blogs/project2
  */
 
+import { execSync } from 'child_process';
 import fs from 'fs';
 import path from 'path';
-import { execSync } from 'child_process';
 
-const CORE_MAUGLI_VERSION = '1.2.72';
+const CORE_MAUGLI_VERSION = '1.2.74';
 
 // Correct scripts for package.json
 const CORRECT_SCRIPTS = {

package/src/components/FAQCard.astro

@@ -0,0 +1,134 @@
+---
+import { maugliConfig } from '../config/maugli.config';
+import { LANGUAGES } from '../i18n/languages';
+
+export interface FaqItem {
+    question: string;
+    answer: string;
+}
+
+export interface Props {
+    faq: FaqItem[];
+}
+
+const { faq } = Astro.props;
+const lang = typeof maugliConfig.defaultLang === 'string' ? maugliConfig.defaultLang : 'en';
+const languageObj = LANGUAGES.find((l) => l.code === lang) || LANGUAGES.find((l) => l.code === 'en');
+const fallbackDict = LANGUAGES.find((l) => l.code === 'en')?.dict || {};
+const dict = languageObj?.dict && Object.keys(languageObj.dict).length > 0 ? languageObj.dict : fallbackDict;
+const faqCard = (dict as any).faqCard || (fallbackDict as any).faqCard || {};
+---
+
+<section
+    class="w-full bg-[var(--bg-muted)] rounded-custom p-6 pl-8 sm:p-8 sm:pl-10 mt-8 mb-4 flex flex-col gap-6 sm:gap-10 overflow-hidden"
+    aria-label={faqCard.ariaLabel || 'Часто задаваемые вопросы'}
+>
+    <div class="flex flex-col sm:flex-row gap-4 sm:gap-6">
+        <div class="flex-shrink-0">
+            <h3 class="font-serif text-[18px] font-bold flex items-center">
+                <span class="mr-2">
+                    <svg width="20" height="20" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <g clip-path="url(#clip0_3491_12505)">
+                            <path
+                                fill-rule="evenodd"
+                                clip-rule="evenodd"
+                                d="M12.5 0C19.4036 0 25 5.59644 25 12.5C25 19.4036 19.4036 25 12.5 25C5.59644 25 0 19.4036 0 12.5C0 5.59644 5.59644 0 12.5 0ZM12.7549 16.1074C12.5033 16.1075 12.2876 16.2001 12.1074 16.3857C11.9271 16.5715 11.8369 16.7943 11.8369 17.0537C11.837 17.313 11.9272 17.5359 12.1074 17.7217C12.2876 17.9072 12.5034 17.9999 12.7549 18C12.9248 18 13.0779 17.958 13.2139 17.874C13.3533 17.7864 13.4643 17.6701 13.5459 17.5264C13.6308 17.3828 13.6738 17.2253 13.6738 17.0537C13.6738 16.7944 13.5835 16.5715 13.4033 16.3857C13.2230 16.2 13.0066 16.1074 12.7549 16.1074ZM13.041 7C12.4901 7 11.9885 7.11263 11.5361 7.33691C11.0872 7.56126 10.7247 7.88541 10.4492 8.30957C10.1772 8.73371 10.0272 9.24397 10 9.83984H11.2861C11.3133 9.4262 11.4134 9.09086 11.5869 8.83496C11.7603 8.57924 11.976 8.39162 12.2344 8.27246C12.4929 8.15328 12.7621 8.09375 13.041 8.09375C13.3606 8.09378 13.6513 8.16218 13.9131 8.29883C14.175 8.43554 14.3846 8.63042 14.541 8.88281C14.6973 9.13512 14.7754 9.43301 14.7754 9.77637C14.7754 10.0532 14.728 10.3054 14.6328 10.5332C14.541 10.761 14.4147 10.9625 14.2549 11.1377C14.095 11.3095 13.9145 11.4588 13.7139 11.585C13.3806 11.7917 13.0955 12.0184 12.8574 12.2637C12.6193 12.509 12.4349 12.8295 12.3057 13.2256C12.1764 13.6217 12.1084 14.1547 12.1016 14.8242V14.8867H13.3262V14.8242C13.333 14.3895 13.3774 14.0263 13.459 13.7354C13.5406 13.4445 13.6714 13.1937 13.8516 12.9834C14.0318 12.7696 14.2721 12.5668 14.5713 12.374C14.8706 12.1847 15.126 11.9671 15.3369 11.7217C15.5511 11.4764 15.714 11.1976 15.8262 10.8857C15.9418 10.5739 16 10.2253 16 9.83984C16 9.29312 15.8776 8.80552 15.6328 8.37793C15.3913 7.95027 15.0471 7.61354 14.6016 7.36816C14.1595 7.12293 13.6394 7.00003 13.041 7Z"
+                                fill="var(--brand-color)"></path>
+                        </g>
+                        <defs>
+                            <clipPath id="clip0_3491_12505">
+                                <rect width="25" height="25" fill="white"></rect>
+                            </clipPath>
+                        </defs>
+                    </svg>
+                </span>
+                <span class="text-[var(--brand-color)]">{faqCard.faqLabel || 'FAQ:'}</span>
+            </h3>
+        </div>
+        <div class="flex-1 min-w-0 flex flex-col gap-2">
+            {
+                faq.map(({ question, answer }, index) => (
+                    <div class="faq-item border-b border-[var(--border-color)] last:border-b-0">
+                        <button 
+                            class="faq-toggle w-full text-left py-3 flex items-center justify-between group hover:bg-[var(--bg-card)] px-2 rounded transition-colors"
+                            data-index={index}
+                            aria-expanded={index === 0 ? "true" : "false"}
+                            aria-controls={`faq-answer-${index}`}
+                        >
+                            <span class="font-sans text-[16px] text-[var(--text-heading)] flex-1 pr-4">
+                                {question}
+                            </span>
+                            <span class="faq-chevron flex-shrink-0 transition-transform duration-200" style={index === 0 ? "transform: rotate(90deg)" : ""}>
+                                <svg width="16" height="16" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+                                    <g clip-path="url(#clip0_3491_12515)">
+                                        <path
+                                            fill-rule="evenodd"
+                                            clip-rule="evenodd"
+                                            d="M12.5 0C19.4036 0 25 5.59644 25 12.5C25 19.4036 19.4036 25 12.5 25C5.59644 25 0 19.4036 0 12.5C0 5.59644 5.59644 0 12.5 0ZM9.20801 8.80273L14.6641 12.499L9.8291 15.7764L9.20801 16.1963L10.0498 17.4385L16.4209 13.1201C16.6265 12.9806 16.7499 12.7485 16.75 12.5C16.75 12.2824 16.6556 12.0769 16.4941 11.9355L16.4209 11.8789L10.0498 7.56055L9.20801 8.80273Z"
+                                            fill="var(--brand-color)"
+                                        />
+                                    </g>
+                                    <defs>
+                                        <clipPath id="clip0_3491_12515">
+                                            <rect width="25" height="25" fill="white" />
+                                        </clipPath>
+                                    </defs>
+                                </svg>
+                            </span>
+                        </button>
+                        <div 
+                            class="faq-answer overflow-hidden transition-all duration-300 ease-in-out"
+                            id={`faq-answer-${index}`}
+                            style={index === 0 ? "max-height: 1000px; opacity: 1;" : "max-height: 0; opacity: 0;"}
+                        >
+                            <div class="font-sans text-[14px] text-[var(--text-main)] pb-4 px-2">
+                                {answer}
+                            </div>
+                        </div>
+                    </div>
+                ))
+            }
+        </div>
+    </div>
+</section>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    const faqToggles = document.querySelectorAll('.faq-toggle');
+    
+    faqToggles.forEach(toggle => {
+        toggle.addEventListener('click', function() {
+            const index = this.dataset.index;
+            const answer = document.getElementById(`faq-answer-${index}`);
+            const chevron = this.querySelector('.faq-chevron');
+            const isExpanded = this.getAttribute('aria-expanded') === 'true';
+            
+            // Закрываем все остальные
+            faqToggles.forEach((otherToggle, otherIndex) => {
+                if (otherToggle !== this) {
+                    const otherAnswer = document.getElementById(`faq-answer-${otherIndex}`);
+                    const otherChevron = otherToggle.querySelector('.faq-chevron');
+                    
+                    otherToggle.setAttribute('aria-expanded', 'false');
+                    otherAnswer.style.maxHeight = '0';
+                    otherAnswer.style.opacity = '0';
+                    otherChevron.style.transform = 'rotate(0deg)';
+                }
+            });
+            
+            // Переключаем текущий
+            if (isExpanded) {
+                this.setAttribute('aria-expanded', 'false');
+                answer.style.maxHeight = '0';
+                answer.style.opacity = '0';
+                chevron.style.transform = 'rotate(0deg)';
+            } else {
+                this.setAttribute('aria-expanded', 'true');
+                answer.style.maxHeight = '1000px';
+                answer.style.opacity = '1';
+                chevron.style.transform = 'rotate(90deg)';
+            }
+        });
+    });
+});
+</script>

package/src/components/SummaryCard.astro

@@ -0,0 +1,51 @@
+---
+import { maugliConfig } from '../config/maugli.config';
+import { LANGUAGES } from '../i18n/languages';
+
+export interface Props {
+    summary: string;
+    highlights: string[];
+}
+
+const { summary, highlights } = Astro.props;
+const lang = typeof maugliConfig.defaultLang === 'string' ? maugliConfig.defaultLang : 'en';
+const languageObj = LANGUAGES.find((l) => l.code === lang) || LANGUAGES.find((l) => l.code === 'en');
+const fallbackDict = LANGUAGES.find((l) => l.code === 'en')?.dict || {};
+const dict = languageObj?.dict && Object.keys(languageObj.dict).length > 0 ? languageObj.dict : fallbackDict;
+const summaryCard = (dict as any).summaryCard || (fallbackDict as any).summaryCard || {};
+---
+
+<section
+    class="w-full bg-[var(--bg-muted)] rounded-custom p-6 pl-8 sm:p-8 sm:pl-10 mt-0 mb-4 flex flex-col gap-6 sm:gap-10 overflow-hidden"
+    aria-label={summaryCard.ariaLabel || 'Саммари статьи'}
+>
+    <div class="flex flex-col sm:flex-row gap-4 sm:gap-6">
+        <div class="flex-shrink-0">
+            <h3 class="font-serif text-[18px] font-bold flex items-center">
+                <span class="mr-2">
+                    <svg width="20" height="20" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+                        <g clip-path="url(#clip0_3491_12503)">
+                            <path
+                                fill-rule="evenodd"
+                                clip-rule="evenodd"
+                                d="M12.5 0C9.18479 0 6.00537 1.31696 3.66117 3.66117C1.31696 6.00537 0 9.18479 0 12.5C0 15.8152 1.31696 18.9946 3.66117 21.3388C6.00537 23.683 9.18479 25 12.5 25C15.8152 25 18.9946 23.683 21.3388 21.3388C23.683 18.9946 25 15.8152 25 12.5C25 9.18479 23.683 6.00537 21.3388 3.66117C18.9946 1.31696 15.8152 0 12.5 0ZM8 9H9V10H8V9ZM10 9H18V10H10V9ZM8 11H9V12H8V11ZM10 11H15V12H10V11ZM8 13H9V14H8V13ZM10 13H17V14H10V13ZM8 15H9V16H8V15ZM10 15H19V16H10V15Z"
+                                fill="var(--brand-color)"></path>
+                        </g>
+                        <defs>
+                            <clipPath id="clip0_3491_12503">
+                                <rect width="25" height="25" fill="white"></rect>
+                            </clipPath>
+                        </defs>
+                    </svg>
+                </span>
+                <span class="text-[var(--brand-color)]">{summaryCard.summaryLabel || 'Саммари:'}</span>
+            </h3>
+        </div>
+        <div class="flex-1 min-w-0">
+            <div class="font-sans text-[16px] mb-4 text-[var(--text-main)] max-w-[calc(100%-2rem)]">{summary}</div>
+            <ul class="list-disc ml-6 font-sans text-[14px] text-[var(--text-heading)] leading-[1.2]">
+                {highlights.map((hl) => <li>{hl}</li>)}
+            </ul>
+        </div>
+    </div>
+</section>

package/src/i18n/en.json

@@ -88,6 +88,14 @@
     "yesterday": "yesterday"
   },
   "sidebarAriaLabel": "Sidebar",
+  "summaryCard": {
+    "ariaLabel": "Article Summary",
+    "summaryLabel": "Summary:"
+  },
+  "faqCard": {
+    "ariaLabel": "Frequently Asked Questions",
+    "faqLabel": "FAQ:"
+  },
   "summaryFAQCard": {
     "ariaLabel": "Summary and FAQ",
     "summaryLabel": "Summary:",

package/src/i18n/ru.json

@@ -85,6 +85,14 @@
     "yesterday": "вчера"
   },
   "sidebarAriaLabel": "Сайдбар",
+  "summaryCard": {
+    "ariaLabel": "Саммари статьи",
+    "summaryLabel": "Саммари:"
+  },
+  "faqCard": {
+    "ariaLabel": "Часто задаваемые вопросы",
+    "faqLabel": "FAQ:"
+  },
   "summaryFAQCard": {
     "ariaLabel": "Саммари и FAQ",
     "summaryLabel": "Саммари:",

package/src/pages/blog/[id].astro

@@ -2,11 +2,12 @@
 import { type CollectionEntry, render } from 'astro:content';
 import ArticleMeta from '../../components/ArticleMeta.astro';
 import ContentFooter from '../../components/ContentFooter.astro';
+import FAQCard from '../../components/FAQCard.astro';
 import HeroImage from '../../components/HeroImage.astro';
 import PostPreview from '../../components/PostPreview.astro';
 import ProductBannerCard from '../../components/ProductBannerCard.astro';
 import Subscribe from '../../components/Subscribe.astro';
-import SummaryFAQCard from '../../components/SummaryFAQCard.astro';
+import SummaryCard from '../../components/SummaryCard.astro';
 import TableOfContents from '../../components/TableOfContents.astro';
 import TagsAndShare from '../../components/TagsAndShare.astro';
 import { maugliConfig } from '../../config/maugli.config';
@@ -131,17 +132,15 @@ if (post.data.productID) {
 
             <!-- Основной контент -->
             <div class="md:col-span-11 px-4 md:px-0 h-auto lg:col-span-11">
-                <!-- Summary/FAQ в начале контента -->
+                <!-- Summary в начале контента -->
                 {
                     post.data.generativeEngineOptimization?.generated &&
                         (post.data.generativeEngineOptimization.generated.summary ||
-                            post.data.generativeEngineOptimization.generated.highlights?.length > 0 ||
-                            post.data.generativeEngineOptimization.generated.faq?.length > 0) && (
+                            post.data.generativeEngineOptimization.generated.highlights?.length > 0) && (
                             <div class="not-prose mb-8">
-                                <SummaryFAQCard
+                                <SummaryCard
                                     summary={post.data.generativeEngineOptimization.generated.summary}
                                     highlights={post.data.generativeEngineOptimization.generated.highlights}
-                                    faq={post.data.generativeEngineOptimization.generated.faq}
                                 />
                             </div>
                         )
@@ -155,6 +154,16 @@ if (post.data.productID) {
                 <!-- Блок тегов и кнопки поделиться под контентом (только на мобилке) -->
                 <ContentFooter tags={tags} shareUrl={href} title={title} basePath="/blog" productLink={post.data.productLink} />
 
+                <!-- FAQ после контента -->
+                {
+                    post.data.generativeEngineOptimization?.generated?.faq &&
+                    post.data.generativeEngineOptimization.generated.faq.length > 0 && (
+                        <div class="not-prose mb-8">
+                            <FAQCard faq={post.data.generativeEngineOptimization.generated.faq} />
+                        </div>
+                    )
+                }
+
                 {
                     (prevPost || nextPost) && (
                         <div class="my-16 sm:my-24">

package/src/pages/products/[id].astro

@@ -4,10 +4,11 @@ import { getFilteredCollection } from '../../utils/content-loader';
 import ArticleMeta from '../../components/ArticleMeta.astro';
 import Breadcrumbs from '../../components/Breadcrumbs.astro';
 import ContentFooter from '../../components/ContentFooter.astro';
+import FAQCard from '../../components/FAQCard.astro';
 import HeroImage from '../../components/HeroImage.astro';
 import PostPreview from '../../components/PostPreview.astro';
 import ProjectPreview from '../../components/ProjectPreview.astro';
-import SummaryFAQCard from '../../components/SummaryFAQCard.astro';
+import SummaryCard from '../../components/SummaryCard.astro';
 import TableOfContents from '../../components/TableOfContents.astro';
 import TagsAndShare from '../../components/TagsAndShare.astro';
 import { maugliConfig } from '../../config/maugli.config';
@@ -98,17 +99,15 @@ const moreLabel = dict.buttons?.more || dicts['en'].buttons.more || 'More';
                 </div>
             </aside>
             <div class="md:col-span-11 px-4 md:px-0 h-auto lg:col-span-11">
-                {/* Summary/FAQ для продукта */}
+                {/* Summary для продукта */}
                 {
                     product.data.generativeEngineOptimization?.generated &&
                         (product.data.generativeEngineOptimization.generated.summary ||
-                            product.data.generativeEngineOptimization.generated.highlights?.length > 0 ||
-                            product.data.generativeEngineOptimization.generated.faq?.length > 0) && (
+                            product.data.generativeEngineOptimization.generated.highlights?.length > 0) && (
                             <div class="not-prose mb-8">
-                                <SummaryFAQCard
+                                <SummaryCard
                                     summary={product.data.generativeEngineOptimization.generated.summary}
                                     highlights={product.data.generativeEngineOptimization.generated.highlights}
-                                    faq={product.data.generativeEngineOptimization.generated.faq}
                                 />
                             </div>
                         )
@@ -116,6 +115,17 @@ const moreLabel = dict.buttons?.more || dicts['en'].buttons.more || 'More';
                 <div class="prose sm:prose-lg lg:prose-xl max-w-none">
                     <Content />
                 </div>
+                
+                {/* FAQ после контента продукта */}
+                {
+                    product.data.generativeEngineOptimization?.generated?.faq &&
+                    product.data.generativeEngineOptimization.generated.faq.length > 0 && (
+                        <div class="not-prose mb-8">
+                            <FAQCard faq={product.data.generativeEngineOptimization.generated.faq} />
+                        </div>
+                    )
+                }
+                
                 <ContentFooter tags={tags} shareUrl={href} title={title} basePath="/products" />
                 {/* Связанные статьи */}
                 {

package/src/pages/projects/[id].astro

@@ -3,10 +3,11 @@ import { getCollection, render, type CollectionEntry } from 'astro:content';
 import ArticleMeta from '../../components/ArticleMeta.astro';
 import Breadcrumbs from '../../components/Breadcrumbs.astro';
 import ContentFooter from '../../components/ContentFooter.astro';
+import FAQCard from '../../components/FAQCard.astro';
 import HeroImage from '../../components/HeroImage.astro';
 import ProductBannerCard from '../../components/ProductBannerCard.astro';
 import ProjectPreview from '../../components/ProjectPreview.astro';
-import SummaryFAQCard from '../../components/SummaryFAQCard.astro';
+import SummaryCard from '../../components/SummaryCard.astro';
 import TableOfContents from '../../components/TableOfContents.astro';
 import TagsAndShare from '../../components/TagsAndShare.astro';
 import { maugliConfig } from '../../config/maugli.config';
@@ -119,17 +120,15 @@ const moreByTag = pages.projects?.moreByTag || 'More cases';
 
             <!-- Основной контент -->
             <div class="md:col-span-11 px-4 md:px-0 h-auto lg:col-span-11">
-                <!-- Summary/FAQ в начале контента -->
+                <!-- Summary в начале контента -->
                 {
                     project.data.generativeEngineOptimization?.generated &&
                         (project.data.generativeEngineOptimization.generated.summary ||
-                            project.data.generativeEngineOptimization.generated.highlights?.length > 0 ||
-                            project.data.generativeEngineOptimization.generated.faq?.length > 0) && (
+                            project.data.generativeEngineOptimization.generated.highlights?.length > 0) && (
                             <div class="not-prose mb-8">
-                                <SummaryFAQCard
+                                <SummaryCard
                                     summary={project.data.generativeEngineOptimization.generated.summary}
                                     highlights={project.data.generativeEngineOptimization.generated.highlights}
-                                    faq={project.data.generativeEngineOptimization.generated.faq}
                                 />
                             </div>
                         )
@@ -145,6 +144,16 @@ const moreByTag = pages.projects?.moreByTag || 'More cases';
                 {/* Мобильный блок: поделиться и "Больше о продукте" в один ряд */}
                 <ContentFooter tags={tags} shareUrl={href} title={title} basePath="/projects" class="sm:hidden" productLink={project.data.productLink} />
 
+                <!-- FAQ после контента -->
+                {
+                    project.data.generativeEngineOptimization?.generated?.faq &&
+                    project.data.generativeEngineOptimization.generated.faq.length > 0 && (
+                        <div class="not-prose mb-8">
+                            <FAQCard faq={project.data.generativeEngineOptimization.generated.faq} />
+                        </div>
+                    )
+                }
+
                 <!-- Блок "Еще по теме" в контенте -->
                 {
                     (prevProject || nextProject) && (