Update app.py

app.py

@@ -150,25 +150,40 @@ def load_data():
         if 'categories' not in data: data['categories'] = []
         if 'orders' not in data: data['orders'] = {}
 
-        if 'categories' in data and data['categories'] and isinstance(data['categories'][0], str):
-            logging.info("Old category format detected. Migrating to new structure.")
-            data['categories'] = [{'name': c, 'subcategories': []} for c in data['categories']]
+        # 1. Ensure categories are in dictionary format with subcategories (Migration)
+        if 'categories' in data:
+            new_categories = []
+            for cat in data['categories']:
+                if isinstance(cat, str): # Old flat structure migration
+                    new_categories.append({'name': cat, 'subcategories': []})
+                elif isinstance(cat, dict) and 'name' in cat:
+                    if 'subcategories' not in cat or not isinstance(cat['subcategories'], list):
+                        cat['subcategories'] = []
+                    new_categories.append(cat)
+                else:
+                    logging.warning(f"Skipping invalid category entry: {cat}")
+            data['categories'] = new_categories
+        else:
+             data['categories'] = []
 
+        # 2. Ensure products have 'prices' and 'subcategory' field
         for product in data['products']:
              if 'subcategory' not in product:
-                  product['subcategory'] = None
+                  product['subcategory'] = 'Без подкатегории'
+
              if 'prices' not in product or not isinstance(product['prices'], list):
-                  if 'price' in product:
+                  if 'price' in product: # Convert old 'price' to new 'prices' structure
                       product['prices'] = [{'type': 'шт', 'value': product.pop('price')}]
                   else:
                       product['prices'] = []
+             
              product['prices'] = [p for p in product['prices'] if isinstance(p, dict) and 'type' in p and 'value' in p]
              for p in product['prices']:
                   try:
                        p['value'] = round(float(p['value']), 2)
                   except (ValueError, TypeError):
                        p['value'] = 0.0
-             if not product['prices']:
+             if not product['prices']: 
                   product['prices'] = [{'type': 'шт', 'value': 0.0}]
 
         return data
@@ -182,6 +197,7 @@ def load_data():
             with open(DATA_FILE, 'r', encoding='utf-8') as file:
                 data = json.load(file)
             logging.info(f"Data loaded successfully from {DATA_FILE} after download.")
+            
             if not isinstance(data, dict):
                  logging.error(f"Downloaded {DATA_FILE} is not a dictionary. Using default.")
                  return default_data
@@ -189,15 +205,26 @@ def load_data():
             if 'categories' not in data: data['categories'] = []
             if 'orders' not in data: data['orders'] = {}
 
-            if 'categories' in data and data['categories'] and isinstance(data['categories'][0], str):
-                logging.info("Old category format detected after download. Migrating to new structure.")
-                data['categories'] = [{'name': c, 'subcategories': []} for c in data['categories']]
+            # Apply same structure fixes after download
+            if 'categories' in data:
+                new_categories = []
+                for cat in data['categories']:
+                    if isinstance(cat, str): 
+                        new_categories.append({'name': cat, 'subcategories': []})
+                    elif isinstance(cat, dict) and 'name' in cat:
+                        if 'subcategories' not in cat or not isinstance(cat['subcategories'], list):
+                            cat['subcategories'] = []
+                        new_categories.append(cat)
+                data['categories'] = new_categories
+            else:
+                 data['categories'] = []
 
             for product in data['products']:
                  if 'subcategory' not in product:
-                      product['subcategory'] = None
+                      product['subcategory'] = 'Без подкатегории'
+                      
                  if 'prices' not in product or not isinstance(product['prices'], list):
-                      if 'price' in product:
+                      if 'price' in product: 
                           product['prices'] = [{'type': 'шт', 'value': product.pop('price')}]
                       else:
                           product['prices'] = []
@@ -266,14 +293,13 @@ CATALOG_TEMPLATE = '''
             .header { display: flex; justify-content: space-between; align-items: center; padding: 15px 0; border-bottom: 1px solid #e0e0e0; }
             .header h1 { font-size: 1.8rem; font-weight: 600; color: #e3a84f; }
             .store-address { padding: 15px; text-align: center; background-color: #f9f9f9; margin: 20px 0; border-radius: 8px; box-shadow: 0 2px 4px rgba(0,0,0,0.03); font-size: 1rem; color: #666; }
-            .filters-wrapper { margin: 20px 0; }
-            .filters-container, .sub-filters-container { display: flex; flex-wrap: wrap; gap: 10px; justify-content: center; }
-            .sub-filters-container { margin-top: 15px; padding-top: 15px; border-top: 1px dashed #e0e0e0;}
+            .filters-container { margin: 20px 0; display: flex; flex-wrap: wrap; gap: 10px; justify-content: center; }
             .search-container { margin: 20px 0; text-align: center; }
             #search-input { width: 90%; max-width: 600px; padding: 12px 18px; font-size: 1rem; border: 1px solid #e0e0e0; border-radius: 25px; outline: none; box-shadow: 0 2px 5px rgba(0,0,0,0.03); transition: all 0.3s ease; }
             #search-input:focus { border-color: #e3a84f; box-shadow: 0 0 0 3px rgba(227, 168, 79, 0.15); }
-            .category-filter, .subcategory-filter { padding: 8px 16px; border: 1px solid #e0e0e0; border-radius: 20px; background-color: #fff; cursor: pointer; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); font-size: 0.9rem; font-weight: 400; color: #c89345; }
-            .category-filter.active, .category-filter:hover, .subcategory-filter.active, .subcategory-filter:hover { background-color: #e3a84f; color: white; border-color: #e3a84f; box-shadow: 0 2px 10px rgba(227, 168, 79, 0.2); }
+            .category-filter { padding: 8px 16px; border: 1px solid #e0e0e0; border-radius: 20px; background-color: #fff; cursor: pointer; transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); font-size: 0.9rem; font-weight: 400; color: #c89345; white-space: nowrap;}
+            .category-filter.subcategory-filter { font-size: 0.8rem; padding: 6px 12px; }
+            .category-filter.active, .category-filter:hover { background-color: #e3a84f; color: white; border-color: #e3a84f; box-shadow: 0 2px 10px rgba(227, 168, 79, 0.2); }
             .products-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(150px, 1fr)); gap: 20px; padding: 10px; }
             @media (min-width: 600px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); } }
             @media (min-width: 900px) { .products-grid { grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); } }
@@ -340,14 +366,14 @@ CATALOG_TEMPLATE = '''
 
             <div class="store-address">Наш адрес: {{ store_address }}</div>
 
-            <div class="filters-wrapper">
-                <div class="filters-container">
-                    <button class="category-filter active" data-category="all">Все категории</button>
-                    {% for category in categories %}
-                    <button class="category-filter" data-category="{{ category.name }}">{{ category.name }}</button>
+            <div class="filters-container">
+                <button class="category-filter active" data-category="all" data-subcategory="all">Все категории</button>
+                {% for category_obj in categories_data %}
+                    <button class="category-filter" data-category="{{ category_obj.name }}" data-subcategory="all">{{ category_obj.name }}</button>
+                    {% for subcategory in category_obj.subcategories %}
+                         <button class="category-filter subcategory-filter" data-category="{{ category_obj.name }}" data-subcategory="{{ subcategory }}">{{ subcategory }}</button>
                     {% endfor %}
-                </div>
-                <div class="sub-filters-container" id="sub-filters-container"></div>
+                {% endfor %}
             </div>
 
             <div class="search-container">
@@ -360,7 +386,7 @@ CATALOG_TEMPLATE = '''
                      data-name="{{ product['name']|lower }}"
                      data-description="{{ product.get('description', '')|lower }}"
                      data-category="{{ product.get('category', 'Без категории') }}"
-                     data-subcategory="{{ product.get('subcategory', '')|lower if product.get('subcategory') else '' }}">
+                     data-subcategory="{{ product.get('subcategory', 'Без подкатегории') }}">
                      {% if product.get('is_top', False) %}
                         <span class="top-product-indicator"><i class="fas fa-star"></i> Топ</span>
                      {% endif %}
@@ -384,7 +410,7 @@ CATALOG_TEMPLATE = '''
                                 <span class="price-item">Нет цены</span>
                             {% endif %}
                         </div>
-                        <p class="product-description">{{ product.get('description', '')[:50] }}{% if product.get('description', '')|length > 50 %}...{% endif %}</p>
+                        <p class="product-description">{{ product.get('category', 'Без категории') }}{% if product.get('subcategory', 'Без подкатегории') != 'Без подкатегории' %} / {{ product.get('subcategory') }}{% endif %}</p>
                     </div>
                     <div class="product-actions">
                         <button class="product-button" onclick="openModal({{ loop.index0 }})">Подробнее</button>
@@ -453,13 +479,11 @@ CATALOG_TEMPLATE = '''
         <script src="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.js"></script>
         <script>
             const products = {{ products|tojson }};
-            const categoriesData = {{ categories|tojson }};
             const repoId = '{{ repo_id }}';
             const currencyCode = '{{ currency_code }}';
             let selectedProductIndex = null;
             let cart = JSON.parse(localStorage.getItem('mekaCart') || '[]');
-            let activeCategory = 'all';
-            let activeSubcategory = 'all';
+
 
             function openModal(index) {
                 loadProductDetails(index);
@@ -556,7 +580,7 @@ CATALOG_TEMPLATE = '''
                           const option = document.createElement('option');
                           option.value = price_item.type.trim();
                           option.text = `${price_item.value.toFixed(2)} ${currencyCode} / ${price_item.type.trim()}`;
-                          option.dataset.priceValue = price_item.value; // Store price value in dataset
+                          option.dataset.priceValue = price_item.value; 
                           priceTypeSelect.appendChild(option);
                      });
                      priceTypeSelect.style.display = 'block';
@@ -565,7 +589,7 @@ CATALOG_TEMPLATE = '''
                      priceTypeSelect.style.display = 'none';
                      if(priceTypeLabel) priceTypeLabel.style.display = 'none';
                      alert("Для этого товара нет доступных цен.");
-                     return;
+                     return; 
                  }
 
 
@@ -586,7 +610,7 @@ CATALOG_TEMPLATE = '''
                 const color = colorSelect.style.display !== 'none' && colorSelect.value ? colorSelect.value : 'N/A';
                 const priceTypeSelect = document.getElementById('priceTypeSelect');
                 const selectedPriceOption = priceTypeSelect.options[priceTypeSelect.selectedIndex];
-                const priceType = selectedPriceOption ? selectedPriceOption.value : 'шт';
+                const priceType = selectedPriceOption ? selectedPriceOption.value : 'шт'; 
                 const priceValue = selectedPriceOption ? parseFloat(selectedPriceOption.dataset.priceValue) : null;
 
 
@@ -607,7 +631,7 @@ CATALOG_TEMPLATE = '''
                     return;
                  }
 
-                const cartItemId = `${product.name}-${priceType}-${color}`;
+                const cartItemId = `${product.name}-${priceType}-${color}`; 
                 const existingItemIndex = cart.findIndex(item => item.id === cartItemId);
 
                 if (existingItemIndex > -1) {
@@ -616,8 +640,8 @@ CATALOG_TEMPLATE = '''
                     cart.push({
                         id: cartItemId,
                         name: product.name,
-                        price_type: priceType,
-                        price_value: priceValue,
+                        price_type: priceType, 
+                        price_value: priceValue, 
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : null,
                         quantity: quantity,
                         color: color
@@ -659,13 +683,13 @@ CATALOG_TEMPLATE = '''
                     cartTotalElement.textContent = '0.00';
                 } else {
                     cartContent.innerHTML = cart.map(item => {
-                        const itemTotal = item.price_value * item.quantity;
+                        const itemTotal = item.price_value * item.quantity; 
                         total += itemTotal;
                         const photoUrl = item.photo
                             ? `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${item.photo}`
                             : 'https://via.placeholder.com/60x60.png?text=N/A';
                         const colorText = item.color && item.color !== 'N/A' ? ` (Цвет: ${item.color})` : '';
-                         const priceTypeText = item.price_type ? `/${item.price_type}` : '';
+                         const priceTypeText = item.price_type ? `/${item.price_type}` : ''; 
 
                         return `
                             <div class="cart-item">
@@ -751,6 +775,11 @@ CATALOG_TEMPLATE = '''
 
             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 activeSubcategory = activeCategoryButton ? activeCategoryButton.dataset.subcategory : 'all';
+                
                 const grid = document.getElementById('products-grid');
                 let visibleProducts = 0;
 
@@ -760,14 +789,24 @@ CATALOG_TEMPLATE = '''
                 document.querySelectorAll('.products-grid .product').forEach(productElement => {
                     const name = productElement.getAttribute('data-name');
                     const description = productElement.getAttribute('data-description');
-                    const category = productElement.getAttribute('data-category');
-                    const subcategory = productElement.getAttribute('data-subcategory');
+                    const productCategory = productElement.getAttribute('data-category');
+                    const productSubcategory = productElement.getAttribute('data-subcategory');
 
                     const matchesSearch = !searchTerm || name.includes(searchTerm) || description.includes(searchTerm);
-                    const matchesCategory = activeCategory === 'all' || category === activeCategory;
-                    const matchesSubcategory = activeSubcategory === 'all' || subcategory === activeSubcategory;
+                    
+                    let matchesFilter = false;
+
+                    if (activeCategory === 'all') {
+                        matchesFilter = true;
+                    } else if (productCategory === activeCategory) {
+                        if (activeSubcategory === 'all') {
+                            matchesFilter = true; 
+                        } else if (productSubcategory === activeSubcategory) {
+                            matchesFilter = true; 
+                        }
+                    }
 
-                    if (matchesSearch && matchesCategory && matchesSubcategory) {
+                    if (matchesSearch && matchesFilter) {
                         productElement.style.display = 'flex';
                         visibleProducts++;
                     } else {
@@ -787,38 +826,6 @@ CATALOG_TEMPLATE = '''
                      grid.appendChild(p);
                  }
             }
-             
-            function renderSubcategories() {
-                const subFiltersContainer = document.getElementById('sub-filters-container');
-                subFiltersContainer.innerHTML = '';
-
-                if (activeCategory === 'all') {
-                    subFiltersContainer.style.display = 'none';
-                    return;
-                }
-
-                const categoryData = categoriesData.find(c => c.name === activeCategory);
-                if (categoryData && categoryData.subcategories && categoryData.subcategories.length > 0) {
-                    subFiltersContainer.style.display = 'flex';
-
-                    let buttonsHTML = `<button class="subcategory-filter active" data-subcategory="all">Все в "${activeCategory}"</button>`;
-                    categoryData.subcategories.forEach(sub => {
-                        buttonsHTML += `<button class="subcategory-filter" data-subcategory="${sub.toLowerCase()}">${sub}</button>`;
-                    });
-                    subFiltersContainer.innerHTML = buttonsHTML;
-
-                    subFiltersContainer.querySelectorAll('.subcategory-filter').forEach(subFilter => {
-                        subFilter.addEventListener('click', function() {
-                            subFiltersContainer.querySelectorAll('.subcategory-filter').forEach(f => f.classList.remove('active'));
-                            this.classList.add('active');
-                            activeSubcategory = this.dataset.subcategory;
-                            filterProducts();
-                        });
-                    });
-                } else {
-                    subFiltersContainer.style.display = 'none';
-                }
-            }
 
              function setupFilters() {
                  const searchInput = document.getElementById('search-input');
@@ -830,9 +837,6 @@ CATALOG_TEMPLATE = '''
                      filter.addEventListener('click', function() {
                          categoryFilters.forEach(f => f.classList.remove('active'));
                          this.classList.add('active');
-                         activeCategory = this.dataset.category;
-                         activeSubcategory = 'all';
-                         renderSubcategories();
                          filterProducts();
                      });
                  });
@@ -922,7 +926,10 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
 
         <div style="margin-top: 20px; font-size: 1rem; line-height: 1.7; color: #333;">
-            <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}{% if product.get('subcategory') %} / {{ product.get('subcategory') }}{% endif %}</p>
+            <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
+            {% if product.get('subcategory', 'Без подкатегории') != 'Без подкатегории' %}
+            <p><strong>Подкатегория:</strong> {{ product.get('subcategory') }}</p>
+            {% endif %}
             <p style="font-size: 1.2rem; font-weight: bold; color: #c89345; margin-bottom: 10px;"><strong>Цена:</strong></p>
              <div class="price-list" style="text-align: left;">
                  {% if product.get('prices') %}
@@ -942,8 +949,9 @@ PRODUCT_DETAIL_TEMPLATE = '''
         </div>
     </div>
     <style>
+        /* Add Swiper Modal Specific Styles if needed */
          #productModal .swiper-button-next, #productModal .swiper-button-prev {
-             color: #e3a84f;
+             color: #e3a84f; /* Ensure modal navigation buttons match new color */
          }
     </style>
 '''
@@ -1028,7 +1036,7 @@ ORDER_TEMPLATE = '''
                 function sendOrderViaWhatsApp() {
                     const orderId = '{{ order.id }}';
                     const orderUrl = `{{ request.url }}`;
-                    const whatsappNumber = "{{ whatsapp_number }}";
+                    const whatsappNumber = "{{ whatsapp_number }}"; 
 
                     let message = `Здравствуйте! Хочу подтвердить свой заказ на сайте "Мир праздника":%0A%0A`;
                     message += `*Номер заказа:* ${orderId}%0A`;
@@ -1067,7 +1075,6 @@ ADMIN_TEMPLATE = '''
             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: #c89345; margin-top: 20px; }
-            h4 { font-size: 1.1rem; color: #333; margin-top: 20px; }
             .section { margin-bottom: 30px; padding: 20px; background-color: #f9f9f9; border: 1px solid #e0e0e0; border-radius: 8px; }
             form { margin-bottom: 20px; }
             label { font-weight: 500; margin-top: 10px; display: block; color: #666; font-size: 0.9rem;}
@@ -1092,8 +1099,8 @@ ADMIN_TEMPLATE = '''
             .item strong { color: #333; }
             .item .description { font-size: 0.85rem; color: #999; max-height: 60px; overflow: hidden; text-overflow: ellipsis; }
             .item-actions { margin-top: 15px; display: flex; gap: 10px; flex-wrap: wrap; align-items: center; }
-            .item-actions button:not(.delete-button) { background-color: #e3a84f; }
-            .item-actions button:not(.delete-button):hover { background-color: #c89345; }
+            .item-actions button:not(.delete-button) { background-color: #e3a84f; } 
+            .item-actions button:not(.delete-button):hover { background-color: #c89345; } 
             .edit-form-container { margin-top: 15px; padding: 20px; background: #fffcf5; border: 1px dashed #e0e0e0; border-radius: 6px; display: none; }
             details { background-color: #f9f9f9; border: 1px solid #e0e0e0; border-radius: 8px; margin-bottom: 20px; }
             details > summary { cursor: pointer; font-weight: 600; color: #c89345; display: block; padding: 15px; border-bottom: 1px solid #e0e0e0; list-style: none; position: relative; }
@@ -1103,9 +1110,10 @@ ADMIN_TEMPLATE = '''
             details .form-content { padding: 20px; }
             .color-input-group, .price-input-group { display: flex; align-items: center; gap: 10px; margin-bottom: 8px; }
             .color-input-group input, .price-input-group input { flex-grow: 1; margin: 0; }
-             .price-input-group input[type="text"] { width: 100px; flex-grow: 0; }
-             .price-input-group input[type="number"] { flex-grow: 1; }
-             .price-input-group label { margin-top: 0; width: auto; display: inline-block; font-weight: normal; color: #333;}
+             .price-input-group input[type="text"] { width: 100px; flex-grow: 0; } 
+             .price-input-group input[type="number"] { flex-grow: 1; } 
+             .price-input-group label { margin-top: 0; width: auto; display: inline-block; font-weight: normal; color: #333;} 
+
             .remove-color-btn, .remove-price-btn { background-color: #dc3545; padding: 6px 10px; font-size: 0.8rem; margin-top: 0; line-height: 1; }
             .remove-color-btn:hover, .remove-price-btn:hover { background-color: #c82333; }
             .add-color-btn, .add-price-btn { background-color: #f0c38b; color: #c89345; border: 1px solid #e0e0e0; }
@@ -1124,10 +1132,9 @@ ADMIN_TEMPLATE = '''
             .status-indicator.in-stock { background-color: #d4edda; color: #155724; }
             .status-indicator.out-of-stock { background-color: #f8d7da; color: #721c24; }
             .status-indicator.top-product { background-color: #fff3cd; color: #856404; margin-left: 5px;}
-            .admin-price-list { margin-top: 5px; }
-            .admin-price-item { font-size: 0.85rem; color: #333; display: block; margin-bottom: 3px;}
-            .subcategory-list { list-style-type: none; padding-left: 20px; margin-top: 10px; }
-            .subcategory-item { background: #f0f0f0; padding: 5px 10px; border-radius: 4px; margin-bottom: 5px; display: flex; justify-content: space-between; align-items: center; font-size: 0.9rem; }
+             .admin-price-list { margin-top: 5px; }
+             .admin-price-item { font-size: 0.85rem; color: #333; display: block; margin-bottom: 3px;}
+             .category-item { background: #fff; padding: 15px 20px; border-radius: 8px; box-shadow: 0 2px 5px rgba(0,0,0,0.03); border: 1px solid #f0f0f0; }
         </style>
     </head>
     <body>
@@ -1154,7 +1161,7 @@ ADMIN_TEMPLATE = '''
                         <button type="submit" class="button" title="Загрузить локальные файлы на Hugging Face"><i class="fas fa-upload"></i> Загрузить БД</button>
                     </form>
                     <form method="POST" action="{{ url_for('force_download') }}" style="display: inline;" onsubmit="return confirm('Вы уверены, что хотите принудительно скачать данные с сервера? Это перезапишет ваши локальные файлы.');">
-                        <button type="submit" class="button download-hf-button" title="Скачать файлы  (перезапишет локальные)"><i class="fas fa-download"></i> Скачать БД</button>
+                        <button type="submit" class="button download-hf-button" title="Скачать файлы (перезапишет локальные)"><i class="fas fa-download"></i> Скачать БД</button>
                     </form>
                 </div>
                  <p style="font-size: 0.85rem; color: #999;">Резервное копирование происходит автоматически каждые 30 минут, а также после каждого сохранения данных. Используйте эти кнопки для немедленной синхронизации.</p>
@@ -1165,55 +1172,59 @@ ADMIN_TEMPLATE = '''
                      <div class="section">
                          <h2><i class="fas fa-tags"></i> Управление категориями</h2>
                           <details>
-                              <summary><i class="fas fa-plus-circle"></i> Добавить новую основную категорию</summary>
+                              <summary><i class="fas fa-plus-circle"></i> Добавить главную категорию</summary>
                               <div class="form-content">
                                   <form method="POST">
                                       <input type="hidden" name="action" value="add_category">
-                                      <label for="add_category_name">Название новой категории:</label>
+                                      <label for="add_category_name">Название новой главной категории:</label>
                                       <input type="text" id="add_category_name" name="category_name" required>
                                       <button type="submit" class="add-button"><i class="fas fa-plus"></i> Добавить</button>
                                   </form>
                               </div>
                           </details>
+                      
+                          <details style="margin-top: 10px;">
+                              <summary><i class="fas fa-sitemap"></i> Добавить подкатегорию</summary>
+                              <div class="form-content">
+                                  <form method="POST">
+                                      <input type="hidden" name="action" value="add_subcategory">
+                                      <label for="parent_category_name">Выберите главную категорию:</label>
+                                      <select id="parent_category_name" name="parent_category_name" required>
+                                          {% for category in categories_data %}
+                                          <option value="{{ category.name }}">{{ category.name }}</option>
+                                          {% endfor %}
+                                      </select>
+                                      <label for="add_subcategory_name">Название новой подкатегории:</label>
+                                      <input type="text" id="add_subcategory_name" name="subcategory_name" required>
+                                      <button type="submit" class="add-button"><i class="fas fa-plus"></i> Добавить подкатегорию</button>
+                                  </form>
+                              </div>
+                          </details>
 
                          <h3>Существующие категории:</h3>
-                         {% if categories %}
+                         {% if categories_data %}
                          <div class="item-list">
-                             {% for category in categories %}
-                             <div class="item">
-                                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
-                                    <strong>{{ category.name }}</strong>
-                                    <form method="POST" style="margin: 0;" onsubmit="return confirm('Вы уверены, что хотите удалить кате��орию \'{{ category.name }}\' и все ее подкатегории?');">
-                                        <input type="hidden" name="action" value="delete_category">
-                                        <input type="hidden" name="category_name" value="{{ category.name }}">
-                                        <button type="submit" class="delete-button" style="padding: 5px 10px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
-                                    </form>
-                                </div>
-                                <hr style="border: 0; border-top: 1px solid #f0f0f0; margin: 10px 0;">
-                                <h4>Подкатегории:</h4>
-                                {% if category.subcategories %}
-                                    <ul class="subcategory-list">
-                                        {% for sub in category.subcategories %}
-                                        <li class="subcategory-item">
-                                            <span>{{ sub }}</span>
-                                            <form method="POST" style="margin:0;" onsubmit="return confirm('Удалить подкатегорию \'{{ sub }}\'?');">
-                                                <input type="hidden" name="action" value="delete_subcategory">
-                                                <input type="hidden" name="parent_category" value="{{ category.name }}">
-                                                <input type="hidden" name="subcategory_name" value="{{ sub }}">
-                                                <button type="submit" class="delete-button" style="padding: 3px 8px; font-size:0.7rem; margin:0;"><i class="fas fa-times"></i></button>
-                                            </form>
-                                        </li>
-                                        {% endfor %}
-                                    </ul>
-                                {% else %}
-                                    <p style="font-size: 0.9rem; color: #999;">Подкатегорий нет.</p>
-                                {% endif %}
-                                <form method="POST" style="margin-top: 15px; display: flex; gap: 10px; align-items: center;">
-                                    <input type="hidden" name="action" value="add_subcategory">
-                                    <input type="hidden" name="parent_category" value="{{ category.name }}">
-                                    <input type="text" name="subcategory_name" placeholder="Новая подкатегория" required style="margin:0; flex-grow: 1;">
-                                    <button type="submit" class="add-button" style="margin:0; padding: 8px 12px;"><i class="fas fa-plus"></i></button>
-                                </form>
+                             {% for category in categories_data %}
+                             <div class="category-item">
+                                 <div style="display: flex; justify-content: space-between; align-items: center; background: #f0f0f0; padding: 5px 10px; border-radius: 4px; margin-bottom: 5px;">
+                                     <span><strong>{{ category.name }}</strong> (Главная)</span>
+                                     <form method="POST" style="margin: 0;" onsubmit="return confirm('Удалить главную категорию \'{{ category.name }}\'? Это также удалит все подкатегории и обновит товары.');">
+                                         <input type="hidden" name="action" value="delete_category">
+                                         <input type="hidden" name="category_name" value="{{ category.name }}">
+                                         <button type="submit" class="delete-button" style="padding: 5px 10px; font-size: 0.8rem; margin: 0;"><i class="fas fa-trash-alt"></i></button>
+                                     </form>
+                                 </div>
+                                 {% for subcategory in category.subcategories %}
+                                     <div style="display: flex; justify-content: space-between; align-items: center; padding: 5px 10px; margin-left: 15px; border-left: 2px solid #e3a84f;">
+                                         <span style="font-size: 0.9em;">— {{ subcategory }} (Подкатегория)</span>
+                                         <form method="POST" style="margin: 0;" onsubmit="return confirm('Удалить подкатегорию \'{{ subcategory }}\' из \'{{ category.name }}\'?');">
+                                             <input type="hidden" name="action" value="delete_category">
+                                             <input type="hidden" name="category_name" value="{{ category.name }}">
+                                             <input type="hidden" name="subcategory_name" value="{{ subcategory }}">
+                                             <button type="submit" class="delete-button" style="padding: 3px 8px; font-size: 0.7rem; margin: 0;"><i class="fas fa-times"></i></button>
+                                         </form>
+                                     </div>
+                                 {% endfor %}
                              </div>
                              {% endfor %}
                          </div>
@@ -1259,18 +1270,18 @@ ADMIN_TEMPLATE = '''
                              <textarea id="add_description" name="description" rows="4"></textarea>
                              
                              <label for="add_category">Категория:</label>
-                             <select id="add_category" name="category" onchange="updateSubcategoryDropdown('add', this.value)">
+                             <select id="add_category" name="category">
                                  <option value="Без категории">Без категории</option>
-                                 {% for category in categories %}
+                                 {% for category in categories_data %}
                                  <option value="{{ category.name }}">{{ category.name }}</option>
                                  {% endfor %}
                              </select>
                              
                              <label for="add_subcategory">Подкатегория:</label>
                              <select id="add_subcategory" name="subcategory">
-                                 <option value="none">-- Сначала выберите категорию --</option>
+                                 <option value="Без подкатегории">Без подкатегории</option>
                              </select>
-
+                             
                              <label for="add_photos">Фотографии (до 10 шт.):</label>
                              <input type="file" id="add_photos" name="photos" accept="image/*" multiple>
                              <label>Цвета/Варианты (оставьте пустым, если нет):</label>
@@ -1323,7 +1334,8 @@ ADMIN_TEMPLATE = '''
                                         <span class="status-indicator top-product"><i class="fas fa-star"></i> Топ</span>
                                      {% endif %}
                                 </h3>
-                                <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}{% if product.get('subcategory') %} / {{ product.get('subcategory') }}{% endif %}</p>
+                                <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
+                                <p><strong>Подкатегория:</strong> {{ product.get('subcategory', 'Без подкатегории') }}</p>
                                 <p><strong>Цены:</strong></p>
                                 <div class="admin-price-list">
                                     {% if product.get('prices') %}
@@ -1391,16 +1403,19 @@ ADMIN_TEMPLATE = '''
                                 <textarea name="description" rows="4">{{ product.get('description', '') }}</textarea>
                                 
                                 <label>Категория:</label>
-                                <select name="category" onchange="updateSubcategoryDropdown('edit_{{ loop.index0 }}', this.value, '{{ product.get('subcategory') }}')">
+                                <select id="edit_category_{{ loop.index0 }}"
+                                        name="category"
+                                        data-initial-subcategory="{{ product.get('subcategory', 'Без подкатегории') }}"
+                                        onchange="updateSubcategorySelect('edit_category_{{ loop.index0 }}', 'edit_subcategory_{{ loop.index0 }}')">
                                     <option value="Без категории" {% if product.get('category', 'Без категории') == 'Без категории' %}selected{% endif %}>Без категории</option>
-                                    {% for category in categories %}
+                                    {% for category in categories_data %}
                                     <option value="{{ category.name }}" {% if product.get('category') == category.name %}selected{% endif %}>{{ category.name }}</option>
                                     {% endfor %}
                                 </select>
-
+                                
                                 <label>Подкатегория:</label>
-                                <select id="edit_{{ loop.index0 }}_subcategory" name="subcategory">
-                                    <option value="none">-- Сначала выберите категорию --</option>
+                                <select id="edit_subcategory_{{ loop.index0 }}" name="subcategory">
+                                    <!-- Options populated by JS -->
                                 </select>
                                 
                                 <label>Заменить фотографии (выберите новые файлы, до 10 шт.):</label>
@@ -1457,45 +1472,64 @@ ADMIN_TEMPLATE = '''
         </div>
 
         <script>
-            const categoriesData = {{ categories|tojson }};
+            const categoriesData = {{ categories_data|tojson }};
+            const categorySubcategoryMap = {};
+            categoriesData.forEach(c => {
+                categorySubcategoryMap[c.name] = c.subcategories;
+            });
             
+            function updateSubcategorySelect(categorySelectId, subcategorySelectId) {
+                const categorySelect = document.getElementById(categorySelectId);
+                const subcategorySelect = document.getElementById(subcategorySelectId);
+                if (!categorySelect || !subcategorySelect) return;
+
+                const selectedCategory = categorySelect.value;
+                const subcategories = categorySubcategoryMap[selectedCategory] || [];
+                
+                // Determine the initial subcategory value for edit forms
+                let currentSubcategory = 'Без подкатегории';
+                if (categorySelect.dataset.initialSubcategory) {
+                     currentSubcategory = categorySelect.dataset.initialSubcategory;
+                     // Clear the data attribute after using it once, so manual changes don't get overwritten
+                     delete categorySelect.dataset.initialSubcategory; 
+                }
+                
+                // If the main category changed, reset the current subcategory selection check
+                if (categorySelect.value !== selectedCategory) {
+                    currentSubcategory = 'Без подкатегории';
+                }
+
+                subcategorySelect.innerHTML = '<option value="Без подкатегории">Без подкатегории</option>';
+
+                subcategories.forEach(sub => {
+                    const option = document.createElement('option');
+                    option.value = sub;
+                    option.textContent = sub;
+                    if (sub === currentSubcategory) {
+                        option.selected = true;
+                    }
+                    subcategorySelect.appendChild(option);
+                });
+            }
+
             function toggleEditForm(formId) {
                 const formContainer = document.getElementById(formId);
                 if (formContainer) {
-                    const isDisplayed = formContainer.style.display === 'block';
-                    formContainer.style.display = isDisplayed ? 'none' : 'block';
-                    if (!isDisplayed) {
-                        const catSelect = formContainer.querySelector('select[name="category"]');
+                    formContainer.style.display = formContainer.style.display === 'none' || formContainer.style.display === '' ? 'block' : 'none';
+                    if (formContainer.style.display === 'block') {
+                        // Re-initialize subcategory select on opening the edit form
+                        const index = formId.split('-').pop();
+                        const catSelect = document.getElementById(`edit_category_${index}`);
                         if (catSelect) {
-                           const currentProductSub = catSelect.getAttribute('data-current-subcategory');
-                           updateSubcategoryDropdown(catSelect.onchange.toString().match(/'(edit_[\d]+)'/)[1], catSelect.value, currentProductSub);
+                             // Use the data attribute to restore the saved subcategory
+                             const initialSubcategory = catSelect.getAttribute('data-initial-subcategory');
+                             updateSubcategorySelect(`edit_category_${index}`, `edit_subcategory_${index}`, initialSubcategory);
+                             // Re-attach listener if not already done via onchange attribute
                         }
                     }
                 }
             }
 
-            function updateSubcategoryDropdown(formIdPrefix, selectedCategory, currentSubcategory = null) {
-                const subcatSelect = document.getElementById(`${formIdPrefix}_subcategory`);
-                if (!subcatSelect) return;
-                
-                subcatSelect.innerHTML = ''; 
-
-                const categoryData = categoriesData.find(c => c.name === selectedCategory);
-
-                if (categoryData && categoryData.subcategories && categoryData.subcategories.length > 0) {
-                    subcatSelect.disabled = false;
-                    let optionsHtml = '<option value="none">-- Выберите подкатегорию --</option>';
-                    categoryData.subcategories.forEach(sub => {
-                        const isSelected = sub === currentSubcategory ? 'selected' : '';
-                        optionsHtml += `<option value="${sub}" ${isSelected}>${sub}</option>`;
-                    });
-                    subcatSelect.innerHTML = optionsHtml;
-                } else {
-                    subcatSelect.innerHTML = '<option value="none">-- Нет подкатегорий --</option>';
-                    subcatSelect.disabled = true;
-                }
-            }
-
             function addColorInput(containerId) {
                 const container = document.getElementById(containerId);
                 if (container) {
@@ -1562,16 +1596,27 @@ ADMIN_TEMPLATE = '''
                  if(addPriceInputsDiv && addPriceInputsDiv.children.length === 0) {
                      addPriceInput('add-price-inputs');
                  }
-
-                 document.querySelectorAll('.edit-form-container').forEach((formContainer, index) => {
-                    const catSelect = formContainer.querySelector('select[name="category"]');
-                    const productSubcategory = "{{ products[" + index + "].get('subcategory', '') }}";
-                    if (catSelect) {
-                        const formIdPrefix = `edit_${index}`;
-                        updateSubcategoryDropdown(formIdPrefix, catSelect.value, productSubcategory);
-                    }
+                 
+                 // Setup for ADD form
+                 const addCatSelect = document.getElementById('add_category');
+                 if (addCatSelect) {
+                     updateSubcategorySelect('add_category', 'add_subcategory');
+                     addCatSelect.addEventListener('change', () => updateSubcategorySelect('add_category', 'add_subcategory'));
+                 }
+                 
+                 // Initial setup for all EDIT forms (only run if the form is already open, otherwise done when opening via toggleEditForm)
+                 document.querySelectorAll('[id^="edit-form-"]').forEach(formContainer => {
+                     if (formContainer.style.display === 'block') {
+                        const index = formContainer.id.split('-').pop();
+                        const catSelect = document.getElementById(`edit_category_${index}`);
+                        if (catSelect) {
+                            const initialSubcategory = catSelect.getAttribute('data-initial-subcategory');
+                            updateSubcategorySelect(`edit_category_${index}`, `edit_subcategory_${index}`, initialSubcategory);
+                        }
+                     }
                  });
             });
+
         </script>
     </body>
     </html>
@@ -1582,7 +1627,7 @@ ADMIN_TEMPLATE = '''
 def catalog():
     data = load_data()
     all_products = data.get('products', [])
-    categories = sorted(data.get('categories', []), key=lambda x: x['name'])
+    categories_data = data.get('categories', []) 
 
     products_in_stock = [p for p in all_products if p.get('in_stock', True)]
     products_sorted = sorted(products_in_stock, key=lambda p: (not p.get('is_top', False), p.get('name', '').lower()))
@@ -1590,7 +1635,7 @@ def catalog():
     return render_template_string(
         CATALOG_TEMPLATE,
         products=products_sorted,
-        categories=categories,
+        categories_data=categories_data,
         repo_id=REPO_ID,
         store_address=STORE_ADDRESS,
         currency_code=CURRENCY_CODE
@@ -1704,7 +1749,7 @@ def view_order(order_id):
 def admin():
     data = load_data()
     products = data.get('products', [])
-    categories = data.get('categories', [])
+    categories = data.get('categories', []) 
     if 'orders' not in data or not isinstance(data.get('orders'), dict):
             data['orders'] = {}
 
@@ -1717,75 +1762,80 @@ def admin():
                 category_name = request.form.get('category_name', '').strip()
                 if category_name and not any(c['name'] == category_name for c in categories):
                     categories.append({'name': category_name, 'subcategories': []})
-                    data['categories'] = sorted(categories, key=lambda x: x['name'])
+                    data['categories'] = categories
                     save_data(data)
                     logging.info(f"Category '{category_name}' added.")
-                    flash(f"Категория '{category_name}' успешно добавлена.", 'success')
+                    flash(f"Главная категория '{category_name}' успешно добавлена.", 'success')
                 elif not category_name:
                      logging.warning("Attempted to add empty category.")
                      flash("Название категории не может быть пустым.", 'error')
                 else:
                      logging.warning(f"Category '{category_name}' already exists.")
-                     flash(f"Категория '{category_name}' уже существует.", 'error')
+                     flash(f"Главная категория '{category_name}' уже существует.", 'error')
 
             elif action == 'add_subcategory':
-                parent_category_name = request.form.get('parent_category')
+                parent_category_name = request.form.get('parent_category_name')
                 subcategory_name = request.form.get('subcategory_name', '').strip()
                 parent_cat = next((c for c in categories if c['name'] == parent_category_name), None)
 
-                if parent_cat and subcategory_name and subcategory_name not in parent_cat['subcategories']:
-                    parent_cat['subcategories'].append(subcategory_name)
-                    parent_cat['subcategories'].sort()
-                    save_data(data)
-                    flash(f"Подкатегория '{subcategory_name}' добавлена в '{parent_category_name}'.", 'success')
-                elif not parent_cat:
-                    flash(f"Родительская категория '{parent_category_name}' не найдена.", 'error')
-                elif not subcategory_name:
-                    flash("Название подкатегории не может быть пустым.", 'error')
+                if parent_cat and subcategory_name:
+                    if subcategory_name not in parent_cat['subcategories']:
+                        parent_cat['subcategories'].append(subcategory_name)
+                        save_data(data)
+                        flash(f"Подкатегория '{subcategory_name}' добавлена в '{parent_category_name}'.", 'success')
+                    else:
+                        flash(f"Подкатегория '{subcategory_name}' уже существует в этой категории.", 'error')
                 else:
-                    flash(f"Подкатегория '{subcategory_name}' уже существует в '{parent_category_name}'.", 'error')
+                    flash("Неверное название категории или подкатегории.", 'error')
 
             elif action == 'delete_category':
                 category_to_delete = request.form.get('category_name')
-                original_len = len(categories)
-                categories = [c for c in categories if c['name'] != category_to_delete]
-                if len(categories) < original_len:
-                    updated_count = 0
-                    for product in products:
-                        if product.get('category') == category_to_delete:
-                            product['category'] = 'Без категории'
-                            product['subcategory'] = None
-                            updated_count += 1
-                    data['categories'] = categories
-                    data['products'] = products
-                    save_data(data)
-                    logging.info(f"Category '{category_to_delete}' deleted. Updated products: {updated_count}.")
-                    flash(f"Категория '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
-                else:
-                    flash(f"Не удалось удалить категорию '{category_to_delete}'.", 'error')
-
-            elif action == 'delete_subcategory':
-                parent_category_name = request.form.get('parent_category')
                 subcategory_to_delete = request.form.get('subcategory_name')
-                parent_cat = next((c for c in categories if c['name'] == parent_category_name), None)
 
-                if parent_cat and subcategory_to_delete in parent_cat['subcategories']:
-                    parent_cat['subcategories'].remove(subcategory_to_delete)
-                    updated_count = 0
-                    for product in products:
-                        if product.get('category') == parent_category_name and product.get('subcategory') == subcategory_to_delete:
-                            product['subcategory'] = None
-                            updated_count += 1
-                    save_data(data)
-                    flash(f"Подкатегория '{subcategory_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
+                if subcategory_to_delete and category_to_delete:
+                    # Deleting a subcategory
+                    parent_cat = next((c for c in categories if c['name'] == category_to_delete), None)
+                    if parent_cat and subcategory_to_delete in parent_cat['subcategories']:
+                        parent_cat['subcategories'].remove(subcategory_to_delete)
+                        
+                        # Update products whose category/subcategory matches
+                        updated_count = 0
+                        for product in products:
+                             if product.get('category') == category_to_delete and product.get('subcategory') == subcategory_to_delete:
+                                product['subcategory'] = 'Без подкатегории'
+                                updated_count += 1
+                        
+                        save_data(data)
+                        flash(f"Подкатегория '{subcategory_to_delete}' из '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
+                    else:
+                        flash(f"Не удалось найти подкатегорию '{subcategory_to_delete}' в '{category_to_delete}'.", 'error')
+                elif category_to_delete and not subcategory_to_delete:
+                    # Deleting a main category
+                    if any(c['name'] == category_to_delete for c in categories):
+                        data['categories'] = [c for c in categories if c['name'] != category_to_delete]
+                        categories = data['categories']
+                        
+                        updated_count = 0
+                        for product in products:
+                            if product.get('category') == category_to_delete:
+                                product['category'] = 'Без категории'
+                                product['subcategory'] = 'Без подкатегории'
+                                updated_count += 1
+                        
+                        data['products'] = products
+                        save_data(data)
+                        flash(f"Главная категория '{category_to_delete}' удалена. {updated_count} товаров обновлено.", 'success')
+                    else:
+                        flash(f"Не удалось найти главную категорию '{category_to_delete}'.", 'error')
                 else:
-                    flash(f"Не удалось удалить подкатегорию '{subcategory_to_delete}'.", 'error')
+                    flash("Неверное действие удаления категории/подкатегории.", 'error')
+
 
             elif action == 'add_product':
                 name = request.form.get('name', '').strip()
                 description = request.form.get('description', '').strip()
                 category = request.form.get('category')
-                subcategory = request.form.get('subcategory')
+                subcategory = request.form.get('subcategory', 'Без подкатегории').strip()
                 photos_files = request.files.getlist('photos')
                 colors = [c.strip() for c in request.form.getlist('colors') if c.strip()]
                 in_stock = 'in_stock' in request.form
@@ -1799,7 +1849,7 @@ def admin():
                     type_str = type_str.strip()
                     value_str = value_str.strip().replace(',', '.')
                     if not type_str or not value_str:
-                        continue
+                        continue 
 
                     try:
                         price_value = round(float(value_str), 2)
@@ -1809,12 +1859,18 @@ def admin():
                     except ValueError:
                          logging.warning(f"Skipping invalid price value '{value_str}' for type '{type_str}' during add product.")
 
+
                 if not name:
                     flash("Название товара обязательно.", 'error')
                     return redirect(url_for('admin'))
                 if not valid_prices_exist:
                     flash("Должен быть указан хотя бы один действительный вариант цены (Тип и Цена > 0).", 'error')
                     return redirect(url_for('admin'))
+                
+                if category != 'Без категории' and not any(c['name'] == category for c in categories):
+                     category = 'Без категории'
+                     subcategory = 'Без подкатегории'
+                     flash("Выбранная категория не найдена. Установлено 'Без категории'.", 'warning')
 
 
                 photos_list = []
@@ -1873,8 +1929,7 @@ def admin():
 
                 new_product = {
                     'name': name, 'prices': prices, 'description': description,
-                    'category': category if any(c['name'] == category for c in categories) else 'Без категории',
-                    'subcategory': subcategory if subcategory and subcategory != 'none' else None,
+                    'category': category, 'subcategory': subcategory,
                     'photos': photos_list, 'colors': colors,
                     'in_stock': in_stock, 'is_top': is_top
                 }
@@ -1904,10 +1959,18 @@ def admin():
 
                 product_to_edit['name'] = request.form.get('name', product_to_edit['name']).strip()
                 product_to_edit['description'] = request.form.get('description', product_to_edit.get('description', '')).strip()
-                category = request.form.get('category')
-                subcategory = request.form.get('subcategory')
-                product_to_edit['category'] = category if any(c['name'] == category for c in categories) else 'Без категории'
-                product_to_edit['subcategory'] = subcategory if subcategory and subcategory != 'none' else None
+                
+                new_category = request.form.get('category')
+                new_subcategory = request.form.get('subcategory', 'Без подкатегории').strip()
+
+                if new_category != 'Без категории' and not any(c['name'] == new_category for c in categories):
+                     new_category = 'Без категории'
+                     new_subcategory = 'Без подкатегории'
+                     flash("Выбранная категория не найдена. Установлено 'Без категории' и 'Без подкатегории'.", 'warning')
+
+                product_to_edit['category'] = new_category
+                product_to_edit['subcategory'] = new_subcategory
+                
                 product_to_edit['colors'] = [c.strip() for c in request.form.getlist('colors') if c.strip()]
                 product_to_edit['in_stock'] = 'in_stock' in request.form
                 product_to_edit['is_top'] = 'is_top' in request.form
@@ -1920,7 +1983,7 @@ def admin():
                     type_str = type_str.strip()
                     value_str = value_str.strip().replace(',', '.')
                     if not type_str or not value_str:
-                         continue
+                         continue 
 
                     try:
                         price_value = round(float(value_str), 2)
@@ -2070,12 +2133,12 @@ def admin():
 
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
-    display_categories = sorted(current_data.get('categories', []), key=lambda x: x.get('name', ''))
+    display_categories_data = current_data.get('categories', [])
 
     return render_template_string(
         ADMIN_TEMPLATE,
         products=display_products,
-        categories=display_categories,
+        categories_data=display_categories_data,
         repo_id=REPO_ID,
         currency_code=CURRENCY_CODE
     )