Baseflask7

Paused

App Files Files Community

flpolprojects commited on Feb 22, 2025

Commit

38eda2f

verified ·

1 Parent(s): 397b649

Update app.py

Browse files

Files changed (1) hide show

app.py +160 -37

app.py CHANGED Viewed

@@ -26,19 +26,22 @@ def load_data():
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
             logging.info("Данные успешно загружены из JSON")
             return data
     except FileNotFoundError:
         logging.warning("Локальный файл базы данных не найден после скачивания.")
-        return []
     except json.JSONDecodeError:
         logging.error("Ошибка: Невозможно декодировать JSON файл.")
-        return []
     except RepositoryNotFoundError:
         logging.error("Репозиторий не найден. Создание локальной базы данных.")
-        return []
     except Exception as e:
         logging.error(f"Произошла ошибка при загрузке данных: {e}")
-        return []
 def save_data(data):
     try:
@@ -90,7 +93,10 @@ def periodic_backup():
 @app.route('/')
 def catalog():
-    products = load_data()
     catalog_html = '''
     <!DOCTYPE html>
     <html lang="ru">
@@ -117,6 +123,13 @@ def catalog():
                 max-width: 1200px;
                 margin: 0 auto;
             }
             .search-container {
                 text-align: center;
                 margin-bottom: 20px;
@@ -134,13 +147,26 @@ def catalog():
                 border-color: #3498db;
                 box-shadow: 0 0 5px rgba(52, 152, 219, 0.5);
             }
             .products-grid {
                 display: grid;
                 grid-template-columns: repeat(2, 1fr);
                 gap: 10px;
                 padding: 0 5px;
                 overflow-y: auto;
-                max-height: calc(100vh - 120px);
             }
             .product {
                 background: #ffffff;
@@ -346,12 +372,21 @@ def catalog():
     </head>
     <body>
         <div class="container">
             <div class="search-container">
                 <input type="text" id="search-input" placeholder="Поиск по названию или описанию...">
             </div>
             <div class="products-grid" id="products-grid">
                 {% for product in products %}
-                <div class="product" data-name="{{ product['name']|lower }}" data-description="{{ product['description']|lower }}">
                     {% if product.get('photos') and product['photos']|length > 0 %}
                     <div class="product-image">
                         <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photos'][0] }}"
@@ -583,22 +618,40 @@ def catalog():
                 }
             }
-            // Поисковая строка
             document.getElementById('search-input').addEventListener('input', function(e) {
-                const searchTerm = e.target.value.toLowerCase();
                 const productElements = document.querySelectorAll('.product');
                 productElements.forEach(product => {
                     const name = product.getAttribute('data-name');
                     const description = product.getAttribute('data-description');
-                    if (name.includes(searchTerm) || description.includes(searchTerm)) {
                         product.style.display = 'flex';
                     } else {
                         product.style.display = 'none';
                     }
                 });
-            });
             console.log("Инициализация страницы, товары:", products);
             updateCartButton();
@@ -606,11 +659,12 @@ def catalog():
     </body>
     </html>
     '''
-    return render_template_string(catalog_html, products=products, repo_id=REPO_ID)
 @app.route('/product/<int:index>')
 def product_detail(index):
-    products = load_data()
     try:
         product = products[index]
     except IndexError:
@@ -640,6 +694,7 @@ def product_detail(index):
             <div class="swiper-button-next"></div>
             <div class="swiper-button-prev"></div>
         </div>
         <p><strong>Цена:</strong> {{ product['price'] }}</p>
         <p><strong>Описание:</strong> {{ product['description'] }}</p>
     </div>
@@ -648,17 +703,45 @@ def product_detail(index):
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
-    products = load_data()
     if request.method == 'POST':
         action = request.form.get('action')
-        if action == 'add':
             name = request.form.get('name')
             price = request.form.get('price')
             description = request.form.get('description')
             photos_files = request.files.getlist('photos')
             photos_list = []
-            logging.info(f"Добавление нового товара: name={name}, price={price}, description={description}")
             if photos_files:
                 for i, photo in enumerate(photos_files[:2]):
@@ -701,25 +784,21 @@ def admin():
                 'name': name,
                 'price': price,
                 'description': description,
                 'photos': photos_list
             }
             products.append(new_product)
-            logging.info(f"Новый товар добавлен в список: {new_product}")
-            try:
-                save_data(products)
-                logging.info("Товар успешно сохранен в базе данных")
-                return redirect(url_for('admin'))
-            except Exception as e:
-                logging.error(f"Ошибка при сохранении товара: {e}")
-                return f"Ошибка при сохранении товара: {e}", 500
         elif action == 'edit':
             index = int(request.form.get('index'))
             name = request.form.get('name')
             price = request.form.get('price')
             description = request.form.get('description')
             photos_files = request.files.getlist('photos')
             logging.info(f"Редактирование товара с индексом {index}")
@@ -760,8 +839,9 @@ def admin():
                 logging.error("Ошибка: Цена должна быть числом")
                 return "Ошибка: Цена должна быть числом", 400
             products[index]['description'] = description
-            save_data(products)
             logging.info(f"Товар с индексом {index} успешно отредактирован")
             return redirect(url_for('admin'))
@@ -769,7 +849,7 @@ def admin():
             index = int(request.form.get('index'))
             logging.info(f"Удаление товара с индексом {index}")
             del products[index]
-            save_data(products)
             logging.info("Товар успешно удален")
             return redirect(url_for('admin'))
@@ -786,7 +866,7 @@ def admin():
                 margin: 20px;
                 background-color: #f9f9f9;
             }
-            h1 {
                 color: #333;
             }
             form {
@@ -802,7 +882,7 @@ def admin():
                 margin-top: 10px;
                 color: #555;
             }
-            input, textarea {
                 width: 100%;
                 padding: 8px;
                 margin-top: 5px;
@@ -822,10 +902,16 @@ def admin():
             button:hover {
                 background-color: #218838;
             }
-            .product-list {
                 margin-top: 20px;
             }
-            .product-item {
                 background-color: #fff;
                 border: 1px solid #ddd;
                 padding: 10px;
@@ -846,14 +932,14 @@ def admin():
                 form {
                     padding: 10px;
                 }
-                input, textarea {
                     font-size: 0.9em;
                 }
                 button {
                     padding: 6px 10px;
                     font-size: 0.9em;
                 }
-                .product-item {
                     padding: 8px;
                 }
             }
@@ -869,11 +955,40 @@ def admin():
             <input type="number" id="price" name="price" step="0.01" required>
             <label for="description">Описание:</label>
             <textarea id="description" name="description" rows="4" required></textarea>
             <label for="photos">Фотографии товара (максимум 2):</label>
             <input type="file" id="photos" name="photos" accept="image/*" multiple>
             <button type="submit">Добавить товар</button>
         </form>
         <h2>Управление базой данных</h2>
         <form method="POST" action="{{ url_for('backup') }}">
             <button type="submit">Создать резервную копию</button>
@@ -887,6 +1002,7 @@ def admin():
             {% for product in products %}
             <div class="product-item">
                 <h3>{{ product['name'] }}</h3>
                 <p><strong>Цена:</strong> {{ product['price'] }}</p>
                 <p><strong>Описание:</strong> {{ product['description'] }}</p>
                 {% if product.get('photos') and product['photos']|length > 0 %}
@@ -907,6 +1023,13 @@ def admin():
                         <input type="number" id="price" name="price" step="0.01" value="{{ product['price'] }}" required>
                         <label for="description">Описание:</label>
                         <textarea id="description" name="description" rows="4" required>{{ product['description'] }}</textarea>
                         <label for="photos">Фотографии товара (максимум 2):</label>
                         <input type="file" id="photos" name="photos" accept="image/*" multiple>
                         <button type="submit">Сохранить изменения</button>
@@ -915,7 +1038,7 @@ def admin():
                 <form method="POST">
                     <input type="hidden" name="action" value="delete">
                     <input type="hidden" name="index" value="{{ loop.index0 }}">
-                    <button type="submit">Удалить</button>
                 </form>
             </div>
             {% endfor %}
@@ -923,7 +1046,7 @@ def admin():
     </body>
     </html>
     '''
-    return render_template_string(admin_html, products=products, repo_id=REPO_ID)
 @app.route('/backup', methods=['POST'])
 def backup():

         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
             logging.info("Данные успешно загружены из JSON")
+            # Проверяем структуру данных и добавляем categories, если его нет
+            if not isinstance(data, dict) or 'products' not in data or 'categories' not in data:
+                return {'products': [], 'categories': [] if not isinstance(data, list) else data}
             return data
     except FileNotFoundError:
         logging.warning("Локальный файл базы данных не найден после скачивания.")
+        return {'products': [], 'categories': []}
     except json.JSONDecodeError:
         logging.error("Ошибка: Невозможно декодировать JSON файл.")
+        return {'products': [], 'categories': []}
     except RepositoryNotFoundError:
         logging.error("Репозиторий не найден. Создание локальной базы данных.")
+        return {'products': [], 'categories': []}
     except Exception as e:
         logging.error(f"Произошла ошибка при загрузке данных: {e}")
+        return {'products': [], 'categories': []}
 def save_data(data):
     try:
 @app.route('/')
 def catalog():
+    data = load_data()
+    products = data['products']
+    categories = data['categories']
     catalog_html = '''
     <!DOCTYPE html>
     <html lang="ru">
                 max-width: 1200px;
                 margin: 0 auto;
             }
+            .filters-container {
+                margin-bottom: 20px;
+                display: flex;
+                flex-wrap: wrap;
+                gap: 10px;
+                justify-content: center;
+            }
             .search-container {
                 text-align: center;
                 margin-bottom: 20px;
                 border-color: #3498db;
                 box-shadow: 0 0 5px rgba(52, 152, 219, 0.5);
             }
+            .category-filter {
+                padding: 6px 12px;
+                border: 1px solid #ddd;
+                border-radius: 5px;
+                background-color: white;
+                cursor: pointer;
+                transition: all 0.3s ease;
+            }
+            .category-filter.active {
+                background-color: #3498db;
+                color: white;
+                border-color: #3498db;
+            }
             .products-grid {
                 display: grid;
                 grid-template-columns: repeat(2, 1fr);
                 gap: 10px;
                 padding: 0 5px;
                 overflow-y: auto;
+                max-height: calc(100vh - 160px);
             }
             .product {
                 background: #ffffff;
     </head>
     <body>
         <div class="container">
+            <div class="filters-container">
+                <button class="category-filter active" data-category="all">Все категории</button>
+                {% for category in categories %}
+                <button class="category-filter" data-category="{{ category }}">{{ category }}</button>
+                {% endfor %}
+            </div>
             <div class="search-container">
                 <input type="text" id="search-input" placeholder="Поиск по названию или описанию...">
             </div>
             <div class="products-grid" id="products-grid">
                 {% for product in products %}
+                <div class="product"
+                     data-name="{{ product['name']|lower }}"
+                     data-description="{{ product['description']|lower }}"
+                     data-category="{{ product.get('category', 'Без категории') }}">
                     {% if product.get('photos') and product['photos']|length > 0 %}
                     <div class="product-image">
                         <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photos'][0] }}"
                 }
             }
+            // Поисковая строка и фильтрация
             document.getElementById('search-input').addEventListener('input', function(e) {
+                filterProducts();
+            });
+            const categoryFilters = document.querySelectorAll('.category-filter');
+            categoryFilters.forEach(filter => {
+                filter.addEventListener('click', function() {
+                    categoryFilters.forEach(f => f.classList.remove('active'));
+                    this.classList.add('active');
+                    filterProducts();
+                });
+            });
+            function filterProducts() {
+                const searchTerm = document.getElementById('search-input').value.toLowerCase();
+                const activeCategory = document.querySelector('.category-filter.active').dataset.category;
                 const productElements = document.querySelectorAll('.product');
                 productElements.forEach(product => {
                     const name = product.getAttribute('data-name');
                     const description = product.getAttribute('data-description');
+                    const category = product.getAttribute('data-category');
+                    const matchesSearch = name.includes(searchTerm) || description.includes(searchTerm);
+                    const matchesCategory = activeCategory === 'all' || category === activeCategory;
+                    if (matchesSearch && matchesCategory) {
                         product.style.display = 'flex';
                     } else {
                         product.style.display = 'none';
                     }
                 });
+            }
             console.log("Инициализация страницы, товары:", products);
             updateCartButton();
     </body>
     </html>
     '''
+    return render_template_string(catalog_html, products=products, categories=categories, repo_id=REPO_ID)
 @app.route('/product/<int:index>')
 def product_detail(index):
+    data = load_data()
+    products = data['products']
     try:
         product = products[index]
     except IndexError:
             <div class="swiper-button-next"></div>
             <div class="swiper-button-prev"></div>
         </div>
+        <p><strong>Категория:</strong> {{ product.get('category', 'Без категории') }}</p>
         <p><strong>Цена:</strong> {{ product['price'] }}</p>
         <p><strong>Описание:</strong> {{ product['description'] }}</p>
     </div>
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
+    data = load_data()
+    products = data['products']
+    categories = data['categories']
     if request.method == 'POST':
         action = request.form.get('action')
+        # Обработка категорий
+        if action == 'add_category':
+            category_name = request.form.get('category_name')
+            if category_name and category_name not in categories:
+                categories.append(category_name)
+                save_data(data)
+                logging.info(f"Добавлена новая категория: {category_name}")
+                return redirect(url_for('admin'))
+            else:
+                return "Ошибка: Категория уже существует или не указано название", 400
+        elif action == 'delete_category':
+            category_index = int(request.form.get('category_index'))
+            deleted_category = categories.pop(category_index)
+            # Обновляем продукты, убирая удаленную категорию
+            for product in products:
+                if product.get('category') == deleted_category:
+                    product['category'] = 'Без категории'
+            save_data(data)
+            logging.info(f"Удалена категория: {deleted_category}")
+            return redirect(url_for('admin'))
+        # Обработка продуктов
+        elif action == 'add':
             name = request.form.get('name')
             price = request.form.get('price')
             description = request.form.get('description')
+            category = request.form.get('category')
             photos_files = request.files.getlist('photos')
             photos_list = []
+            logging.info(f"Добавление нового товара: name={name}, price={price}, description={description}, category={category}")
             if photos_files:
                 for i, photo in enumerate(photos_files[:2]):
                 'name': name,
                 'price': price,
                 'description': description,
+                'category': category if category in categories else 'Без категории',
                 'photos': photos_list
             }
             products.append(new_product)
+            save_data(data)
+            logging.info(f"Новый товар добавлен: {new_product}")
+            return redirect(url_for('admin'))
         elif action == 'edit':
             index = int(request.form.get('index'))
             name = request.form.get('name')
             price = request.form.get('price')
             description = request.form.get('description')
+            category = request.form.get('category')
             photos_files = request.files.getlist('photos')
             logging.info(f"Редактирование товара с индексом {index}")
                 logging.error("Ошибка: Цена должна быть числом")
                 return "Ошибка: Цена должна быть числом", 400
             products[index]['description'] = description
+            products[index]['category'] = category if category in categories else 'Без категории'
+            save_data(data)
             logging.info(f"Товар с индексом {index} успешно отредактирован")
             return redirect(url_for('admin'))
             index = int(request.form.get('index'))
             logging.info(f"Удаление товара с индексом {index}")
             del products[index]
+            save_data(data)
             logging.info("Товар успешно удален")
             return redirect(url_for('admin'))
                 margin: 20px;
                 background-color: #f9f9f9;
             }
+            h1, h2 {
                 color: #333;
             }
             form {
                 margin-top: 10px;
                 color: #555;
             }
+            input, textarea, select {
                 width: 100%;
                 padding: 8px;
                 margin-top: 5px;
             button:hover {
                 background-color: #218838;
             }
+            .delete-button {
+                background-color: #dc3545;
+            }
+            .delete-button:hover {
+                background-color: #c82333;
+            }
+            .product-list, .category-list {
                 margin-top: 20px;
             }
+            .product-item, .category-item {
                 background-color: #fff;
                 border: 1px solid #ddd;
                 padding: 10px;
                 form {
                     padding: 10px;
                 }
+                input, textarea, select {
                     font-size: 0.9em;
                 }
                 button {
                     padding: 6px 10px;
                     font-size: 0.9em;
                 }
+                .product-item, .category-item {
                     padding: 8px;
                 }
             }
             <input type="number" id="price" name="price" step="0.01" required>
             <label for="description">Описание:</label>
             <textarea id="description" name="description" rows="4" required></textarea>
+            <label for="category">Категория:</label>
+            <select id="category" name="category">
+                <option value="Без категории">Без категории</option>
+                {% for category in categories %}
+                <option value="{{ category }}">{{ category }}</option>
+                {% endfor %}
+            </select>
             <label for="photos">Фотографии товара (максимум 2):</label>
             <input type="file" id="photos" name="photos" accept="image/*" multiple>
             <button type="submit">Добавить товар</button>
         </form>
+        <h1>Управление категориями</h1>
+        <form method="POST">
+            <input type="hidden" name="action" value="add_category">
+            <label for="category_name">Название категории:</label>
+            <input type="text" id="category_name" name="category_name" required>
+            <button type="submit">Добавить категорию</button>
+        </form>
+        <h2>Список категорий</h2>
+        <div class="category-list">
+            {% for category in categories %}
+            <div class="category-item">
+                <h3>{{ category }}</h3>
+                <form method="POST" style="display: inline;">
+                    <input type="hidden" name="action" value="delete_category">
+                    <input type="hidden" name="category_index" value="{{ loop.index0 }}">
+                    <button type="submit" class="delete-button">Удалить</button>
+                </form>
+            </div>
+            {% endfor %}
+        </div>
         <h2>Управление базой данных</h2>
         <form method="POST" action="{{ url_for('backup') }}">
             <button type="submit">Создать резервную копию</button>
             {% for product in products %}
             <div class="product-item">
                 <h3>{{ product['name'] }}</h3>
+                <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 %}
                         <input type="number" id="price" name="price" step="0.01" value="{{ product['price'] }}" required>
                         <label for="description">Описание:</label>
                         <textarea id="description" name="description" rows="4" required>{{ product['description'] }}</textarea>
+                        <label for="category">Категория:</label>
+                        <select id="category" 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>
+                            {% endfor %}
+                        </select>
                         <label for="photos">Фотографии товара (максимум 2):</label>
                         <input type="file" id="photos" name="photos" accept="image/*" multiple>
                         <button type="submit">Сохранить изменения</button>
                 <form method="POST">
                     <input type="hidden" name="action" value="delete">
                     <input type="hidden" name="index" value="{{ loop.index0 }}">
+                    <button type="submit" class="delete-button">Удалить</button>
                 </form>
             </div>
             {% endfor %}
     </body>
     </html>
     '''
+    return render_template_string(admin_html, products=products, categories=categories, repo_id=REPO_ID)
 @app.route('/backup', methods=['POST'])
 def backup():