Update app.py

app.py

@@ -365,14 +365,14 @@ TEMPLATE = """
             if (themeParams.button_text_color) root.style.setProperty('--tg-theme-button-text-color', themeParams.button_text_color);
             if (themeParams.secondary_bg_color) root.style.setProperty('--tg-theme-secondary-bg-color', themeParams.secondary_bg_color);
         }
-
+        
         function setupTelegram() {
              if (!tg || !tg.initData) {
                  console.error("Telegram WebApp script not loaded or initData is missing.");
                  document.body.style.visibility = 'visible';
                  return;
              }
-
+             
             tg.ready();
             tg.expand();
 
@@ -381,38 +381,50 @@ TEMPLATE = """
             }
             tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
 
-             fetch('/verify', {
-                 method: 'POST',
-                 headers: {
-                     'Content-Type': 'application/json',
-                     'Accept': 'application/json'
-                 },
-                 body: JSON.stringify({ initData: tg.initData }),
-             })
-             .then(response => response.json())
-             .then(data => {
-                 if (data.status === 'ok' && data.verified) {
-                     console.log('Backend verification successful.');
-                 } else {
-                     console.warn('Backend verification failed:', data.message);
-                 }
-             })
-             .catch(error => console.error('Error sending initData for verification:', error));
+             const urlParams = new URLSearchParams(window.location.search);
+             const userIdForTest = urlParams.get('user_id_for_test');
+
+             if (!userIdForTest) {
+                fetch('/verify', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Accept': 'application/json'
+                    },
+                    body: JSON.stringify({ initData: tg.initData }),
+                })
+                .then(response => response.json())
+                .then(data => {
+                    if (data.status === 'ok' && data.verified && data.user_id) {
+                        console.log('Backend verification successful. Reloading with user data.');
+                        window.location.replace('/?user_id_for_test=' + data.user_id);
+                    } else {
+                        console.warn('Backend verification failed:', data.message);
+                        document.body.style.visibility = 'visible';
+                    }
+                })
+                .catch(error => {
+                    console.error('Error sending initData for verification:', error);
+                    document.body.style.visibility = 'visible';
+                });
+             } else {
+                 document.body.style.visibility = 'visible';
+             }
 
              const user = tg.initDataUnsafe?.user;
              const greetingElement = document.getElementById('greeting');
              if (user) {
                  const name = user.first_name || user.username || 'Гость';
                  greetingElement.textContent = `Добро пожаловать, ${name}! 👋`;
+             } else {
+                greetingElement.textContent = `Добро пожаловать, {{ user.first_name or 'Гость' }}! 👋`;
              }
-
-             document.body.style.visibility = 'visible';
          }
 
         if (window.Telegram && window.Telegram.WebApp) {
             setupTelegram();
         } else {
-            window.addEventListener('load', setupTelegram);
+             window.addEventListener('load', setupTelegram, {once: true});
              setTimeout(() => {
                  if (document.body.style.visibility !== 'visible') {
                       document.body.style.visibility = 'visible';
@@ -453,8 +465,11 @@ ADMIN_TEMPLATE = """
         body { font-family: var(--font-family); background-color: var(--admin-bg); color: var(--admin-text); margin: 0; padding: var(--padding); line-height: 1.6; }
         .container { max-width: 1200px; margin: 0 auto; }
         h1 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
-        .controls-bar { background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); margin-bottom: var(--padding); }
-        .controls-bar input[type="text"] { width: 100%; padding: 12px 15px; font-size: 1.1em; border-radius: 8px; border: 1px solid var(--admin-border); box-sizing: border-box; }
+        .controls-bar { display: flex; gap: 1rem; align-items: center; background: var(--admin-card-bg); padding: var(--padding); border-radius: var(--border-radius); box-shadow: 0 4px 15px var(--admin-shadow); border: 1px solid var(--admin-border); margin-bottom: var(--padding); }
+        .controls-bar input[type="text"] { flex-grow: 1; padding: 12px 15px; font-size: 1.1em; border-radius: 8px; border: 1px solid var(--admin-border); box-sizing: border-box; }
+        .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); }
         .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); }
@@ -465,10 +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 .btn { 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; }
-        .user-actions .btn:hover { background-color: var(--admin-primary-dark); }
+        .user-actions .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; }
+        .user-actions .btn-manage:hover { background-color: var(--admin-primary-dark); }
         .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); }
         .modal-close { color: #aaa; position: absolute; top: 15px; right: 25px; font-size: 28px; font-weight: bold; cursor: pointer; }
@@ -478,7 +492,7 @@ ADMIN_TEMPLATE = """
         .form-row { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; align-items: center; margin-bottom: 1.5rem; }
         .form-group { display: flex; flex-direction: column; }
         .form-group label { margin-bottom: 0.5rem; font-weight: 500; font-size: 0.9em; }
-        .form-group input { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; }
+        .form-group input { padding: 10px; font-size: 1rem; border: 1px solid var(--admin-border); border-radius: 8px; width: 100%; box-sizing: border-box; }
         .calculation-summary { background: #f0f0f0; padding: 1rem; border-radius: 8px; margin-bottom: 1.5rem; }
         .summary-item { display: flex; justify-content: space-between; margin-bottom: 0.5rem; font-size: 0.95em; }
         .summary-item strong { font-weight: 600; }
@@ -491,16 +505,18 @@ ADMIN_TEMPLATE = """
         .history-item .date { font-size: 0.8em; color: var(--admin-secondary); }
         .history-item .amount.accrual { color: var(--admin-success); font-weight: 600; }
         .history-item .amount.deduction { color: var(--admin-danger); font-weight: 600; }
+        .modal-footer { margin-top: 1.5rem; display: flex; justify-content: flex-end; align-items: center; gap: 1rem;}
         .modal-footer button { padding: 12px 25px; font-size: 1.1em; border-radius: 8px; border: none; font-weight: 600; cursor: pointer; }
         .btn-submit { background-color: var(--admin-success); color: white; }
-        .status-message { margin-top: 1rem; text-align: center; font-weight: 500; }
+        .status-message { text-align: center; font-weight: 500; flex-grow: 1; text-align: left; }
     </style>
 </head>
 <body>
     <div class="container">
         <h1>Панель администратора Druzhba</h1>
         <div class="controls-bar">
-            <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username...">
+            <input type="text" id="searchInput" onkeyup="searchUsers()" placeholder="Поиск по имени, ID, username, номеру...">
+            <button class="btn btn-primary" onclick="openAddClientModal()">Добавить клиента</button>
         </div>
 
         {% if users %}
@@ -519,7 +535,7 @@ ADMIN_TEMPLATE = """
                             <div class="amount">{{ "%.2f"|format(user.bonuses|float) }}</div>
                         </div>
                         <div class="user-actions">
-                            <button class="btn" onclick='openTransactionModal({{ user|tojson }})'>Управление бонусами</button>
+                            <button class="btn-manage" onclick='openTransactionModal({{ user|tojson }})'>Управление бонусами</button>
                         </div>
                     </div>
                 {% endfor %}
@@ -531,14 +547,12 @@ ADMIN_TEMPLATE = """
 
     <div id="transactionModal" class="modal">
       <div class="modal-content">
-        <span class="modal-close" onclick="closeModal()">×</span>
+        <span class="modal-close" onclick="closeModal('transactionModal')">×</span>
         <div class="modal-header">
             <h2 id="modalUserName"></h2>
             <div id="modalUserUsername" class="username"></div>
         </div>
-        
         <input type="hidden" id="modalUserId">
-
         <div class="form-row">
             <div class="form-group">
                 <label for="purchaseAmount">Сумма покупки</label>
@@ -549,7 +563,6 @@ ADMIN_TEMPLATE = """
                 <input type="number" id="deductAmount" placeholder="Например, 100" oninput="calculateBonuses()">
             </div>
         </div>
-
         <div class="calculation-summary">
             <div class="summary-item"><span>Текущий баланс:</span> <strong id="summaryCurrentBalance">0.00</strong></div>
             <div class="summary-item"><span>Будет начислено (2%):</span> <strong id="summaryAccrual">+0.00</strong></div>
@@ -557,22 +570,45 @@ ADMIN_TEMPLATE = """
             <hr>
             <div class="summary-item"><strong>Итоговый баланс:</strong> <strong id="summaryFinalBalance">0.00</strong></div>
         </div>
-        
         <div class="history-container">
             <h3>История операций</h3>
             <ul id="modalHistoryList" class="history-list"></ul>
         </div>
-
         <div class="modal-footer">
-            <button class="btn-submit" onclick="submitTransaction()">Провести операцию</button>
             <div id="modalStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitTransaction()">Провести операцию</button>
+        </div>
+      </div>
+    </div>
+    
+    <div id="addClientModal" class="modal">
+      <div class="modal-content">
+        <span class="modal-close" onclick="closeModal('addClientModal')">×</span>
+        <div class="modal-header">
+            <h2>Добавить нового клиента</h2>
+        </div>
+        <div class="form-group" style="margin-bottom: 1rem;">
+            <label for="newClientFirstName">Имя</label>
+            <input type="text" id="newClientFirstName" placeholder="Иван">
+        </div>
+        <div class="form-group" style="margin-bottom: 1rem;">
+            <label for="newClientLastName">Фамилия</label>
+            <input type="text" id="newClientLastName" placeholder="Иванов">
+        </div>
+        <div class="form-group" style="margin-bottom: 1.5rem;">
+            <label for="newClientPhone">Номер телефона (уникальный)</label>
+            <input type="tel" id="newClientPhone" placeholder="+79001234567">
+        </div>
+        <div class="modal-footer">
+            <div id="addClientStatus" class="status-message"></div>
+            <button class="btn-submit" onclick="submitNewClient()">Сохранить клиента</button>
         </div>
       </div>
     </div>
 
     <script>
-        const modal = document.getElementById('transactionModal');
-        const allUsers = {{ users|tojson }};
+        const transactionModal = document.getElementById('transactionModal');
+        const addClientModal = document.getElementById('addClientModal');
         let currentUserData = null;
 
         function searchUsers() {
@@ -620,31 +656,36 @@ ADMIN_TEMPLATE = """
             }
             
             calculateBonuses();
-            modal.style.display = 'block';
+            transactionModal.style.display = 'block';
         }
 
-        function closeModal() {
-            modal.style.display = 'none';
-            currentUserData = null;
+        function openAddClientModal() {
+            document.getElementById('newClientFirstName').value = '';
+            document.getElementById('newClientLastName').value = '';
+            document.getElementById('newClientPhone').value = '';
+            document.getElementById('addClientStatus').textContent = '';
+            addClientModal.style.display = 'block';
+        }
+
+        function closeModal(modalId) {
+            document.getElementById(modalId).style.display = 'none';
+            if (modalId === 'transactionModal') {
+                currentUserData = null;
+            }
         }
 
         function calculateBonuses() {
             if (!currentUserData) return;
-
             const currentBalance = parseFloat(currentUserData.bonuses) || 0;
             const purchaseAmount = parseFloat(document.getElementById('purchaseAmount').value) || 0;
             const deductAmount = parseFloat(document.getElementById('deductAmount').value) || 0;
-
             const accrualAmount = purchaseAmount * 0.02;
-            
             let finalDeductAmount = deductAmount;
             if (deductAmount > currentBalance) {
                 finalDeductAmount = currentBalance;
-                document.getElementById('deductAmount').value = finalDeductAmount;
+                document.getElementById('deductAmount').value = finalDeductAmount.toFixed(2);
             }
-
             const finalBalance = currentBalance + accrualAmount - finalDeductAmount;
-
             document.getElementById('summaryCurrentBalance').textContent = currentBalance.toFixed(2);
             document.getElementById('summaryAccrual').textContent = `+${accrualAmount.toFixed(2)}`;
             document.getElementById('summaryDeduction').textContent = `-${finalDeductAmount.toFixed(2)}`;
@@ -655,19 +696,16 @@ ADMIN_TEMPLATE = """
             const statusEl = document.getElementById('modalStatus');
             statusEl.style.color = 'var(--admin-secondary)';
             statusEl.textContent = 'Обработка...';
-
             const payload = {
                 user_id: document.getElementById('modalUserId').value,
                 purchase_amount: parseFloat(document.getElementById('purchaseAmount').value) || 0,
                 deduct_amount: parseFloat(document.getElementById('deductAmount').value) || 0,
             };
-
             if (payload.purchase_amount <= 0 && payload.deduct_amount <= 0) {
                 statusEl.style.color = 'var(--admin-danger)';
                 statusEl.textContent = 'Введите сумму покупки или сумму для списания.';
                 return;
             }
-
             try {
                 const response = await fetch('/admin/add_transaction', {
                     method: 'POST',
@@ -675,13 +713,47 @@ ADMIN_TEMPLATE = """
                     body: JSON.stringify(payload)
                 });
                 const result = await response.json();
-
                 if (response.ok) {
                     statusEl.style.color = 'var(--admin-success)';
                     statusEl.textContent = 'Операция успешно проведена!';
-                    setTimeout(() => {
-                        location.reload();
-                    }, 1500);
+                    setTimeout(() => { location.reload(); }, 1500);
+                } else {
+                    throw new Error(result.message || 'Произошла ошибка');
+                }
+            } catch (error) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = `Ошибка: ${error.message}`;
+            }
+        }
+        
+        async function submitNewClient() {
+            const statusEl = document.getElementById('addClientStatus');
+            statusEl.style.color = 'var(--admin-secondary)';
+            statusEl.textContent = 'Сохранение...';
+
+            const payload = {
+                first_name: document.getElementById('newClientFirstName').value.trim(),
+                last_name: document.getElementById('newClientLastName').value.trim(),
+                phone_number: document.getElementById('newClientPhone').value.trim(),
+            };
+
+            if (!payload.first_name || !payload.phone_number) {
+                statusEl.style.color = 'var(--admin-danger)';
+                statusEl.textContent = 'Имя и номер телефона обязательны.';
+                return;
+            }
+
+            try {
+                const response = await fetch('/admin/add_client', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify(payload)
+                });
+                const result = await response.json();
+                if (response.ok) {
+                    statusEl.style.color = 'var(--admin-success)';
+                    statusEl.textContent = 'Клиент успешно добавлен!';
+                    setTimeout(() => { location.reload(); }, 1500);
                 } else {
                     throw new Error(result.message || 'Произошла ошибка');
                 }
@@ -692,8 +764,11 @@ ADMIN_TEMPLATE = """
         }
 
         window.onclick = function(event) {
-            if (event.target == modal) {
-                closeModal();
+            if (event.target == transactionModal) {
+                closeModal('transactionModal');
+            }
+            if (event.target == addClientModal) {
+                closeModal('addClientModal');
             }
         }
     </script>
@@ -770,9 +845,9 @@ def verify_data():
                 
                 save_visitor_data({user_id_str: user_entry})
                 
-                return redirect(url_for('index', user_id_for_test=user_id_str))
-
-            return jsonify({"status": "ok", "verified": True, "user": user_info_dict}), 200
+                return jsonify({"status": "ok", "verified": True, "user_id": user_id_str})
+            else:
+                 return jsonify({"status": "error", "verified": True, "message": "User ID not found in parsed data"}), 400
         else:
             logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
@@ -781,13 +856,52 @@ def verify_data():
         logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
-
 @app.route('/admin')
 def admin_panel():
     current_data = load_visitor_data()
     users_list = list(current_data.values())
     return render_template_string(ADMIN_TEMPLATE, users=users_list)
 
+@app.route('/admin/add_client', methods=['POST'])
+def add_client():
+    try:
+        data = request.get_json()
+        phone_number = data.get('phone_number')
+        first_name = data.get('first_name')
+        last_name = data.get('last_name')
+
+        if not phone_number or not first_name:
+            return jsonify({"status": "error", "message": "Имя и номер телефона обязательны."}), 400
+        
+        all_data = load_visitor_data()
+
+        if phone_number in all_data:
+            return jsonify({"status": "error", "message": "Клиент с таким номером телефона уже существует."}), 409
+
+        now = datetime.now()
+        new_client = {
+            'id': phone_number,
+            'first_name': first_name,
+            'last_name': last_name,
+            'username': phone_number,
+            'photo_url': None,
+            'language_code': 'ru',
+            'is_premium': False,
+            'visited_at': now.timestamp(),
+            'visited_at_str': now.strftime('%Y-%m-%d %H:%M:%S'),
+            'bonuses': 0,
+            'history': []
+        }
+        
+        save_visitor_data({phone_number: new_client})
+
+        return jsonify({"status": "ok", "message": "Client added successfully"}), 201
+
+    except Exception as e:
+        logging.exception("Error in /admin/add_client endpoint")
+        return jsonify({"status": "error", "message": str(e)}), 500
+
+
 @app.route('/admin/add_transaction', methods=['POST'])
 def add_transaction():
     try: