Update app.py

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template_string, request, redirect, url_for, send_from_directory
+from flask import Flask, render_template_string, request, redirect, url_for
 import json
 import os
 import logging
@@ -27,63 +27,45 @@ def load_data():
         download_db_from_hf()
         with open(DATA_FILE, 'r', encoding='utf-8') as file:
             data = json.load(file)
-            logging.info("Данные успешно загружены из JSON")
             if not isinstance(data, dict) or 'products' not in data or 'categories' not in data:
-                 # Attempt to handle older formats gracefully if possible, or default
                 if isinstance(data, list):
-                    # Assume it was just a list of products in older format
                     return {'products': data, 'categories': []}
                 else:
-                    # Fallback for unexpected format
-                    logging.warning("Неожиданный формат данных в JSON.")
                     return {'products': [], 'categories': []}
             return data
     except FileNotFoundError:
-        logging.warning(f"Локальный файл базы данных ({DATA_FILE}) не найден после скачивания.")
         return {'products': [], 'categories': []}
     except json.JSONDecodeError:
-        logging.error("Ошибка: Невозможно декодировать JSON файл.")
         return {'products': [], 'categories': []}
     except RepositoryNotFoundError:
-        logging.error(f"Репозиторий '{REPO_ID}' не найден на Hugging Face. Создание локальной базы данных.")
         return {'products': [], 'categories': []}
     except HfHubHTTPError as e:
-         logging.error(f"Ошибка HTTP при скачивании из Hugging Face: {e}")
-         logging.warning(f"Попытка загрузить локальный файл '{DATA_FILE}' если существует.")
          try:
             with open(DATA_FILE, 'r', encoding='utf-8') as file:
                 data = json.load(file)
-                logging.info("Данные успешно загружены из локального JSON после ошибки HF.")
                 if not isinstance(data, dict) or 'products' not in data or 'categories' not in data:
                      if isinstance(data, list):
                          return {'products': data, 'categories': []}
                      else:
-                         logging.warning("Неожиданный формат данных в локальном JSON.")
                          return {'products': [], 'categories': []}
                 return data
          except FileNotFoundError:
-             logging.warning(f"Локальный файл '{DATA_FILE}' также не найден.")
              return {'products': [], 'categories': []}
          except json.JSONDecodeError:
-             logging.error("Ошибка: Невозможно декодировать локальный JSON файл.")
              return {'products': [], 'categories': []}
     except Exception as e:
-        logging.error(f"Произошла неизвестная ошибка при загрузке данных: {e}")
         return {'products': [], 'categories': []}
 
 def save_data(data):
     try:
         with open(DATA_FILE, 'w', encoding='utf-8') as file:
             json.dump(data, file, ensure_ascii=False, indent=4)
-        logging.info("Данные успешно сохранены в JSON")
         upload_db_to_hf()
     except Exception as e:
-        logging.error(f"Ошибка при сохранении данных: {e}")
         raise
 
 def upload_db_to_hf():
     if not HF_TOKEN_WRITE:
-        logging.warning("HF_TOKEN не установлен. Пропуск загрузки на Hugging Face.")
         return
     try:
         api = HfApi()
@@ -95,13 +77,12 @@ def upload_db_to_hf():
             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:
         logging.error(f"Ошибка при загрузке резервной копии на Hugging Face: {e}")
 
+
 def download_db_from_hf():
     if not HF_TOKEN_READ:
-         logging.warning("HF_TOKEN_READ не установлен. Пропуск скачивания из Hugging Face.")
          return
     try:
         hf_hub_download(
@@ -112,13 +93,10 @@ def download_db_from_hf():
             local_dir=".",
             local_dir_use_symlinks=False
         )
-        logging.info("JSON база успешно скачана из Hugging Face.")
     except RepositoryNotFoundError:
-        logging.warning(f"Репозиторий '{REPO_ID}' не найден. Скачива��ие невозможно.")
-        raise # Re-raise to be caught by load_data
+        raise
     except Exception as e:
-        logging.error(f"Ошибка при скачивании JSON базы из Hugging Face: {e}")
-        raise # Re-raise to be caught by load_data
+        raise
 
 def periodic_backup():
     while True:
@@ -235,6 +213,16 @@ catalog_html = '''
             gap: 15px;
             padding: 10px;
         }
+        @media (max-width: 768px) {
+            .products-grid {
+                grid-template-columns: repeat(2, 1fr);
+            }
+        }
+        @media (max-width: 480px) {
+            .products-grid {
+                grid-template-columns: 1fr;
+            }
+        }
         .product {
             background: var(--light-text);
             border-radius: 15px;
@@ -297,7 +285,7 @@ catalog_html = '''
             flex-grow: 1;
         }
         .product-buttons {
-            margin-top: auto; /* Push buttons to the bottom */
+            margin-top: auto;
         }
         .product-button {
             display: block;
@@ -354,7 +342,7 @@ catalog_html = '''
             height: 100%;
             background-color: rgba(0,0,0,0.5);
             backdrop-filter: blur(5px);
-            overflow: auto; /* Add scroll for smaller screens */
+            overflow: auto;
         }
         .modal-content {
             background: var(--light-text);
@@ -427,20 +415,20 @@ catalog_html = '''
 
         .quantity-input, .color-select {
             width: 100%;
-            max-width: 150px; /* Adjust max-width */
+            max-width: 200px;
             padding: 8px;
             border: 1px solid var(--secondary-color);
             border-radius: 8px;
             font-size: 1rem;
             margin: 5px 0;
-            display: block; /* Make them block elements */
+            display: block;
             margin-bottom: 15px;
         }
         .modal-content button {
-            margin-top: 0; /* Remove extra margin */
+            margin-top: 0;
         }
         .modal-content .product-button {
-             margin-top: 15px; /* Restore margin for modal buttons */
+             margin-top: 15px;
         }
 
         .clear-cart {
@@ -457,6 +445,17 @@ catalog_html = '''
             background-color: #BA68C8;
             box-shadow: 0 4px 15px rgba(186, 104, 200, 0.4);
         }
+        #cart-count {
+            position: absolute;
+            top: -5px;
+            right: -5px;
+            background-color: red;
+            color: white;
+            border-radius: 50%;
+            padding: 2px 5px;
+            font-size: 0.7em;
+            display: none;
+        }
         @media (max-width: 768px) {
              .header {
                 flex-direction: column;
@@ -466,9 +465,6 @@ catalog_html = '''
                  margin-right: 0;
                  margin-bottom: 10px;
              }
-            .products-grid {
-                grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-            }
              .modal-content {
                  margin: 10% auto;
              }
@@ -478,7 +474,7 @@ catalog_html = '''
         }
          @media (max-width: 480px) {
              .products-grid {
-                 grid-template-columns: 1fr; /* Stack products on very small screens */
+                 grid-template-columns: 1fr;
              }
              .modal-content {
                  margin: 15% auto;
@@ -558,11 +554,10 @@ catalog_html = '''
         </div>
     </div>
 
-    <button id="cart-button" onclick="openCartModal()">🛒<span id="cart-count" style="position: absolute; top: -5px; right: -5px; background-color: red; color: white; border-radius: 50%; padding: 2px 5px; font-size: 0.7em; display: none;">0</span></button>
+    <button id="cart-button" onclick="openCartModal()">🛒<span id="cart-count">0</span></button>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/Swiper/10.2.0/swiper-bundle.min.js"></script>
     <script>
-        // products data is available as a global variable from the template
         const allProducts = {{ products|tojson }};
         let selectedProductName = null;
 
@@ -591,7 +586,7 @@ catalog_html = '''
                 new Swiper('.swiper-container', {
                     slidesPerView: 1,
                     spaceBetween: 20,
-                    loop: true, // Enable loop if you have multiple images
+                    loop: true,
                     grabCursor: true,
                     pagination: { el: '.swiper-pagination', clickable: true },
                     navigation: { nextEl: '.swiper-button-next', prevEl: '.swiper-button-prev' },
@@ -639,7 +634,7 @@ catalog_html = '''
 
             if (quantity <= 0) {
                 alert("Укажите количество больше 0");
-                quantityInput.value = 1; // Reset to 1
+                quantityInput.value = 1;
                 return;
             }
 
@@ -682,7 +677,7 @@ catalog_html = '''
             if (cart.length > 0) {
                 cartButton.style.display = 'block';
                 cartCount.textContent = totalItems;
-                cartCount.style.display = 'block';
+                cartCount.style.display = totalItems > 0 ? 'block' : 'none';
             } else {
                 cartButton.style.display = 'none';
                 cartCount.style.display = 'none';
@@ -736,12 +731,11 @@ catalog_html = '''
             });
             orderText += `Итого к оплате: ${total} с`;
 
-            const phoneNumber = '996772179559'; // Замените на ваш номер телефона в международном формате
+            const phoneNumber = '996772179559';
             const whatsappUrl = `https://api.whatsapp.com/send?phone=${phoneNumber}&text=${encodeURIComponent(orderText)}`;
 
             window.open(whatsappUrl, '_blank');
-            // Optionally clear cart after order attempt
-            // clearCart();
+
         }
 
         function clearCart() {
@@ -776,13 +770,12 @@ catalog_html = '''
                 const category = productDiv.getAttribute('data-category');
                 const matchesSearch = name.includes(searchTerm) || description.includes(searchTerm);
                 const matchesCategory = activeCategory === 'all' || category === activeCategory;
-                productDiv.style.display = matchesSearch && matchesCategory ? 'flex' : 'none'; // Use flex because product uses flex-direction column
+                productDiv.style.display = matchesSearch && matchesCategory ? 'flex' : 'none';
             });
         }
 
-        // Initial load
         updateCartButton();
-        filterProducts(); // Apply initial filter (all categories)
+        filterProducts();
 
     </script>
 </body>
@@ -828,17 +821,14 @@ detail_html = '''
 @app.route('/')
 def catalog():
     data = load_data()
-    # Sort products for display in the catalog by added_at, newest first
     products_for_display = sorted(data.get('products', []), key=lambda x: x.get('added_at', ''), reverse=True)
     categories = data.get('categories', [])
 
-    # Pass the sorted list to the template
     return render_template_string(catalog_html, products=products_for_display, categories=categories, repo_id=REPO_ID, LOGO_URL=LOGO_URL)
 
 @app.route('/product_by_name/<string:product_name>')
 def product_detail_by_name(product_name):
     data = load_data()
-    # Find the product by name in the *unsorted* list
     product = next((p for p in data.get('products', []) if p['name'] == product_name), None)
 
     if product:
@@ -868,7 +858,6 @@ def admin():
                 category_name_to_delete = request.form.get('category_name_to_delete')
                 if category_name_to_delete in categories:
                      categories.remove(category_name_to_delete)
-                     # Change category for products using the deleted one
                      for product in products:
                          if product.get('category') == category_name_to_delete:
                              product['category'] = 'Без категории'
@@ -877,7 +866,6 @@ def admin():
                 else:
                      return "Ошибка: Категория не найдена.", 400
             except Exception as e:
-                 logging.error(f"Ошибка при удалении категории: {e}")
                  return f"Ошибка при удалении категории: {e}", 500
 
         elif action == 'add':
@@ -900,9 +888,7 @@ def admin():
             if photos_files:
                 for photo in photos_files:
                     if photo and photo.filename:
-                        # Ensure filename is secure and unique if needed (e.g., timestamp prefix)
                         original_filename = secure_filename(photo.filename)
-                        # Use a timestamp or UUID to make filename unique in the repo
                         timestamp = datetime.now().strftime("%Y%m%d%H%M%S%f")
                         photo_filename = f"{timestamp}_{original_filename}"
 
@@ -912,7 +898,6 @@ def admin():
                         try:
                             photo.save(temp_path)
                             api = HfApi()
-                            # Upload to a dedicated 'photos' directory in the HF dataset repo
                             api.upload_file(
                                 path_or_fileobj=temp_path,
                                 path_in_repo=f"photos/{photo_filename}",
@@ -924,10 +909,8 @@ def admin():
                             photos_list.append(photo_filename)
                         except Exception as e:
                              logging.error(f"Ошибка при загрузке фото {original_filename} на HF: {e}")
-                             # Decide if you want to stop or continue with other photos
                              pass
                         finally:
-                            # Clean up the temporary file
                             if os.path.exists(temp_path):
                                 os.remove(temp_path)
 
@@ -965,7 +948,6 @@ def admin():
                     if not name or price is None or not description:
                         return "Ошибка: Заполните все обязательные поля для редактирования", 400
 
-                    # Handle new photos
                     if photos_files and any(photo.filename for photo in photos_files):
                         new_photos_list = []
                         for photo in photos_files:
@@ -995,7 +977,6 @@ def admin():
                                     if os.path.exists(temp_path):
                                         os.remove(temp_path)
                         product_to_edit['photos'] = new_photos_list
-                    # else: no new photos uploaded, keep existing ones
 
                     product_to_edit['name'] = name
                     product_to_edit['price'] = price
@@ -1010,7 +991,6 @@ def admin():
             except ValueError:
                  return "Ошибка: Неверный индекс товара.", 400
             except Exception as e:
-                 logging.error(f"Ошибка при редактировании товара: {e}")
                  return f"Ошибка при редактировании товара: {e}", 500
 
 
@@ -1018,9 +998,6 @@ def admin():
             try:
                 index = int(request.form.get('index'))
                 if 0 <= index < len(products):
-                    # Optional: Add logic here to delete photos from Hugging Face repo
-                    # This would involve listing files in the 'photos' directory for this product
-                    # and using api.delete_file
                     del products[index]
                     save_data(data)
                     return redirect(url_for('admin'))
@@ -1029,7 +1006,6 @@ def admin():
             except ValueError:
                  return "Ошибка: Неверный индекс товара.", 400
             except Exception as e:
-                 logging.error(f"Ошибка при удалении товара: {e}")
                  return f"Ошибка при удалении товара: {e}", 500
 
     admin_html = '''
@@ -1101,7 +1077,7 @@ def admin():
                 border-radius: 8px;
                 font-size: 1rem;
                 transition: all 0.3s ease;
-                 box-sizing: border-box; /* Include padding and border in element's total width */
+                 box-sizing: border-box;
             }
             input:focus, textarea:focus, select:focus {
                 border-color: var(--primary-color);
@@ -1408,19 +1384,14 @@ def download():
         return f"Ошибка при скачивании базы данных: {e}", 500
 
 if __name__ == '__main__':
-    # Ensure the uploads directory exists
     os.makedirs('uploads', exist_ok=True)
 
-    # Start periodic backup thread
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)
     backup_thread.start()
 
-    # Attempt initial data load
     try:
         load_data()
     except Exception as e:
         logging.error(f"Не удалось выполнить начальную загрузку базы данных при запуске: {e}")
-        # Continue running, the app will likely start with empty data
 
-    # Run the Flask app
     app.run(debug=True, host='0.0.0.0', port=7860)