Baseflask5

Paused

App Files Files Community

flpolprojects commited on Feb 19, 2025

Commit

e35954f

verified ·

1 Parent(s): 076b99d

Update app.py

Browse files

Files changed (1) hide show

app.py +34 -49

app.py CHANGED Viewed

@@ -24,7 +24,6 @@ logging.basicConfig(level=logging.DEBUG)
 def load_data():
     """Загружает данные из JSON-файла или скачивает их из репозитория Hugging Face."""
     try:
-        # Пытаемся скачать базу данных из Hugging Face
         download_db_from_hf()
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             return json.load(file)
@@ -96,20 +95,22 @@ def periodic_backup():
 @app.route('/')
 def catalog():
     products = load_data()
     # Pagination setup
     page = request.args.get('page', 1, type=int)
     per_page = 10  # 10 products per column
     # Calculate start and end indices for the current page
-    start = (page - 1) * per_page * 3  # 3 columns
     end = start + per_page * 3
     # Slice the products list for the current page
     paginated_products = products[start:end]
     # Calculate total number of pages
     total_products = len(products)
     total_pages = (total_products + (per_page * 3) - 1) // (per_page * 3)
     catalog_html = '''
     <!DOCTYPE html>
     <html lang="ru">
@@ -125,40 +126,29 @@ def catalog():
             }
             h1 {
                 color: #333;
-                text-align: center; /* Center the header */
             }
             .container {
                 display: flex;
                 flex-wrap: wrap;
-                justify-content: space-around; /* Distribute items evenly */
-            }
-            .column {
-                width: 30%; /* Adjust for three columns with some spacing */
-                margin-bottom: 20px;
             }
             .product {
                 background-color: #fff;
                 border: 1px solid #ddd;
                 padding: 15px;
-                margin-bottom: 10px;
                 border-radius: 5px;
-                text-align: center; /* Center product content */
-            }
-            .product h2 {
-                margin-top: 0;
-                color: #555;
-            }
-            .product p {
-                color: #777;
             }
             .product img {
-                max-width: 100%; /* Make images responsive */
                 height: auto;
-                border: 1px solid #ccc;
-                border-radius: 4px;
                 margin-bottom: 10px;
             }
-            /* Pagination styles */
             .pagination {
                 text-align: center;
                 margin-top: 20px;
@@ -170,11 +160,12 @@ def catalog():
                 border: 1px solid #ddd;
                 color: #333;
                 background-color: white;
             }
             .pagination a.active {
                 background-color: #4CAF50;
                 color: white;
-                border: 1px solid #4CAF50;
             }
             .pagination a:hover:not(.active) {
                 background-color: #ddd;
@@ -183,46 +174,44 @@ def catalog():
     </head>
     <body>
         <h1>Каталог товаров</h1>
         <div class="container">
             {% for product in paginated_products %}
-                {% if loop.index0 % 10 == 0 and loop.index0 != 0 %}
-                    </div><div class="column"> <!-- Start a new column every 10 products -->
-                {% elif loop.index0 % 30 == 0 %}
-                   <div class="column">  <!-- Start the first column -->
-                {% endif %}
-                <div class="product">
-                    <h2>{{ product['name'] }}</h2>
                     <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}" alt="{{ product['name'] }}">
-                    <p><strong>Цена:</strong> {{ product['price'] }} руб.</p>
-                    <p><strong>Описание:</strong> {{ product['description'] }}</p>
-                </div>
-                {% if loop.index0 % 10 == 9 or loop.last %}
-                   </div> <!-- Close the column -->
                 {% endif %}
             {% endfor %}
         </div>
-        <!-- Pagination links -->
         <div class="pagination">
             {% if page > 1 %}
                 <a href="{{ url_for('catalog', page=page-1) }}">Назад</a>
             {% endif %}
-            {% for page_num in range(1, total_pages + 1) %}
-                {% if page_num == page %}
-                    <a class="active" href="{{ url_for('catalog', page=page_num) }}">{{ page_num }}</a>
                 {% else %}
-                    <a href="{{ url_for('catalog', page=page_num) }}">{{ page_num }}</a>
                 {% endif %}
             {% endfor %}
             {% if page < total_pages %}
                 <a href="{{ url_for('catalog', page=page+1) }}">Вперед</a>
             {% endif %}
         </div>
     </body>
     </html>
     '''
-    return render_template_string(catalog_html, products=paginated_products, repo_id=REPO_ID, page=page, total_pages=total_pages)
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
@@ -493,16 +482,12 @@ def download():
     return "База данных успешно скачана.", 200
 if __name__ == '__main__':
-    # Запуск фонового потока для периодического резервного копирования
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)
     backup_thread.start()
-    # Попытка загрузить базу данных из репозитория перед запуском приложения
     try:
         load_data()
     except Exception as e:
-        logging.error(f"Не удалось загрузить базу данных при запуске: {e}")
-        # Здесь можно добавить логику для создания пустой базы данных, если это необходимо
-        # Например: save_data([])
     app.run(debug=True, host='0.0.0.0', port=7860)

 def load_data():
     """Загружает данные из JSON-файла или скачивает их из репозитория Hugging Face."""
     try:
         download_db_from_hf()
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             return json.load(file)
 @app.route('/')
 def catalog():
     products = load_data()
     # Pagination setup
     page = request.args.get('page', 1, type=int)
     per_page = 10  # 10 products per column
     # Calculate start and end indices for the current page
+    start = (page - 1) * per_page * 3  # 3 columns per row
     end = start + per_page * 3
     # Slice the products list for the current page
     paginated_products = products[start:end]
     # Calculate total number of pages
     total_products = len(products)
     total_pages = (total_products + (per_page * 3) - 1) // (per_page * 3)
     catalog_html = '''
     <!DOCTYPE html>
     <html lang="ru">
             }
             h1 {
                 color: #333;
+                text-align: center;
             }
             .container {
                 display: flex;
                 flex-wrap: wrap;
+                justify-content: space-between;
+                gap: 20px;
             }
             .product {
+                flex: 1 1 calc(30% - 20px); /* Three columns */
                 background-color: #fff;
                 border: 1px solid #ddd;
                 padding: 15px;
                 border-radius: 5px;
+                text-align: center;
+                box-shadow: 0px 2px 5px rgba(0,0,0,0.1);
             }
             .product img {
+                max-width: 100%;
                 height: auto;
+                border-radius: 5px;
                 margin-bottom: 10px;
             }
             .pagination {
                 text-align: center;
                 margin-top: 20px;
                 border: 1px solid #ddd;
                 color: #333;
                 background-color: white;
+                margin-right: 5px;
             }
             .pagination a.active {
                 background-color: #4CAF50;
                 color: white;
+                border-color: #4CAF50;
             }
             .pagination a:hover:not(.active) {
                 background-color: #ddd;
     </head>
     <body>
         <h1>Каталог товаров</h1>
         <div class="container">
             {% for product in paginated_products %}
+            <div class="product">
+                <h2>{{ product['name'] }}</h2>
+                {% if product.get('photo') %}
                     <img src="https://huggingface.co/datasets/{{ repo_id }}/resolve/main/photos/{{ product['photo'] }}" alt="{{ product['name'] }}">
                 {% endif %}
+                <p><strong>Цена:</strong> {{ product['price'] }} руб.</p>
+                <p>{{ product['description'] }}</p>
+            </div>
             {% endfor %}
         </div>
+        <!-- Pagination -->
         <div class="pagination">
             {% if page > 1 %}
                 <a href="{{ url_for('catalog', page=page-1) }}">Назад</a>
             {% endif %}
+            {% for p in range(1, total_pages + 1) %}
+                {% if p == page %}
+                    <a class="active">{{ p }}</a>
                 {% else %}
+                    <a href="{{ url_for('catalog', page=p) }}">{{ p }}</a>
                 {% endif %}
             {% endfor %}
             {% if page < total_pages %}
                 <a href="{{ url_for('catalog', page=page+1) }}">Вперед</a>
             {% endif %}
         </div>
     </body>
     </html>
     '''
+    return render_template_string(catalog_html, paginated_products=paginated_products, repo_id=REPO_ID, page=page, total_pages=total_pages)
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
     return "База данных успешно скачана.", 200
 if __name__ == '__main__':
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)
     backup_thread.start()
     try:
         load_data()
     except Exception as e:
+        logging.error(f"Не удалось загрузить базу данных при запуске приложения. Ошибка: {e}")
     app.run(debug=True, host='0.0.0.0', port=7860)