Update app.py

app.py

@@ -479,12 +479,12 @@ 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; flex-direction: column; gap: 0.5rem; margin-top: auto; }
-        .user-actions button { display: block; width: 100%; padding: 10px; border: none; border-radius: 8px; font-weight: 600; cursor: pointer; transition: background-color 0.2s; }
+        .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; }
         .btn-manage:hover { background-color: var(--admin-primary-dark); }
-        .btn-delete { background-color: #e4e6e8; color: var(--admin-text); }
-        .btn-delete:hover { background-color: var(--admin-danger); color: white; }
+        .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 +538,8 @@ 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.id }}", "{{ (user.first_name or "") + " " + (user.last_name or "") }}")'>Удалить клиента</button>
+                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление</button>
+                            <button class="btn-delete" onclick='deleteClient({{ user|tojson }})'>Удалить</button>
                         </div>
                     </div>
                 {% endfor %}
@@ -760,10 +760,12 @@ ADMIN_TEMPLATE = """
                 statusEl.textContent = `Ошибка: ${error.message}`;
             }
         }
-        
-        async function deleteClient(userId, userName) {
-            const fullName = (userName || `ID ${userId}`).trim();
-            if (!confirm(`Вы уверены, что хотите удалить клиента "${fullName}"? Это действие необратимо и удалит всю его историю и бонусы.`)) {
+
+        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})? Это действие необратимо.`)) {
                 return;
             }
 
@@ -775,14 +777,15 @@ ADMIN_TEMPLATE = """
                 });
 
                 const result = await response.json();
+
                 if (response.ok) {
-                    alert(result.message || 'Клиент успешно удален.');
+                    alert('Клиент успешно удален.');
                     location.reload();
                 } else {
-                    throw new Error(result.message || 'Произошла ошибка на сервере.');
+                    throw new Error(result.message || 'Произошла ошибка при удалении');
                 }
             } catch (error) {
-                alert(`Ошибка при удалении: ${error.message}`);
+                alert(`Ошибка: ${error.message}`);
             }
         }
 
@@ -941,6 +944,38 @@ 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():
@@ -999,41 +1034,6 @@ 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)
-
-        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]
-
-            try:
-                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 file rewritten.")
-                upload_data_to_hf_async()
-            except Exception as e:
-                logging.error(f"Error writing file after deletion: {e}")
-                return jsonify({"status": "error", "message": "Failed to save changes to disk."}), 500
-
-        return jsonify({"status": "ok", "message": "Клиент успешно удален."}), 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}")