Ca

Running

App Files Files Community

Shveiauto commited on Apr 28, 2025

Commit

b8b80ed

verified ·

1 Parent(s): f08e1b7

Update app.py

Browse files

Files changed (1) hide show

app.py +94 -38

app.py CHANGED Viewed

@@ -1,3 +1,4 @@
 # --- START OF FILE app.py ---
 from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash, jsonify
@@ -362,6 +363,9 @@ CATALOG_TEMPLATE = '''
             body.dark-mode .no-results-message { color: #8aa39a; }
             .top-product-indicator { position: absolute; top: 8px; right: 8px; background-color: rgba(255, 215, 0, 0.8); color: #333; padding: 2px 6px; font-size: 0.7rem; border-radius: 4px; font-weight: bold; z-index: 10; backdrop-filter: blur(2px); }
             .product { position: relative; }
         </style>
     </head>
     <body>
@@ -1051,6 +1055,9 @@ ADMIN_TEMPLATE = '''
             .status-indicator.in-stock { background-color: #c6f6d5; color: #2f855a; }
             .status-indicator.out-of-stock { background-color: #fed7d7; color: #c53030; }
             .status-indicator.top-product { background-color: #feebc8; color: #9c4221; margin-left: 5px;}
         </style>
     </head>
     <body>
@@ -1218,11 +1225,18 @@ ADMIN_TEMPLATE = '''
                      </div>
                 </details>
                 <h3>Список товаров:</h3>
                 {% if products %}
-                <div class="item-list">
                     {% for product in products %}
-                    <div class="item">
                         <div style="display: flex; gap: 15px; align-items: flex-start;">
                              <div class="photo-preview" style="flex-shrink: 0;">
                                 {% if product.get('photos') %}
@@ -1328,9 +1342,10 @@ ADMIN_TEMPLATE = '''
                         </div>
                     </div>
                     {% endfor %}
                 </div>
                 {% else %}
-                <p>Товаров пока нет.</p>
                 {% endif %}
             </div>
@@ -1379,6 +1394,49 @@ ADMIN_TEMPLATE = '''
                      console.warn("Could not find parent .color-input-group for remove button");
                 }
             }
         </script>
     </body>
     </html>
@@ -1680,8 +1738,7 @@ def create_order():
     order_timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     user_info_for_order = session.get('user_info', None)
-    # Make a copy to avoid modifying the session object directly if needed later
-    # and to store only relevant info, excluding potentially sensitive session data
     user_info_for_order_copy = None
     if user_info_for_order:
         user_info_for_order_copy = {
@@ -1692,7 +1749,7 @@ def create_order():
             'city': user_info_for_order.get('city', ''),
             'phone': user_info_for_order.get('phone', '')
         }
-        # Clean up empty strings/None values if desired, but keeping them might be useful
         user_info_for_order_copy = {k: v for k, v in user_info_for_order_copy.items() if v}
@@ -1733,34 +1790,34 @@ def view_order(order_id):
                                   order=order,
                                   repo_id=REPO_ID,
                                   currency_code=CURRENCY_CODE,
-                                  request=request # Pass request to access request.url in template
                                   )
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
     data = load_data()
-    # Sort products by name for consistent display and indexing in admin
     products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower())
     categories = sorted(data.get('categories', []))
-    users = dict(sorted(load_users().items())) # Load and sort users
     if request.method == 'POST':
         action = request.form.get('action')
         logging.info(f"Admin action received: {action}")
-        # Reload data and users immediately after POST to ensure actions operate on the latest state
         data = load_data()
-        products = data.get('products', []) # Reload products
-        categories = data.get('categories', []) # Reload categories
-        users = load_users() # Reload users
         try:
             if action == 'add_category':
                 category_name = request.form.get('category_name', '').strip()
                 if category_name and category_name not in categories:
                     categories.append(category_name)
-                    categories.sort() # Keep categories sorted
                     data['categories'] = categories
                     save_data(data)
                     logging.info(f"Category '{category_name}' added.")
@@ -1831,8 +1888,8 @@ def admin():
                                      flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning")
                                      continue
-                                safe_name = secure_filename(name.replace(' ', '_'))[:50].rstrip('_') # Limit name length and trailing underscore
-                                # Ensure filename is unique and avoids collisions
                                 photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}"
                                 temp_path = os.path.join(uploads_dir, photo_filename)
                                 photo.save(temp_path)
@@ -1873,7 +1930,7 @@ def admin():
                     'in_stock': in_stock, 'is_top': is_top
                 }
                 products.append(new_product)
-                # Re-sort products after adding
                 products.sort(key=lambda p: p.get('name', '').lower())
                 data['products'] = products
                 save_data(data)
@@ -1888,7 +1945,7 @@ def admin():
                 try:
                     index = int(index_str)
-                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower()) # Ensure we are editing based on the *sorted* list
                     if not (0 <= index < len(products)):
                         raise IndexError("Product index out of range")
                     product_to_edit = products[index]
@@ -1896,7 +1953,7 @@ def admin():
                 except (ValueError, IndexError):
                      flash(f"Ошибка редактирования: неверный индекс товара '{index_str}'.", 'error')
-                     # Reload products list based on current data for the template render after error
                      display_products = sorted(load_data().get('products', []), key=lambda p: p.get('name', '').lower())
                      display_categories = sorted(load_data().get('categories', []))
                      display_users = dict(sorted(load_users().items()))
@@ -1981,7 +2038,7 @@ def admin():
                                 api = HfApi()
                                 api.delete_files(
                                     repo_id=REPO_ID,
-                                    paths_in_repo=[f"photos/{p}" for p in old_photos if p], # Ensure valid paths
                                     repo_type="dataset",
                                     token=HF_TOKEN_WRITE,
                                     commit_message=f"Delete old photos for product {product_to_edit['name']}"
@@ -1998,12 +2055,11 @@ def admin():
                     flash("HF_TOKEN (write) не настроен. Фотографии не были обновлены.", "warning")
-                # The product_to_edit object is already a reference to the list element, so modifying it updates the list directly.
-                # We just need to ensure the overall list in 'data' is the one we save.
                 data['products'] = products
-                 # Re-sort products after edit, as name might have changed affecting sort order
                 products.sort(key=lambda p: p.get('name', '').lower())
-                data['products'] = products # Update data dict with sorted list
                 save_data(data)
                 logging.info(f"Product '{original_name}' (original index {index}) updated to '{product_to_edit['name']}'.")
                 flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success')
@@ -2016,7 +2072,7 @@ def admin():
                     return redirect(url_for('admin'))
                 try:
                     index = int(index_str)
-                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower()) # Ensure we are deleting based on the *sorted* list
                     if not (0 <= index < len(products)): raise IndexError("Product index out of range")
                     deleted_product = products.pop(index)
                     product_name = deleted_product.get('name', 'N/A')
@@ -2028,7 +2084,7 @@ def admin():
                             api = HfApi()
                             api.delete_files(
                                 repo_id=REPO_ID,
-                                paths_in_repo=[f"photos/{p}" for p in photos_to_delete if p], # Ensure valid paths
                                 repo_type="dataset",
                                 token=HF_TOKEN_WRITE,
                                 commit_message=f"Delete photos for deleted product {product_name}"
@@ -2052,7 +2108,7 @@ def admin():
             elif action == 'add_user':
                  login = request.form.get('login', '').strip()
-                 password = request.form.get('password', '').strip() # Storing plain text password
                  first_name = request.form.get('first_name', '').strip()
                  last_name = request.form.get('last_name', '').strip()
                  phone = request.form.get('phone', '').strip()
@@ -2067,7 +2123,7 @@ def admin():
                      return redirect(url_for('admin'))
                  users[login] = {
-                     'password': password, # Store plain text password
                      'first_name': first_name, 'last_name': last_name,
                      'phone': phone,
                      'country': country, 'city': city
@@ -2097,7 +2153,7 @@ def admin():
                  try:
                     product_index = int(product_index_str)
-                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower()) # Ensure we are deleting based on the *sorted* list
                     if not (0 <= product_index < len(products)):
                         raise IndexError("Product index out of range")
                     product = products[product_index]
@@ -2115,12 +2171,12 @@ def admin():
                                     commit_message=f"Delete photo {photo_filename} for product {product.get('name', 'N/A')}"
                                 )
                                 logging.info(f"Photo '{photo_filename}' deleted from HF.")
-                                # Remove photo from product data only after successful HF deletion
                                 product['photos'].remove(photo_filename)
                                 data['products'] = products
-                                # Re-sort products after modifying (though photo deletion shouldn't change sort order)
                                 products.sort(key=lambda p: p.get('name', '').lower())
-                                data['products'] = products # Update data dict with sorted list
                                 save_data(data)
                                 flash(f"Фото '{photo_filename}' успешно удалено.", 'success')
                             except Exception as e:
@@ -2146,11 +2202,10 @@ def admin():
              logging.error(f"Error processing admin action '{action}': {e}", exc_info=True)
              flash(f"Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.", 'error')
-        # Redirect after any POST action to prevent resubmission on refresh
         return redirect(url_for('admin'))
-    # --- GET request or after POST redirect ---
-    # Always reload data and users for the GET request template rendering
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
     display_categories = sorted(current_data.get('categories', []))
@@ -2182,8 +2237,8 @@ def force_download():
     try:
         if download_db_from_hf():
             flash("Данные успешно скачаны с Hugging Face. Локальные файлы обновлены.", 'success')
-            load_data() # Reload data in memory after download
-            load_users() # Reload users in memory after download
         else:
             flash("Не удалось скачать данные с Hugging Face после нескольких попыток. Проверьте логи.", 'error')
     except Exception as e:
@@ -2194,7 +2249,7 @@ def force_download():
 if __name__ == '__main__':
     logging.info("Application starting up. Performing initial data load/download...")
-    # Attempt to download first, then load
     download_db_from_hf()
     load_data()
     load_users()
@@ -2210,3 +2265,4 @@ if __name__ == '__main__':
     port = int(os.environ.get('PORT', 7860))
     logging.info(f"Starting Flask app on host 0.0.0.0 and port {port}")
     app.run(debug=False, host='0.0.0.0', port=port)

 # --- START OF FILE app.py ---
 from flask import Flask, render_template_string, request, redirect, url_for, session, send_file, flash, jsonify
             body.dark-mode .no-results-message { color: #8aa39a; }
             .top-product-indicator { position: absolute; top: 8px; right: 8px; background-color: rgba(255, 215, 0, 0.8); color: #333; padding: 2px 6px; font-size: 0.7rem; border-radius: 4px; font-weight: bold; z-index: 10; backdrop-filter: blur(2px); }
             .product { position: relative; }
+            @media (min-width: 768px) { .products-grid { grid-template-columns: repeat(3, 1fr); } }
+            @media (min-width: 1024px) { .products-grid { grid-template-columns: repeat(4, 1fr); } }
+            @media (min-width: 1200px) { .products-grid { grid-template-columns: repeat(5, 1fr); } }
         </style>
     </head>
     <body>
             .status-indicator.in-stock { background-color: #c6f6d5; color: #2f855a; }
             .status-indicator.out-of-stock { background-color: #fed7d7; color: #c53030; }
             .status-indicator.top-product { background-color: #feebc8; color: #9c4221; margin-left: 5px;}
+            .search-container { margin-bottom: 20px; }
+            .no-results-message { display: none; grid-column: 1 / -1; text-align: center; padding: 20px; font-size: 1rem; color: #5e6e68; }
         </style>
     </head>
     <body>
                      </div>
                 </details>
+                 <div class="search-container" id="admin-search-container">
+                     <label for="admin-product-search">Поиск по названию/описанию:</label>
+                     <input type="text" id="admin-product-search" placeholder="Введите текст для поиска..." style="width: 100%; max-width: 500px; display: block; margin-top: 5px;">
+                 </div>
                 <h3>Список товаров:</h3>
                 {% if products %}
+                <div class="item-list" id="admin-product-list">
                     {% for product in products %}
+                    <div class="item product-item"
+                         data-name="{{ product['name']|lower }}"
+                         data-description="{{ product.get('description', '')|lower }}">
                         <div style="display: flex; gap: 15px; align-items: flex-start;">
                              <div class="photo-preview" style="flex-shrink: 0;">
                                 {% if product.get('photos') %}
                         </div>
                     </div>
                     {% endfor %}
+                    <p id="admin-no-results" class="no-results-message" style="display: none;">Товары по вашему запросу не найдены.</p>
                 </div>
                 {% else %}
+                 <p id="admin-no-products-initial">Товаров пока нет.</p>
                 {% endif %}
             </div>
                      console.warn("Could not find parent .color-input-group for remove button");
                 }
             }
+             function filterAdminProducts() {
+                const searchTerm = document.getElementById('admin-product-search').value.toLowerCase().trim();
+                const productItems = document.querySelectorAll('#admin-product-list .product-item');
+                const noResultsMessage = document.getElementById('admin-no-results');
+                let visibleCount = 0;
+                productItems.forEach(item => {
+                    const name = item.dataset.name || '';
+                    const description = item.dataset.description || '';
+                    if (!searchTerm || name.includes(searchTerm) || description.includes(searchTerm)) {
+                        item.style.display = '';
+                        visibleCount++;
+                    } else {
+                        item.style.display = 'none';
+                    }
+                });
+                if (noResultsMessage) {
+                    noResultsMessage.style.display = visibleCount === 0 && searchTerm ? 'block' : 'none';
+                }
+            }
+            document.addEventListener('DOMContentLoaded', () => {
+                 const searchInput = document.getElementById('admin-product-search');
+                 const searchContainer = document.getElementById('admin-search-container');
+                 const noProductsInitialMessage = document.getElementById('admin-no-products-initial');
+                 const productList = document.getElementById('admin-product-list');
+                 const hasProducts = productList && productList.querySelector('.product-item');
+                 if (searchInput) {
+                     searchInput.addEventListener('input', filterAdminProducts);
+                 }
+                 if (!hasProducts && noProductsInitialMessage) {
+                     if (searchContainer) searchContainer.style.display = 'none';
+                 } else if (searchContainer) {
+                     searchContainer.style.display = 'block';
+                 }
+            });
         </script>
     </body>
     </html>
     order_timestamp = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     user_info_for_order = session.get('user_info', None)
     user_info_for_order_copy = None
     if user_info_for_order:
         user_info_for_order_copy = {
             'city': user_info_for_order.get('city', ''),
             'phone': user_info_for_order.get('phone', '')
         }
         user_info_for_order_copy = {k: v for k, v in user_info_for_order_copy.items() if v}
                                   order=order,
                                   repo_id=REPO_ID,
                                   currency_code=CURRENCY_CODE,
+                                  request=request
                                   )
 @app.route('/admin', methods=['GET', 'POST'])
 def admin():
     data = load_data()
     products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower())
     categories = sorted(data.get('categories', []))
+    users = dict(sorted(load_users().items()))
     if request.method == 'POST':
         action = request.form.get('action')
         logging.info(f"Admin action received: {action}")
         data = load_data()
+        products = data.get('products', [])
+        categories = data.get('categories', [])
+        users = load_users()
         try:
             if action == 'add_category':
                 category_name = request.form.get('category_name', '').strip()
                 if category_name and category_name not in categories:
                     categories.append(category_name)
+                    categories.sort()
                     data['categories'] = categories
                     save_data(data)
                     logging.info(f"Category '{category_name}' added.")
                                      flash(f"Файл {photo.filename} не является изображением и был пропущен.", "warning")
                                      continue
+                                safe_name = secure_filename(name.replace(' ', '_'))[:50].rstrip('_')
                                 photo_filename = f"{safe_name}_{datetime.now().strftime('%Y%m%d%H%M%S%f')}{ext}"
                                 temp_path = os.path.join(uploads_dir, photo_filename)
                                 photo.save(temp_path)
                     'in_stock': in_stock, 'is_top': is_top
                 }
                 products.append(new_product)
                 products.sort(key=lambda p: p.get('name', '').lower())
                 data['products'] = products
                 save_data(data)
                 try:
                     index = int(index_str)
+                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower())
                     if not (0 <= index < len(products)):
                         raise IndexError("Product index out of range")
                     product_to_edit = products[index]
                 except (ValueError, IndexError):
                      flash(f"Ошибка редактирования: неверный индекс товара '{index_str}'.", 'error')
                      display_products = sorted(load_data().get('products', []), key=lambda p: p.get('name', '').lower())
                      display_categories = sorted(load_data().get('categories', []))
                      display_users = dict(sorted(load_users().items()))
                                 api = HfApi()
                                 api.delete_files(
                                     repo_id=REPO_ID,
+                                    paths_in_repo=[f"photos/{p}" for p in old_photos if p],
                                     repo_type="dataset",
                                     token=HF_TOKEN_WRITE,
                                     commit_message=f"Delete old photos for product {product_to_edit['name']}"
                     flash("HF_TOKEN (write) не настроен. Фотографии не были обновлены.", "warning")
                 data['products'] = products
                 products.sort(key=lambda p: p.get('name', '').lower())
+                data['products'] = products
                 save_data(data)
                 logging.info(f"Product '{original_name}' (original index {index}) updated to '{product_to_edit['name']}'.")
                 flash(f"Товар '{product_to_edit['name']}' успешно обновлен.", 'success')
                     return redirect(url_for('admin'))
                 try:
                     index = int(index_str)
+                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower())
                     if not (0 <= index < len(products)): raise IndexError("Product index out of range")
                     deleted_product = products.pop(index)
                     product_name = deleted_product.get('name', 'N/A')
                             api = HfApi()
                             api.delete_files(
                                 repo_id=REPO_ID,
+                                paths_in_repo=[f"photos/{p}" for p in photos_to_delete if p],
                                 repo_type="dataset",
                                 token=HF_TOKEN_WRITE,
                                 commit_message=f"Delete photos for deleted product {product_name}"
             elif action == 'add_user':
                  login = request.form.get('login', '').strip()
+                 password = request.form.get('password', '').strip()
                  first_name = request.form.get('first_name', '').strip()
                  last_name = request.form.get('last_name', '').strip()
                  phone = request.form.get('phone', '').strip()
                      return redirect(url_for('admin'))
                  users[login] = {
+                     'password': password,
                      'first_name': first_name, 'last_name': last_name,
                      'phone': phone,
                      'country': country, 'city': city
                  try:
                     product_index = int(product_index_str)
+                    products = sorted(data.get('products', []), key=lambda p: p.get('name', '').lower())
                     if not (0 <= product_index < len(products)):
                         raise IndexError("Product index out of range")
                     product = products[product_index]
                                     commit_message=f"Delete photo {photo_filename} for product {product.get('name', 'N/A')}"
                                 )
                                 logging.info(f"Photo '{photo_filename}' deleted from HF.")
                                 product['photos'].remove(photo_filename)
                                 data['products'] = products
                                 products.sort(key=lambda p: p.get('name', '').lower())
+                                data['products'] = products
                                 save_data(data)
                                 flash(f"Фото '{photo_filename}' успешно удалено.", 'success')
                             except Exception as e:
              logging.error(f"Error processing admin action '{action}': {e}", exc_info=True)
              flash(f"Произошла внутренняя ошибка при выполнении действия '{action}'. Подробности в логе сервера.", 'error')
         return redirect(url_for('admin'))
     current_data = load_data()
     display_products = sorted(current_data.get('products', []), key=lambda p: p.get('name', '').lower())
     display_categories = sorted(current_data.get('categories', []))
     try:
         if download_db_from_hf():
             flash("Данные успешно скачаны с Hugging Face. Локальные файлы обновлены.", 'success')
+            load_data()
+            load_users()
         else:
             flash("Не удалось скачать данные с Hugging Face после нескольких попыток. Проверьте логи.", 'error')
     except Exception as e:
 if __name__ == '__main__':
     logging.info("Application starting up. Performing initial data load/download...")
     download_db_from_hf()
     load_data()
     load_users()
     port = int(os.environ.get('PORT', 7860))
     logging.info(f"Starting Flask app on host 0.0.0.0 and port {port}")
     app.run(debug=False, host='0.0.0.0', port=port)