Baseflask6

Paused

App Files Files Community

flpolprojects commited on Feb 19

Commit

2a5cd5a

verified ·

1 Parent(s): da22402

Update app.py

Browse files

Files changed (1) hide show

app.py +311 -314

app.py CHANGED Viewed

@@ -12,15 +12,15 @@ from werkzeug.utils import secure_filename
 app = Flask(__name__)
 DATA_FILE = 'products.json'
-# --- Настройки Hugging Face ---
 REPO_ID = "flpolprojects/Clients"  # Замените на ваш репозиторий
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")  # Токен для записи (загрузки)
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")  # Токен для чтения (скачивания)
-# Настройка логирования
 logging.basicConfig(level=logging.DEBUG)
-# --- Функции для работы с JSON ---
 def load_data():
     """Загружает данные из JSON-файла или скачивает их из репозитория Hugging Face."""
     try:
@@ -50,7 +50,7 @@ def save_data(data):
         logging.error(f"Ошибка при сохранении данных: {e}")
         raise
-# --- Функции для резервного копирования ---
 def upload_db_to_hf():
     """Загружает JSON-файл базы данных в репозиторий Hugging Face."""
     try:
@@ -92,7 +92,7 @@ def periodic_backup():
         upload_db_to_hf()
         time.sleep(15)
-# --- Маршруты приложения ---
 @app.route('/')
 def catalog():
     products = load_data()
@@ -102,92 +102,108 @@ def catalog():
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Каталог</title>
     <style>
         body {
-            font-family: Arial, sans-serif;
-            margin: 20px;
-            background-color: #f9f9f9;
         }
         h1 {
-            color: #333;
-            text-align: center; /* Added for centering */
-            margin-bottom: 20px;
         }
         .product-grid {
             display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); /* Responsive columns */
-            gap: 20px;
         }
-        .product {
-            background-color: #fff;
-            border: 1px solid #ddd;
-            padding: 15px;
-            border-radius: 5px;
-            transition: transform 0.2s;
         }
-        .product:hover {
             transform: translateY(-5px);
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
         }
-        .product h2 {
-            margin-top: 0;
-            color: #555;
-            font-size: 1.5em; /* Increased font size */
         }
-        .product p {
-            color: #777;
-            font-size: 1em; /* Increased font size */
         }
-        .product img {
-            max-width: 100%; /* Make images responsive */
-            height: auto;
-            margin-top: 10px;
-            border: 1px solid #ccc;
-            border-radius: 4px;
-            display: block;
-            margin-left: auto;
-            margin-right: auto;
         }
-        /* Media query for larger screens */
-        @media (min-width: 768px) {
-            .product-grid {
-                grid-template-columns: repeat(3, 1fr); /* 3 columns on larger screens */
-            }
         }
-        /* Basic mobile optimization */
-        @media (max-width: 600px) {
-            body {
-                margin: 10px;
-            }
-            .product {
-                padding: 10px;
-            }
-            h1 {
-                font-size: 1.8em;
-            }
         }
     </style>
 </head>
 <body>
-    <h1>Каталог товаров</h1>
-    <div class="product-grid">
-        {% for product in products %}
-        <div class="product">
-            <h2>{{ product['name'] }}</h2>
-            <p><strong>Цена:</strong> {{ product['price'] }} руб.</p>
-            <p><strong>Описание:</strong> {{ product['description'] }}</p>
-            {% if product.get('photo') %}
-            <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}" alt="{{ product['name'] }}">
-            {% endif %}
         </div>
-        {% endfor %}
     </div>
 </body>
 </html>
-'''
     return render_template_string(catalog_html, products=products, repo_id=REPO_ID)
 @app.route('/admin', methods=['GET', 'POST'])
@@ -196,254 +212,235 @@ def admin():
     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')
-            photo = request.files.get('photo')
-            logging.debug(f"Полученные данные из формы: name={name}, price={price}, description={description}")
-            photo_filename = None
-            if photo and photo.filename:
-                photo_filename = secure_filename(photo.filename)
-                # Сохраняем файл временно в папку uploads
-                uploads_dir = 'uploads'
-                os.makedirs(uploads_dir, exist_ok=True)
-                temp_path = os.path.join(uploads_dir, photo_filename)
-                photo.save(temp_path)
-                # Загружаем фото в репозиторий в папку "photos"
-                try:
-                    api = HfApi()
-                    api.upload_file(
-                        path_or_fileobj=temp_path,
-                        path_in_repo=f"photos/{photo_filename}",
-                        repo_id=REPO_ID,
-                        repo_type="dataset",
-                        token=HF_TOKEN_WRITE,
-                        commit_message=f"Добавлено фото для товара {name} {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-                    )
-                    logging.info("Фото успешно загружено в репозиторий.")
-                except Exception as e:
-                    logging.error(f"Ошибка при загрузке фото: {e}")
-                    return f"Ошибка при загрузке фото: {e}", 500
-                finally:
-                    # Удаляем временный файл
-                    os.remove(temp_path)
-            if name and price and description:
-                try:
-                    price = float(price.replace(',', '.'))
-                except ValueError:
-                    logging.error("Ошибка: Цена должна быть числом.")
-                    return "Ошибка: Цена должна быть числом.", 400
-                product_entry = {
-                    'name': name,
-                    'price': price,
-                    'description': description
-                }
-                if photo_filename:
-                    product_entry['photo'] = photo_filename
-                products.append(product_entry)
-                save_data(products)
-                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')
-            photo = request.files.get('photo')
-            # Логика обновления фотографии
-            if photo:
-                photo_filename = secure_filename(photo.filename)
-                uploads_dir = 'uploads'
-                os.makedirs(uploads_dir, exist_ok=True)
-                temp_path = os.path.join(uploads_dir, photo_filename)
-                photo.save(temp_path)
-                try:
-                    api = HfApi()
-                    api.upload_file(
-                        path_or_fileobj=temp_path,
-                        path_in_repo=f"photos/{photo_filename}",
-                        repo_id=REPO_ID,
-                        repo_type="dataset",
-                        token=HF_TOKEN_WRITE,
-                        commit_message=f"Обновлено фото для товара {name} {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-                    )
-                    logging.info("Фото успешно обновлено в репозитории.")
-                    products[index]['photo'] = photo_filename  # Обновляем имя файла
-                except Exception as e:
-                    logging.error(f"Ошибка при загрузке фото: {e}")
-                    return f"Ошибка при загрузке фото: {e}", 500
-                finally:
-                    os.remove(temp_path)
-            # Обновление остальных полей
-            products[index]['name'] = name
-            try:
-                price = float(price.replace(',', '.'))
-            except ValueError:
-                logging.error("Ошибка: Цена должна быть числом.")
-                return "Ошибка: Цена должна быть числом.", 400
-            products[index]['price'] = price
-            products[index]['description'] = description
-            save_data(products)
-            return redirect(url_for('admin'))
-        elif action == 'delete':
-            index = int(request.form.get('index'))
-            del products[index]
-            save_data(products)
-            return redirect(url_for('admin'))
-    admin_html = '''
-<!DOCTYPE html>
-<html lang="ru">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Админ-панель</title>
-    <style>
-        body {
-            font-family: Arial, sans-serif;
-            margin: 20px;
-            background-color: #f9f9f9;
-        }
-        h1 {
-            color: #333;
-        }
-        form {
-            background-color: #fff;
-            padding: 20px;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            max-width: 400px;
-            margin-bottom: 20px;
-        }
-        label {
-            display: block;
-            margin-top: 10px;
-            color: #555;
-        }
-        input, textarea {
-            width: 100%;
-            padding: 8px;
-            margin-top: 5px;
-            border: 1px solid #ddd;
-            border-radius: 4px;
-        }
-        button {
-            margin-top: 15px;
-            padding: 10px 15px;
-            background-color: #28a745;
-            color: white;
-            border: none;
-            border-radius: 4px;
-            cursor: pointer;
-        }
-        button:hover {
-            background-color: #218838;
-        }
-        .product-list {
-            margin-top: 20px;
-        }
-        .product-item {
-            background-color: #fff;
-            border: 1px solid #ddd;
-            padding: 15px;
-            margin-bottom: 10px;
-            border-radius: 5px;
-        }
-        .edit-form {
-            margin-top: 10px;
-            padding: 10px;
-            border: 1px solid #ddd;
-            border-radius: 5px;
-            background-color: #f9f9f9;
-        }
-    </style>
-</head>
-<body>
-    <h1>Добавление товара</h1>
-    <form method="POST" enctype="multipart/form-data">
-        <input type="hidden" name="action" value="add">
-        <label for="name">Название товара:</label>
-        <input type="text" id="name" name="name" required>
-        <label for="price">Цена:</label>
-        <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="photo">Фотография товара (необязательно):</label>
-        <input type="file" id="photo" name="photo" accept="image/*">
-        <button type="submit">Добавить товар</button>
-    </form>
-    <h2>Управление базой данных</h2>
-    <!-- Кнопки для резервной копии и скачивания -->
-    <form method="POST" action="{{ url_for('backup') }}">
-      <button type="submit">Создать резервную копию</button>
-    </form>
-    <form method="GET" action="{{ url_for('download') }}">
-      <button type="submit">Скачать базу данных</button>
-    </form>
-    <h2>Список товаров</h2>
-    <div class="product-list">
-        {% 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('photo') %}
-                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}" alt="{{ product['name'] }}" style="max-width: 100px;">
-            {% endif %}
-            <details>
-                <summary>Редактировать</summary>
-                <form method="POST" enctype="multipart/form-data" class="edit-form">
-                    <input type="hidden" name="action" value="edit">
-                    <input type="hidden" name="index" value="{{ loop.index0 }}">
-                    <label for="name">Название товара:</label>
-                    <input type="text" id="name" name="name" value="{{ product['name'] }}" required>
-                    <label for="price">Цена:</label>
-                    <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="photo">Фотография товара (необязательно):</label>
-                    <input type="file" id="photo" name="photo" accept="image/*">
-                    <button type="submit">Сохранить изменения</button>
-                </form>
-            </details>
-            <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 %}
-    </div>
-</body>
-</html>
-'''
     return render_template_string(admin_html, products=products, repo_id=REPO_ID)
 @app.route('/backup', methods=['POST'])
@@ -469,6 +466,6 @@ if __name__ == '__main__':
     except Exception as e:
         logging.error(f"Не удалось загрузить базу данных при запуске: {e}")
         # Здесь можно добавить логику для создания пустой базы данных, если это необходимо
-        # Например: save_data([])
     app.run(debug=True, host='0.0.0.0', port=7860)

 app = Flask(__name__)
 DATA_FILE = 'products.json'
+# --- Hugging Face Settings ---
 REPO_ID = "flpolprojects/Clients"  # Замените на ваш репозиторий
 HF_TOKEN_WRITE = os.getenv("HF_TOKEN")  # Токен для записи (загрузки)
 HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")  # Токен для чтения (скачивания)
+# Logging Configuration
 logging.basicConfig(level=logging.DEBUG)
+# --- JSON Data Functions ---
 def load_data():
     """Загружает данные из JSON-файла или скачивает их из репозитория Hugging Face."""
     try:
         logging.error(f"Ошибка при сохранении данных: {e}")
         raise
+# --- Backup Functions ---
 def upload_db_to_hf():
     """Загружает JSON-файл базы данных в репозиторий Hugging Face."""
     try:
         upload_db_to_hf()
         time.sleep(15)
+# --- Routes ---
 @app.route('/')
 def catalog():
     products = load_data()
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Каталог товаров</title>
     <style>
+        :root {
+            --gap: 15px;
+            --card-radius: 12px;
+            --shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+        }
         body {
+            margin: 0;
+            font-family: 'Segoe UI', system-ui;
+            background: #f5f5f5;
+        }
+        .container {
+            max-width: 1200px;
+            margin: 0 auto;
+            padding: 20px;
         }
         h1 {
+            text-align: center;
+            color: #2c3e50;
+            margin: 40px 0;
+            font-size: 2.8rem;
         }
         .product-grid {
             display: grid;
+            grid-template-columns: repeat(auto-fill, minmax(300px, 1fr)); /* Three columns on mobile and larger */
+            gap: var(--gap);
+            padding: 0 15px;
         }
+        .product-card {
+            background: white;
+            border-radius: var(--card-radius);
+            overflow: hidden;
+            box-shadow: var(--shadow);
+            transition: transform 0.2s, box-shadow 0.2s;
         }
+        .product-card:hover {
             transform: translateY(-5px);
+            box-shadow: 0 8px 15px rgba(0, 0, 0, 0.15);
         }
+        .product-image {
+            width: 100%;
+            height: 220px;
+            object-fit: cover;
+            border-bottom: 1px solid #eee;
         }
+        .product-content {
+            padding: 20px;
         }
+        .product-title {
+            margin: 0 0 12px;
+            color: #34495e;
+            font-size: 1.4rem;
+            line-height: 1.3;
         }
+        .product-price {
+            color: #e74c3c;
+            font-weight: 700;
+            font-size: 1.3rem;
+            margin: 10px 0;
         }
+        .product-description {
+            color: #7f8c8d;
+            font-size: 0.95rem;
+            line-height: 1.5;
         }
     </style>
 </head>
 <body>
+    <div class="container">
+        <h1>Наши товары</h1>
+        <div class="product-grid">
+            {% for product in products %}
+            <article class="product-card">
+                {% if product.get('photo') %}
+                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}"
+                     alt="{{ product['name'] }}"
+                     class="product-image">
+                {% endif %}
+                <div class="product-content">
+                    <h2 class="product-title">{{ product['name'] }}</h2>
+                    <p class="product-price">{{ product['price'] }} ₽</p>
+                    <p class="product-description">{{ product['description'] }}</p>
+                </div>
+            </article>
+            {% endfor %}
         </div>
     </div>
 </body>
 </html>
+    '''
     return render_template_string(catalog_html, products=products, repo_id=REPO_ID)
 @app.route('/admin', methods=['GET', 'POST'])
     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')
+            photo = request.files.get('photo')
+            photo_filename = None
+            if photo and photo.filename:
+                photo_filename = secure_filename(photo.filename)
+                uploads_dir = 'uploads'
+                os.makedirs(uploads_dir, exist_ok=True)
+                temp_path = os.path.join(uploads_dir, photo_filename)
+                photo.save(temp_path)
+                try:
+                    api = HfApi()
+                    api.upload_file(
+                        path_or_fileobj=temp_path,
+                        path_in_repo=f"photos/{photo_filename}",
+                        repo_id=REPO_ID,
+                        repo_type="dataset",
+                        token=HF_TOKEN_WRITE,
+                        commit_message=f"New photo for {name}"
+                    )
+                except Exception as e:
+                    return f"Photo upload error: {e}", 500
+                finally:
+                    os.remove(temp_path)
+            try:
+                price = float(price.replace(',', '.'))
+                product_entry = {
+                    'name': name,
+                    'price': price,
+                    'description': description,
+                    'photo': photo_filename
+                }
+                products.append(product_entry)
+                save_data(products)
+            except ValueError:
+                return "Invalid price format", 400
+            return redirect(url_for('admin'))
+        elif action == 'edit':
+            index = int(request.form.get('index'))
+            product = products[index]
+            product['name'] = request.form.get('name')
+            try:
+                product['price'] = float(request.form.get('price').replace(',', '.'))
+            except ValueError:
+                return "Invalid price format", 400
+            product['description'] = request.form.get('description')
+            photo = request.files.get('photo')
+            if photo and photo.filename:
+                photo_filename = secure_filename(photo.filename)
+                uploads_dir = 'uploads'
+                os.makedirs(uploads_dir, exist_ok=True)
+                temp_path = os.path.join(uploads_dir, photo_filename)
+                photo.save(temp_path)
+                try:
+                    api = HfApi()
+                    api.upload_file(
+                        path_or_fileobj=temp_path,
+                        path_in_repo=f"photos/{photo_filename}",
+                        repo_id=REPO_ID,
+                        repo_type="dataset",
+                        token=HF_TOKEN_WRITE,
+                        commit_message=f"Updated photo for {product['name']}"
+                    )
+                    product['photo'] = photo_filename
+                except Exception as e:
+                    return f"Photo upload error: {e}", 500
+                finally:
+                    os.remove(temp_path)
+            save_data(products)
+            return redirect(url_for('admin'))
+        elif action == 'delete':
+            index = int(request.form.get('index'))
+            del products[index]
+            save_data(products)
+            return redirect(url_for('admin'))
+    admin_html = '''
+<!DOCTYPE html>
+<html lang="ru">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Админ-панель</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            margin: 20px;
+            background-color: #f9f9f9;
+        }
+        h1 {
+            color: #333;
+        }
+        form {
+            background-color: #fff;
+            padding: 20px;
+            border: 1px solid #ddd;
+            border-radius: 5px;
+            max-width: 400px;
+            margin-bottom: 20px;
+        }
+        label {
+            display: block;
+            margin-top: 10px;
+            color: #555;
+        }
+        input, textarea {
+            width: 100%;
+            padding: 8px;
+            margin-top: 5px;
+            border: 1px solid #ddd;
+            border-radius: 4px;
+        }
+        button {
+            margin-top: 15px;
+            padding: 10px 15px;
+            background-color: #28a745;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+        }
+        button:hover {
+            background-color: #218838;
+        }
+        .product-list {
+            margin-top: 20px;
+        }
+        .product-item {
+            background-color: #fff;
+            border: 1px solid #ddd;
+            padding: 15px;
+            margin-bottom: 10px;
+            border-radius: 5px;
+        }
+        .edit-form {
+            margin-top: 10px;
+            padding: 10px;
+            border: 1px solid #ddd;
+            border-radius: 5px;
+            background-color: #f9f9f9;
+        }
+    </style>
+</head>
+<body>
+    <h1>Добавление товара</h1>
+    <form method="POST" enctype="multipart/form-data">
+        <input type="hidden" name="action" value="add">
+        <label for="name">Название товара:</label>
+        <input type="text" id="name" name="name" required>
+        <label for="price">Цена:</label>
+        <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="photo">Фотография товара (необязательно):</label>
+        <input type="file" id="photo" name="photo" accept="image/*">
+        <button type="submit">Добавить товар</button>
+    </form>
+    <h2>Управление базой данных</h2>
+    <!-- Кнопки для резервной копии и скачивания -->
+    <form method="POST" action="{{ url_for('backup') }}">
+      <button type="submit">Создать резервную копию</button>
+    </form>
+    <form method="GET" action="{{ url_for('download') }}">
+      <button type="submit">Скачать базу данных</button>
+    </form>
+    <h2>Список товаров</h2>
+    <div class="product-list">
+        {% 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('photo') %}
+                <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}" alt="{{ product['name'] }}" style="max-width: 100px;">
+            {% endif %}
+            <details>
+                <summary>Редактировать</summary>
+                <form method="POST" enctype="multipart/form-data" class="edit-form">
+                    <input type="hidden" name="action" value="edit">
+                    <input type="hidden" name="index" value="{{ loop.index0 }}">
+                    <label for="name">Название товара:</label>
+                    <input type="text" id="name" name="name" value="{{ product['name'] }}" required>
+                    <label for="price">Цена:</label>
+                    <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="photo">Фотография товара (необязательно):</label>
+                    <input type="file" id="photo" name="photo" accept="image/*">
+                    <button type="submit">Сохранить изменения</button>
+                </form>
+            </details>
+            <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 %}
+    </div>
+</body>
+</html>
+    '''
     return render_template_string(admin_html, products=products, repo_id=REPO_ID)
 @app.route('/backup', methods=['POST'])
     except Exception as e:
         logging.error(f"Не удалось загрузить базу данных при запуске: {e}")
         # Здесь можно добавить логику для создания пустой базы данных, если это необходимо
+        save_data([])
     app.run(debug=True, host='0.0.0.0', port=7860)