Update app.py

app.py

@@ -398,23 +398,23 @@ CATALOG_TEMPLATE = '''
             .category-filter.active, .category-filter:hover { background-color: var(--primary-accent); color: var(--bg-color); border-color: var(--primary-accent); }
             .products-grid { display: grid; grid-template-columns: repeat(2, 1fr); gap: 20px; padding: 10px; }
             @media (min-width: 768px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(280px, 1fr)); } }
-            .product { background: var(--surface-color); border-radius: 15px; padding: 0; box-shadow: 0 5px 20px rgba(0, 0, 0, 0.3); transition: transform 0.3s ease, box-shadow 0.3s ease; overflow: hidden; display: flex; flex-direction: column; justify-content: space-between; height: 100%; border: 1px solid var(--secondary-accent); position: relative; }
+            .product { background: var(--surface-color); border-radius: 15px; box-shadow: 0 5px 20px rgba(0, 0, 0, 0.3); transition: transform 0.3s ease, box-shadow 0.3s ease; overflow: hidden; display: flex; flex-direction: column; height: 100%; border: 1px solid var(--secondary-accent); position: relative; }
             .product:hover { transform: translateY(-8px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.5); }
-            .product-image { width: 100%; aspect-ratio: 1 / 1.1; background-color: #fff; overflow: hidden; display: flex; justify-content: center; align-items: center; }
+            .product-clickable-area { cursor: pointer; flex-grow: 1; display: flex; flex-direction: column; }
+            .product-image { width: 100%; aspect-ratio: 1 / 1; background-color: #fff; overflow: hidden; display: flex; justify-content: center; align-items: center; }
             .product-image img { width: 100%; height: 100%; object-fit: cover; transition: transform 0.4s ease; }
             .product:hover .product-image img { transform: scale(1.05); }
-            .product-info { padding: 20px; flex-grow: 1; display: flex; flex-direction: column; justify-content: center; text-align: center; }
-            .product h2 { font-size: 1.2rem; font-weight: 600; margin: 0 0 10px 0; color: var(--text-color); }
-            .price-container { margin: 10px 0; }
-            .product-price-line { font-size: 1.3rem; color: var(--primary-accent); font-weight: 700; display: block; }
-            .product-price-piece { font-size: 0.9rem; color: var(--text-muted); display: block; }
-            .product-description { font-size: 0.85rem; color: var(--text-muted); margin-bottom: 15px; }
-            .product-actions { padding: 0 20px 20px 20px; display: flex; flex-direction: column; gap: 10px; }
+            .product-info { padding: 15px; flex-grow: 1; display: flex; flex-direction: column; justify-content: center; text-align: center; }
+            .product h2 { font-size: 1.1rem; font-weight: 600; margin: 0 0 8px 0; color: var(--text-color); }
+            .price-container { margin: 8px 0; }
+            .product-price-line { font-size: 1.2rem; color: var(--primary-accent); font-weight: 700; display: block; }
+            .product-price-piece { font-size: 0.85rem; color: var(--text-muted); display: block; }
+            .product-colors { display: flex; flex-wrap: wrap; justify-content: center; gap: 5px; margin-top: 10px; min-height: 24px; }
+            .color-tag { font-size: 0.75rem; background-color: var(--bg-color); color: var(--text-muted); padding: 3px 8px; border-radius: 10px; border: 1px solid var(--secondary-accent); }
+            .product-actions { padding: 0 15px 15px 15px; }
             .product-button { display: block; width: 100%; padding: 12px; border: none; border-radius: 8px; background-color: var(--primary-accent); color: var(--bg-color); font-size: 1rem; font-weight: 600; cursor: pointer; transition: all 0.3s ease; text-align: center; text-decoration: none; }
             .product-button:hover { background-color: var(--primary-accent-hover); }
             .product-button i { margin-right: 8px; }
-            .details-button { background-color: transparent; border: 2px solid var(--primary-accent); color: var(--primary-accent); }
-            .details-button:hover { background-color: var(--primary-accent); color: var(--bg-color); }
             #cart-button { position: fixed; bottom: 90px; right: 30px; background-color: var(--primary-accent); color: var(--bg-color); border: none; border-radius: 50%; width: 60px; height: 60px; font-size: 1.6rem; cursor: pointer; display: none; align-items: center; justify-content: center; box-shadow: 0 5px 20px rgba(217, 158, 203, 0.3); transition: all 0.3s ease; z-index: 1000; }
             #cart-button:hover { transform: scale(1.1); }
             #cart-button span { position: absolute; top: 0px; right: 0px; background-color: var(--secondary-accent); color: var(--text-color); border-radius: 50%; padding: 3px 7px; font-size: 0.8rem; font-weight: bold; }
@@ -447,7 +447,7 @@ CATALOG_TEMPLATE = '''
             .favorite-button.favorited { color: #e91e63; transform: scale(1.1); }
             .favorite-button:hover { transform: scale(1.2); }
             .bottom-nav { position: fixed; bottom: 0; left: 0; right: 0; background-color: var(--surface-color); display: flex; justify-content: space-around; align-items: center; padding: 10px 0; box-shadow: 0 -3px 15px rgba(0,0,0,0.3); z-index: 999; border-top: 1px solid var(--secondary-accent); }
-            .nav-button { background: none; border: none; color: var(--text-muted); cursor: pointer; text-align: center; font-size: 0.8rem; transition: color 0.3s; display: flex; flex-direction: column; align-items: center; gap: 4px; padding: 5px 10px; }
+            .nav-button { background: none; border: none; color: var(--text-muted); cursor: pointer; text-align: center; font-size: 0.8rem; transition: color 0.3s; display: flex; flex-direction: column; align-items: center; gap: 4px; padding: 5px 10px; text-decoration: none; }
             .nav-button:hover, .nav-button.active { color: var(--primary-accent); }
             .nav-button i { font-size: 1.5rem; }
             .address-list p { margin-bottom: 10px; }
@@ -490,29 +490,38 @@ CATALOG_TEMPLATE = '''
                      {% if product.get('is_top', False) %}
                         <span class="top-product-indicator"><i class="fas fa-star"></i> {{ _('top_product') }}</span>
                      {% endif %}
-                    <div class="product-image">
-                        {% if product.get('photos') and product['photos']|length > 0 %}
-                            <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photos'][0] }}"
-                                 alt="{{ product['name'] }}"
-                                 loading="lazy">
-                        {% else %}
-                            <img src="https://via.placeholder.com/300x330.png?text=No+Image" alt="No Image" loading="lazy">
-                        {% endif %}
-                    </div>
-                    <div class="product-info">
-                        <h2>{{ product['name'] }}</h2>
-                        <div class="price-container">
-                            <span class="product-price-line">{{ "%.2f"|format(product['price']) }} {{ currency_code }}</span>
-                            <span class="product-price-piece">
-                                {% if product.get('items_per_line', 0) > 0 %}
-                                    {{ "%.2f"|format(product['price'] / product.get('items_per_line')) }} {{ currency_code }} / {{ _('price_per_piece') }}
-                                    ({{ product.get('items_per_line') }} {{ _('items_in_line') }})
+                    <div class="product-clickable-area" onclick="openModalByIndex({{ loop.index0 }})">
+                        <div class="product-image">
+                            {% if product.get('photos') and product['photos']|length > 0 %}
+                                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photos'][0] }}"
+                                     alt="{{ product['name'] }}"
+                                     loading="lazy">
+                            {% else %}
+                                <img src="https://via.placeholder.com/300x300.png?text=No+Image" alt="No Image" loading="lazy">
+                            {% endif %}
+                        </div>
+                        <div class="product-info">
+                            <h2>{{ product['name'] }}</h2>
+                            <div class="price-container">
+                                <span class="product-price-line">{{ "%.2f"|format(product['price']) }} {{ currency_code }}</span>
+                                <span class="product-price-piece">
+                                    {% if product.get('items_per_line', 0) > 1 %}
+                                        {{ "%.2f"|format(product['price'] / product.get('items_per_line')) }} {{ currency_code }} / {{ _('price_per_piece') }}
+                                        ({{ product.get('items_per_line') }} {{ _('items_in_line') }})
+                                    {% endif %}
+                                </span>
+                            </div>
+                            <div class="product-colors">
+                                {% set colors = product.get('colors', [])|select('ne', '')|list %}
+                                {% if colors %}
+                                    {% for color in colors %}
+                                        <span class="color-tag">{{ color }}</span>
+                                    {% endfor %}
                                 {% endif %}
-                            </span>
+                            </div>
                         </div>
                     </div>
                     <div class="product-actions">
-                        <button class="product-button details-button" onclick="openModalByIndex({{ loop.index0 }})"><i class="fas fa-info-circle"></i> {{ _('details') }}</button>
                         <button class="product-button add-to-cart" onclick="openQuantityModal({{ loop.index0 }})">
                            <i class="fas fa-cart-plus"></i> {{ _('add_to_cart') }}
                         </button>
@@ -780,7 +789,7 @@ CATALOG_TEMPLATE = '''
                             ? `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${item.photo}`
                             : 'https://via.placeholder.com/70x70.png?text=N/A';
                         const colorText = item.color !== 'N/A' ? ` (${item.color})` : '';
-                        const lineInfo = item.items_per_line ? ` (${item.items_per_line} ${t.items_in_line})` : '';
+                        const lineInfo = item.items_per_line && item.items_per_line > 1 ? ` (${item.items_per_line} ${t.items_in_line})` : '';
 
                         return `
                             <div class="cart-item">
@@ -918,6 +927,7 @@ CATALOG_TEMPLATE = '''
              }
              
              function toggleFavorite(productId, buttonElement) {
+                 event.stopPropagation();
                  const index = favorites.indexOf(productId);
                  if (index > -1) {
                      favorites.splice(index, 1);
@@ -944,6 +954,16 @@ CATALOG_TEMPLATE = '''
                  });
              }
              
+            function openFavoriteProductDetail(productId) {
+                const productIndex = products.findIndex(p => p.id === productId);
+                if (productIndex > -1) {
+                    closeModal('favoritesModal');
+                    setTimeout(() => {
+                       openModalByIndex(productIndex);
+                    }, 250);
+                }
+            }
+
              function openFavoritesModal() {
                  const favoritesContent = document.getElementById('favoritesContent');
                  favoritesContent.innerHTML = '';
@@ -958,14 +978,14 @@ CATALOG_TEMPLATE = '''
                             : 'https://via.placeholder.com/70x70.png?text=N/A';
                         
                         const itemHtml = `
-                            <div class="cart-item">
+                            <div class="cart-item" onclick="openFavoriteProductDetail('${item.id}')" style="cursor: pointer;">
                                 <img src="${photoUrl}" alt="${item.name}">
                                 <div class="cart-item-details">
                                     <strong>${item.name}</strong>
                                     <p class="cart-item-price">${item.price.toFixed(2)} ${currencyCode}</p>
                                 </div>
                                 <span class="cart-item-total"></span>
-                                <button class="cart-item-remove" onclick="removeFromFavorites('${item.id}')" title="Удалить из избранного">×</button>
+                                <button class="cart-item-remove" onclick="removeFromFavorites('${item.id}', event)" title="Удалить из избранного">×</button>
                             </div>`;
                         favoritesContent.innerHTML += itemHtml;
                     });
@@ -974,7 +994,8 @@ CATALOG_TEMPLATE = '''
                  openModal('favoritesModal');
              }
              
-             function removeFromFavorites(productId) {
+             function removeFromFavorites(productId, event) {
+                 event.stopPropagation();
                  const index = favorites.indexOf(productId);
                  if (index > -1) {
                      favorites.splice(index, 1);
@@ -1054,7 +1075,7 @@ PRODUCT_DETAIL_TEMPLATE = '''
             <p style="font-size: 1.4rem; font-weight: bold; color: var(--primary-accent);">
                 <strong>{{ _('price') }}</strong> {{ "%.2f"|format(product['price']) }} {{ currency_code }}
             </p>
-            {% if product.get('items_per_line', 0) > 0 %}
+            {% if product.get('items_per_line', 0) > 1 %}
                 <p style="font-size: 1rem; color: var(--text-muted); margin-top: -10px; margin-bottom: 15px;">
                     {{ "%.2f"|format(product['price'] / product.get('items_per_line')) }} {{ currency_code }} / {{ _('price_per_piece') }} ({{ product.get('items_per_line') }} {{ _('items_in_line') }})
                 </p>