Update app.py

app.py

@@ -27,7 +27,7 @@ def load_data():
             data = json.load(file)
             if not isinstance(data, dict):
                 logging.warning("Данные не в формате dict, инициализация пустой базы")
-                return {'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}}
+                return {'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}, 'user_orders': {}}
             if 'posts' not in data:
                 data['posts'] = []
             if 'users' not in data:
@@ -36,11 +36,13 @@ def load_data():
                 data['pending_organizations'] = []
             if 'orders' not in data:
                 data['orders'] = {}
+            if 'user_orders' not in data:
+                data['user_orders'] = {}
             logging.info("Данные успешно загружены")
             return data
     except Exception as e:
         logging.error(f"Ошибка загрузки данных: {e}")
-        return {'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}}
+        return {'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}, 'user_orders': {}}
 
 def save_data(data):
     try:
@@ -82,7 +84,7 @@ def download_db_from_hf():
         logging.error(f"Ошибка скачивания базы: {e}")
         if not os.path.exists(DATA_FILE):
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
-                json.dump({'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}}, f)
+                json.dump({'posts': [], 'users': {}, 'pending_organizations': [], 'orders': {}, 'user_orders': {}}, f)
 
 def periodic_backup():
     while True:
@@ -157,6 +159,7 @@ BASE_STYLE = '''
         border-radius: 15px;
         font-size: 1.1em;
         transition: var(--transition);
+        position: relative;
     }
     body.dark .nav-link {
         background: var(--card-bg-dark);
@@ -174,6 +177,21 @@ BASE_STYLE = '''
     .logout-btn:hover {
         background: #e63970;
     }
+    .order-count {
+        position: absolute;
+        right: 15px;
+        top: 50%;
+        transform: translateY(-50%);
+        background: var(--secondary);
+        color: white;
+        border-radius: 50%;
+        width: 20px;
+        height: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 0.9em;
+    }
     .menu-btn {
         display: none;
         font-size: 32px;
@@ -306,8 +324,9 @@ NAV_HTML = '''
                 <a href="{{ url_for('profile') }}" class="nav-link"><span>👤</span> Профиль ({{ username }})</a>
                 <a href="{{ url_for('upload') }}" class="nav-link"><span>⬆️</span> Загрузить</a>
                 {% if user_type == 'seller' and verified %}
-                    <a href="{{ url_for('orders') }}" class="nav-link"><span>🛒</span> Заказы</a>
+                    <a href="{{ url_for('seller_orders') }}" class="nav-link"><span>🛒</span> Заказы {% if order_count > 0 %}<span class="order-count">{{ order_count }}</span>{% endif %}</a>
                 {% endif %}
+                <a href="{{ url_for('user_orders') }}" class="nav-link"><span>📦</span> Мои заказы</a>
                 <a href="{{ url_for('logout') }}" class="nav-link logout-btn"><span>🚪</span> Выйти</a>
             {% else %}
                 <a href="{{ url_for('login') }}" class="nav-link"><span>🔑</span> Войти</a>
@@ -326,11 +345,13 @@ def register():
         username = request.form.get('username')
         password = request.form.get('password')
         user_type = request.form.get('user_type')
+        phone = request.form.get('phone')
+        address = request.form.get('address')
         data = load_data()
 
-        if not username or not password:
-            flash('Заполните логин и пароль!', 'error')
-            logging.debug("Логин или пароль не заполнены")
+        if not username or not password or not phone or (user_type == 'buyer' and not address):
+            flash('Заполните все обязательные поля!', 'error')
+            logging.debug("Не все обязательные поля заполнены")
             return redirect(url_for('register'))
 
         if username in data['users']:
@@ -356,7 +377,11 @@ def register():
                 'link': '',
                 'avatar': None,
                 'type': 'seller',
-                'verified': False
+                'verified': False,
+                'phone': phone,
+                'org_phone': org_phone,
+                'org_address': org_address,
+                'is_online': is_online
             }
             data['pending_organizations'].append({
                 'username': username,
@@ -379,7 +404,9 @@ def register():
                 'link': '',
                 'avatar': None,
                 'type': 'buyer',
-                'verified': True
+                'verified': True,
+                'phone': phone,
+                'address': address
             }
             save_data(data)
             flash('Регистрация успешна! Войдите в систему.', 'success')
@@ -478,6 +505,8 @@ def register():
             <form method="POST">
                 <input type="text" name="username" placeholder="Логин" required>
                 <input type="password" name="password" placeholder="Пароль" required>
+                <input type="text" name="phone" placeholder="Номер телефона (с кодом, например, +996)" required>
+                <input type="text" name="address" placeholder="Адрес доставки" id="address_field">
                 <div id="seller-fields">
                     <input type="text" name="org_name" placeholder="Название организации">
                     <input type="text" name="org_phone" placeholder="Рабочий номер организации">
@@ -499,6 +528,7 @@ def register():
             }
             function toggleSellerFields(show) {
                 document.getElementById('seller-fields').style.display = show ? 'block' : 'none';
+                document.getElementById('address_field').required = !show;
             }
             function toggleAddress() {
                 const isOnline = document.querySelector('input[name="is_online"]').checked;
@@ -636,6 +666,7 @@ def feed():
     username = session.get('username', None)
     user_type = data['users'].get(username, {}).get('type') if username else None
     verified = data['users'].get(username, {}).get('verified', False) if username else False
+    order_count = len(data['orders'].get(username, [])) if user_type == 'seller' and verified else 0
 
     search_query = request.form.get('search', '').strip().lower() if request.method == 'POST' else request.args.get('search', '').strip().lower()
     if search_query:
@@ -823,7 +854,7 @@ def feed():
     </body>
     </html>
     '''
-    return render_template_string(html, posts=posts, is_authenticated=is_authenticated, username=username, repo_id=REPO_ID, search_query=search_query, user_type=user_type, verified=verified)
+    return render_template_string(html, posts=posts, is_authenticated=is_authenticated, username=username, repo_id=REPO_ID, search_query=search_query, user_type=user_type, verified=verified, order_count=order_count)
 
 # Страница публикации
 @app.route('/post/<post_id>', methods=['GET', 'POST'])
@@ -837,6 +868,7 @@ def post_page(post_id):
     username = session.get('username', None)
     user_type = data['users'].get(username, {}).get('type') if username else None
     verified = data['users'].get(username, {}).get('verified', False) if username else False
+    order_count = len(data['orders'].get(username, [])) if user_type == 'seller' and verified else 0
     post['views'] = post.get('views', 0) + 1
     save_data(data)
 
@@ -985,7 +1017,7 @@ def post_page(post_id):
     </body>
     </html>
     '''
-    return render_template_string(html, post=post, repo_id=REPO_ID, is_authenticated=is_authenticated, username=username, user_type=user_type, verified=verified)
+    return render_template_string(html, post=post, repo_id=REPO_ID, is_authenticated=is_authenticated, username=username, user_type=user_type, verified=verified, order_count=order_count)
 
 # Профиль пользователя
 @app.route('/profile', methods=['GET', 'POST'])
@@ -1007,6 +1039,12 @@ def profile():
     avatar = user_data.get('avatar', None)
     user_type = user_data.get('type', 'buyer')
     verified = user_data.get('verified', False)
+    phone = user_data.get('phone', '')
+    address = user_data.get('address', '')
+    org_phone = user_data.get('org_phone', '')
+    org_address = user_data.get('org_address', '')
+    is_online = user_data.get('is_online', False)
+    order_count = len(data['orders'].get(username, [])) if user_type == 'seller' and verified else 0
 
     if request.method == 'POST':
         if 'delete_post' in request.form:
@@ -1018,6 +1056,10 @@ def profile():
         elif 'update_profile' in request.form:
             bio = request.form.get('bio', '')
             link = request.form.get('link', '')
+            phone = request.form.get('phone', '')
+            address = request.form.get('address', '') if user_type == 'buyer' else address
+            org_phone = request.form.get('org_phone', '') if user_type == 'seller' else org_phone
+            org_address = request.form.get('org_address', '') if user_type == 'seller' and not is_online else None
             avatar_file = request.files.get('avatar')
             if avatar_file and avatar_file.filename:
                 filename = secure_filename(avatar_file.filename)
@@ -1039,17 +1081,24 @@ def profile():
                     os.remove(temp_path)
             data['users'][username]['bio'] = bio
             data['users'][username]['link'] = link
+            data['users'][username]['phone'] = phone
+            if user_type == 'buyer':
+                data['users'][username]['address'] = address
+            if user_type == 'seller' and verified:
+                data['users'][username]['org_phone'] = org_phone
+                data['users'][username]['org_address'] = org_address
             save_data(data)
             return redirect(url_for('profile'))
         elif 'checkout' in request.form:
             cart = json.loads(request.form.get('cart_data', '[]'))
             if cart:
+                if not phone or (user_type == 'buyer' and not address):
+                    flash('Укажите номер телефона и адрес доставки в профиле перед оформлением заказа!', 'error')
+                    return redirect(url_for('profile'))
                 for item in cart:
                     seller = item['uploader']
-                    if seller not in data['orders']:
-                        data['orders'][seller] = []
-                    order_id = f"order_{len(data['orders'].get(seller, [])) + 1}_{int(time.time())}"
-                    data['orders'][seller].append({
+                    order_id = f"order_{int(time.time())}_{random.randint(1, 1000)}"
+                    order_data = {
                         'order_id': order_id,
                         'buyer': username,
                         'post_id': item['postId'],
@@ -1057,11 +1106,19 @@ def profile():
                         'price': item['price'],
                         'currency': item['currency'],
                         'date': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-                        'status': 'pending'
-                    })
+                        'status': 'pending',
+                        'buyer_phone': phone,
+                        'buyer_address': address if user_type == 'buyer' else None
+                    }
+                    if seller not in data['orders']:
+                        data['orders'][seller] = []
+                    data['orders'][seller].append(order_data)
+                    if username not in data['user_orders']:
+                        data['user_orders'][username] = []
+                    data['user_orders'][username].append(order_data)
                 save_data(data)
                 flash('Заказ успешно оформлен!', 'success')
-            return redirect(url_for('profile'))
+                return redirect(url_for('profile'))
 
     html = '''
     <!DOCTYPE html>
@@ -1186,6 +1243,14 @@ def profile():
                         <p><a href="{{ link }}" target="_blank">{{ link }}</a></p>
                     {% endif %}
                     <p>Тип: {{ 'Продавец' if user_type == 'seller' else 'Покупатель' }} {% if user_type == 'seller' and not verified %}(На проверке){% endif %}</p>
+                    <p>Телефон: {{ phone }}</p>
+                    {% if user_type == 'buyer' %}
+                        <p>Адрес доставки: {{ address }}</p>
+                    {% endif %}
+                    {% if user_type == 'seller' and verified %}
+                        <p>Рабочий номер: {{ org_phone }}</p>
+                        <p>Адрес организации: {{ org_address if org_address else 'Онлайн' }}</p>
+                    {% endif %}
                     <p>Просмотров: {{ total_views }} | Лайков: {{ total_likes }}</p>
                     <button class="btn share-btn" onclick="copyProfileLink()">Поделиться</button>
                 </div>
@@ -1194,6 +1259,16 @@ def profile():
             <form method="POST" enctype="multipart/form-data">
                 <textarea name="bio" placeholder="Описание профиля" rows="4">{{ bio }}</textarea>
                 <input type="text" name="link" placeholder="Ссылка" value="{{ link }}">
+                <input type="text" name="phone" placeholder="Номер телефона" value="{{ phone }}" required>
+                {% if user_type == 'buyer' %}
+                    <input type="text" name="address" placeholder="Адрес доставки" value="{{ address }}" required>
+                {% endif %}
+                {% if user_type == 'seller' and verified %}
+                    <input type="text" name="org_phone" placeholder="Рабочий номер" value="{{ org_phone }}" required>
+                    {% if not is_online %}
+                        <input type="text" name="org_address" placeholder="Адрес организации" value="{{ org_address }}">
+                    {% endif %}
+                {% endif %}
                 <input type="file" name="avatar" accept="image/*">
                 <button type="submit" name="update_profile" class="btn">Сохранить</button>
             </form>
@@ -1203,6 +1278,13 @@ def profile():
             <h2>Корзина</h2>
             <div class="cart-grid" id="cartGrid"></div>
             <button class="btn" onclick="checkout()" style="margin-top: 20px;">Оформить заказ</button>
+            {% with messages = get_flashed_messages(with_categories=true) %}
+                {% if messages %}
+                    {% for category, message in messages %}
+                        <div class="flash {{ category }}">{{ message }}</div>
+                    {% endfor %}
+                {% endif %}
+            {% endwith %}
             <h2>Ваши видео</h2>
             <div class="post-grid">
                 {% if user_posts %}
@@ -1300,7 +1382,7 @@ def profile():
     </body>
     </html>
     '''
-    return render_template_string(html, username=username, user_posts=user_posts, total_views=total_views, total_likes=total_likes, bio=bio, link=link, avatar=avatar, repo_id=REPO_ID, is_authenticated=is_authenticated, user_type=user_type, verified=verified)
+    return render_template_string(html, username=username, user_posts=user_posts, total_views=total_views, total_likes=total_likes, bio=bio, link=link, avatar=avatar, repo_id=REPO_ID, is_authenticated=is_authenticated, user_type=user_type, verified=verified, phone=phone, address=address, org_phone=org_phone, org_address=org_address, is_online=is_online, order_count=order_count)
 
 # Профиль другого пользователя
 @app.route('/profile/<username>')
@@ -1320,6 +1402,12 @@ def user_profile(username):
     avatar = user_data.get('avatar', None)
     user_type = user_data.get('type', 'buyer')
     verified = user_data.get('verified', False)
+    phone = user_data.get('phone', '')
+    address = user_data.get('address', '')
+    org_phone = user_data.get('org_phone', '')
+    org_address = user_data.get('org_address', '')
+    is_online = user_data.get('is_online', False)
+    order_count = len(data['orders'].get(current_user, [])) if data['users'].get(current_user, {}).get('type') == 'seller' and data['users'].get(current_user, {}).get('verified', False) else 0
 
     html = '''
     <!DOCTYPE html>
@@ -1432,6 +1520,14 @@ def user_profile(username):
                         <p><a href="{{ link }}" target="_blank">{{ link }}</a></p>
                     {% endif %}
                     <p>Тип: {{ 'Продавец' if user_type == 'seller' else 'Покупатель' }} {% if user_type == 'seller' and not verified %}(На проверке){% endif %}</p>
+                    <p>Телефон: {{ phone }}</p>
+                    {% if user_type == 'buyer' %}
+                        <p>Адрес доставки: {{ address }}</p>
+                    {% endif %}
+                    {% if user_type == 'seller' and verified %}
+                        <p>Рабочий номер: {{ org_phone }}</p>
+                        <p>Адрес организации: {{ org_address if org_address else 'Онлайн' }}</p>
+                    {% endif %}
                     <p>Просмотров: {{ total_views }} | Лайков: {{ total_likes }}</p>
                     <button class="btn share-btn" onclick="copyProfileLink()">Поделиться</button>
                 </div>
@@ -1483,7 +1579,7 @@ def user_profile(username):
     </body>
     </html>
     '''
-    return render_template_string(html, username=username, user_posts=user_posts, total_views=total_views, total_likes=total_likes, bio=bio, link=link, avatar=avatar, repo_id=REPO_ID, is_authenticated=is_authenticated, user_type=user_type, verified=verified)
+    return render_template_string(html, username=username, user_posts=user_posts, total_views=total_views, total_likes=total_likes, bio=bio, link=link, avatar=avatar, repo_id=REPO_ID, is_authenticated=is_authenticated, user_type=user_type, verified=verified, phone=phone, address=address, org_phone=org_phone, org_address=org_address, is_online=is_online, order_count=order_count)
 
 # Загрузка контента
 @app.route('/upload', methods=['GET', 'POST'])
@@ -1556,8 +1652,9 @@ def upload():
 
     is_authenticated = 'username' in session
     username = session.get('username', None)
-    user_type = data['users'].get(username, {}).get('type')
-    verified = data['users'].get(username, {}).get('verified', False)
+    user_type = user_data.get('type')
+    verified = user_data.get('verified', False)
+    order_count = len(data['orders'].get(username, []))
     html = '''
     <!DOCTYPE html>
     <html lang="ru">
@@ -1687,11 +1784,11 @@ def upload():
     </body>
     </html>
     '''
-    return render_template_string(html, username=username, is_authenticated=is_authenticated, user_type=user_type, verified=verified)
+    return render_template_string(html, username=username, is_authenticated=is_authenticated, user_type=user_type, verified=verified, order_count=order_count)
 
 # Заказы продавца
-@app.route('/orders', methods=['GET', 'POST'])
-def orders():
+@app.route('/seller_orders', methods=['GET', 'POST'])
+def seller_orders():
     if 'username' not in session:
         flash('Войдите, чтобы просмотреть заказы!', 'error')
         return redirect(url_for('login'))
@@ -1707,6 +1804,7 @@ def orders():
     is_authenticated = 'username' in session
     user_type = user_data.get('type')
     verified = user_data.get('verified', False)
+    order_count = len(orders)
 
     if request.method == 'POST':
         if 'update_status' in request.form:
@@ -1715,9 +1813,14 @@ def orders():
             for order in orders:
                 if order['order_id'] == order_id:
                     order['status'] = new_status
+                    # Обновляем статус в заказах пользователя
+                    for user_order in data['user_orders'].get(order['buyer'], []):
+                        if user_order['order_id'] == order_id:
+                            user_order['status'] = new_status
+                            break
                     break
             save_data(data)
-            return redirect(url_for('orders'))
+            return redirect(url_for('seller_orders'))
 
     html = '''
     <!DOCTYPE html>
@@ -1798,6 +1901,10 @@ def orders():
                         <h3>{{ order['title'] }}</h3>
                         <p class="price">Цена: {{ order['price'] }} {{ order['currency'] }}</p>
                         <p>Покупатель: <a href="{{ url_for('user_profile', username=order['buyer']) }}" class="username-link">{{ order['buyer'] }}</a></p>
+                        <p>Телефон покупателя: {{ order['buyer_phone'] }}</p>
+                        {% if order['buyer_address'] %}
+                            <p>Адрес доставки: {{ order['buyer_address'] }}</p>
+                        {% endif %}
                         <p>Дата: {{ order['date'] }}</p>
                         <form method="POST">
                             <input type="hidden" name="order_id" value="{{ order['order_id'] }}">
@@ -1830,7 +1937,124 @@ def orders():
     </body>
     </html>
     '''
-    return render_template_string(html, username=username, orders=orders, is_authenticated=is_authenticated, user_type=user_type, verified=verified)
+    return render_template_string(html, username=username, orders=orders, is_authenticated=is_authenticated, user_type=user_type, verified=verified, order_count=order_count)
+
+# Мои заказы пользователя
+@app.route('/user_orders', methods=['GET'])
+def user_orders():
+    if 'username' not in session:
+        flash('Войдите, чтобы просмотреть свои заказы!', 'error')
+        return redirect(url_for('login'))
+    
+    data = load_data()
+    username = session['username']
+    user_data = data['users'].get(username, {})
+    orders = data['user_orders'].get(username, [])
+    is_authenticated = 'username' in session
+    user_type = user_data.get('type')
+    verified = user_data.get('verified', False)
+    order_count = len(data['orders'].get(username, [])) if user_type == 'seller' and verified else 0
+
+    html = '''
+    <!DOCTYPE html>
+    <html lang="ru">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Мои заказы - {{ username }}</title>
+        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600&display=swap" rel="stylesheet">
+        <style>
+            ''' + BASE_STYLE + '''
+            .container {
+                max-width: 950px;
+            }
+            h1 {
+                font-size: 2.5em;
+                font-weight: 700;
+                margin-bottom: 40px;
+                background: linear-gradient(45deg, var(--primary), var(--secondary));
+                -webkit-background-clip: text;
+                color: transparent;
+            }
+            .order-grid {
+                display: grid;
+                grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));
+                gap: 30px;
+            }
+            .order-item {
+                background: var(--card-bg-light);
+                backdrop-filter: blur(20px);
+                padding: 25px;
+                border-radius: 20px;
+                box-shadow: var(--shadow);
+                transition: var(--transition);
+            }
+            body.dark .order-item {
+                background: var(--card-bg-dark);
+            }
+            .order-item:hover {
+                transform: translateY(-15px);
+            }
+            .order-item h3 {
+                font-size: 1.5em;
+                margin-bottom: 15px;
+            }
+            .order-item p {
+                margin-bottom: 15px;
+                font-size: 1.1em;
+            }
+            .price {
+                font-weight: 600;
+                color: var(--primary);
+            }
+            .username-link {
+                color: var(--primary);
+                font-weight: 600;
+                text-decoration: none;
+            }
+            .username-link:hover {
+                text-decoration: underline;
+            }
+        </style>
+    </head>
+    <body>
+        <button class="menu-btn" onclick="toggleSidebar()">☰</button>
+        ''' + NAV_HTML + '''
+        <button class="theme-toggle" onclick="toggleTheme()">🌙</button>
+        <div class="container">
+            <h1>Мои заказ��</h1>
+            <div class="order-grid">
+                {% if orders %}
+                    {% for order in orders %}
+                    <div class="order-item">
+                        <h3>{{ order['title'] }}</h3>
+                        <p class="price">Цена: {{ order['price'] }} {{ order['currency'] }}</p>
+                        <p>Продавец: <a href="{{ url_for('user_profile', username=order['uploader']) }}" class="username-link">{{ order['uploader'] }}</a></p>
+                        <p>Дата: {{ order['date'] }}</p>
+                        <p>Статус: {{ 'В ожидании' if order['status'] == 'pending' else 'В обработке' if order['status'] == 'processing' else 'Завершено' }}</p>
+                    </div>
+                    {% endfor %}
+                {% else %}
+                    <p style="font-size: 1.2em;">У вас пока нет заказов.</p>
+                {% endif %}
+            </div>
+        </div>
+        <script>
+            function toggleSidebar() {
+                document.getElementById('sidebar').classList.toggle('active');
+            }
+            function toggleTheme() {
+                document.body.classList.toggle('dark');
+                localStorage.setItem('theme', document.body.classList.contains('dark') ? 'dark' : 'light');
+            }
+            window.onload = () => {
+                if (localStorage.getItem('theme') === 'dark') document.body.classList.add('dark');
+            };
+        </script>
+    </body>
+    </html>
+    '''
+    return render_template_string(html, username=username, orders=orders, is_authenticated=is_authenticated, user_type=user_type, verified=verified, order_count=order_count)
 
 # Админ-панель
 @app.route('/admhosto', methods=['GET', 'POST'])
@@ -1842,6 +2066,7 @@ def admin_panel():
     username = session.get('username', None)
     user_type = data['users'].get(username, {}).get('type') if username else None
     verified = data['users'].get(username, {}).get('verified', False) if username else False
+    order_count = len(data['orders'].get(username, [])) if user_type == 'seller' and verified else 0
 
     if request.method == 'POST':
         if 'delete' in request.form:
@@ -1869,7 +2094,7 @@ def admin_panel():
         posts = [post for post in posts if search_query in post['title'].lower() or search_query in post['description'].lower()]
 
     html = '''
-    <!DOCTYPE html
+    <!DOCTYPE html>
     <html lang="ru">
     <head>
         <meta charset="UTF-8">
@@ -2063,7 +2288,7 @@ def admin_panel():
     </body>
     </html>
     '''
-    return render_template_string(html, posts=posts, pending_orgs=pending_orgs, is_authenticated=is_authenticated, username=username, repo_id=REPO_ID, search_query=search_query, user_type=user_type, verified=verified)
+    return render_template_string(html, posts=posts, pending_orgs=pending_orgs, is_authenticated=is_authenticated, username=username, repo_id=REPO_ID, search_query=search_query, user_type=user_type, verified=verified, order_count=order_count)
 
 if __name__ == '__main__':
     backup_thread = threading.Thread(target=periodic_backup, daemon=True)