Telebottest2

Paused

App Files Files Community

flpolprojects commited on Feb 21, 2025

Commit

75f90e3

verified ·

1 Parent(s): a8bc99d

Update app.py

Browse files

Files changed (1) hide show

app.py +85 -80

app.py CHANGED Viewed

@@ -11,7 +11,7 @@ import threading
 # Настройка логирования
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)  # Используем __name__ для логгера
 # Инициализация бота и Flask
 BOT_TOKEN = '7734802681:AAGKHGG8O9uNk64JWTHH5yqXzvSxCcoLUdA'
@@ -67,10 +67,8 @@ async def show_products(message: types.Message):
         await message.answer("Нет доступных товаров.")
         return
     for product in data['products']:
-        await message.answer(
-            f"🏷 {product['name']} - {product['price']} руб.\nОписание: {product['description']}\n/id: {product['id']}",
-            reply_markup=get_product_keyboard(product['id'])
-        )
 @dp.message(F.text == "🛒 Корзина")
 async def show_cart(message: types.Message):
@@ -100,11 +98,7 @@ async def add_to_cart(callback_query: types.CallbackQuery):
         if not cart:
             cart = {'user_id': user_id, 'items': [], 'completed': False, 'date': datetime.now().isoformat()}
             data['orders'].append(cart)
-        cart_item = next((item for item in cart['items'] if item['product_id'] == product_id), None)
-        if cart_item:
-            cart_item['quantity'] += 1
-        else:
-            cart['items'].append({'product_id': product_id, 'quantity': 1})
         save_data(data)
         await bot.answer_callback_query(callback_query.id, "Товар добавлен в корзину!")
     else:
@@ -139,81 +133,100 @@ async def show_orders(message: types.Message):
         response += f"\nИтого: {total} руб.\nДата: {order['date']}"
         await message.answer(response)
-# Админ-панель (Flask) с HTML-шаблоном
 admin_html = """
 <!DOCTYPE html>
 <html>
 <head>
-<title>Админ-панель</title>
-<style>
-body { font-family: Arial; background-color: #f0f0f0; margin: 20px; }
-.container { max-width: 800px; margin: auto; }
-.product { border: 1px solid #ccc; padding: 10px; margin-bottom: 10px; background-color: #fff; }
-</style>
 </head>
 <body>
-<div class="container">
-<h1>Управление товарами</h1>
-<form id="addProductForm">
-<input type="text" name="name" placeholder="Название" required><br>
-<input type="number" name="price" placeholder="Цена" required><br>
-<textarea name="description" placeholder="Описание"></textarea><br>
-<button type="submit">Добавить товар</button>
-</form>
-<h2>Существующие товары</h2>
-{% for product in products %}
-<div class="product">
-<b>{{ product.name }}</b> - {{ product.price }}<br>{{ product.description }}
-<button onclick="deleteProduct({{ product.id }})">Удалить</button>
-</div>
-{% endfor %}
-<h2>Заказы</h2>
-{% for order in orders %}
-<div class="product">
-<b>Пользователь:</b> {{ order.user_id }}<br><b>Дата:</b> {{ order.date }}
-<ul>{% for item in order.items %} <li>{{ item.quantity }}</li>{% endfor %}</ul></div>{% endfor %}
-<script>
-// JS для добавления/удаления товаров.
-async function deleteProduct(productId) {
-   const response = await fetch(`/delete_product/${productId}`, { method: 'POST' });
-   if (response.ok) window.location.reload();
-}
-document.getElementById('addProductForm').onsubmit = async (e) => {
-   e.preventDefault();
-   const formData = new FormData(e.target);
-   const response = await fetch('/add_product', { method: 'POST', body=formData });
-   if (response.ok) window.location.reload();
-};
-</script>
-</div></body></html>"""
 @app.route('/')
 def admin_panel():
     try:
-        logger.info(f"Products: {data.get('products')}, Orders: {data.get('orders')}")
-        return render_template_string(admin_html, products=data.get('products', []), orders=data.get('orders', []))
     except Exception as e:
         logger.error(f"Ошибка в шаблоне: {e}")
-        return "Ошибка сервера. Проверьте логи.", 500
 @app.route('/add_product', methods=['POST'])
 def add_product():
     try:
-        logger.info("Adding new product")
-        name = request.form.get('name')
-        price = float(request.form.get('price'))
-        description = request.form.get('description')
-        # Генерация нового ID для продукта
-        product_id = max((p['id'] for p in data.get('products', [])), default=0) + 1
-        # Добавление продукта в данные и сохранение
-        data.setdefault('products', []).append({'id': product_id, 'name': name, 'price': price, 'description': description})
-        save_data(data)
-        return jsonify({'status': 'success'})
     except Exception as e:
         logger.error(f"Ошибка при добавлении товара: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 500
@@ -222,14 +235,9 @@ def add_product():
 def delete_product(product_id):
     try:
         logger.info(f"Deleting product with id={product_id}")
-        # Удаление продукта из данных и сохранение
-        data['products'] = [p for p in data.get('products', []) if p['id'] != product_id]
         save_data(data)
         return jsonify({'status': 'success'})
     except Exception as e:
         logger.error(f"Ошибка при удалении товара: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 500
@@ -241,15 +249,12 @@ async def on_startup(_):
 def run_flask():
     try:
         logger.info("Starting Flask server on port 7860")
-        # Запуск Flask приложения
         app.run(host='0.0.0.0', port=7860)
     except Exception as e:
         logger.error(f"Ошибка в Flask: {e}")
 if __name__ == '__main__':
-    # Создаем и запускаем поток для Flask
     flask_thread = threading.Thread(target=run_flask, daemon=True)
     flask_thread.start()
     logger.info("Flask thread started")
@@ -260,4 +265,4 @@ if __name__ == '__main__':
     except KeyboardInterrupt:
         logger.info("Stopping bot and Flask")
     finally:
-        flask_thread.join()  # Ждем завершения потока Flask при завершении программы

 # Настройка логирования
 logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 # Инициализация бота и Flask
 BOT_TOKEN = '7734802681:AAGKHGG8O9uNk64JWTHH5yqXzvSxCcoLUdA'
         await message.answer("Нет доступных товаров.")
         return
     for product in data['products']:
+        await message.answer(f"🏷 {product['name']} - {product['price']} руб.\nОписание: {product['description']}\n/id: {product['id']}",
+                            reply_markup=get_product_keyboard(product['id']))
 @dp.message(F.text == "🛒 Корзина")
 async def show_cart(message: types.Message):
         if not cart:
             cart = {'user_id': user_id, 'items': [], 'completed': False, 'date': datetime.now().isoformat()}
             data['orders'].append(cart)
+        cart['items'].append({'product_id': product_id, 'quantity': 1})
         save_data(data)
         await bot.answer_callback_query(callback_query.id, "Товар добавлен в корзину!")
     else:
         response += f"\nИтого: {total} руб.\nДата: {order['date']}"
         await message.answer(response)
+# Админ-панель (Flask) с HTML, CSS и JavaScript в строке
 admin_html = """
 <!DOCTYPE html>
 <html>
 <head>
+    <title>Админ-панель</title>
+    <style>
+        body { font-family: Arial, sans-serif; margin: 20px; background-color: #f0f0f0; }
+        .container { max-width: 800px; margin: 0 auto; }
+        .product { border: 1px solid #ccc; padding: 15px; margin: 10px 0; background-color: #fff; border-radius: 5px; }
+        form { background-color: #fff; padding: 15px; border-radius: 5px; margin-bottom: 20px; }
+        input, textarea { width: 100%; margin: 5px 0; padding: 8px; }
+        button { background-color: #4CAF50; color: white; padding: 10px 15px; border: none; border-radius: 5px; cursor: pointer; }
+        button:hover { background-color: #45a049; }
+    </style>
 </head>
 <body>
+    <div class="container">
+        <h1>Управление товарами</h1>
+        <form id="addProductForm">
+            <input type="text" name="name" placeholder="Название" required><br>
+            <input type="number" name="price" placeholder="Цена" step="0.01" required><br>
+            <textarea name="description" placeholder="Описание" required></textarea><br>
+            <button type="submit">Добавить товар</button>
+        </form>
+        <h2>Существующие товары</h2>
+        {% if products %}
+            {% for product in products %}
+            <div class="product">
+                {{ product.name }} - {{ product.price }} руб.<br>
+                {{ product.description }}<br>
+                <button onclick="deleteProduct({{ product.id }})">Удалить</button>
+            </div>
+            {% endfor %}
+        {% else %}
+            <p>Нет товаров.</p>
+        {% endif %}
+        <h2>Заказы</h2>
+        {% if orders %}
+            {% for order in orders %}
+            <div class="product">
+                Пользователь: {{ order.user_id }}<br>
+                Дата: {{ order.date }}<br>
+                Товары:
+                {% for item in order.items %}
+                    {% for product in products %}
+                        {% if product.id == item.product_id %}
+                            {{ item.quantity }} x {{ product.name }}<br>
+                        {% endif %}
+                    {% endfor %}
+                {% endfor %}
+            </div>
+            {% endfor %}
+        {% else %}
+            <p>Нет заказов.</p>
+        {% endif %}
+    </div>
+    <script>
+        document.getElementById('addProductForm').onsubmit = async (e) => {
+            e.preventDefault();
+            const formData = new FormData(e.target);
+            const response = await fetch('/add_product', { method: 'POST', body: formData });
+            if (response.ok) window.location.reload();
+        };
+        async function deleteProduct(productId) {
+            const response = await fetch(`/delete_product/${productId}`, { method: 'POST' });
+            if (response.ok) window.location.reload();
+        }
+    </script>
+</body>
+</html>
+"""
 @app.route('/')
 def admin_panel():
     try:
+        logger.info("Rendering admin panel with products and orders")
+        return render_template_string(admin_html, products=data['products'], orders=data['orders'])
     except Exception as e:
         logger.error(f"Ошибка в шаблоне: {e}")
+        return "Ошибка сервера. Проверь логи.", 500
 @app.route('/add_product', methods=['POST'])
 def add_product():
     try:
+        if request.method == 'POST':
+            logger.info("Adding new product")
+            name = request.form['name']
+            price = float(request.form['price'])
+            description = request.form['description']
+            product_id = max((p['id'] for p in data['products']), default=0) + 1
+            data['products'].append({'id': product_id, 'name': name, 'price': price, 'description': description})
+            save_data(data)
+            return jsonify({'status': 'success'})
     except Exception as e:
         logger.error(f"Ошибка при добавлении товара: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 500
 def delete_product(product_id):
     try:
         logger.info(f"Deleting product with id={product_id}")
+        data['products'] = [p for p in data['products'] if p['id'] != product_id]
         save_data(data)
         return jsonify({'status': 'success'})
     except Exception as e:
         logger.error(f"Ошибка при удалении товара: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 500
 def run_flask():
     try:
         logger.info("Starting Flask server on port 7860")
         app.run(host='0.0.0.0', port=7860)
     except Exception as e:
         logger.error(f"Ошибка в Flask: {e}")
 if __name__ == '__main__':
+    # Создаём и запускаем поток для Flask
     flask_thread = threading.Thread(target=run_flask, daemon=True)
     flask_thread.start()
     logger.info("Flask thread started")
     except KeyboardInterrupt:
         logger.info("Stopping bot and Flask")
     finally:
+        flask_thread.join()  # Ждём завершения потока Flask при завершении программы