core-maugli 1.2.16 → 1.2.18

package/package.json

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

package/src/components/Card.astro

@@ -52,8 +52,8 @@ const cardImageAlt = seo?.image?.alt || image?.alt || title || 'Изображе
 
 // Используем уменьшенное превью, если оно существует
 let previewImage;
-if (cardImage) {
-    previewImage = cardImage.replace(/\/([^\/]+)$/, '/previews/$1');
+if (cardImage.src) {
+    previewImage = cardImage.src.replace(/\/([^\/]+)$/, '/previews/$1');
 
     const __filename = fileURLToPath(import.meta.url);
     const projectRoot = path.resolve(path.dirname(__filename), '../..');
@@ -64,7 +64,7 @@ if (cardImage) {
     }
 }
 
-const finalImage = previewImage || cardImage;
+const finalImage = previewImage || cardImage.src;
 
 // Определяем контент для отображения
 const content = excerpt || description;
@@ -81,7 +81,7 @@ const content = excerpt || description;
         <!-- Изображение -->
         <div class="w-full aspect-[1200/630] bg-[var(--bg-muted)] overflow-hidden relative">
             <img
-                src={cardImage.src}
+                src={finalImage}
                 srcset={cardImage.srcset}
                 sizes={cardImage.sizes}
                 alt={cardImageAlt}

package/src/components/HeroImage.astro

@@ -1,5 +1,9 @@
 ---
 // src/components/HeroImage.astro
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
 export interface Props {
     src: string;
     alt?: string;
@@ -9,11 +13,12 @@ export interface Props {
     className?: string;
     srcset?: string;
 }
-const defaultWidth = 800;
-const { src, alt = '', caption, width = defaultWidth, height, className = '', srcset = '' } = Astro.props;
+const defaultWidth = 1200;
+const defaultHeight = 630;
+const { src, alt = '', caption, width = defaultWidth, height = defaultHeight, className = '', srcset = '' } = Astro.props;
 
-// Вариант aspect-ratio: если есть оба размера, рассчитываем; иначе не пишем!
-const aspectRatio = width && height ? `${width} / ${height}` : undefined;
+// Фиксированные пропорции 1200:630
+const aspectRatio = '1200 / 630';
 
 // Генерируем адаптивные версии изображений
 function getResponsiveImages(imagePath: string) {
@@ -39,17 +44,33 @@ if (srcset) {
     // Генерируем адаптивные изображения
     imageData = getResponsiveImages(src);
 }
+
+// Используем уменьшенное превью, если оно существует
+let previewImage;
+if (imageData.src) {
+    previewImage = imageData.src.replace(/\/([^\/]+)$/, '/previews/$1');
+
+    const __filename = fileURLToPath(import.meta.url);
+    const projectRoot = path.resolve(path.dirname(__filename), '../..');
+    const previewFilePath = path.join(projectRoot, 'public', previewImage.replace(/^\//, ''));
+
+    if (!fs.existsSync(previewFilePath)) {
+        previewImage = undefined;
+    }
+}
+
+const finalImage = previewImage || imageData.src;
 ---
 
 <figure class={`w-full max-w-[${width}px] mx-auto rounded-custom overflow-hidden bg-[var(--bg-muted)] ${className}`}>
     <img
-        src={imageData.src}
+        src={finalImage}
         srcset={imageData.srcset}
         sizes={imageData.sizes}
         alt={alt}
         width={width}
         height={height}
-        style={aspectRatio ? `aspect-ratio: ${aspectRatio}; width: 100%; height: auto;` : 'width: 100%; height: auto;'}
+        style={`aspect-ratio: ${aspectRatio}; width: 100%; height: auto;`}
         class="block rounded-custom object-cover"
         loading="eager"
         decoding="async"

package/src/components/RubricCard.astro

@@ -194,23 +194,18 @@ if (import.meta.env.DEV) {
         class={`w-full h-[195px] border border-[var(--border-main)] rounded-custom card-bg hover:card-shadow hover:-translate-y-1 transition-all duration-300 p-6 flex flex-row gap-4 items-start ${className}`}
     >
         <!-- Левая часть: картинка и дата -->
-        <<<<<<< HEAD
-        <div class="flex flex-col items-end gap-2 w-[105px] h-[147px]">
-            <img src={previewImageSrc} alt={image?.alt || title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" decoding="async" />
-            =======
-            <div class="flex flex-col items-end gap-2 w-[105px] h-[147px] relative">
-                <img src={previewImageSrc} alt={title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" />
-                {
-                    rubricInitials && (
-                        <span style="position:absolute;left:0;top:0;width:105px;height:107px;display:flex;align-items:center;justify-content:center;pointer-events:none;z-index:2;">
-                            <span style="position:absolute;left:0;top:0;width:105px;height:107px;background:rgba(0,0,0,0.10);border-radius:inherit;z-index:1;" />
-                            <span style="position:relative;z-index:2;font-size:48px;font-weight:700;font-family:inherit;color:var(--brand-color);letter-spacing:2px;">
-                                {rubricInitials}
-                            </span>
+        <div class="flex flex-col items-end gap-2 w-[105px] h-[147px] relative">
+            <img src={previewImageSrc} alt={title} class="w-[105px] h-[107px] object-cover rounded-custom" loading="lazy" />
+            {
+                rubricInitials && (
+                    <span style="position:absolute;left:0;top:0;width:105px;height:107px;display:flex;align-items:center;justify-content:center;pointer-events:none;z-index:2;">
+                        <span style="position:absolute;left:0;top:0;width:105px;height:107px;background:rgba(0,0,0,0.10);border-radius:inherit;z-index:1;" />
+                        <span style="position:relative;z-index:2;font-size:48px;font-weight:700;font-family:inherit;color:var(--brand-color);letter-spacing:2px;">
+                            {rubricInitials}
                         </span>
-                    )
-                }
-                >>>>>>> 41e6ca2 (fix: always use default rubric image from config, initials overlay, preview logic)
+                    </span>
+                )
+            }
                 <div class="flex flex-col items-end gap-1 w-[74px] h-[32px]">
                     <span class={`flex items-center gap-1 text-[12px] text-right ${isBrandDate ? 'text-[var(--brand-color)]' : 'text-[var(--text-muted)]'}`}>
                         <svg