Update app.py

app.py

@@ -146,6 +146,15 @@ def load_data():
     except Exception:
         data = default_data
 
+    migrated_cats = []
+    for c in data.get('categories', []):
+        if isinstance(c, str):
+            migrated_cats.append({'name': c, 'icon': 'fas fa-utensils'})
+        else:
+            if 'icon' not in c: c['icon'] = 'fas fa-utensils'
+            migrated_cats.append(c)
+    data['categories'] = migrated_cats
+
     for product in data['products']:
         if 'product_id' not in product:
             product['product_id'] = uuid4().hex
@@ -283,11 +292,10 @@ CATALOG_TEMPLATE = '''
         .gallery-dot.active { background: var(--primary); }
 
         .floating-socials { position: fixed; bottom: max(100px, calc(100px + env(safe-area-inset-bottom))); right: 15px; display: flex; flex-direction: column; gap: 12px; z-index: 90; }
-        .social-btn { width: 48px; height: 48px; border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #000; font-size: 1.6rem; text-decoration: none; box-shadow: 0 4px 12px rgba(0,0,0,0.5); transition: transform 0.2s; }
+        .social-btn { width: 48px; height: 48px; border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #000; font-size: 1.6rem; text-decoration: none; box-shadow: 0 4px 12px rgba(0,0,0,0.5); transition: transform 0.2s; border: none; cursor: pointer; }
         .social-btn:active { transform: scale(0.9); }
-        .btn-float-wa { background: var(--primary); }
         .btn-float-ig { background: radial-gradient(circle at 30% 107%, #fdf497 0%, #fdf497 5%, #fd5949 45%, #d6249f 60%, #285AEB 90%); color: #fff; }
-        .btn-float-tg { background: #0088cc; color: #fff; }
+        .btn-float-map { background: #ff4757; color: #fff; }
 
         @media (min-width: 768px) {
             .categories-container { grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); }
@@ -329,9 +337,8 @@ CATALOG_TEMPLATE = '''
     <div class="products-container" id="productsContainer"></div>
 
     <div class="floating-socials">
-        <a href="https://wa.me/{{ settings.wa_shift1|replace('+', '') if settings.active_shift == 1 else settings.wa_shift2|replace('+', '') }}" class="social-btn btn-float-wa" target="_blank"><i class="fab fa-whatsapp"></i></a>
-        <a href="#" class="social-btn btn-float-ig" target="_blank"><i class="fab fa-instagram"></i></a>
-        <a href="#" class="social-btn btn-float-tg" target="_blank"><i class="fab fa-telegram-plane"></i></a>
+        <a href="https://instagram.com/hongkong_milyanfan" class="social-btn btn-float-ig" target="_blank"><i class="fab fa-instagram"></i></a>
+        <button class="social-btn btn-float-map" onclick="openAddressModal()"><i class="fas fa-map-marker-alt"></i></button>
     </div>
 
     <div class="cart-bar" id="cartBar">
@@ -364,6 +371,19 @@ CATALOG_TEMPLATE = '''
         </div>
     </div>
 
+    <div class="modal-overlay" id="addressModal" onclick="if(event.target === this) closeAddressModal()">
+        <div class="modal-content" style="max-height: 30vh; align-items: center; justify-content: center; text-align: center;">
+            <div class="modal-header" style="width: 100%; margin-bottom: 10px;">
+                <h2 style="margin: 0 auto;">Наш адрес</h2>
+                <button class="modal-close" style="position: absolute; right: 20px;" onclick="closeAddressModal()"><i class="fas fa-times"></i></button>
+            </div>
+            <div style="font-size: 1.2rem; font-weight: 600; padding: 20px; color: var(--text);">
+                <i class="fas fa-map-pin" style="color: var(--primary); margin-right: 10px; font-size: 1.5rem;"></i>
+                село Милянфан<br>ул. Фрунзе 99
+            </div>
+        </div>
+    </div>
+
     <div class="gallery-modal" id="galleryModal">
         <button class="gallery-close" onclick="closeGallery()"><i class="fas fa-times"></i></button>
         <div class="gallery-img-container" id="gallerySwipeArea">
@@ -424,17 +444,17 @@ CATALOG_TEMPLATE = '''
             container.innerHTML = '';
             
             categoriesList.forEach(cat => {
-                const catProducts = products.filter(p => p.category === cat);
+                const catProducts = products.filter(p => p.category === cat.name);
                 const count = catProducts.length;
                 
                 const div = document.createElement('div');
                 div.className = 'category-item';
-                div.onclick = () => showProducts(cat);
+                div.onclick = () => showProducts(cat.name);
                 div.innerHTML = `
                     <div style="background: #1a1a1a; width: 50px; height: 50px; border-radius: 12px; border: 1px solid var(--border); display: flex; align-items: center; justify-content: center; margin-bottom: 5px;">
-                        <i class="fas fa-utensils" style="font-size: 1.5rem; color: var(--primary);"></i>
+                        <i class="${cat.icon}" style="font-size: 1.5rem; color: var(--primary);"></i>
                     </div>
-                    <span class="name">${cat}</span>
+                    <span class="name">${cat.name}</span>
                     <span class="count">${count} шт</span>
                 `;
                 container.appendChild(div);
@@ -618,6 +638,18 @@ CATALOG_TEMPLATE = '''
             setTimeout(() => modal.style.display = 'none', 300);
         }
 
+        function openAddressModal() {
+            const modal = document.getElementById('addressModal');
+            modal.style.display = 'flex';
+            setTimeout(() => modal.classList.add('active'), 10);
+        }
+
+        function closeAddressModal() {
+            const modal = document.getElementById('addressModal');
+            modal.classList.remove('active');
+            setTimeout(() => modal.style.display = 'none', 300);
+        }
+
         function submitOrder() {
             const cartArray = Object.values(cart);
             if(cartArray.length === 0) return;
@@ -1227,6 +1259,7 @@ ADMIN_TEMPLATE = '''
             <form method="POST" class="add-cat-form">
                 <input type="hidden" name="action" value="add_category">
                 <input type="text" name="category_name" placeholder="Название новой категории" required autocomplete="off">
+                <input type="text" name="category_icon" placeholder="Класс иконки (напр. fas fa-pizza-slice)" value="fas fa-utensils" required autocomplete="off">
                 <button type="submit" class="btn btn-dark"><i class="fas fa-plus"></i> Добавить</button>
             </form>
         </div>
@@ -1241,16 +1274,26 @@ ADMIN_TEMPLATE = '''
             <div class="category-header" onclick="toggleCategory('cat-{{ loop.index }}')">
                 <div style="display: flex; align-items: center; gap: 10px;">
                     <i class="fas fa-chevron-down" id="icon-cat-{{ loop.index }}" style="color: var(--text-muted);"></i>
-                    <span class="cat-title-text"><i class="fas fa-folder-open" style="color:var(--info); margin-right:5px;"></i> {{ category }}</span>
+                    <span class="cat-title-text"><i class="{{ category.icon }}" style="color:var(--info); margin-right:5px;"></i> {{ category.name }}</span>
                 </div>
                 <form method="POST" style="margin:0;" onclick="event.stopPropagation();" onsubmit="return confirm('Удалить категорию и все ее блюда?');">
                     <input type="hidden" name="action" value="delete_category">
-                    <input type="hidden" name="category_name" value="{{ category }}">
+                    <input type="hidden" name="category_name" value="{{ category.name }}">
                     <button type="submit" class="btn btn-danger"><i class="fas fa-trash-alt"></i></button>
                 </form>
             </div>
             <div class="category-content" id="cat-{{ loop.index }}">
                 
+                <div style="padding: 15px; border-bottom: 1px solid var(--border);">
+                    <form method="POST" style="display: flex; gap: 10px; flex-wrap: wrap;">
+                        <input type="hidden" name="action" value="edit_category">
+                        <input type="hidden" name="old_name" value="{{ category.name }}">
+                        <input type="text" name="new_name" value="{{ category.name }}" required style="flex: 1; min-width: 150px;">
+                        <input type="text" name="new_icon" value="{{ category.icon }}" required style="flex: 1; min-width: 150px;">
+                        <button type="submit" class="btn btn-primary" style="white-space: nowrap;"><i class="fas fa-save"></i> Обновить категорию</button>
+                    </form>
+                </div>
+
                 <div class="toggle-add-product" onclick="toggleAddProduct('add-prod-{{ loop.index }}')">
                     <i class="fas fa-plus"></i> Добавить блюдо
                 </div>
@@ -1258,8 +1301,8 @@ ADMIN_TEMPLATE = '''
                 <div class="add-product-wrapper" id="add-prod-{{ loop.index }}">
                     <form class="add-product-form" method="POST" enctype="multipart/form-data" onsubmit="showLoading(this)">
                         <input type="hidden" name="action" value="add_product">
-                        <input type="hidden" name="category" value="{{ category }}">
-                        <div style="font-weight: 600; font-size: 0.9rem; color: var(--primary);">Новое блюдо в категории "{{ category }}"</div>
+                        <input type="hidden" name="category" value="{{ category.name }}">
+                        <div style="font-weight: 600; font-size: 0.9rem; color: var(--primary);">Новое блюдо в категории "{{ category.name }}"</div>
                         <div class="form-row">
                             <input type="text" name="name" placeholder="Название блюда" required autocomplete="off" style="flex:2;">
                             <input type="number" name="price" placeholder="Цена" required step="0.01" style="flex:1;">
@@ -1274,7 +1317,7 @@ ADMIN_TEMPLATE = '''
                 </div>
 
                 {% for product in products %}
-                    {% if product.category == category %}
+                    {% if product.category == category.name %}
                     <div class="product-item">
                         <div class="product-info">
                             {% if product.photos and product.photos|length > 0 %}
@@ -1302,7 +1345,7 @@ ADMIN_TEMPLATE = '''
                             <form class="add-product-form" method="POST" enctype="multipart/form-data" onsubmit="showLoading(this)" style="padding: 0;">
                                 <input type="hidden" name="action" value="edit_product">
                                 <input type="hidden" name="product_id" value="{{ product.product_id }}">
-                                <input type="hidden" name="category" value="{{ category }}">
+                                <input type="hidden" name="category" value="{{ category.name }}">
                                 <div style="font-weight: 600; font-size: 0.9rem; color: var(--primary);">Редактирование блюда</div>
                                 <div class="form-row">
                                     <input type="text" name="name" value="{{ product.name }}" required autocomplete="off" style="flex:2;">
@@ -1587,19 +1630,35 @@ def admin():
 
         elif action == 'add_category':
             cat_name = request.form.get('category_name', '').strip()
-            if cat_name and cat_name not in categories:
-                categories.append(cat_name)
+            cat_icon = request.form.get('category_icon', 'fas fa-utensils').strip()
+            if cat_name and not any(c.get('name') == cat_name for c in categories):
+                categories.append({'name': cat_name, 'icon': cat_icon})
                 data['categories'] = categories
                 save_data(data)
 
-        elif action == 'delete_category':
-            cat_name = request.form.get('category_name')
-            if cat_name in categories:
-                categories.remove(cat_name)
-                data['products'] = [p for p in products if p.get('category') != cat_name]
+        elif action == 'edit_category':
+            old_name = request.form.get('old_name')
+            new_name = request.form.get('new_name', '').strip()
+            new_icon = request.form.get('new_icon', 'fas fa-utensils').strip()
+            if new_name:
+                for c in categories:
+                    if c.get('name') == old_name:
+                        c['name'] = new_name
+                        c['icon'] = new_icon
+                        break
+                for p in products:
+                    if p.get('category') == old_name:
+                        p['category'] = new_name
                 data['categories'] = categories
+                data['products'] = products
                 save_data(data)
 
+        elif action == 'delete_category':
+            cat_name = request.form.get('category_name')
+            data['categories'] = [c for c in categories if c.get('name') != cat_name]
+            data['products'] = [p for p in products if p.get('category') != cat_name]
+            save_data(data)
+
         elif action == 'add_product':
             name = request.form.get('name', '').strip()
             price = float(request.form.get('price', 0))