Update app.py

app.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 
 import os
 from flask import Flask, request, Response, render_template_string, jsonify, redirect, url_for
@@ -469,6 +468,8 @@ ADMIN_TEMPLATE = """
         .btn { padding: 12px 20px; font-size: 1em; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s ease; }
         .btn-primary { background-color: var(--admin-primary); color: #000; }
         .btn-primary:hover { background-color: var(--admin-primary-dark); }
+        .btn-delete { background-color: var(--admin-danger); color: white; }
+        .btn-delete:hover { background-color: #c82333; }
         .user-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); gap: var(--padding); margin-top: var(--padding); }
         .user-card { background-color: var(--admin-card-bg); border-radius: var(--border-radius); padding: var(--padding); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); display: flex; flex-direction: column; transition: transform 0.2s ease, box-shadow 0.2s ease; }
         .user-card:hover { transform: translateY(-5px); box-shadow: 0 8px 25px rgba(0, 0, 0, 0.08); }
@@ -479,12 +480,9 @@ ADMIN_TEMPLATE = """
         .user-bonuses { text-align: center; margin-bottom: 1rem; }
         .user-bonuses .label { font-size: 0.9em; color: var(--admin-secondary); }
         .user-bonuses .amount { font-size: 1.8em; font-weight: 700; color: var(--admin-primary-dark); }
-        .user-actions { display: flex; gap: 0.5rem; margin-top: auto; }
-        .btn-manage, .btn-delete { flex: 1; padding: 10px; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s; font-size: 0.9em; }
-        .btn-manage { background-color: var(--admin-primary); color: #000; }
+        .user-actions { margin-top: auto; display: flex; flex-direction: column; gap: 0.5rem; }
+        .btn-manage { display: block; width: 100%; padding: 10px; background-color: var(--admin-primary); color: #000; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s; }
         .btn-manage:hover { background-color: var(--admin-primary-dark); }
-        .btn-delete { background-color: var(--admin-danger); color: white; }
-        .btn-delete:hover { background-color: #c82333; }
         .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
         .modal { display: none; position: fixed; z-index: 1001; left: 0; top: 0; width: 100%; height: 100%; overflow: auto; background-color: rgba(0,0,0,0.5); backdrop-filter: blur(5px); }
         .modal-content { background-color: var(--admin-bg); margin: 10% auto; padding: var(--padding); border: 1px solid var(--admin-border); width: 90%; max-width: 600px; border-radius: var(--border-radius); position: relative; box-shadow: 0 8px 30px rgba(0,0,0,0.15); }
@@ -538,8 +536,10 @@ ADMIN_TEMPLATE = """
                             <div class="amount">{{ "%.2f"|format(user.bonuses|float) }}</div>
                         </div>
                         <div class="user-actions">
-                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление</button>
-                            <button class="btn-delete" onclick='deleteClient({{ user|tojson }})'>Удалить</button>
+                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление бонусами</button>
+                            {% if user.telegram_id == None %}
+                            <button class="btn btn-delete" onclick='deleteClient("{{ user.id }}")'>Удалить клиента</button>
+                            {% endif %}
                         </div>
                     </div>
                 {% endfor %}
@@ -761,28 +761,21 @@ ADMIN_TEMPLATE = """
             }
         }
 
-        async function deleteClient(userData) {
-            const userId = userData.id;
-            const userName = `${userData.first_name || ''} ${userData.last_name || ''}`.trim() || `@${userData.username || userData.phone_number}`;
-
-            if (!confirm(`Вы уверены, что хотите удалить клиента ${userName} (ID: ${userId})? Это действие необратимо.`)) {
+        async function deleteClient(userId) {
+            if (!confirm(`Вы уверены, что хотите удалить клиента с ID ${userId}? Это действие необратимо.`)) {
                 return;
             }
-
             try {
                 const response = await fetch('/admin/delete_client', {
                     method: 'POST',
                     headers: { 'Content-Type': 'application/json' },
                     body: JSON.stringify({ user_id: userId })
                 });
-
                 const result = await response.json();
-
                 if (response.ok) {
-                    alert('Клиент успешно удален.');
                     location.reload();
                 } else {
-                    throw new Error(result.message || 'Произошла ошибка при удалении');
+                    throw new Error(result.message || 'Не удалось удалить клиента.');
                 }
             } catch (error) {
                 alert(`Ошибка: ${error.message}`);
@@ -944,38 +937,6 @@ def add_client():
         logging.exception("Error in /admin/add_client endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
-@app.route('/admin/delete_client', methods=['POST'])
-def delete_client():
-    try:
-        data = request.get_json()
-        user_id = data.get('user_id')
-
-        if not user_id:
-            return jsonify({"status": "error", "message": "User ID is required"}), 400
-
-        user_id_str = str(user_id)
-        
-        with _data_lock:
-            all_data = load_visitor_data()
-            
-            if user_id_str not in all_data:
-                return jsonify({"status": "error", "message": "User not found"}), 404
-
-            del all_data[user_id_str]
-
-            with open(DATA_FILE, 'w', encoding='utf-8') as f:
-                json.dump(all_data, f, ensure_ascii=False, indent=4)
-            
-            logging.info(f"User {user_id_str} deleted. Data saved to {DATA_FILE}.")
-            
-            upload_data_to_hf_async()
-
-        return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
-
-    except Exception as e:
-        logging.exception("Error in /admin/delete_client endpoint")
-        return jsonify({"status": "error", "message": str(e)}), 500
-
 
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
@@ -1034,6 +995,43 @@ def add_transaction():
         logging.exception("Error in /admin/add_transaction endpoint")
         return jsonify({"status": "error", "message": str(e)}), 500
 
+@app.route('/admin/delete_client', methods=['POST'])
+def delete_client():
+    try:
+        data = request.get_json()
+        user_id = data.get('user_id')
+
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID is required"}), 400
+
+        user_id_str = str(user_id)
+        load_visitor_data()
+
+        with _data_lock:
+            if user_id_str not in visitor_data_cache:
+                return jsonify({"status": "error", "message": "User not found"}), 404
+
+            user_to_delete = visitor_data_cache[user_id_str]
+            if user_to_delete.get('telegram_id') is not None:
+                return jsonify({"status": "error", "message": "Cannot delete a Telegram-linked user"}), 403
+
+            del visitor_data_cache[user_id_str]
+
+            try:
+                with open(DATA_FILE, 'w', encoding='utf-8') as f:
+                    json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
+                logging.info(f"User {user_id_str} deleted. Data saved to {DATA_FILE}.")
+                upload_data_to_hf_async()
+            except Exception as e:
+                logging.error(f"Error saving data after deletion: {e}")
+                return jsonify({"status": "error", "message": "Failed to save data after deletion"}), 500
+
+        return jsonify({"status": "ok", "message": "Client deleted successfully"}), 200
+
+    except Exception as e:
+        logging.exception("Error in /admin/delete_client endpoint")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
 if __name__ == '__main__':
     print("--- DRUZHBA BONUS SYSTEM SERVER ---")
     print(f"Server starting on http://{HOST}:{PORT}")