Update app.py

app.py

@@ -12,15 +12,12 @@ from werkzeug.utils import secure_filename
 app = Flask(__name__)
 DATA_FILE = 'data.json'
 
-# Настройки Hugging Face
 REPO_ID = "Kgshop/ecokozha.data"
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
-# Ссылка на логотип
 LOGO_URL = "https://huggingface.co/spaces/Kgshop/ecokozha/resolve/main/412767655_723792496081352_8094264164475669882_n.jpg"
 
-# Настройка логирования
 logging.basicConfig(level=logging.DEBUG)
 
 def load_data():
@@ -450,7 +447,6 @@ def catalog():
             </div>
         </div>
 
-        <!-- Product Modal -->
         <div id="productModal" class="modal">
             <div class="modal-content">
                 <span class="close" onclick="closeModal('productModal')">×</span>
@@ -458,18 +454,16 @@ def catalog():
             </div>
         </div>
 
-        <!-- Quantity and Color Modal -->
         <div id="quantityModal" class="modal">
             <div class="modal-content">
                 <span class="close" onclick="closeModal('quantityModal')">×</span>
                 <h2>Укажите количество и цвет</h2>
-                <input type="number" id="quantityInput" class="quantity-input" min="1" value="1">
+                <input type="number" id="quantityInput" class="quantity-input" step="0.1" min="0.1" value="1">
                 <select id="colorSelect" class="color-select"></select>
                 <button class="product-button" onclick="confirmAddToCart()">Добавить</button>
             </div>
         </div>
 
-        <!-- Cart Modal -->
         <div id="cartModal" class="modal">
             <div class="modal-content">
                 <span class="close" onclick="closeModal('cartModal')">×</span>
@@ -560,12 +554,14 @@ def catalog():
 
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
-                const quantity = parseInt(document.getElementById('quantityInput').value) || 1;
+                const quantity = parseFloat(document.getElementById('quantityInput').value);
                 const color = document.getElementById('colorSelect').value;
-                if (quantity <= 0) {
-                    alert("Укажите количество больше 0");
+
+                if (isNaN(quantity) || quantity <= 0) {
+                    alert("Укажите корректное количество больше 0");
                     return;
                 }
+
                 let cart = JSON.parse(localStorage.getItem('cart') || '[]');
                 const product = products[selectedProductIndex];
                 const cartItemId = `${product.name}-${color}`;
@@ -608,15 +604,15 @@ def catalog():
                                 ${item.photo ? `<img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/${item.photo}" alt="${item.name}">` : ''}
                                 <div>
                                     <strong>${item.name}</strong>
-                                    <p>${item.price} с × ${item.quantity} (Цвет: ${item.color})</p>
+                                    <p>${item.price} с × ${item.quantity.toFixed(2)} (Цвет: ${item.color})</p>
                                 </div>
                             </div>
-                            <span>${itemTotal} с</span>
+                            <span>${itemTotal.toFixed(2)} с</span>
                         </div>
                     `;
                 }).join('');
 
-                document.getElementById('cartTotal').textContent = total;
+                document.getElementById('cartTotal').textContent = total.toFixed(2);
                 document.getElementById('cartModal').style.display = 'block';
             }
 
@@ -631,9 +627,9 @@ def catalog():
                 cart.forEach((item, index) => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
-                    orderText += `${index + 1}. ${item.name} - ${item.price} с × ${item.quantity} (Цвет: ${item.color})%0A`;
+                    orderText += `${index + 1}. ${item.name} - ${item.price} с × ${item.quantity.toFixed(2)} (Цвет: ${item.color})%0A`;
                 });
-                orderText += `Итого: ${total} с`;
+                orderText += `Итого: ${total.toFixed(2)} с`;
                 window.open(`https://api.whatsapp.com/send?phone=996702588388&text=${orderText}`, '_blank');
             }
 
@@ -753,7 +749,7 @@ def admin():
             photos_list = []
             
             if photos_files:
-                for photo in photos_files[:10]:  # Ограничение до 10 фото
+                for photo in photos_files[:10]:
                     if photo and photo.filename:
                         photo_filename = secure_filename(photo.filename)
                         uploads_dir = 'uploads'
@@ -783,7 +779,7 @@ def admin():
                 'description': description,
                 'category': category if category in categories else 'Без категории',
                 'photos': photos_list,
-                'colors': colors if colors else []
+                'colors': [c for c in colors if c.strip()] if colors else []
             }
             products.append(new_product)
             save_data(data)
@@ -800,7 +796,7 @@ def admin():
             
             if photos_files and any(photo.filename for photo in photos_files):
                 new_photos_list = []
-                for photo in photos_files[:10]:  # Ограничение до 10 фото
+                for photo in photos_files[:10]:
                     if photo and photo.filename:
                         photo_filename = secure_filename(photo.filename)
                         uploads_dir = 'uploads'
@@ -825,7 +821,7 @@ def admin():
             products[index]['price'] = float(price.replace(',', '.'))
             products[index]['description'] = description
             products[index]['category'] = category if category in categories else 'Без категории'
-            products[index]['colors'] = colors if colors else []
+            products[index]['colors'] = [c for c in colors if c.strip()] if colors else []
             save_data(data)
             return redirect(url_for('admin'))
             
@@ -897,6 +893,7 @@ def admin():
                 border-radius: 8px;
                 font-size: 1rem;
                 transition: all 0.3s ease;
+                box-sizing: border-box;
             }
             input:focus, textarea:focus, select:focus {
                 border-color: #3b82f6;
@@ -946,9 +943,20 @@ def admin():
                 display: flex;
                 gap: 10px;
                 margin-top: 5px;
+                align-items: center;
+            }
+             .color-input-group input {
+                flex-grow: 1;
+            }
+            .remove-color-btn {
+                background-color: #ef4444;
+                padding: 8px 12px;
+                font-size: 0.8rem;
+                margin-top: 5px;
             }
             .add-color-btn {
                 background-color: #10b981;
+                 margin-bottom: 10px;
             }
             .add-color-btn:hover {
                 background-color: #059669;
@@ -980,12 +988,13 @@ def admin():
                 <label>Фотографии (до 10):</label>
                 <input type="file" name="photos" accept="image/*" multiple>
                 <label>Цвета:</label>
-                <div id="color-inputs">
+                <div id="color-inputs-add">
                     <div class="color-input-group">
                         <input type="text" name="colors" placeholder="Например: Красный">
+                        <button type="button" class="remove-color-btn" onclick="this.parentElement.remove()">Удалить</button>
                     </div>
                 </div>
-                <button type="button" class="add-color-btn" onclick="addColorInput()">Добавить цвет</button>
+                <button type="button" class="add-color-btn" onclick="addColorInput('color-inputs-add')">Добавить цвет</button>
                 <button type="submit">Добавить товар</button>
             </form>
 
@@ -1029,7 +1038,7 @@ def admin():
                     <p><strong>Описание:</strong> {{ product['description'] }}</p>
                     <p><strong>Цвета:</strong> {{ product.get('colors', ['Нет цветов'])|join(', ') }}</p>
                     {% if product.get('photos') and product['photos']|length > 0 %}
-                    <div style="display: flex; flex-wrap: wrap; gap: 10px;">
+                    <div style="display: flex; flex-wrap: wrap; gap: 10px; margin-bottom:10px;">
                         {% for photo in product['photos'] %}
                         <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ photo }}"
                              alt="{{ product['name'] }}"
@@ -1051,25 +1060,32 @@ def admin():
                             <label>Категория:</label>
                             <select name="category">
                                 <option value="Без категории" {% if product.get('category', 'Без категории') == 'Без категории' %}selected{% endif %}>Без категории</option>
-                                {% for category in categories %}
-                                <option value="{{ category }}" {% if product.get('category') == category %}selected{% endif %}>{{ category }}</option>
+                                {% for category_item in categories %}
+                                <option value="{{ category_item }}" {% if product.get('category') == category_item %}selected{% endif %}>{{ category_item }}</option>
                                 {% endfor %}
                             </select>
-                            <label>Фотографии (до 10):</label>
+                            <label>Фотографии (до 10, выберите новые, чтобы заменить старые):</label>
                             <input type="file" name="photos" accept="image/*" multiple>
                             <label>Цвета:</label>
                             <div id="edit-color-inputs-{{ loop.index0 }}">
                                 {% for color in product.get('colors', []) %}
                                 <div class="color-input-group">
                                     <input type="text" name="colors" value="{{ color }}">
+                                    <button type="button" class="remove-color-btn" onclick="this.parentElement.remove()">Удалить</button>
                                 </div>
                                 {% endfor %}
+                                {% if not product.get('colors') %}
+                                <div class="color-input-group">
+                                    <input type="text" name="colors" placeholder="Например: Синий">
+                                    <button type="button" class="remove-color-btn" onclick="this.parentElement.remove()">Удалить</button>
+                                </div>
+                                {% endif %}
                             </div>
                             <button type="button" class="add-color-btn" onclick="addColorInput('edit-color-inputs-{{ loop.index0 }}')">Добавить цвет</button>
                             <button type="submit">Сохранить</button>
                         </form>
                     </details>
-                    <form method="POST">
+                    <form method="POST" style="display: inline;">
                         <input type="hidden" name="action" value="delete">
                         <input type="hidden" name="index" value="{{ loop.index0 }}">
                         <button type="submit" class="delete-button">Удалить</button>
@@ -1079,12 +1095,27 @@ def admin():
             </div>
         </div>
         <script>
-            function addColorInput(containerId = 'color-inputs') {
+            function addColorInput(containerId) {
                 const container = document.getElementById(containerId);
-                const newInput = document.createElement('div');
-                newInput.className = 'color-input-group';
-                newInput.innerHTML = '<input type="text" name="colors" placeholder="Например: Красный">';
-                container.appendChild(newInput);
+                const newInputGroup = document.createElement('div');
+                newInputGroup.className = 'color-input-group';
+                
+                const newInput = document.createElement('input');
+                newInput.type = 'text';
+                newInput.name = 'colors';
+                newInput.placeholder = 'Например: Красный';
+                
+                const removeBtn = document.createElement('button');
+                removeBtn.type = 'button';
+                removeBtn.className = 'remove-color-btn';
+                removeBtn.textContent = 'Удалить';
+                removeBtn.onclick = function() {
+                    newInputGroup.remove();
+                };
+                
+                newInputGroup.appendChild(newInput);
+                newInputGroup.appendChild(removeBtn);
+                container.appendChild(newInputGroup);
             }
         </script>
     </body>
@@ -1103,8 +1134,9 @@ def download():
     return "База данных скачана.", 200
 
 if __name__ == '__main__':
-    backup_thread = threading.Thread(target=periodic_backup, daemon=True)
-    backup_thread.start()
+    if HF_TOKEN_WRITE and REPO_ID:
+        backup_thread = threading.Thread(target=periodic_backup, daemon=True)
+        backup_thread.start()
     try:
         load_data()
     except Exception as e: