diff --git "a/app.py" "b/app.py" --- "a/app.py" +++ "b/app.py" @@ -282,6 +282,13 @@ def catalog(): display: block; margin-top: 5px; } + .product-price .discount { + font-size: 0.9rem; + color: #2ecc71; + font-weight: 500; + display: block; + margin-top: 5px; + } .product-description { font-size: 0.85rem; color: #666; @@ -322,6 +329,23 @@ def catalog(): background-color: #27ae60; box-shadow: 0 4px 15px rgba(46, 204, 113, 0.4); } + .favorite-button { + position: absolute; + top: 10px; + left: 10px; + background: none; + border: none; + font-size: 1.5rem; + cursor: pointer; + color: #666; + transition: color 0.3s ease; + } + .favorite-button.favorited { + color: #e63946; + } + .favorite-button:hover { + color: #e63946; + } #cart-button { position: fixed; bottom: 80px; @@ -474,6 +498,17 @@ def catalog(): font-size: 0.75rem; font-weight: 500; } + .discount-badge { + position: absolute; + top: 40px; + right: 10px; + background-color: #2ecc71; + color: white; + padding: 5px 10px; + border-radius: 15px; + font-size: 0.75rem; + font-weight: 500; + } @@ -500,6 +535,9 @@ def catalog(): data-name="{{ product['name']|lower }}" data-description="{{ product['description']|lower }}" data-category="{{ product.get('category', 'Без категории') }}"> + {% if product.get('photos') and product['photos']|length > 0 %}
Опт от {{ product['min_wholesale'] }} {% endif %} + {% if product.get('discount') %} + Скидка {{ product['discount'] }}% + {% endif %}

{{ product['name'] }}

+ {% if product.get('discount') %} + {{ product['price'] }} с + {{ (product['price'] * (1 - product['discount'] / 100))|round(2) }} с + Скидка: {{ product['discount'] }}% + {% else %} {{ product['price'] }} с + {% endif %} {% if product.get('wholesale_price') and product.get('min_wholesale') %} Опт: {{ product['wholesale_price'] }} с {% endif %} @@ -557,6 +604,15 @@ def catalog():
+ + + @@ -569,6 +625,18 @@ def catalog(): Каталог + + + Избранное + + + + Скидки + + + + Адрес + WhatsApp @@ -661,11 +729,17 @@ def catalog(): const cartItemId = `${product.name}-${color}`; const existingItem = cart.find(item => item.id === cartItemId); - const priceToUse = (product.min_wholesale && quantity >= product.min_wholesale) ? product.wholesale_price : product.price; + let priceToUse = product.price; + if (product.discount) { + priceToUse = product.price * (1 - product.discount / 100); + } + if (product.min_wholesale && quantity >= product.min_wholesale) { + priceToUse = product.wholesale_price; + } if (existingItem) { existingItem.quantity += quantity; - existingItem.price = (existingItem.quantity >= product.min_wholesale) ? product.wholesale_price : product.price; + existingItem.price = (existingItem.quantity >= product.min_wholesale) ? product.wholesale_price : (product.discount ? product.price * (1 - product.discount / 100) : product.price); } else { cart.push({ id: cartItemId, @@ -674,6 +748,7 @@ def catalog(): retail_price: product.price, wholesale_price: product.wholesale_price, min_wholesale: product.min_wholesale, + discount: product.discount, photo: product.photos && product.photos.length > 0 ? product.photos[0] : '', quantity: quantity, color: color @@ -705,7 +780,7 @@ def catalog():
${item.name}

${item.price} с × ${item.quantity} (Цвет: ${item.color})

-

${item.quantity >= item.min_wholesale ? 'Оптовая цена' : 'Розничная цена'}

+

${item.quantity >= item.min_wholesale ? 'Оптовая цена' : (item.discount ? 'Скидка ' + item.discount + '%' : 'Розничная цена')}

${itemTotal} с @@ -740,6 +815,34 @@ def catalog(): updateCartButton(); } + function toggleFavorite(index) { + let favorites = JSON.parse(localStorage.getItem('favorites') || '[]'); + const productId = index.toString(); + const favoriteButton = document.querySelector(`.favorite-button[onclick="event.stopPropagation(); toggleFavorite(${index})"]`); + if (favorites.includes(productId)) { + favorites = favorites.filter(id => id !== productId); + favoriteButton.classList.remove('favorited'); + } else { + favorites.push(productId); + favoriteButton.classList.add('favorited'); + } + localStorage.setItem('favorites', JSON.stringify(favorites)); + } + + function loadFavorites() { + const favorites = JSON.parse(localStorage.getItem('favorites') || '[]'); + document.querySelectorAll('.favorite-button').forEach(button => { + const index = button.getAttribute('onclick').match(/\d+/)[0]; + if (favorites.includes(index)) { + button.classList.add('favorited'); + } + }); + } + + function openAddressModal() { + document.getElementById('addressModal').style.display = 'block'; + } + window.onclick = function(event) { if (event.target.className === 'modal') event.target.style.display = "none"; } @@ -767,6 +870,7 @@ def catalog(): } updateCartButton(); + loadFavorites(); @@ -931,6 +1035,15 @@ def categories_page(): + + +
@@ -940,6 +1053,18 @@ def categories_page(): Каталог + + + Избранное + + + + Скидки + + + + Адрес + WhatsApp @@ -959,6 +1084,18 @@ def categories_page(): document.body.classList.add('dark-mode'); document.querySelector('.theme-toggle i').classList.replace('fa-moon', 'fa-sun'); } + + function openAddressModal() { + document.getElementById('addressModal').style.display = 'block'; + } + + function closeModal(modalId) { + document.getElementById(modalId).style.display = "none"; + } + + window.onclick = function(event) { + if (event.target.className === 'modal') event.target.style.display = "none"; + } @@ -1110,6 +1247,13 @@ def category_products(category): display: block; margin-top: 5px; } + .product-price .discount { + font-size: 0.9rem; + color: #2ecc71; + font-weight: 500; + display: block; + margin-top: 5px; + } .product-description { font-size: 0.85rem; color: #666; @@ -1150,6 +1294,23 @@ def category_products(category): background-color: #27ae60; box-shadow: 0 4px 15px rgba(46, 204, 113, 0.4); } + .favorite-button { + position: absolute; + top: 10px; + left: 10px; + background: none; + border: none; + font-size: 1.5rem; + cursor: pointer; + color: #666; + transition: color 0.3s ease; + } + .favorite-button.favorited { + color: #e63946; + } + .favorite-button:hover { + color: #e63946; + } #cart-button { position: fixed; bottom: 80px; @@ -1302,6 +1463,17 @@ def category_products(category): font-size: 0.75rem; font-weight: 500; } + .discount-badge { + position: absolute; + top: 40px; + right: 10px; + background-color: #2ecc71; + color: white; + padding: 5px 10px; + border-radius: 15px; + font-size: 0.75rem; + font-weight: 500; + } @@ -1319,6 +1491,9 @@ def category_products(category): data-name="{{ product['name']|lower }}" data-description="{{ product['description']|lower }}" data-category="{{ product.get('category', 'Без категории') }}"> + {% if product.get('photos') and product['photos']|length > 0 %}
Опт от {{ product['min_wholesale'] }} {% endif %} + {% if product.get('discount') %} + Скидка {{ product['discount'] }}% + {% endif %}

{{ product['name'] }}

+ {% if product.get('discount') %} + {{ product['price'] }} с + {{ (product['price'] * (1 - product['discount'] / 100))|round(2) }} с + Скидка: {{ product['discount'] }}% + {% else %} {{ product['price'] }} с + {% endif %} {% if product.get('wholesale_price') and product.get('min_wholesale') %} Опт: {{ product['wholesale_price'] }} с {% endif %} @@ -1376,6 +1560,15 @@ def category_products(category):
+ + +
@@ -1387,6 +1580,18 @@ def category_products(category): Каталог + + + Избранное + + + + Скидки + + + + Адрес + WhatsApp @@ -1479,11 +1684,17 @@ def category_products(category): const cartItemId = `${product.name}-${color}`; const existingItem = cart.find(item => item.id === cartItemId); - const priceToUse = (product.min_wholesale && quantity >= product.min_wholesale) ? product.wholesale_price : product.price; + let priceToUse = product.price; + if (product.discount) { + priceToUse = product.price * (1 - product.discount / 100); + } + if (product.min_wholesale && quantity >= product.min_wholesale) { + priceToUse = product.wholesale_price; + } if (existingItem) { existingItem.quantity += quantity; - existingItem.price = (existingItem.quantity >= product.min_wholesale) ? product.wholesale_price : product.price; + existingItem.price = (existingItem.quantity >= product.min_wholesale) ? product.wholesale_price : (product.discount ? product.price * (1 - product.discount / 100) : product.price); } else { cart.push({ id: cartItemId, @@ -1492,6 +1703,7 @@ def category_products(category): retail_price: product.price, wholesale_price: product.wholesale_price, min_wholesale: product.min_wholesale, + discount: product.discount, photo: product.photos && product.photos.length > 0 ? product.photos[0] : '', quantity: quantity, color: color @@ -1523,7 +1735,7 @@ def category_products(category):
${item.name}

${item.price} с × ${item.quantity} (Цвет: ${item.color})

-

${item.quantity >= item.min_wholesale ? 'Оптовая цена' : 'Розничная цена'}

+

${item.quantity >= item.min_wholesale ? 'Оптовая цена' : (item.discount ? 'Скидка ' + item.discount + '%' : 'Розничная цена')}

${itemTotal} с @@ -1558,215 +1770,88 @@ def category_products(category): updateCartButton(); } + function toggleFavorite(index) { + let favorites = JSON.parse(localStorage.getItem('favorites') || '[]'); + const productId = index.toString(); + const favoriteButton = document.querySelector(`.favorite-button[onclick="event.stopPropagation(); toggleFavorite(${index})"]`); + if (favorites.includes(productId)) { + favorites = favorites.filter(id => id !== productId); + favoriteButton.classList.remove('favorited'); + } else { + favorites.push(productId); + favoriteButton.classList.add('favorited'); + } + localStorage.setItem('favorites', JSON.stringify(favorites)); + } + + function loadFavorites() { + const favorites = JSON.parse(localStorage.getItem('favorites') || '[]'); + document.querySelectorAll('.favorite-button').forEach(button => { + const index = button.getAttribute('onclick').match(/\d+/)[0]; + if (favorites.includes(index)) { + button.classList.add('favorited'); + } + }); + } + + function openAddressModal() { + document.getElementById('addressModal').style.display = 'block'; + } + window.onclick = function(event) { if (event.target.className === 'modal') event.target.style.display = "none"; } updateCartButton(); + loadFavorites(); ''' return render_template_string(category_html, products=products, category=category, repo_id=REPO_ID) -@app.route('/product/') -def product_detail(index): - data = load_data() - products = data['products'] - try: - product = products[index] - except IndexError: - return "Продукт не найден", 404 - detail_html = ''' -
-

{{ product['name'] }}

-
-
- {% if product.get('photos') %} - {% for photo in product['photos'] %} -
-
- {{ product['name'] }} -
-
- {% endfor %} - {% else %} -
- No Image -
- {% endif %} -
-
-
-
-
-

Категория: {{ product.get('category', 'Без категории') }}

-

Цена: {{ product['price'] }} с

- {% if product.get('wholesale_price') and product.get('min_wholesale') %} -

Оптовая цена (от {{ product['min_wholesale'] }}): {{ product['wholesale_price'] }} с

- {% endif %} -

Описание: {{ product['description'] }}

-

Доступные цвета: {{ product.get('colors', ['Нет цветов'])|join(', ') }}

-
- ''' - return render_template_string(detail_html, product=product, repo_id=REPO_ID) - -@app.route('/admin', methods=['GET', 'POST']) -def admin(): +@app.route('/favorites') +def favorites_page(): 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) - return redirect(url_for('admin')) - 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) - return redirect(url_for('admin')) - - elif action == 'add': - name = request.form.get('name') - price = request.form.get('price') - wholesale_price = request.form.get('wholesale_price') - min_wholesale = request.form.get('min_wholesale') - description = request.form.get('description') - category = request.form.get('category') - photos_files = request.files.getlist('photos') - colors = request.form.getlist('colors') - photos_list = [] - - if photos_files: - for photo in photos_files[:10]: # Ограничение до 10 фото - 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) - 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}" - ) - photos_list.append(photo_filename) - if os.path.exists(temp_path): - os.remove(temp_path) - - if not name or not price or not description: - return "Ошибка: Заполните все обязательные поля", 400 - - price = float(price.replace(',', '.')) - new_product = { - 'name': name, - 'price': price, - 'description': description, - 'category': category if category in categories else 'Без категории', - 'photos': photos_list, - 'colors': colors if colors else [] - } - - if wholesale_price and min_wholesale: - new_product['wholesale_price'] = float(wholesale_price.replace(',', '.')) - new_product['min_wholesale'] = int(min_wholesale) - - products.append(new_product) - save_data(data) - return redirect(url_for('admin')) - - elif action == 'edit': - index = int(request.form.get('index')) - name = request.form.get('name') - price = request.form.get('price') - wholesale_price = request.form.get('wholesale_price') - min_wholesale = request.form.get('min_wholesale') - description = request.form.get('description') - category = request.form.get('category') - photos_files = request.files.getlist('photos') - colors = request.form.getlist('colors') - - if photos_files and any(photo.filename for photo in photos_files): - new_photos_list = [] - for photo in photos_files[:10]: # Ограничение до 10 фото - 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) - 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}" - ) - new_photos_list.append(photo_filename) - if os.path.exists(temp_path): - os.remove(temp_path) - products[index]['photos'] = new_photos_list - - products[index]['name'] = name - products[index]['price'] = float(price.replace(',', '.')) - if wholesale_price and min_wholesale: - products[index]['wholesale_price'] = float(wholesale_price.replace(',', '.')) - products[index]['min_wholesale'] = int(min_wholesale) - else: - products[index].pop('wholesale_price', None) - products[index].pop('min_wholesale', None) - products[index]['description'] = description - products[index]['category'] = category if category in categories else 'Без категории' - products[index]['colors'] = colors if colors else [] - save_data(data) - return redirect(url_for('admin')) - - elif action == 'delete': - index = int(request.form.get('index')) - del products[index] - save_data(data) - return redirect(url_for('admin')) + favorites = request.args.get('favorites', '[]') - admin_html = ''' + favorites_html = ''' - Админ-панель + Избранное + + + + +
+
+

Избранное

+ +
+
+
+
+ + + + + + + + + + + + + + + +
+ + + Главная + + + + Каталог + + + + Избранное + + + + Скидки + + + + Адрес + + + + WhatsApp + +
+ + + + + + + + ''' + return render_template_string(favorites_html, products=products, repo_id=REPO_ID) + +@app.route('/discounts') +def discounts_page(): + data = load_data() + products = [p for p in data['products'] if p.get('discount')] + categories = data['categories'] + + discounts_html = ''' + + + + + + Скидки + + + + + + +
+
+

Скидки

+ +
+
+ {% for product in products %} +
+ + {% if product.get('photos') and product['photos']|length > 0 %} +
+ {{ product['name'] }} +
+ {% endif %} + {% if product.get('wholesale_price') and product.get('min_wholesale') %} + Опт от {{ product['min_wholesale'] }} + {% endif %} + {% if product.get('discount') %} + Скидка {{ product['discount'] }}% + {% endif %} +

{{ product['name'] }}

+
+ {% if product.get('discount') %} + {{ product['price'] }} с + {{ (product['price'] * (1 - product['discount'] / 100))|round(2) }} с + Скидка: {{ product['discount'] }}% + {% else %} + {{ product['price'] }} с + {% endif %} + {% if product.get('wholesale_price') and product.get('min_wholesale') %} + Опт: {{ product['wholesale_price'] }} с + {% endif %} +
+

{{ product['description'][:50] }}{% if product['description']|length > 50 %}...{% endif %}

+ +
+ {% endfor %} +
+
+ + + + + + + + + + + + + + + +
+ + + Главная + + + + Каталог + + + + Избранное + + + + Скидки + + + + Адрес + + + + WhatsApp + +
+ + + + + + + + ''' + return render_template_string(discounts_html, products=products, categories=categories, repo_id=REPO_ID) + +@app.route('/product/') +def product_details(index): + data = load_data() + product = data['products'][index] + + product_html = ''' + +
+

{{ product['name'] }}

+
+
+ {% for photo in product.get('photos', []) %} +
+ {{ product['name'] }} +
+ {% endfor %} +
+
+
+
+
+
+ {% if product.get('discount') %} + {{ product['price'] }} с + {{ (product['price'] * (1 - product['discount'] / 100))|round(2) }} с + Скидка: {{ product['discount'] }}% + {% else %} + {{ product['price'] }} с + {% endif %} + {% if product.get('wholesale_price') and product.get('min_wholesale') %} + Опт: {{ product['wholesale_price'] }} с (от {{ product['min_wholesale'] }}) + {% endif %} +
+

Описание: {{ product['description'] }}

+

Категория: {{ product.get('category', 'Без категории') }}

+ {% if product.get('colors') %} +
+ Цвета: + {% for color in product['colors'] %} + {{ color }} + {% endfor %} +
+ {% endif %} +
+ ''' + return render_template_string(product_html, product=product, repo_id=REPO_ID) + +@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': + photos = request.files.getlist('photos') + photo_filenames = [] + for photo in photos: + if photo and photo.filename: + filename = secure_filename(photo.filename) + api = HfApi() + api.upload_file( + path_or_fileobj=photo, + path_in_repo=f"photos/{filename}", + repo_id=REPO_ID, + repo_type="dataset", + token=HF_TOKEN_WRITE + ) + photo_filenames.append(filename) + + colors = request.form.getlist('colors') + colors = [color.strip() for color in colors if color.strip()] + + new_product = { + 'name': request.form['name'], + 'price': float(request.form['price']), + 'wholesale_price': float(request.form['wholesale_price']) if request.form['wholesale_price'] else None, + 'min_wholesale': int(request.form['min_wholesale']) if request.form['min_wholesale'] else None, + 'description': request.form['description'], + 'category': request.form['category'], + 'colors': colors, + 'photos': photo_filenames, + 'discount': float(request.form['discount']) if request.form['discount'] else None + } + products.append(new_product) + + elif action == 'edit': + index = int(request.form['index']) + photos = request.files.getlist('photos') + photo_filenames = products[index].get('photos', []) + for photo in photos: + if photo and photo.filename: + filename = secure_filename(photo.filename) + api = HfApi() + api.upload_file( + path_or_fileobj=photo, + path_in_repo=f"photos/{filename}", + repo_id=REPO_ID, + repo_type="dataset", + token=HF_TOKEN_WRITE + ) + photo_filenames.append(filename) + + colors = request.form.getlist('colors') + colors = [color.strip() for color in colors if color.strip()] + + products[index] = { + 'name': request.form['name'], + 'price': float(request.form['price']), + 'wholesale_price': float(request.form['wholesale_price']) if request.form['wholesale_price'] else None, + 'min_wholesale': int(request.form['min_wholesale']) if request.form['min_wholesale'] else None, + 'description': request.form['description'], + 'category': request.form['category'], + 'colors': colors, + 'photos': photo_filenames, + 'discount': float(request.form['discount']) if request.form['discount'] else None + } + + elif action == 'delete': + index = int(request.form['index']) + products.pop(index) + + elif action == 'add_category': + category = request.form['category_name'].strip() + if category and category not in categories: + categories.append(category) + + elif action == 'delete_category': + index = int(request.form['category_index']) + category_to_delete = categories[index] + categories.pop(index) + for product in products: + if product.get('category') == category_to_delete: + product['category'] = 'Без категории' + + save_data({'products': products, 'categories': categories}) + return redirect(url_for('admin')) + + admin_html = ''' + + + + + + Админ-панель + +
-
-

Админ-панель

-
-

Добавление товара

-
- - - - - - - - - - - - - - - - -
-
- +

Админ-панель

+ +
+

Добавить товар

+ + + + + + + + + + + + + + + + + + + +
+
+ +
-
- - - - -

Управление категориями

-
- - - - -
+ + + +
+ +
+

Добавить категорию

+
+ + + + +
+
{% for category in categories %} @@ -1920,14 +3649,23 @@ def admin():

Список товаров

-
+
+ +
+
{% for product in products %} -
+

{{ product['name'] }}

Цена (розница): {{ product['price'] }} с

{% if product.get('wholesale_price') and product.get('min_wholesale') %}

Цена (опт): {{ product['wholesale_price'] }} с (от {{ product['min_wholesale'] }})

{% endif %} + {% if product.get('discount') %} +

Скидка: {{ product['discount'] }}%

+ {% endif %}

Описание: {{ product['description'] }}

Категория: {{ product.get('category', 'Без категории') }}

Цвета: {{ product.get('colors', ['Нет цветов'])|join(', ') }}

@@ -1950,6 +3688,8 @@ def admin(): + + @@ -1990,6 +3730,19 @@ def admin(): newInput.innerHTML = ''; container.appendChild(newInput); } + + document.getElementById('search-input').addEventListener('input', filterProducts); + + function filterProducts() { + const searchTerm = document.getElementById('search-input').value.toLowerCase(); + document.querySelectorAll('.product-item').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) || category.includes(searchTerm); + product.style.display = matchesSearch ? 'block' : 'none'; + }); + } @@ -2013,4 +3766,5 @@ if __name__ == '__main__': load_data() except Exception as e: logging.error(f"Не удалось загрузить базу данных: {e}") - app.run(debug=True, host='0.0.0.0', port=7860) \ No newline at end of file + app.run(debug=True, host='0.0.0.0', port=7860) + \ No newline at end of file