Shop

Paused

App Files Files Community

flpolprojects commited on Feb 26

Commit

c024b89

verified ·

1 Parent(s): 71f7874

Update app.py

Browse files

Files changed (1) hide show

app.py +85 -30

app.py CHANGED Viewed

@@ -10,7 +10,7 @@ from huggingface_hub.utils import RepositoryNotFoundError
 from werkzeug.utils import secure_filename
 app = Flask(__name__)
-DATA_FILE = 'dataasdem.json'
 # Настройки Hugging Face
 REPO_ID = "flpolprojects/Clients"
@@ -64,7 +64,7 @@ def upload_db_to_hf():
             repo_id=REPO_ID,
             repo_type="dataset",
             token=HF_TOKEN_WRITE,
-            commit_message=f"Автоматическое резервное копирование базы данных {datetime.now().strftime('%Y-%m-%d %H:%M:S')}"
         )
         logging.info("Резервная копия JSON базы успешно загружена на Hugging Face.")
     except Exception as e:
@@ -105,11 +105,12 @@ def catalog():
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Routine wholesale - Женская одежда </title>
         <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">
         <style>
             * {
                 margin: 0;
                 padding: 0;
@@ -137,7 +138,6 @@ def catalog():
                 align-items: center;
                 padding: 15px 0;
                 border-bottom: 1px solid #e2e8f0;
-                position: relative;
             }
             .header-logo {
                 width: 60px;
@@ -211,8 +211,8 @@ def catalog():
             }
             .products-grid {
                 display: grid;
-                grid-template-columns: repeat(2, minmax(200px, 1fr)); /* Два столбца по умолчанию на всех устройствах */
-                gap: 15px; /* Уменьшаем gap для мобильных устройств */
                 padding: 10px;
             }
             .product {
@@ -251,7 +251,7 @@ def catalog():
                 transform: scale(1.1);
             }
             .product h2 {
-                font-size: 1rem; /* Уменьшаем размер текста для всех устройств */
                 font-weight: 600;
                 margin: 10px 0;
                 text-align: center;
@@ -260,14 +260,14 @@ def catalog():
                 text-overflow: ellipsis;
             }
             .product-price {
-                font-size: 1.1rem; /* Уменьшаем размер цены для всех устройств */
                 color: #ef4444;
                 font-weight: 700;
                 text-align: center;
                 margin: 5px 0;
             }
             .product-description {
-                font-size: 0.8rem; /* Уменьшаем размер описания для всех устройств */
                 color: #718096;
                 text-align: center;
                 margin-bottom: 15px;
@@ -281,12 +281,12 @@ def catalog():
             .product-button {
                 display: block;
                 width: 100%;
-                padding: 8px; /* Уменьшаем отступы кнопок для всех устройств */
                 border: none;
                 border-radius: 8px;
                 background-color: #3b82f6;
                 color: white;
-                font-size: 0.8rem; /* Уменьшаем размер текста кнопок для всех устройств */
                 font-weight: 500;
                 cursor: pointer;
                 transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
@@ -323,10 +323,6 @@ def catalog():
                 transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
                 z-index: 1000;
             }
-            #cart-button:hover {
-                background-color: #dc2626;
-                transform: scale(1.1);
-            }
             .modal {
                 display: none;
                 position: fixed;
@@ -389,12 +385,14 @@ def catalog():
                 border-radius: 8px;
                 margin-right: 15px;
             }
-            .quantity-input {
-                width: 70px;
                 padding: 8px;
                 border: 1px solid #e2e8f0;
                 border-radius: 8px;
                 font-size: 1rem;
             }
             .clear-cart {
                 background-color: #ef4444;
@@ -461,12 +459,13 @@ def catalog():
             </div>
         </div>
-        <!-- Quantity 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">
                 <button class="product-button" onclick="confirmAddToCart()">Добавить</button>
             </div>
         </div>
@@ -540,6 +539,22 @@ def catalog():
             function openQuantityModal(index) {
                 selectedProductIndex = index;
                 document.getElementById('quantityModal').style.display = 'block';
                 document.getElementById('quantityInput').value = 1;
             }
@@ -547,22 +562,26 @@ def catalog():
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
                 const quantity = parseInt(document.getElementById('quantityInput').value) || 1;
                 if (quantity <= 0) {
                     alert("Укажите количество больше 0");
                     return;
                 }
                 let cart = JSON.parse(localStorage.getItem('cart') || '[]');
                 const product = products[selectedProductIndex];
-                const existingItem = cart.find(item => item.name === product.name);
                 if (existingItem) {
                     existingItem.quantity += quantity;
                 } else {
                     cart.push({
                         name: product.name,
                         price: product.price,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : '',
-                        quantity: quantity
                     });
                 }
@@ -590,7 +609,7 @@ 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}</p>
                                 </div>
                             </div>
                             <span>${itemTotal} с</span>
@@ -613,7 +632,7 @@ def catalog():
                 cart.forEach((item, index) => {
                     const itemTotal = item.price * item.quantity;
                     total += itemTotal;
-                    orderText += `${index + 1}. ${item.name} - ${item.price} с × ${item.quantity}%0A`;
                 });
                 orderText += `Итого: ${total} с`;
                 window.open(`https://api.whatsapp.com/send?phone=996772179559&text=${orderText}`, '_blank');
@@ -694,6 +713,7 @@ def product_detail(index):
         <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
         <p><strong>Цена:</strong> {{ product['price'] }} с</p>
         <p><strong>Описание:</strong> {{ product['description'] }}</p>
     </div>
     '''
     return render_template_string(detail_html, product=product, repo_id=REPO_ID)
@@ -730,6 +750,7 @@ def admin():
             description = request.form.get('description')
             category = request.form.get('category')
             photos_files = request.files.getlist('photos')
             photos_list = []
             if photos_files:
@@ -762,7 +783,8 @@ def admin():
                 'price': price,
                 'description': description,
                 'category': category if category in categories else 'Без категории',
-                'photos': photos_list
             }
             products.append(new_product)
             save_data(data)
@@ -775,6 +797,7 @@ def admin():
             description = request.form.get('description')
             category = request.form.get('category')
             photos_files = request.files.getlist('photos')
             if photos_files and any(photo.filename for photo in photos_files):
                 new_photos_list = []
@@ -803,6 +826,7 @@ def admin():
             products[index]['price'] = float(price.replace(',', '.'))
             products[index]['description'] = description
             products[index]['category'] = category if category in categories else 'Без категории'
             save_data(data)
             return redirect(url_for('admin'))
@@ -919,11 +943,16 @@ def admin():
                 background: #f7fafc;
                 border-radius: 10px;
             }
-            @media (max-width: 768px) {
-                .header-logo {
-                    width: 50px;
-                    height: 50px;
-                }
             }
         </style>
     </head>
@@ -951,7 +980,14 @@ def admin():
                 </select>
                 <label>Фотографии (до 2):</label>
                 <input type="file" name="photos" accept="image/*" multiple>
-                <button type="submit">Добавить</button>
             </form>
             <h1>Управление категориями</h1>
@@ -992,6 +1028,7 @@ def admin():
                     <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
                     <p><strong>Цена:</strong> {{ product['price'] }} с</p>
                     <p><strong>Описание:</strong> {{ product['description'] }}</p>
                     {% 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'] }}"
@@ -1017,6 +1054,15 @@ def admin():
                             </select>
                             <label>Фотографии:</label>
                             <input type="file" name="photos" accept="image/*" multiple>
                             <button type="submit">Сохранить</button>
                         </form>
                     </details>
@@ -1029,6 +1075,15 @@ def admin():
                 {% endfor %}
             </div>
         </div>
     </body>
     </html>
     '''

 from werkzeug.utils import secure_filename
 app = Flask(__name__)
+DATA_FILE = 'datatest.json'
 # Настройки Hugging Face
 REPO_ID = "flpolprojects/Clients"
             repo_id=REPO_ID,
             repo_type="dataset",
             token=HF_TOKEN_WRITE,
+            commit_message=f"Автоматическое резервное копирование базы данных {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
         )
         logging.info("Резервная копия JSON базы успешно загружена на Hugging Face.")
     except Exception as e:
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Routine wholesale - Женская одежда</title>
         <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">
         <style>
+            /* Существующие стили остаются без изменений */
             * {
                 margin: 0;
                 padding: 0;
                 align-items: center;
                 padding: 15px 0;
                 border-bottom: 1px solid #e2e8f0;
             }
             .header-logo {
                 width: 60px;
             }
             .products-grid {
                 display: grid;
+                grid-template-columns: repeat(2, minmax(200px, 1fr));
+                gap: 15px;
                 padding: 10px;
             }
             .product {
                 transform: scale(1.1);
             }
             .product h2 {
+                font-size: 1rem;
                 font-weight: 600;
                 margin: 10px 0;
                 text-align: center;
                 text-overflow: ellipsis;
             }
             .product-price {
+                font-size: 1.1rem;
                 color: #ef4444;
                 font-weight: 700;
                 text-align: center;
                 margin: 5px 0;
             }
             .product-description {
+                font-size: 0.8rem;
                 color: #718096;
                 text-align: center;
                 margin-bottom: 15px;
             .product-button {
                 display: block;
                 width: 100%;
+                padding: 8px;
                 border: none;
                 border-radius: 8px;
                 background-color: #3b82f6;
                 color: white;
+                font-size: 0.8rem;
                 font-weight: 500;
                 cursor: pointer;
                 transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
                 transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
                 z-index: 1000;
             }
             .modal {
                 display: none;
                 position: fixed;
                 border-radius: 8px;
                 margin-right: 15px;
             }
+            .quantity-input, .color-select {
+                width: 100%;
+                max-width: 150px;
                 padding: 8px;
                 border: 1px solid #e2e8f0;
                 border-radius: 8px;
                 font-size: 1rem;
+                margin: 5px 0;
             }
             .clear-cart {
                 background-color: #ef4444;
             </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">
+                <select id="colorSelect" class="color-select"></select>
                 <button class="product-button" onclick="confirmAddToCart()">Добавить</button>
             </div>
         </div>
             function openQuantityModal(index) {
                 selectedProductIndex = index;
+                const product = products[index];
+                const colorSelect = document.getElementById('colorSelect');
+                colorSelect.innerHTML = '';
+                if (product.colors && product.colors.length > 0) {
+                    product.colors.forEach(color => {
+                        const option = document.createElement('option');
+                        option.value = color;
+                        option.text = color;
+                        colorSelect.appendChild(option);
+                    });
+                } else {
+                    const option = document.createElement('option');
+                    option.value = 'Нет цвета';
+                    option.text = 'Нет цвета';
+                    colorSelect.appendChild(option);
+                }
                 document.getElementById('quantityModal').style.display = 'block';
                 document.getElementById('quantityInput').value = 1;
             }
             function confirmAddToCart() {
                 if (selectedProductIndex === null) return;
                 const quantity = parseInt(document.getElementById('quantityInput').value) || 1;
+                const color = document.getElementById('colorSelect').value;
                 if (quantity <= 0) {
                     alert("Укажите количество больше 0");
                     return;
                 }
                 let cart = JSON.parse(localStorage.getItem('cart') || '[]');
                 const product = products[selectedProductIndex];
+                const cartItemId = `${product.name}-${color}`;
+                const existingItem = cart.find(item => item.id === cartItemId);
                 if (existingItem) {
                     existingItem.quantity += quantity;
                 } else {
                     cart.push({
+                        id: cartItemId,
                         name: product.name,
                         price: product.price,
                         photo: product.photos && product.photos.length > 0 ? product.photos[0] : '',
+                        quantity: quantity,
+                        color: color
                     });
                 }
                                 ${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>
                                 </div>
                             </div>
                             <span>${itemTotal} с</span>
                 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 += `Итого: ${total} с`;
                 window.open(`https://api.whatsapp.com/send?phone=996772179559&text=${orderText}`, '_blank');
         <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
         <p><strong>Цена:</strong> {{ product['price'] }} с</p>
         <p><strong>Описание:</strong> {{ product['description'] }}</p>
+        <p><strong>Доступные цвета:</strong> {{ product.get('colors', ['Нет цветов'])|join(', ') }}</p>
     </div>
     '''
     return render_template_string(detail_html, product=product, repo_id=REPO_ID)
             description = request.form.get('description')
             category = request.form.get('category')
             photos_files = request.files.getlist('photos')
+            colors = request.form.getlist('colors')  # Получаем список цветов
             photos_list = []
             if photos_files:
                 'price': price,
                 'description': description,
                 'category': category if category in categories else 'Без категории',
+                'photos': photos_list,
+                'colors': colors if colors else []  # Добавляем цвета
             }
             products.append(new_product)
             save_data(data)
             description = request.form.get('description')
             category = request.form.get('category')
             photos_files = request.files.getlist('photos')
+            colors = request.form.getlist('colors')  # Обновляем цвета
             if photos_files and any(photo.filename for photo in photos_files):
                 new_photos_list = []
             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 []  # Обновляем цвета
             save_data(data)
             return redirect(url_for('admin'))
                 background: #f7fafc;
                 border-radius: 10px;
             }
+            .color-input-group {
+                display: flex;
+                gap: 10px;
+                margin-top: 5px;
+            }
+            .add-color-btn {
+                background-color: #10b981;
+            }
+            .add-color-btn:hover {
+                background-color: #059669;
             }
         </style>
     </head>
                 </select>
                 <label>Фотографии (до 2):</label>
                 <input type="file" name="photos" accept="image/*" multiple>
+                <label>Цвета:</label>
+                <div id="color-inputs">
+                    <div class="color-input-group">
+                        <input type="text" name="colors" placeholder="Например: Красный">
+                    </div>
+                </div>
+                <button type="button" class="add-color-btn" onclick="addColorInput()">Добавить цвет</button>
+                <button type="submit">Добавить товар</button>
             </form>
             <h1>Управление категориями</h1>
                     <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
                     <p><strong>Цена:</strong> {{ product['price'] }} с</p>
                     <p><strong>Описание:</strong> {{ product['description'] }}</p>
+                    <p><strong>Цвета:</strong> {{ product.get('colors', ['Нет цветов'])|join(', ') }}</p>
                     {% 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'] }}"
                             </select>
                             <label>Фотографии:</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 }}">
+                                </div>
+                                {% endfor %}
+                            </div>
+                            <button type="button" class="add-color-btn" onclick="addColorInput('edit-color-inputs-{{ loop.index0 }}')">Добавить цвет</button>
                             <button type="submit">Сохранить</button>
                         </form>
                     </details>
                 {% endfor %}
             </div>
         </div>
+        <script>
+            function addColorInput(containerId = 'color-inputs') {
+                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);
+            }
+        </script>
     </body>
     </html>
     '''