Update app.py

app.py

@@ -1,6 +1,5 @@
 
-
-from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash
+from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash, abort
 import json
 import os
 import logging
@@ -40,18 +39,15 @@ def load_data():
             logging.info(f"Данные успешно загружены из {DATA_FILE}")
             if not isinstance(data, dict):
                  logging.warning(f"{DATA_FILE} не является словарем. Инициализация пустой структурой.")
-                 data = {'products': [], 'categories': []}
-
+                 return {'products': [], 'categories': []}
             if 'products' not in data:
                 data['products'] = []
             if 'categories' not in data:
                 data['categories'] = []
-
-            # Ensure new fields exist with defaults
+            # Ensure default values for new fields if missing
             for product in data['products']:
-                product.setdefault('is_top', False)
+                product.setdefault('is_featured', False)
                 product.setdefault('in_stock', True)
-
             return data
     except FileNotFoundError:
         logging.warning(f"Локальный файл {DATA_FILE} не найден. Попытка скачать с HF.")
@@ -67,9 +63,8 @@ def load_data():
                     if not isinstance(data, dict): return {'products': [], 'categories': []}
                     if 'products' not in data: data['products'] = []
                     if 'categories' not in data: data['categories'] = []
-                    # Ensure new fields exist with defaults after download
                     for product in data['products']:
-                        product.setdefault('is_top', False)
+                        product.setdefault('is_featured', False)
                         product.setdefault('in_stock', True)
                     return data
         except (FileNotFoundError, RepositoryNotFoundError) as e:
@@ -93,12 +88,6 @@ def load_data():
 
 def save_data(data):
     try:
-        # Ensure new fields exist before saving
-        if 'products' in data:
-             for product in data['products']:
-                product.setdefault('is_top', False)
-                product.setdefault('in_stock', True)
-
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
         logging.info(f"Данные успешно сохранены в {DATA_FILE}")
@@ -201,7 +190,7 @@ def download_db_from_hf(specific_file=None):
                  logging.error(f"Репозиторий {REPO_ID} не найден на Hugging Face. Скачивание прервано.")
                  break
             except Exception as e:
-                if "404" in str(e) or isinstance(e, FileNotFoundError) or "EntryNotFound" in str(e):
+                if "404" in str(e) or isinstance(e, FileNotFoundError):
                      logging.warning(f"Файл {file_name} не найден в репозитории {REPO_ID} или ошибка доступа. Пропуск скачивания этого файла.")
                 else:
                     logging.error(f"Ошибка при скачивании файла {file_name} с Hugging Face: {e}", exc_info=True)
@@ -221,6 +210,9 @@ def periodic_backup():
         upload_db_to_hf()
         logging.info("Периодическое резервное копирование завершено.")
 
+@app.route('/favicon.ico')
+def favicon():
+    return send_file('static/favicon.ico', mimetype='image/vnd.microsoft.icon', max_age=0) # Use max_age=0 for debugging
 
 @app.route('/')
 def catalog():
@@ -229,14 +221,8 @@ def catalog():
     categories = data.get('categories', [])
     is_authenticated = 'user' in session
 
-    # Filter out products that are not in stock
-    available_products = [p for p in all_products if p.get('in_stock', True)]
-
-    # Sort products: top products first, then alphabetically
-    sorted_products = sorted(
-        available_products,
-        key=lambda p: (not p.get('is_top', False), p.get('name', '').lower())
-    )
+    products_in_stock = [p for p in all_products if p.get('in_stock', True)]
+    products_in_stock.sort(key=lambda p: (not p.get('is_featured', False), p.get('name', '').lower()))
 
     catalog_html = '''
     <!DOCTYPE html>
@@ -245,6 +231,7 @@ def catalog():
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Soola Cosmetics - Каталог</title>
+        <link rel="icon" href="/favicon.ico">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.css">
@@ -285,10 +272,9 @@ def catalog():
             body.dark-mode .product { background: #253f37; box-shadow: 0 4px 15px rgba(0, 0, 0, 0.2); border-color: #2c4a41; }
             .product:hover { transform: translateY(-5px) scale(1.02); box-shadow: 0 6px 20px rgba(0, 0, 0, 0.12); }
             body.dark-mode .product:hover { box-shadow: 0 6px 20px rgba(0, 0, 0, 0.3); }
-            .product-image { width: 100%; aspect-ratio: 1 / 1; background-color: #fff; border-radius: 10px 10px 0 0; overflow: hidden; display: flex; justify-content: center; align-items: center; margin-bottom: 0; position: relative; }
+            .product-image { width: 100%; aspect-ratio: 1 / 1; background-color: #fff; border-radius: 10px 10px 0 0; overflow: hidden; display: flex; justify-content: center; align-items: center; margin-bottom: 0; }
             .product-image img { max-width: 100%; max-height: 100%; object-fit: contain; transition: transform 0.3s ease; }
             .product-image img:hover { transform: scale(1.08); }
-            .top-product-badge { position: absolute; top: 10px; left: 10px; background-color: #ffc107; color: #333; padding: 3px 8px; font-size: 0.75rem; font-weight: bold; border-radius: 5px; z-index: 1; box-shadow: 0 1px 3px rgba(0,0,0,0.2); }
             .product-info { padding: 15px; flex-grow: 1; display: flex; flex-direction: column; justify-content: center; }
             .product h2 { font-size: 1.1rem; font-weight: 600; margin: 0 0 8px 0; text-align: center; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; color: #2d332f; }
             body.dark-mode .product h2 { color: #c8d8d3; }
@@ -300,6 +286,7 @@ def catalog():
             .product-button { display: block; width: 100%; padding: 10px; border: none; border-radius: 8px; background-color: #1C6758; color: white; font-size: 0.9rem; font-weight: 500; cursor: pointer; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); text-align: center; text-decoration: none; }
             .product-button:hover { background-color: #164B41; box-shadow: 0 4px 15px rgba(22, 75, 65, 0.4); transform: translateY(-2px); }
             .product-button i { margin-right: 5px; }
+            .product.featured { border-left: 5px solid #ffc107; } /* Style for featured */
 
             .add-to-cart { background-color: #38a169; }
             .add-to-cart:hover { background-color: #2f855a; box-shadow: 0 4px 15px rgba(47, 133, 90, 0.4); }
@@ -358,7 +345,7 @@ def catalog():
                     <a href="{{ url_for('login') }}">Войти</a>
                     {% endif %}
                 </div>
-                <button class="theme-toggle" aria-label="Переключить тему">
+                <button class="theme-toggle" onclick="toggleTheme()" aria-label="Переключить тему">
                     <i class="fas fa-moon"></i>
                 </button>
             </div>
@@ -378,14 +365,12 @@ def catalog():
 
             <div class="products-grid" id="products-grid">
                 {% for product in products %}
-                <div class="product"
+                <div class="product {% if product.get('is_featured') %}featured{% endif %}"
                      data-name="{{ product['name']|lower }}"
                      data-description="{{ product.get('description', '')|lower }}"
-                     data-category="{{ product.get('category', 'Без категории') }}">
+                     data-category="{{ product.get('category', 'Без категории') }}"
+                     data-id="{{ loop.index0 }}"> {# Use original index for mapping #}
                     <div class="product-image">
-                        {% if product.get('is_top') %}
-                         <span class="top-product-badge" title="Популярный товар"><i class="fas fa-star"></i> Топ</span>
-                        {% endif %}
                         {% 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'] }}"
@@ -395,7 +380,7 @@ def catalog():
                         {% endif %}
                     </div>
                     <div class="product-info">
-                        <h2>{{ product['name'] }}</h2>
+                        <h2>{{ product['name'] }} {% if product.get('is_featured') %}<i class="fas fa-star" style="color: #ffc107; font-size: 0.8em;" title="Популярный товар"></i>{% endif %}</h2>
                         {% if is_authenticated %}
                         <div class="product-price">{{ "%.2f"|format(product['price']) }} {{ currency_code }}</div>
                         {% else %}
@@ -404,9 +389,9 @@ def catalog():
                         <p class="product-description">{{ product.get('description', '')[:50] }}{% if product.get('description', '')|length > 50 %}...{% endif %}</p>
                     </div>
                     <div class="product-actions">
-                        <button class="product-button" data-action="open-details" data-index="{{ loop.index0 }}">Подробнее</button>
+                        <button class="product-button" onclick="openModal({{ loop.index0 }})">Подробнее</button>
                         {% if is_authenticated %}
-                        <button class="product-button add-to-cart" data-action="open-quantity" data-index="{{ loop.index0 }}">
+                        <button class="product-button add-to-cart" onclick="openQuantityModal({{ loop.index0 }})">
                            <i class="fas fa-cart-plus"></i> В корзину
                         </button>
                         {% endif %}
@@ -414,8 +399,9 @@ def catalog():
                 </div>
                 {% endfor %}
                  {% if not products %}
-                 <p class="no-results-message">Товары пока не добавлены или нет в наличии.</p>
+                 <p class="no-results-message">Товары пока не добавлены или не соответствуют фильтру.</p>
                  {% endif %}
+                 <p id="no-results-placeholder" class="no-results-message" style="display: none;">По вашему запросу товары не найдены.</p>
             </div>
         </div>
 
@@ -466,13 +452,15 @@ def catalog():
 
         <script src="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.js"></script>
         <script>
-            const products = {{ products|tojson }};
+            // Make sure product data is available globally AFTER DOM is loaded or handled correctly
+            let products = [];
             const repoId = '{{ repo_id }}';
             const currencyCode = '{{ currency_code }}';
             const isAuthenticated = {{ is_authenticated|tojson }};
             let selectedProductIndex = null;
             let cart = JSON.parse(localStorage.getItem('soolaCart') || '[]');
 
+            // --- Function Definitions ---
             function toggleTheme() {
                 document.body.classList.toggle('dark-mode');
                 const icon = document.querySelector('.theme-toggle i');
@@ -488,10 +476,13 @@ def catalog():
                     document.body.classList.add('dark-mode');
                     const icon = document.querySelector('.theme-toggle i');
                     if (icon) icon.classList.replace('fa-moon', 'fa-sun');
+                } else {
+                    const icon = document.querySelector('.theme-toggle i');
+                    if (icon) icon.classList.replace('fa-sun', 'fa-moon');
                 }
             }
 
-            function attemptAutoLogin() {
+             function attemptAutoLogin() {
                 const storedUser = localStorage.getItem('soolaUser');
                 if (storedUser && !isAuthenticated) {
                     console.log('Attempting auto-login for:', storedUser);
@@ -506,18 +497,19 @@ def catalog():
                             window.location.reload();
                         } else {
                             response.text().then(text => console.log(`Auto-login failed: ${response.status} ${text}`));
-                            localStorage.removeItem('soolaUser');
+                            localStorage.removeItem('soolaUser'); // Remove invalid stored user
                         }
                     })
                     .catch(error => {
                         console.error('Auto-login fetch error:', error);
-                        localStorage.removeItem('soolaUser');
+                        localStorage.removeItem('soolaUser'); // Remove on error too
                     });
                 }
             }
 
-            function openModal(index) {
-                loadProductDetails(index);
+            function openModal(productIndex) {
+                // Fetch details using the original index
+                loadProductDetails(productIndex);
                 const modal = document.getElementById('productModal');
                 if (modal) {
                     modal.style.display = "block";
@@ -530,6 +522,7 @@ def catalog():
                  if (modal) {
                      modal.style.display = "none";
                  }
+                 // Check if ANY modal is still open before re-enabling scroll
                  const anyModalOpen = document.querySelector('.modal[style*="display: block"]');
                  if (!anyModalOpen) {
                     document.body.style.overflow = 'auto';
@@ -540,7 +533,7 @@ def catalog():
                 const modalContent = document.getElementById('modalContent');
                 if (!modalContent) return;
                 modalContent.innerHTML = '<p style="text-align:center; padding: 40px;">Загрузка...</p>';
-                // The index passed is relative to the filtered/sorted list shown on the page
+                // Use the original index passed from the backend
                 fetch('/product/' + index)
                     .then(response => {
                         if (!response.ok) throw new Error(`Ошибка ${response.status}: ${response.statusText}`);
@@ -562,7 +555,7 @@ def catalog():
                     new Swiper(swiperContainer, {
                         slidesPerView: 1,
                         spaceBetween: 20,
-                        loop: true,
+                        loop: true, // Looping might cause issues if only 1 image
                         grabCursor: true,
                         pagination: { el: '.swiper-pagination', clickable: true },
                         navigation: { nextEl: '.swiper-button-next', prevEl: '.swiper-button-prev' },
@@ -572,17 +565,17 @@ def catalog():
                 }
             }
 
-            function openQuantityModal(index) {
+             function openQuantityModal(productIndex) {
                 if (!isAuthenticated) {
                     alert('Пожалуйста, войдите в систему, чтобы добавить товар в корзину.');
                     window.location.href = '/login';
                     return;
                 }
-                selectedProductIndex = index;
-                // Use the 'products' array available in JS, which is already filtered/sorted
-                const product = products[index];
+                selectedProductIndex = productIndex; // Store the original index
+                const product = products[selectedProductIndex]; // Access using original index
+
                 if (!product) {
-                    console.error("Product not found for index:", index);
+                    console.error("Product not found for index:", productIndex);
                     alert("Ошибка: товар не найден.");
                     return;
                 }
@@ -603,6 +596,11 @@ def catalog():
                     colorSelect.style.display = 'block';
                     if(colorLabel) colorLabel.style.display = 'block';
                 } else {
+                    // Add a default "N/A" option if no colors, but hide it
+                    const option = document.createElement('option');
+                    option.value = 'N/A';
+                    option.text = 'N/A';
+                    colorSelect.appendChild(option);
                     colorSelect.style.display = 'none';
                     if(colorLabel) colorLabel.style.display = 'none';
                 }
@@ -615,12 +613,14 @@ def catalog():
                  }
             }
 
+
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
 
                 const quantityInput = document.getElementById('quantityInput');
                 const quantity = parseInt(quantityInput.value);
                 const colorSelect = document.getElementById('colorSelect');
+                // Use selected value if visible, otherwise 'N/A'
                 const color = colorSelect.style.display !== 'none' && colorSelect.value ? colorSelect.value : 'N/A';
 
                 if (isNaN(quantity) || quantity <= 0) {
@@ -629,20 +629,21 @@ def catalog():
                     return;
                 }
 
-                const product = products[selectedProductIndex];
+                const product = products[selectedProductIndex]; // Access using original index
                  if (!product) {
                     alert("Ошибка добавления: товар не найден.");
                     return;
                  }
 
-                const cartItemId = `${product.name}-${color}`;
+                 // Use product index and color to make ID unique even if names are same
+                const cartItemId = `product-${selectedProductIndex}-${color}`;
                 const existingItemIndex = cart.findIndex(item => item.id === cartItemId);
 
                 if (existingItemIndex > -1) {
                     cart[existingItemIndex].quantity += quantity;
                 } else {
                     cart.push({
-                        id: cartItemId,
+                        id: cartItemId, // Use unique ID
                         name: product.name,
                         price: product.price,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : null,
@@ -655,8 +656,10 @@ def catalog():
                 closeModal('quantityModal');
                 updateCartButton();
                 showNotification(`${product.name} добавлен в корзину!`);
+                 selectedProductIndex = null; // Reset selected index
             }
 
+
             function updateCartButton() {
                  const cartCountElement = document.getElementById('cart-count');
                  const cartButton = document.getElementById('cart-button');
@@ -665,7 +668,7 @@ def catalog():
                  let totalItems = 0;
                  cart.forEach(item => { totalItems += item.quantity; });
 
-                 if (totalItems > 0) {
+                 if (totalItems > 0 && isAuthenticated) { // Show only if logged in and items exist
                      cartCountElement.textContent = totalItems;
                      cartButton.style.display = 'flex';
                  } else {
@@ -675,6 +678,9 @@ def catalog():
             }
 
             function openCartModal() {
+                 if (!isAuthenticated) { // Should not happen if button isn't shown, but double-check
+                    return;
+                 }
                 const cartContent = document.getElementById('cartContent');
                 const cartTotalElement = document.getElementById('cartTotal');
                 if (!cartContent || !cartTotalElement) return;
@@ -717,16 +723,16 @@ def catalog():
              function removeFromCart(itemId) {
                 cart = cart.filter(item => item.id !== itemId);
                 localStorage.setItem('soolaCart', JSON.stringify(cart));
-                openCartModal();
-                updateCartButton();
+                openCartModal(); // Refresh cart view
+                updateCartButton(); // Update bubble count
              }
 
             function clearCart() {
                 if (confirm("Вы уверены, что хотите очистить корзину?")) {
                     cart = [];
                     localStorage.removeItem('soolaCart');
-                    openCartModal();
-                    updateCartButton();
+                    openCartModal(); // Refresh cart view
+                    updateCartButton(); // Update bubble count
                 }
             }
 
@@ -751,7 +757,11 @@ def catalog():
                 orderText += `*Итого: ${total.toFixed(2)} ${currencyCode}*\n\n`;
                 orderText += "--- Заказчик ---\n";
 
-                const userInfo = {{ session.get('user_info', {})|tojson }};
+                 // Fetch current user info directly if possible, or use session data if available client-side
+                 // Assuming session data is passed correctly and available via `isAuthenticated` check
+                 // The Python template passes session data, but it's safer to get it fresh if needed, though not standard for client-side JS
+                 // We rely on the `session['user_info']` passed during render
+                 const userInfo = {{ session.get('user_info', {})|tojson }}; // Use data injected by Jinja
                 if (userInfo && userInfo.login) {
                      orderText += `Имя: ${userInfo.first_name || ''} ${userInfo.last_name || ''}\n`;
                      orderText += `Логин: ${userInfo.login}\n`;
@@ -766,23 +776,20 @@ def catalog():
                 const dateTimeString = now.toLocaleString('ru-RU', { dateStyle: 'short', timeStyle: 'medium'});
                 orderText += `\nДата заказа: ${dateTimeString}`;
 
-                const whatsappNumber = "996997703090";
+                const whatsappNumber = "996997703090"; // Replace if needed
                 const whatsappUrl = `https://api.whatsapp.com/send?phone=${whatsappNumber}&text=${encodeURIComponent(orderText)}`;
                 window.open(whatsappUrl, '_blank');
             }
 
-            function filterProducts() {
+             function filterProducts() {
                 const searchTerm = document.getElementById('search-input').value.toLowerCase().trim();
                 const activeCategoryButton = document.querySelector('.category-filter.active');
                 const activeCategory = activeCategoryButton ? activeCategoryButton.dataset.category : 'all';
                 const grid = document.getElementById('products-grid');
+                const noResultsPlaceholder = document.getElementById('no-results-placeholder');
                 let visibleProducts = 0;
 
-                const existingNoResults = grid.querySelector('.no-results-message');
-                if (existingNoResults) existingNoResults.remove();
-
-                // Iterate over the products displayed (which are already filtered by stock)
-                document.querySelectorAll('.products-grid .product').forEach(productElement => {
+                grid.querySelectorAll('.product').forEach(productElement => {
                     const name = productElement.getAttribute('data-name');
                     const description = productElement.getAttribute('data-description');
                     const category = productElement.getAttribute('data-category');
@@ -791,31 +798,29 @@ def catalog():
                     const matchesCategory = activeCategory === 'all' || category === activeCategory;
 
                     if (matchesSearch && matchesCategory) {
-                        productElement.style.display = 'flex';
+                        productElement.style.display = 'flex'; // Use flex as defined in CSS
                         visibleProducts++;
                     } else {
                         productElement.style.display = 'none';
                     }
                 });
 
+                 // Show/hide the "no results" message specifically for filtering
                  if (visibleProducts === 0 && (searchTerm || activeCategory !== 'all')) {
-                    const p = document.createElement('p');
-                    p.className = 'no-results-message';
-                    p.textContent = 'По вашему запросу товары не найдены.';
-                    grid.appendChild(p);
-                 } else if (products.length === 0 && !grid.querySelector('.no-results-message')) {
-                     const p = document.createElement('p');
-                     p.className = 'no-results-message';
-                     p.textContent = 'Товары пока не добавлены или нет в наличии.';
-                     grid.appendChild(p);
+                    if (noResultsPlaceholder) noResultsPlaceholder.style.display = 'block';
+                 } else {
+                    if (noResultsPlaceholder) noResultsPlaceholder.style.display = 'none';
                  }
-            }
+             }
+
 
              function setupFilters() {
                  const searchInput = document.getElementById('search-input');
                  const categoryFilters = document.querySelectorAll('.category-filter');
 
-                 if(searchInput) searchInput.addEventListener('input', filterProducts);
+                 if(searchInput) {
+                    searchInput.addEventListener('input', filterProducts);
+                 }
 
                  categoryFilters.forEach(filter => {
                      filter.addEventListener('click', function() {
@@ -828,69 +833,52 @@ def catalog():
 
              function showNotification(message, duration = 3000) {
                 const placeholder = document.getElementById('notification-placeholder');
-                if (!placeholder) return;
+                if (!placeholder) {
+                    // Create placeholder if it doesn't exist
+                    const newPlaceholder = document.createElement('div');
+                    newPlaceholder.id = 'notification-placeholder';
+                    document.body.appendChild(newPlaceholder);
+                    placeholder = newPlaceholder;
+                }
 
                 const notification = document.createElement('div');
                 notification.className = 'notification';
                 notification.textContent = message;
                 placeholder.appendChild(notification);
 
-                setTimeout(() => { notification.classList.add('show'); }, 10);
+                // Trigger reflow to enable transition
+                void notification.offsetWidth;
+
+                // Add 'show' class to fade in
+                notification.classList.add('show');
 
+                // Set timer to remove notification
                 setTimeout(() => {
                     notification.classList.remove('show');
-                    setTimeout(() => { notification.remove(); }, 500);
+                    // Remove element after fade out transition ends
+                    notification.addEventListener('transitionend', () => notification.remove());
                 }, duration);
              }
 
+            // --- Initialization ---
             document.addEventListener('DOMContentLoaded', () => {
-                applyInitialTheme();
-                attemptAutoLogin();
-                updateCartButton();
-                setupFilters();
-                filterProducts(); // Initial filter application
-
-                // Attach theme toggle event listener
-                const themeToggleButton = document.querySelector('.theme-toggle');
-                if (themeToggleButton) {
-                    themeToggleButton.addEventListener('click', toggleTheme);
-                }
-
-                // Attach product action listeners using event delegation
-                const productsGrid = document.getElementById('products-grid');
-                if (productsGrid) {
-                    productsGrid.addEventListener('click', function(event) {
-                        const button = event.target.closest('button[data-action]');
-                        if (!button) return;
-
-                        const action = button.dataset.action;
-                        const index = parseInt(button.dataset.index, 10);
-
-                        if (isNaN(index)) {
-                            console.error("Invalid index found on button:", button);
-                            return;
-                        }
-
-                        if (action === 'open-details') {
-                            openModal(index);
-                        } else if (action === 'open-quantity') {
-                            if (isAuthenticated) {
-                                openQuantityModal(index);
-                            } else {
-                                alert('Пожалуйста, войдите в систему, чтобы добавить товар в корзину.');
-                                window.location.href = '/login';
-                            }
-                        }
-                    });
-                }
+                 // Load product data into the global variable AFTER DOM is ready
+                 // The data is injected directly into the script tag by Jinja
+                 products = {{ products|tojson }};
 
+                 applyInitialTheme();
+                 attemptAutoLogin(); // Attempt auto-login if needed
+                 updateCartButton(); // Initial cart button state
+                 setupFilters();     // Set up search and category filters
 
+                // Close modal on background click
                 window.addEventListener('click', function(event) {
                     if (event.target.classList.contains('modal')) {
                         closeModal(event.target.id);
                     }
                 });
 
+                // Close modal on Escape key
                 window.addEventListener('keydown', function(event) {
                     if (event.key === 'Escape') {
                          document.querySelectorAll('.modal[style*="display: block"]').forEach(modal => {
@@ -898,6 +886,9 @@ def catalog():
                          });
                     }
                 });
+
+                 // Initial filter application in case the page loads with filters active (e.g., back button)
+                 filterProducts();
             });
 
         </script>
@@ -906,7 +897,7 @@ def catalog():
     '''
     return render_template_string(
         catalog_html,
-        products=sorted_products, # Pass sorted and filtered products
+        products=products_in_stock, # Pass filtered & sorted list
         categories=categories,
         repo_id=REPO_ID,
         is_authenticated=is_authenticated,
@@ -919,31 +910,25 @@ def catalog():
 @app.route('/product/<int:index>')
 def product_detail(index):
     data = load_data()
-    all_products = data.get('products', [])
+    products = data.get('products', [])
     is_authenticated = 'user' in session
-
-    # Apply the same filtering and sorting as the catalog to ensure the index is correct
-    available_products = [p for p in all_products if p.get('in_stock', True)]
-    sorted_products = sorted(
-        available_products,
-        key=lambda p: (not p.get('is_top', False), p.get('name', '').lower())
-    )
-
     try:
-        product = sorted_products[index]
+        # Use the index directly as passed from the catalog
+        product = products[index]
+        if not product.get('in_stock', True):
+             # Optionally, decide if out-of-stock items can be viewed directly
+             # For now, let's allow viewing but maybe add a note later
+             pass
     except IndexError:
-        logging.warning(f"Попытка доступа к несуществующему или недоступному продукту с индексом {index} (относительно видимого списка)")
-        return "Товар не найден или недоступен", 404
+        logging.warning(f"Попытка доступа к несуществующему продукту с индексом {index}")
+        abort(404, "Товар не найден") # Use abort for standard 404 page
 
     detail_html = '''
     <div style="padding: 10px;">
         <h2 style="font-size: 1.6rem; font-weight: 600; margin-bottom: 15px; text-align: center; color: #1C6758;">{{ product['name'] }}</h2>
         {% if not product.get('in_stock', True) %}
-         <p style="text-align: center; color: #f56565; font-weight: bold; margin-bottom: 15px;">Нет в наличии</p>
+            <p style="text-align: center; color: red; font-weight: bold; margin-bottom: 15px;">Нет в наличии</p>
         {% endif %}
-         {% if product.get('is_top') %}
-          <p style="text-align: center; color: #ffc107; font-weight: bold; margin-bottom: 15px;"><i class="fas fa-star"></i> Популярный товар</p>
-         {% endif %}
         <div class="swiper-container" style="max-width: 450px; margin: 0 auto 20px; border-radius: 10px; overflow: hidden; background-color: #fff;">
             <div class="swiper-wrapper">
                 {% if product.get('photos') and product['photos']|length > 0 %}
@@ -982,11 +967,20 @@ def product_detail(index):
                 <p><strong>Доступные цвета/варианты:</strong> {{ colors|select('ne', '')|join(', ') }}</p>
             {% endif %}
         </div>
+        {% if is_authenticated and product.get('in_stock', True) %}
+            <div style="text-align: center; margin-top: 20px;">
+                 <button class="product-button add-to-cart" onclick="closeModal('productModal'); openQuantityModal({{ index }});">
+                    <i class="fas fa-cart-plus"></i> В корзину
+                 </button>
+            </div>
+        {% endif %}
     </div>
     '''
+    # Pass the original index back to the template for the add-to-cart button
     return render_template_string(
         detail_html,
         product=product,
+        index=index,
         repo_id=REPO_ID,
         is_authenticated=is_authenticated,
         currency_code=CURRENCY_CODE
@@ -999,6 +993,7 @@ LOGIN_TEMPLATE = '''
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Вход - Soola Cosmetics</title>
+    <link rel="icon" href="/favicon.ico">
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap" rel="stylesheet">
     <style>
         body { font-family: 'Poppins', sans-serif; background: linear-gradient(135deg, #d1e7dd, #e9f5f0); display: flex; justify-content: center; align-items: center; min-height: 100vh; padding: 20px; }
@@ -1056,7 +1051,7 @@ def login():
             }
             logging.info(f"Пользователь {login} успешно вошел в систему.")
             login_response_html = f'''
-             <!DOCTYPE html><html><head><title>Перенаправление...</title></head><body>
+             <!DOCTYPE html><html><head><title>Перенаправление...</title><link rel="icon" href="/favicon.ico"></head><body>
              <script>
                 try {{ localStorage.setItem('soolaUser', '{login}'); }} catch (e) {{ console.error("Ошибка сохранения в localStorage:", e); }}
                 window.location.href = "{url_for('catalog')}";
@@ -1101,7 +1096,8 @@ def auto_login():
         return "OK", 200
     else:
         logging.warning(f"Неудачная попытка автоматического входа для несуществующего пользователя {login}.")
-        return "Ошибка авто-входа", 400
+         # Clear invalid user from localStorage on client side via response header or message
+        return "Ошибка авто-входа", 400 # 400 or 401 might be appropriate
 
 @app.route('/logout')
 def logout():
@@ -1111,7 +1107,7 @@ def logout():
     if logged_out_user:
         logging.info(f"Пользователь {logged_out_user} вышел из системы.")
     logout_response_html = '''
-     <!DOCTYPE html><html><head><title>Выход...</title></head><body>
+     <!DOCTYPE html><html><head><title>Выход...</title><link rel="icon" href="/favicon.ico"></head><body>
      <script>
          try { localStorage.removeItem('soolaUser'); } catch (e) { console.error("Ошибка удаления из localStorage:", e); }
          window.location.href = "/";
@@ -1128,16 +1124,18 @@ ADMIN_TEMPLATE = '''
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <title>Админ-панель - Soola Cosmetics</title>
+        <link rel="icon" href="/favicon.ico">
         <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap" rel="stylesheet">
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css">
         <style>
             body { font-family: 'Poppins', sans-serif; background-color: #e9f5f0; color: #2d332f; padding: 20px; line-height: 1.6; }
             .container { max-width: 1200px; margin: 0 auto; background-color: #fff; padding: 25px; border-radius: 10px; box-shadow: 0 3px 10px rgba(0,0,0,0.05); }
             .header { padding-bottom: 15px; margin-bottom: 25px; border-bottom: 1px solid #d1e7dd; display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 10px;}
-            h1, h2, h3 { font-weight: 600; color: #1C6758; margin-bottom: 15px; }
+            h1, h2, h3, h4 { font-weight: 600; color: #1C6758; margin-bottom: 15px; }
             h1 { font-size: 1.8rem; }
             h2 { font-size: 1.5rem; margin-top: 30px; display: flex; align-items: center; gap: 8px; }
             h3 { font-size: 1.2rem; color: #164B41; margin-top: 20px; }
+            h4 { font-size: 1.1rem; margin-bottom: 10px; color: #1C6758;}
             .section { margin-bottom: 30px; padding: 20px; background-color: #f8fcfb; border: 1px solid #d1e7dd; border-radius: 8px; }
             form { margin-bottom: 20px; }
             label { font-weight: 500; margin-top: 10px; display: block; color: #44524c; font-size: 0.9rem;}
@@ -1146,8 +1144,6 @@ ADMIN_TEMPLATE = '''
             textarea { min-height: 80px; resize: vertical; }
             input[type="file"] { padding: 8px; background-color: #f0f9f4; cursor: pointer; border: 1px solid #c4d9d1;}
             input[type="file"]::file-selector-button { padding: 5px 10px; border-radius: 4px; background-color: #e0f0e9; border: 1px solid #c4d9d1; cursor: pointer; margin-right: 10px;}
-            input[type="checkbox"] { margin-right: 5px; width: auto; vertical-align: middle;}
-            .checkbox-label { display: inline-block; margin-top: 10px; margin-bottom: 5px; font-weight: 400; color: #2d332f; }
             button, .button { padding: 10px 18px; border: none; border-radius: 6px; background-color: #1C6758; color: white; font-weight: 500; cursor: pointer; transition: background-color 0.3s ease, transform 0.1s ease; margin-top: 15px; font-size: 0.95rem; display: inline-flex; align-items: center; gap: 5px; text-decoration: none; line-height: 1.2;}
             button:hover, .button:hover { background-color: #164B41; }
             button:active, .button:active { transform: scale(0.98); }
@@ -1160,12 +1156,7 @@ ADMIN_TEMPLATE = '''
             .item { background: #fff; padding: 15px 20px; border-radius: 8px; box-shadow: 0 2px 5px rgba(0,0,0,0.07); border: 1px solid #e1f0e9; }
             .item p { margin: 5px 0; font-size: 0.9rem; color: #44524c; }
             .item strong { color: #2d332f; }
-            .item .description { font-size: 0.85rem; color: #5e6e68; max-height: 60px; overflow: hidden; text-overflow: ellipsis; }
-            .item-status { display: flex; gap: 15px; flex-wrap: wrap; font-size: 0.85rem; margin-top: 8px;}
-            .status-badge { padding: 2px 8px; border-radius: 10px; font-weight: 500; }
-            .status-top { background-color: #ffecb3; color: #6d4c41; border: 1px solid #ffe082;}
-            .status-instock { background-color: #c8e6c9; color: #1b5e20; border: 1px solid #a5d6a7;}
-            .status-outofstock { background-color: #ffcdd2; color: #b71c1c; border: 1px solid #ef9a9a;}
+            .item .description { font-size: 0.85rem; color: #5e6e68; max-height: 60px; overflow: hidden; text-overflow: ellipsis; display: block; } /* Ensure block for ellipsis */
             .item-actions { margin-top: 15px; display: flex; gap: 10px; flex-wrap: wrap; }
             .item-actions button:not(.delete-button) { background-color: #1C6758; }
             .item-actions button:not(.delete-button):hover { background-color: #164B41; }
@@ -1192,8 +1183,11 @@ ADMIN_TEMPLATE = '''
              .message.success { background-color: #d4edda; color: #155724; border: 1px solid #c3e6cb;}
              .message.error { background-color: #f8d7da; color: #721c24; border: 1px solid #f5c6cb;}
              .message.warning { background-color: #fff3cd; color: #856404; border: 1px solid #ffeeba; }
-             .form-row { display: flex; gap: 20px; flex-wrap: wrap; margin-top: 10px;}
-             .form-row > div { flex: 1; min-width: 150px;}
+             .checkbox-label { display: flex; align-items: center; gap: 5px; margin-top: 10px; }
+             .checkbox-label input[type="checkbox"] { width: auto; margin-top: 0; }
+             .status-indicator { font-weight: bold; font-size: 0.85rem; margin-left: 10px; padding: 3px 8px; border-radius: 4px; }
+             .status-featured { color: #856404; background-color: #fff3cd; }
+             .status-outofstock { color: #721c24; background-color: #f8d7da; }
         </style>
     </head>
     <body>
@@ -1338,16 +1332,6 @@ ADMIN_TEMPLATE = '''
                              </select>
                              <label for="add_photos">Фотографии (до 10 шт.):</label>
                              <input type="file" id="add_photos" name="photos" accept="image/*" multiple>
-                             <div class="form-row">
-                                 <div>
-                                     <input type="checkbox" id="add_is_top" name="is_top">
-                                     <label for="add_is_top" class="checkbox-label"> <i class="fas fa-star"></i> Топ товар (в начале каталога)</label>
-                                 </div>
-                                 <div>
-                                     <input type="checkbox" id="add_in_stock" name="in_stock" checked>
-                                     <label for="add_in_stock" class="checkbox-label"> <i class="fas fa-check-circle"></i> В наличии (отображать в каталоге)</label>
-                                 </div>
-                            </div>
                              <label>Цвета/Варианты (оставьте пустым, если нет):</label>
                              <div id="add-color-inputs">
                                  <div class="color-input-group">
@@ -1356,6 +1340,16 @@ ADMIN_TEMPLATE = '''
                                  </div>
                              </div>
                              <button type="button" class="button add-color-btn" style="margin-top: 5px;" onclick="addColorInput('add-color-inputs')"><i class="fas fa-palette"></i> Добавить поле для цвета/варианта</button>
+
+                             <label class="checkbox-label">
+                                <input type="checkbox" id="add_in_stock" name="in_stock" value="true" checked>
+                                <span>В наличии? (Снимите галочку, чтобы скрыть товар из каталога)</span>
+                             </label>
+                             <label class="checkbox-label">
+                                <input type="checkbox" id="add_is_featured" name="is_featured" value="true">
+                                <span><i class="fas fa-star"></i> Показывать в топе? (Отмеченные товары будут первыми в списке)</span>
+                            </label>
+
                              <br>
                              <button type="submit" class="add-button" style="margin-top: 20px;"><i class="fas fa-save"></i> Добавить товар</button>
                          </form>
@@ -1363,9 +1357,9 @@ ADMIN_TEMPLATE = '''
                 </details>
 
                 <h3>Список товаров:</h3>
-                {% if all_products %}
+                {% if products %}
                 <div class="item-list">
-                    {% for product in all_products %}
+                    {% for product in products %}
                     <div class="item">
                         <div style="display: flex; gap: 15px; align-items: flex-start;">
                              <div class="photo-preview" style="flex-shrink: 0;">
@@ -1378,24 +1372,22 @@ ADMIN_TEMPLATE = '''
                                 {% endif %}
                             </div>
                             <div style="flex-grow: 1;">
-                                <h3 style="margin-top: 0; margin-bottom: 5px; color: #2d332f;">{{ product['name'] }}</h3>
+                                <h3 style="margin-top: 0; margin-bottom: 5px; color: #2d332f;">
+                                   {{ product['name'] }}
+                                   {% if product.get('is_featured') %}
+                                       <span class="status-indicator status-featured"><i class="fas fa-star"></i> В топе</span>
+                                   {% endif %}
+                                   {% if not product.get('in_stock', True) %}
+                                       <span class="status-indicator status-outofstock"><i class="fas fa-times-circle"></i> Нет в наличии</span>
+                                   {% endif %}
+                                </h3>
                                 <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
                                 <p><strong>Цена:</strong> {{ "%.2f"|format(product['price']) }} {{ currency_code }}</p>
                                 <p class="description" title="{{ product.get('description', '') }}"><strong>Описание:</strong> {{ product.get('description', 'N/A')[:150] }}{% if product.get('description', '')|length > 150 %}...{% endif %}</p>
                                 {% set colors = product.get('colors', []) %}
                                 <p><strong>Цвета/Вар-ты:</strong> {{ colors|select('ne', '')|join(', ') if colors|select('ne', '')|list|length > 0 else 'Нет' }}</p>
-                                <div class="item-status">
-                                    {% if product.get('is_top') %}
-                                        <span class="status-badge status-top"><i class="fas fa-star"></i> Топ товар</span>
-                                    {% endif %}
-                                    {% if product.get('in_stock', True) %}
-                                        <span class="status-badge status-instock"><i class="fas fa-check-circle"></i> В наличии</span>
-                                    {% else %}
-                                        <span class="status-badge status-outofstock"><i class="fas fa-times-circle"></i> Нет в наличии</span>
-                                    {% endif %}
-                                </div>
                                 {% if product.get('photos') and product['photos']|length > 1 %}
-                                    <p style="font-size: 0.8rem; color: #5e6e68; margin-top: 5px;">(Всего фото: {{ product['photos']|length }})</p>
+                                    <p style="font-size: 0.8rem; color: #5e6e68;">(Всего фото: {{ product['photos']|length }})</p>
                                 {% endif %}
                             </div>
                         </div>
@@ -1404,7 +1396,7 @@ ADMIN_TEMPLATE = '''
                              <button type="button" class="button" onclick="toggleEditForm('edit-form-{{ loop.index0 }}')"><i class="fas fa-edit"></i> Редактировать</button>
                             <form method="POST" style="margin:0;" onsubmit="return confirm('Вы уверены, что хотите удалить товар \'{{ product['name'] }}\'?');">
                                 <input type="hidden" name="action" value="delete_product">
-                                <input type="hidden" name="original_index" value="{{ loop.index0 }}">
+                                <input type="hidden" name="index" value="{{ loop.index0 }}">
                                 <button type="submit" class="delete-button"><i class="fas fa-trash-alt"></i> Удалить</button>
                             </form>
                         </div>
@@ -1413,7 +1405,7 @@ ADMIN_TEMPLATE = '''
                             <h4><i class="fas fa-edit"></i> Редактирование: {{ product['name'] }}</h4>
                             <form method="POST" enctype="multipart/form-data">
                                 <input type="hidden" name="action" value="edit_product">
-                                <input type="hidden" name="original_index" value="{{ loop.index0 }}">
+                                <input type="hidden" name="index" value="{{ loop.index0 }}">
                                 <label>Название *:</label>
                                 <input type="text" name="name" value="{{ product['name'] }}" required>
                                 <label>Цена ({{ currency_code }}) *:</label>
@@ -1437,16 +1429,6 @@ ADMIN_TEMPLATE = '''
                                         {% endfor %}
                                     </div>
                                 {% endif %}
-                                <div class="form-row">
-                                     <div>
-                                         <input type="checkbox" id="edit_is_top_{{ loop.index0 }}" name="is_top" {% if product.get('is_top') %}checked{% endif %}>
-                                         <label for="edit_is_top_{{ loop.index0 }}" class="checkbox-label"> <i class="fas fa-star"></i> Топ товар</label>
-                                     </div>
-                                     <div>
-                                         <input type="checkbox" id="edit_in_stock_{{ loop.index0 }}" name="in_stock" {% if product.get('in_stock', True) %}checked{% endif %}>
-                                         <label for="edit_in_stock_{{ loop.index0 }}" class="checkbox-label"> <i class="fas fa-check-circle"></i> В наличии</label>
-                                     </div>
-                                </div>
                                 <label>Цвета/Варианты:</label>
                                 <div id="edit-color-inputs-{{ loop.index0 }}">
                                     {% set current_colors = product.get('colors', []) %}
@@ -1467,6 +1449,16 @@ ADMIN_TEMPLATE = '''
                                      {% endif %}
                                 </div>
                                 <button type="button" class="button add-color-btn" style="margin-top: 5px;" onclick="addColorInput('edit-color-inputs-{{ loop.index0 }}')"><i class="fas fa-palette"></i> Добавить поле для цвета</button>
+
+                                <label class="checkbox-label">
+                                   <input type="checkbox" name="in_stock" value="true" {% if product.get('in_stock', True) %}checked{% endif %}>
+                                   <span>В наличии?</span>
+                                </label>
+                                <label class="checkbox-label">
+                                   <input type="checkbox" name="is_featured" value="true" {% if product.get('is_featured', False) %}checked{% endif %}>
+                                   <span><i class="fas fa-star"></i> Показывать в топе?</span>
+                                </label>
+
                                 <br>
                                 <button type="submit" class="add-button" style="margin-top: 20px;"><i class="fas fa-save"></i> Сохранить изменения</button>
                             </form>
@@ -1509,15 +1501,16 @@ ADMIN_TEMPLATE = '''
             function removeColorInput(button) {
                 const group = button.closest('.color-input-group');
                 if (group) {
-                    const container = group.parentNode;
-                    // Prevent removing the last input field in the add form
-                    const isAddForm = container.id === 'add-color-inputs';
-                    const siblingCount = container.querySelectorAll('.color-input-group').length;
-                    if (isAddForm && siblingCount <= 1) {
-                         group.querySelector('input[name="colors"]').value = ''; // Clear instead of removing
-                         return;
-                    }
-                    group.remove();
+                     // Only remove if there's more than one input or if it's empty
+                     const container = group.parentNode;
+                     const inputs = container.querySelectorAll('.color-input-group');
+                     // Keep at least one input field available unless explicitly cleared later
+                     //if (inputs.length > 1) {
+                         group.remove();
+                     //} else {
+                     //    const inputField = group.querySelector('input[name="colors"]');
+                     //    if (inputField) inputField.value = ''; // Clear the last one instead of removing
+                     //}
                 } else {
                      console.warn("Не удалось найти родительский .color-input-group для кнопки удаления");
                 }
@@ -1529,16 +1522,17 @@ ADMIN_TEMPLATE = '''
 
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
+    # Authentication Check - Basic example, replace with proper roles if needed
+    if 'user' not in session:
+         flash("Доступ запрещен. Пожалуйста, войдите.", "error")
+         return redirect(url_for('login'))
+    # Add role check here if implementing roles later
+
     data = load_data()
-    # Admin sees ALL products, regardless of stock status
-    all_products = data.get('products', [])
+    products = data.get('products', [])
     categories = data.get('categories', [])
     users = load_users()
 
-    # Sort products alphabetically for consistent admin display
-    all_products.sort(key=lambda x: x.get('name', '').lower())
-
-
     if request.method == 'POST':
         action = request.form.get('action')
         logging.info(f"Admin action received: {action}")
@@ -1564,8 +1558,7 @@ def admin():
                 if category_to_delete and category_to_delete in categories:
                     categories.remove(category_to_delete)
                     updated_count = 0
-                    # Use all_products here as data['products'] is the source
-                    for product in data['products']:
+                    for product in products:
                         if product.get('category') == category_to_delete:
                             product['category'] = 'Без категории'
                             updated_count += 1
@@ -1584,8 +1577,8 @@ def admin():
                 category = request.form.get('category')
                 photos_files = request.files.getlist('photos')
                 colors = [c.strip() for c in request.form.getlist('colors') if c.strip()]
-                is_top = request.form.get('is_top') == 'on'
-                in_stock = request.form.get('in_stock') == 'on'
+                in_stock = request.form.get('in_stock') == 'true'
+                is_featured = request.form.get('is_featured') == 'true'
 
                 if not name or not price_str:
                     flash("Название и цена товара обязательны.", 'error')
@@ -1599,7 +1592,7 @@ def admin():
                      return redirect(url_for('admin'))
 
                 photos_list = []
-                if photos_files and any(f.filename for f in photos_files) and HF_TOKEN_WRITE:
+                if photos_files and HF_TOKEN_WRITE:
                     uploads_dir = 'uploads_temp'
                     os.makedirs(uploads_dir, exist_ok=True)
                     api = HfApi()
@@ -1612,7 +1605,7 @@ def admin():
                             break
                         if photo and photo.filename:
                             try:
-                                ext = os.path.splitext(photo.filename)[1].lower()
+                                ext = os.path.splitext(photo.filename)[1]
                                 photo_filename = secure_filename(f"{name.replace(' ','_')}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}")
                                 temp_path = os.path.join(uploads_dir, photo_filename)
                                 photo.save(temp_path)
@@ -1635,7 +1628,7 @@ def admin():
                         elif photo and not photo.filename:
                              logging.warning("Получен пустой объект файла фото при добавлении товара.")
                     try:
-                        # Attempt to remove the temp dir only if it's empty
+                         # Cleanup only if directory exists and is empty
                          if os.path.exists(uploads_dir) and not os.listdir(uploads_dir):
                              os.rmdir(uploads_dir)
                     except OSError as e:
@@ -1646,29 +1639,28 @@ def admin():
                     'name': name, 'price': price, 'description': description,
                     'category': category if category in categories else 'Без категории',
                     'photos': photos_list, 'colors': colors,
-                    'is_top': is_top, 'in_stock': in_stock
+                    'in_stock': in_stock, 'is_featured': is_featured
                 }
-                # Append to the source list in data
-                data['products'].append(new_product)
-                # No need to sort here, sorting happens when loading or displaying
+                products.append(new_product)
+                # products.sort(key=lambda x: x.get('name', '').lower()) # Keep insertion order or sort later? Let's sort.
+                products.sort(key=lambda p: (not p.get('is_featured', False), p.get('name', '').lower()))
                 save_data(data)
-                logging.info(f"Товар '{name}' добавлен.")
+                logging.info(f"Товар '{name}' добавлен (In Stock: {in_stock}, Featured: {is_featured}).")
                 flash(f"Товар '{name}' успешно добавлен.", 'success')
 
             elif action == 'edit_product':
-                index_str = request.form.get('original_index') # Use original_index from hidden input
+                index_str = request.form.get('index')
                 if index_str is None:
                      flash("Ошибка редактирования: индекс товара не передан.", 'error')
                      return redirect(url_for('admin'))
 
                 try:
-                    # Index refers to the position in the ORIGINAL all_products list from data
                     index = int(index_str)
-                    if not (0 <= index < len(data['products'])): raise IndexError("Индекс вне диапазона")
-                    product_to_edit = data['products'][index]
+                    if not (0 <= index < len(products)): raise IndexError("Индекс вне диапазона")
+                    product_to_edit = products[index]
                     original_name = product_to_edit.get('name', 'N/A')
-                except (ValueError, IndexError) as e:
-                     flash(f"Ошибка редактирования: неверный индекс товара '{index_str}'. {e}", 'error')
+                except (ValueError, IndexError):
+                     flash(f"Ошибка редактирования: неверный индекс товара '{index_str}'.", 'error')
                      return redirect(url_for('admin'))
 
                 product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip()
@@ -1677,8 +1669,8 @@ def admin():
                 category = request.form.get('category')
                 product_to_edit['category'] = category if category in categories else 'Без категории'
                 product_to_edit['colors'] = [c.strip() for c in request.form.getlist('colors') if c.strip()]
-                product_to_edit['is_top'] = request.form.get('is_top') == 'on'
-                product_to_edit['in_stock'] = request.form.get('in_stock') == 'on'
+                product_to_edit['in_stock'] = request.form.get('in_stock') == 'true'
+                product_to_edit['is_featured'] = request.form.get('is_featured') == 'true'
 
                 try:
                     price = round(float(price_str), 2)
@@ -1704,7 +1696,7 @@ def admin():
                             break
                         if photo and photo.filename:
                             try:
-                                ext = os.path.splitext(photo.filename)[1].lower()
+                                ext = os.path.splitext(photo.filename)[1]
                                 photo_filename = secure_filename(f"{product_to_edit['name'].replace(' ','_')}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}")
                                 temp_path = os.path.join(uploads_dir, photo_filename)
                                 photo.save(temp_path)
@@ -1731,39 +1723,52 @@ def admin():
                         if old_photos:
                             logging.info(f"Попытка удаления старых фото: {old_photos}")
                             try:
-                                api.delete_files(
-                                    repo_id=REPO_ID,
-                                    paths_in_repo=[f"photos/{p}" for p in old_photos],
-                                    repo_type="dataset",
-                                    token=HF_TOKEN_WRITE,
-                                    commit_message=f"Delete old photos for product {product_to_edit['name']}"
-                                )
-                                logging.info(f"Старые фото для товара {product_to_edit['name']} удалены с HF.")
+                                api = HfApi()
+                                paths_to_delete = [f"photos/{p}" for p in old_photos if p] # Ensure no empty strings
+                                if paths_to_delete:
+                                    api.delete_files(
+                                        repo_id=REPO_ID,
+                                        paths_in_repo=paths_to_delete,
+                                        repo_type="dataset",
+                                        token=HF_TOKEN_WRITE,
+                                        commit_message=f"Delete old photos for product {product_to_edit['name']}",
+                                        # ignore_patterns=None, # Ensure it tries to delete
+                                        # delete_patterns=None
+                                    )
+                                    logging.info(f"Старые фото для товара {product_to_edit['name']} удалены с HF.")
+                                else:
+                                     logging.info("Нет старых фото для удаления с HF.")
+
                             except Exception as e:
-                                # Log error but don't stop the update process
-                                logging.error(f"Ошибка при удалении старых фото {old_photos} с HF: {e}", exc_info=True)
-                                flash("Не удалось удалить старые фотографии с сервера.", "warning")
+                                # Handle cases where files might not exist on HF already
+                                if "404" in str(e) or "not found on repo" in str(e).lower():
+                                     logging.warning(f"Некоторые старые фото не найдены на HF при попытке удаления: {e}")
+                                     flash("Некоторые ста��ые фото не были найдены на сервере для удаления.", "warning")
+                                else:
+                                    logging.error(f"Ошибка при удалении старых фото {old_photos} с HF: {e}", exc_info=True)
+                                    flash("Не удалось удалить старые фотографии с сервера.", "warning")
+
                         product_to_edit['photos'] = new_photos_list
                         flash("Фотографии товара успешно обновлены.", "success")
                     elif uploaded_count == 0 and any(f.filename for f in photos_files):
                          flash("Не удалось загрузить новые фотографии.", "error")
 
-                # No sorting needed here, save directly
+                # products.sort(key=lambda x: x.get('name', '').lower()) # Re-sort after edit
+                products.sort(key=lambda p: (not p.get('is_featured', False), p.get('name', '').lower()))
                 save_data(data)
-                logging.info(f"Товар '{original_name}' (исходный индекс {index}) обновлен на '{product_to_edit['name']}'.")
+                logging.info(f"Товар '{original_name}' (индекс {index}) обновлен на '{product_to_edit['name']}' (In Stock: {product_to_edit['in_stock']}, Featured: {product_to_edit['is_featured']}).")
                 flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success')
 
 
             elif action == 'delete_product':
-                index_str = request.form.get('original_index') # Use original_index
+                index_str = request.form.get('index')
                 if index_str is None:
                     flash("Ошибка удаления: индекс товара не передан.", 'error')
                     return redirect(url_for('admin'))
                 try:
                     index = int(index_str)
-                     # Index refers to the position in the ORIGINAL all_products list from data
-                    if not (0 <= index < len(data['products'])): raise IndexError("Индекс вне диапазона")
-                    deleted_product = data['products'].pop(index) # Remove from the source list
+                    if not (0 <= index < len(products)): raise IndexError("Индекс вне диапазона")
+                    deleted_product = products.pop(index)
                     product_name = deleted_product.get('name', 'N/A')
 
                     photos_to_delete = deleted_product.get('photos', [])
@@ -1771,23 +1776,31 @@ def admin():
                         logging.info(f"Попытка удаления фото товара '{product_name}' с HF: {photos_to_delete}")
                         try:
                             api = HfApi()
-                            api.delete_files(
-                                repo_id=REPO_ID,
-                                paths_in_repo=[f"photos/{p}" for p in photos_to_delete],
-                                repo_type="dataset",
-                                token=HF_TOKEN_WRITE,
-                                commit_message=f"Delete photos for deleted product {product_name}"
-                            )
-                            logging.info(f"Фото товара '{product_name}' удалены с HF.")
+                            paths_to_delete = [f"photos/{p}" for p in photos_to_delete if p]
+                            if paths_to_delete:
+                                api.delete_files(
+                                    repo_id=REPO_ID,
+                                    paths_in_repo=paths_to_delete,
+                                    repo_type="dataset",
+                                    token=HF_TOKEN_WRITE,
+                                    commit_message=f"Delete photos for deleted product {product_name}"
+                                )
+                                logging.info(f"Фото товара '{product_name}' удалены с HF.")
+                            else:
+                                logging.info("Нет фото для удаления с HF.")
                         except Exception as e:
-                             logging.error(f"Ошибка при удалении фото {photos_to_delete} для товара '{product_name}' с HF: {e}", exc_info=True)
-                             flash(f"Не удалось удалить фото для товара '{product_name}' с сервера.", "warning")
+                             if "404" in str(e) or "not found on repo" in str(e).lower():
+                                 logging.warning(f"Некоторые фото не найдены на HF при удалении товара '{product_name}': {e}")
+                                 flash(f"Фото для удаленного товара '{product_name}' не найдены на сервере.", "warning")
+                             else:
+                                 logging.error(f"Ошибка при удалении фото {photos_to_delete} для товара '{product_name}' с HF: {e}", exc_info=True)
+                                 flash(f"Не удалось удалить фото для товара '{product_name}' с сервера.", "warning")
 
                     save_data(data)
-                    logging.info(f"Товар '{product_name}' (исходный индекс {index}) удален.")
+                    logging.info(f"Товар '{product_name}' (индекс {index}) удален.")
                     flash(f"Товар '{product_name}' удален.", 'success')
-                except (ValueError, IndexError) as e:
-                     flash(f"Ошибка удаления: неверный индекс товара '{index_str}'. {e}", 'error')
+                except (ValueError, IndexError):
+                     flash(f"Ошибка удаления: неверный индекс товара '{index_str}'.", 'error')
 
 
             elif action == 'add_user':
@@ -1838,18 +1851,14 @@ def admin():
              flash(f"Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.", 'error')
              return redirect(url_for('admin'))
 
-    # Prepare data for rendering the admin page again after potential POST redirect or GET
-    data = load_data() # Reload data in case it was modified
-    all_products = data.get('products', [])
-    all_products.sort(key=lambda x: x.get('name', '').lower()) # Sort for display
-    categories = data.get('categories', [])
+    # Sort products for display in admin panel as well
+    products.sort(key=lambda p: (not p.get('is_featured', False), p.get('name', '').lower()))
     categories.sort()
-    users = load_users()
     sorted_users = dict(sorted(users.items()))
 
     return render_template_string(
         ADMIN_TEMPLATE,
-        all_products=all_products, # Pass all products to admin template
+        products=products, # Pass the full list to admin
         categories=categories,
         users=sorted_users,
         repo_id=REPO_ID,
@@ -1858,6 +1867,10 @@ def admin():
 
 @app.route('/force_upload', methods=['POST'])
 def force_upload():
+     # Add auth check
+    if 'user' not in session:
+        flash("Доступ запрещен.", "error")
+        return redirect(url_for('login'))
     logging.info("Запущена принудительная загрузка данных на Hugging Face...")
     try:
         upload_db_to_hf()
@@ -1869,10 +1882,18 @@ def force_upload():
 
 @app.route('/force_download', methods=['POST'])
 def force_download():
+     # Add auth check
+    if 'user' not in session:
+        flash("Доступ запрещен.", "error")
+        return redirect(url_for('login'))
     logging.info("Запущено принудительное скачивание данных с Hugging Face...")
     try:
         download_db_from_hf()
-        flash("Данные успешно скачаны с Hugging Face. Локальные файлы обновлены.", 'success')
+        # Reload data in memory after download
+        global data, users
+        data = load_data()
+        users = load_users()
+        flash("Данные успешно скачаны с Hugging Face. Локальные файлы и данные в памяти обновлены.", 'success')
     except Exception as e:
         logging.error(f"Ошибка при принудительном скачивании: {e}", exc_info=True)
         flash(f"Ошибка при скачивании с Hugging Face: {e}", 'error')
@@ -1880,7 +1901,21 @@ def force_download():
 
 
 if __name__ == '__main__':
-    # Initial load on startup
+    # Ensure static folder exists for favicon
+    if not os.path.exists('static'):
+        os.makedirs('static')
+    # Create a dummy favicon if it doesn't exist to avoid initial 404s
+    favicon_path = 'static/favicon.ico'
+    if not os.path.exists(favicon_path):
+        try:
+            # Create a minimal ICO file (1x1 pixel transparent)
+            with open(favicon_path, 'wb') as f:
+                f.write(b'\x00\x00\x01\x00\x01\x00\x01\x01\x00\x00\x01\x00\x18\x00\x1c\x00\x00\x00\x16\x00\x00\x00(\x00\x00\x00\x01\x00\x00\x00\x02\x00\x00\x00\x01\x00\x18\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+            logging.info(f"Создан пустой файл {favicon_path}")
+        except Exception as e:
+            logging.warning(f"Не удалось создать пустой favicon.ico: {e}")
+
+
     load_data()
     load_users()
 
@@ -1893,10 +1928,6 @@ if __name__ == '__main__':
 
     port = int(os.environ.get('PORT', 7860))
     logging.info(f"Запуск Flask приложения на хосте 0.0.0.0 и порту {port}")
-    # Use Waitress or Gunicorn for production instead of app.run(debug=...)
-    # Example with Waitress (install waitress first: pip install waitress)
-    # from waitress import serve
-    # serve(app, host='0.0.0.0', port=port)
-    # For development:
+    # Set debug=False for production/deployment
     app.run(debug=False, host='0.0.0.0', port=port)