Update app.py

app.py

@@ -14,25 +14,22 @@ import threading
 from huggingface_hub import HfApi, hf_hub_download
 from huggingface_hub.utils import RepositoryNotFoundError
 
-# --- Configuration ---
-BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvbTVsqEJVG5SYK5hUlc_Ewo") # Use environment variable or default
+BOT_TOKEN = os.getenv("BOT_TOKEN", "7566834146:AAGiG4MaTZZvvbTVsqEJVG5SYK5hUlc_Ewo")
 HOST = '0.0.0.0'
 PORT = 7860
-DATA_FILE = 'data.json' # Local file for visitor data
+DATA_FILE = 'data.json'
 
-# Hugging Face Settings
 REPO_ID = "flpolprojects/teledata"
-HF_DATA_FILE_PATH = "data.json" # Path within the HF repo
-HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE") # Token with write access
-HF_TOKEN_READ = os.getenv("HF_TOKEN_READ") # Token with read access (can be same as write)
+HF_DATA_FILE_PATH = "data.json"
+HF_TOKEN_WRITE = os.getenv("HF_TOKEN_WRITE")
+HF_TOKEN_READ = os.getenv("HF_TOKEN_READ")
 
 app = Flask(__name__)
 logging.basicConfig(level=logging.INFO)
-app.secret_key = os.urandom(24) # For potential future session use
+app.secret_key = os.urandom(24)
 
-# --- Hugging Face & Data Handling ---
 _data_lock = threading.Lock()
-visitor_data_cache = {} # In-memory cache
+visitor_data_cache = {}
 
 def download_data_from_hf():
     global visitor_data_cache
@@ -48,11 +45,10 @@ def download_data_from_hf():
             token=HF_TOKEN_READ,
             local_dir=".",
             local_dir_use_symlinks=False,
-            force_download=True, # Ensure we get the latest version
-            etag_timeout=10 # Shorter timeout to avoid hanging
+            force_download=True,
+            etag_timeout=10
         )
         logging.info("Data file successfully downloaded from Hugging Face.")
-        # Force reload from downloaded file
         with _data_lock:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
@@ -64,16 +60,14 @@ def download_data_from_hf():
         return True
     except RepositoryNotFoundError:
         logging.error(f"Hugging Face repository '{REPO_ID}' not found. Cannot download data.")
-        # Don't clear local cache if repo not found, might have local data
     except Exception as e:
         logging.error(f"Error downloading data from Hugging Face: {e}")
-        # Don't clear local cache on generic download errors
     return False
 
 def load_visitor_data():
     global visitor_data_cache
     with _data_lock:
-        if not visitor_data_cache: # Only load from file if cache is empty
+        if not visitor_data_cache:
             try:
                 with open(DATA_FILE, 'r', encoding='utf-8') as f:
                     visitor_data_cache = json.load(f)
@@ -89,17 +83,15 @@ def load_visitor_data():
                 visitor_data_cache = {}
         return visitor_data_cache
 
-def save_visitor_data(data):
+def save_visitor_data(data_to_update):
+    global visitor_data_cache
     with _data_lock:
         try:
-            # Update cache first
-            visitor_data_cache.update(data)
-            # Save updated cache to file
+            visitor_data_cache.update(data_to_update)
             with open(DATA_FILE, 'w', encoding='utf-8') as f:
                 json.dump(visitor_data_cache, f, ensure_ascii=False, indent=4)
             logging.info(f"Visitor data successfully saved to {DATA_FILE}.")
-            # Trigger upload after successful local save
-            upload_data_to_hf_async() # Use async upload
+            upload_data_to_hf_async()
         except Exception as e:
             logging.error(f"Error saving visitor data: {e}")
 
@@ -113,7 +105,7 @@ def upload_data_to_hf():
 
     try:
         api = HfApi()
-        with _data_lock: # Ensure file isn't being written while reading for upload
+        with _data_lock:
              file_content_exists = os.path.getsize(DATA_FILE) > 0
              if not file_content_exists:
                  logging.warning(f"{DATA_FILE} is empty. Skipping upload.")
@@ -131,10 +123,8 @@ def upload_data_to_hf():
         logging.info("Visitor data successfully uploaded to Hugging Face.")
     except Exception as e:
         logging.error(f"Error uploading data to Hugging Face: {e}")
-        # Consider adding retry logic here if needed
 
 def upload_data_to_hf_async():
-     # Run upload in a separate thread to avoid blocking web requests
      upload_thread = threading.Thread(target=upload_data_to_hf, daemon=True)
      upload_thread.start()
 
@@ -143,11 +133,10 @@ def periodic_backup():
          logging.info("Periodic backup disabled: HF_TOKEN_WRITE not set.")
          return
      while True:
-         time.sleep(3600) # Backup every hour
+         time.sleep(3600)
          logging.info("Initiating periodic backup...")
          upload_data_to_hf()
 
-# --- Telegram Verification ---
 def verify_telegram_data(init_data_str):
     try:
         parsed_data = parse_qs(init_data_str)
@@ -167,8 +156,8 @@ def verify_telegram_data(init_data_str):
         if calculated_hash == received_hash:
             auth_date = int(parsed_data.get('auth_date', [0])[0])
             current_time = int(time.time())
-            if current_time - auth_date > 86400: # Allow data up to 24 hours old
-                 logging.warning(f"Telegram InitData is older than 1 hour (Auth Date: {auth_date}, Current: {current_time}).")
+            if current_time - auth_date > 86400:
+                 logging.warning(f"Telegram InitData is older than 24 hours (Auth Date: {auth_date}, Current: {current_time}).")
             return parsed_data, True
         else:
             logging.warning(f"Data verification failed. Calculated: {calculated_hash}, Received: {received_hash}")
@@ -177,7 +166,6 @@ def verify_telegram_data(init_data_str):
         logging.error(f"Error verifying Telegram data: {e}")
         return None, False
 
-# --- HTML Templates ---
 TEMPLATE = """
 <!DOCTYPE html>
 <html lang="ru">
@@ -186,6 +174,7 @@ TEMPLATE = """
     <meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no, user-scalable=no, viewport-fit=cover">
     <title>Morshen Group</title>
     <script src="https://telegram.org/js/telegram-web-app.js"></script>
+    <script src="https://unpkg.com/@tonconnect/ui@latest/dist/tonconnect-ui.min.js"></script>
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
@@ -200,7 +189,7 @@ TEMPLATE = """
             --tg-theme-secondary-bg-color: {{ theme.secondary_bg_color | default('#1e1e1e') }};
 
             --bg-gradient: linear-gradient(160deg, #1a232f 0%, #121212 100%);
-            --card-bg: rgba(44, 44, 46, 0.8); /* Semi-transparent card */
+            --card-bg: rgba(44, 44, 46, 0.8);
             --card-bg-solid: #2c2c2e;
             --text-color: var(--tg-theme-text-color);
             --text-secondary-color: var(--tg-theme-hint-color);
@@ -208,16 +197,16 @@ TEMPLATE = """
             --accent-gradient-green: linear-gradient(95deg, #34c759, #30d158);
             --tag-bg: rgba(255, 255, 255, 0.1);
             --border-radius-s: 8px;
-            --border-radius-m: 14px; /* Increased radius */
-            --border-radius-l: 18px; /* Increased radius */
+            --border-radius-m: 14px;
+            --border-radius-l: 18px;
             --padding-s: 10px;
-            --padding-m: 18px; /* Increased padding */
-            --padding-l: 28px; /* Increased padding */
+            --padding-m: 18px;
+            --padding-l: 28px;
             --font-family: 'Inter', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif;
             --shadow-color: rgba(0, 0, 0, 0.3);
             --shadow-light: 0 4px 15px var(--shadow-color);
             --shadow-medium: 0 6px 25px var(--shadow-color);
-            --backdrop-blur: 10px; /* Glassmorphism effect */
+            --backdrop-blur: 10px;
         }
         * { box-sizing: border-box; margin: 0; padding: 0; }
         html {
@@ -229,11 +218,11 @@ TEMPLATE = """
             background: var(--bg-gradient);
             color: var(--text-color);
             padding: var(--padding-m);
-            padding-bottom: 120px; /* More space for fixed button */
+            padding-bottom: 120px;
             overscroll-behavior-y: none;
             -webkit-font-smoothing: antialiased;
             -moz-osx-font-smoothing: grayscale;
-            visibility: hidden; /* Hide until ready */
+            visibility: hidden;
             min-height: 100vh;
         }
         .container {
@@ -252,7 +241,7 @@ TEMPLATE = """
         }
         .logo { display: flex; align-items: center; gap: var(--padding-s); }
         .logo img {
-            width: 50px; /* Larger logo */
+            width: 50px;
             height: 50px;
             border-radius: 50%;
             background-color: var(--card-bg-solid);
@@ -260,12 +249,12 @@ TEMPLATE = """
             border: 2px solid rgba(255, 255, 255, 0.15);
             box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
         }
-        .logo span { font-size: 1.6em; font-weight: 700; letter-spacing: -0.5px; } /* Bold, slightly larger */
+        .logo span { font-size: 1.6em; font-weight: 700; letter-spacing: -0.5px; }
         .btn {
             display: inline-flex; align-items: center; justify-content: center;
             padding: 12px var(--padding-m); border-radius: var(--border-radius-m);
             background: var(--accent-gradient); color: var(--tg-theme-button-text-color);
-            text-decoration: none; font-weight: 600; /* Bolder */
+            text-decoration: none; font-weight: 600;
             border: none; cursor: pointer;
             transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
             gap: 8px; font-size: 1em;
@@ -298,14 +287,14 @@ TEMPLATE = """
             background-color: var(--card-bg);
             border-radius: var(--border-radius-l);
             padding: var(--padding-l);
-            margin-bottom: 0; /* Removed bottom margin, gap handles spacing */
+            margin-bottom: 0;
             box-shadow: var(--shadow-medium);
             border: 1px solid rgba(255, 255, 255, 0.08);
             backdrop-filter: blur(var(--backdrop-blur));
             -webkit-backdrop-filter: blur(var(--backdrop-blur));
         }
         .section-title {
-            font-size: 2em; /* Larger titles */
+            font-size: 2em;
             font-weight: 700; margin-bottom: var(--padding-s); line-height: 1.25;
             letter-spacing: -0.6px;
         }
@@ -314,7 +303,7 @@ TEMPLATE = """
             margin-bottom: var(--padding-m);
         }
         .description {
-            font-size: 1.05em; line-height: 1.6; color: var(--text-secondary-color); /* Slightly larger desc */
+            font-size: 1.05em; line-height: 1.6; color: var(--text-secondary-color);
             margin-bottom: var(--padding-m);
         }
         .stats-grid {
@@ -334,7 +323,7 @@ TEMPLATE = """
             background-color: var(--card-bg-solid);
             padding: var(--padding-m); border-radius: var(--border-radius-m);
             margin-bottom: var(--padding-s); display: flex; align-items: center;
-            gap: var(--padding-m); /* Increased gap */
+            gap: var(--padding-m);
             font-size: 1.1em; font-weight: 500;
             border: 1px solid rgba(255, 255, 255, 0.08);
             transition: background-color 0.2s ease, transform 0.2s ease;
@@ -350,11 +339,11 @@ TEMPLATE = """
         }
         .save-card-button {
             position: fixed;
-            bottom: 30px; /* Raised */
+            bottom: 30px;
             left: 50%;
             transform: translateX(-50%);
-            padding: 14px 28px; /* Larger padding */
-            border-radius: 30px; /* More rounded */
+            padding: 14px 28px;
+            border-radius: 30px;
             background: var(--accent-gradient-green);
             color: var(--tg-theme-button-text-color);
             text-decoration: none;
@@ -363,26 +352,24 @@ TEMPLATE = """
             cursor: pointer;
             transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
             z-index: 1000;
-            box-shadow: var(--shadow-medium), 0 0 0 4px rgba(var(--tg-theme-bg-color-rgb, 18, 18, 18), 0.5); /* Add outer glow */
-            font-size: 1.05em; /* Slightly larger text */
+            box-shadow: var(--shadow-medium), 0 0 0 4px rgba(var(--tg-theme-bg-color-rgb, 18, 18, 18), 0.5);
+            font-size: 1.05em;
             display: flex;
             align-items: center;
-            gap: 10px; /* Increased gap */
+            gap: 10px;
             backdrop-filter: blur(5px);
             -webkit-backdrop-filter: blur(5px);
         }
         .save-card-button:hover {
             opacity: 0.95;
-            transform: translateX(-50%) scale(1.05); /* Slightly larger scale */
+            transform: translateX(-50%) scale(1.05);
             box-shadow: var(--shadow-medium), 0 0 0 4px rgba(var(--tg-theme-bg-color-rgb, 18, 18, 18), 0.3);
         }
         .save-card-button i { font-size: 1.2em; }
-
-        /* Modal Styles */
         .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.7); /* Darker backdrop */
+            overflow: auto; background-color: rgba(0,0,0,0.7);
             backdrop-filter: blur(8px);
             -webkit-backdrop-filter: blur(8px);
             animation: fadeIn 0.3s ease-out;
@@ -409,8 +396,6 @@ TEMPLATE = """
         .modal-text { font-size: 1.2em; line-height: 1.6; margin-bottom: var(--padding-s); word-wrap: break-word; }
         .modal-text b { color: var(--tg-theme-link-color); font-weight: 600; }
         .modal-instruction { font-size: 1em; color: var(--text-secondary-color); margin-top: var(--padding-m); }
-
-        /* Icons */
         .icon { display: inline-block; width: 1.2em; text-align: center; margin-right: 8px; opacity: 0.9; }
         .icon-save::before { content: '💾'; }
         .icon-web::before { content: '🌐'; }
@@ -431,8 +416,12 @@ TEMPLATE = """
         .icon-link::before { content: '🔗'; }
         .icon-leader::before { content: '🏆'; }
         .icon-company::before { content: '🏢'; }
+        .icon-wallet::before { content: '💎'; } /* TON Wallet Icon */
+        
+        #ton-connect-button-container { margin-top: var(--padding-m); }
+        #ton-wallet-info { margin-top: var(--padding-s); font-size: 0.9em; color: var(--text-secondary-color); text-align: center;}
+        #ton-wallet-info b { color: var(--tg-theme-link-color); }
 
-        /* Responsive adjustments */
         @media (max-width: 480px) {
             .section-title { font-size: 1.8em; }
             .logo span { font-size: 1.4em; }
@@ -466,6 +455,13 @@ TEMPLATE = """
              <a href="#" class="btn contact-link" style="background: var(--accent-gradient-green); width: 100%; margin-top: var(--padding-s);">
                  <i class="icon icon-contact"></i>Написать нам в Telegram
              </a>
+             
+            <div id="ton-connect-button-container">
+                <button id="ton-connect-btn" class="btn" style="width: 100%; background: var(--tg-theme-button-color);"><i class="icon icon-wallet"></i>Подключить TON кошелек</button>
+            </div>
+            <div id="ton-wallet-info" style="display: none;">
+                <p>TON кошелек: <b id="ton-wallet-address"></b></p>
+            </div>
         </section>
 
          <section class="ecosystem-header">
@@ -562,7 +558,6 @@ TEMPLATE = """
         <i class="icon icon-save"></i>Сохранить визитку
     </button>
 
-    <!-- The Modal -->
     <div id="saveModal" class="modal">
       <div class="modal-content">
         <span class="modal-close" id="modal-close-btn">×</span>
@@ -573,9 +568,9 @@ TEMPLATE = """
       </div>
     </div>
 
-
     <script>
         const tg = window.Telegram.WebApp;
+        let tonConnectUI;
 
         function applyTheme(themeParams) {
             const root = document.documentElement;
@@ -586,8 +581,6 @@ TEMPLATE = """
             root.style.setProperty('--tg-theme-button-color', themeParams.button_color || '#31a5f5');
             root.style.setProperty('--tg-theme-button-text-color', themeParams.button_text_color || '#ffffff');
             root.style.setProperty('--tg-theme-secondary-bg-color', themeParams.secondary_bg_color || '#1e1e1e');
-
-            // Optional: Convert main bg color to RGB for glow effect alpha
             try {
                  const bgColor = themeParams.bg_color || '#121212';
                  const r = parseInt(bgColor.slice(1, 3), 16);
@@ -595,16 +588,60 @@ TEMPLATE = """
                  const b = parseInt(bgColor.slice(5, 7), 16);
                  root.style.setProperty('--tg-theme-bg-color-rgb', `${r}, ${g}, ${b}`);
             } catch (e) {
-                 root.style.setProperty('--tg-theme-bg-color-rgb', `18, 18, 18`); // Fallback
+                 root.style.setProperty('--tg-theme-bg-color-rgb', `18, 18, 18`);
+            }
+        }
+
+        function updateTonWalletUI(address) {
+            const tonConnectBtnContainer = document.getElementById('ton-connect-button-container');
+            const tonWalletInfoDiv = document.getElementById('ton-wallet-info');
+            const tonWalletAddressEl = document.getElementById('ton-wallet-address');
+
+            if (address) {
+                tonConnectBtnContainer.style.display = 'none';
+                tonWalletAddressEl.textContent = `${address.slice(0, 6)}...${address.slice(-4)}`;
+                tonWalletInfoDiv.style.display = 'block';
+            } else {
+                tonConnectBtnContainer.style.display = 'block';
+                tonWalletInfoDiv.style.display = 'none';
+            }
+        }
+        
+        async function connectTonWalletBackend(walletAddress) {
+            try {
+                const response = await fetch('/connect_ton_wallet', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'Accept': 'application/json'
+                    },
+                    body: JSON.stringify({ initData: tg.initData, walletAddress: walletAddress }),
+                });
+                if (!response.ok) {
+                    const errorData = await response.json().catch(() => ({}));
+                    throw new Error(`HTTP error ${response.status}: ${errorData.message || 'Failed to connect wallet on backend'}`);
+                }
+                const data = await response.json();
+                if (data.status === 'ok') {
+                    console.log('TON Wallet connected successfully on backend.');
+                    updateTonWalletUI(walletAddress);
+                    tg.HapticFeedback.notificationOccurred('success');
+                } else {
+                    throw new Error(data.message || 'Backend rejected TON wallet connection.');
+                }
+            } catch (error) {
+                console.error('Error connecting TON wallet with backend:', error);
+                tg.showAlert(`Ошибка подключения кошелька: ${error.message}`);
+                // Revert UI if needed, or keep button visible for retry
             }
         }
 
+
         function setupTelegram() {
             if (!tg || !tg.initData) {
                  console.error("Telegram WebApp script not loaded or initData is missing.");
                  const greetingElement = document.getElementById('greeting');
                  if(greetingElement) greetingElement.textContent = 'Не удалось связаться с Telegram.';
-                 // Apply default dark theme maybe? Or leave as is.
                  document.body.style.visibility = 'visible';
                  return;
              }
@@ -615,7 +652,6 @@ TEMPLATE = """
             applyTheme(tg.themeParams);
             tg.onEvent('themeChanged', () => applyTheme(tg.themeParams));
 
-            // Send initData for verification and user logging
              fetch('/verify', {
                  method: 'POST',
                  headers: {
@@ -631,18 +667,21 @@ TEMPLATE = """
              .then(data => {
                  if (data.status === 'ok' && data.verified) {
                      console.log('Backend verification successful.');
+                     if (data.ton_wallet_address) {
+                         updateTonWalletUI(data.ton_wallet_address);
+                     } else {
+                         updateTonWalletUI(null);
+                     }
                  } else {
                      console.warn('Backend verification failed:', data.message);
-                     // Potentially show a non-blocking warning to user if needed
+                     updateTonWalletUI(null);
                  }
              })
              .catch(error => {
                  console.error('Error sending initData for verification:', error);
-                 // Display a more user-friendly error?
+                 updateTonWalletUI(null);
              });
 
-
-             // User Greeting (using unsafe data for immediate feedback)
              const user = tg.initDataUnsafe?.user;
              const greetingElement = document.getElementById('greeting');
              if (user) {
@@ -653,16 +692,14 @@ TEMPLATE = """
                  console.warn('Telegram User data not available (initDataUnsafe.user is empty).');
              }
 
-             // Contact Links
              const contactButtons = document.querySelectorAll('.contact-link');
              contactButtons.forEach(button => {
                  button.addEventListener('click', (e) => {
                      e.preventDefault();
-                     tg.openTelegramLink('https://t.me/morshenkhan'); // Use actual contact username
+                     tg.openTelegramLink('https://t.me/morshenkhan');
                  });
              });
 
-             // Modal Setup
              const modal = document.getElementById("saveModal");
              const saveCardBtn = document.getElementById("save-card-btn");
              const closeBtn = document.getElementById("modal-close-btn");
@@ -675,20 +712,59 @@ TEMPLATE = """
                         tg.HapticFeedback.impactOccurred('light');
                      }
                  });
-
-                 closeBtn.addEventListener('click', () => {
-                     modal.style.display = "none";
-                 });
-
+                 closeBtn.addEventListener('click', () => { modal.style.display = "none"; });
                  window.addEventListener('click', (event) => {
-                     if (event.target == modal) {
-                         modal.style.display = "none";
-                     }
+                     if (event.target == modal) { modal.style.display = "none"; }
                  });
              } else {
                  console.error("Modal elements not found!");
              }
 
+            // TON Connect UI Initialization
+            // The manifest an absolute URL to the manifest.json
+            const manifestUrl = new URL('/tonconnect-manifest.json', window.location.origin).toString();
+            tonConnectUI = new TON_CONNECT_UI.TonConnectUI({
+                manifestUrl: manifestUrl,
+                buttonRootId: 'ton-connect-button-container', // Optional: if you want SDK to render button
+                actionsConfiguration: {
+                    twaReturnUrl: `https://t.me/${tg.WebApp. Gastgeberanwendung}/${tg.WebApp.Startparam}` // Optional
+                }
+            });
+            
+            // Handle TON Connect button click manually if not using buttonRootId or want custom button
+            const tonConnectBtnManual = document.getElementById('ton-connect-btn');
+            if (tonConnectBtnManual) {
+                 tonConnectBtnManual.addEventListener('click', async () => {
+                    try {
+                        const connectedWallet = await tonConnectUI.connectWallet();
+                        if (connectedWallet && connectedWallet.account && connectedWallet.account.address) {
+                            const rawAddress = TON_CONNECT_UI.Address.parse(connectedWallet.account.address).toString({ testOnly: false }); // mainnet address
+                            console.log('TON Wallet connected:', rawAddress);
+                            await connectTonWalletBackend(rawAddress);
+                        } else {
+                           console.warn('TON Wallet connection cancelled or failed.');
+                        }
+                    } catch (error) {
+                        console.error('Error during TON wallet connection process:', error);
+                        tg.showAlert('Не удалось подключить TON кошелек.');
+                    }
+                });
+            }
+            
+            // Subscribe to connection status changes (optional, good for advanced UI updates)
+            tonConnectUI.onStatusChange(walletAndAccount => {
+                if (walletAndAccount && walletAndAccount.account) {
+                    const rawAddress = TON_CONNECT_UI.Address.parse(walletAndAccount.account.address).toString({ testOnly: false });
+                    console.log('TON Connect status change, connected:', rawAddress);
+                    // connectTonWalletBackend(rawAddress); // Potentially connect here too, or rely on button click
+                    updateTonWalletUI(rawAddress);
+                } else {
+                    console.log('TON Connect status change, disconnected.');
+                    updateTonWalletUI(null);
+                }
+            });
+
+
              document.body.style.visibility = 'visible';
          }
 
@@ -704,9 +780,8 @@ TEMPLATE = """
                       if(greetingElement) greetingElement.textContent = 'Ошибка загрузки интерфейса Telegram.';
                       document.body.style.visibility = 'visible';
                   }
-             }, 3500); // Slightly longer timeout
+             }, 3500);
         }
-
     </script>
 </body>
 </html>
@@ -750,7 +825,7 @@ ADMIN_TEMPLATE = """
         h1 { text-align: center; color: var(--admin-secondary); margin-bottom: var(--padding); font-weight: 600; }
         .user-grid {
             display: grid;
-            grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
+            grid-template-columns: repeat(auto-fill, minmax(320px, 1fr)); /* Wider cards */
             gap: var(--padding);
             margin-top: var(--padding);
         }
@@ -774,12 +849,12 @@ ADMIN_TEMPLATE = """
             width: 80px; height: 80px;
             border-radius: 50%; margin-bottom: 1rem;
             object-fit: cover; border: 3px solid var(--admin-border);
-            background-color: #eee; /* Placeholder bg */
+            background-color: #eee;
         }
         .user-card .name { font-weight: 600; font-size: 1.2em; margin-bottom: 0.3rem; color: var(--admin-primary); }
         .user-card .username { color: var(--admin-secondary); margin-bottom: 0.8rem; font-size: 0.95em; }
-        .user-card .details { font-size: 0.9em; color: #495057; word-break: break-word; }
-        .user-card .detail-item { margin-bottom: 0.3rem; }
+        .user-card .details { font-size: 0.9em; color: #495057; word-break: break-all; width:100%; } /* break-all */
+        .user-card .detail-item { margin-bottom: 0.3rem; text-align: left; padding-left: 10px; }
         .user-card .detail-item strong { color: var(--admin-text); }
         .user-card .timestamp { font-size: 0.8em; color: var(--admin-secondary); margin-top: 1rem; }
         .no-users { text-align: center; color: var(--admin-secondary); margin-top: 2rem; font-size: 1.1em; }
@@ -802,8 +877,6 @@ ADMIN_TEMPLATE = """
              transition: background-color 0.2s ease;
         }
          .refresh-btn:hover { background-color: #0b5ed7; }
-
-        /* Admin Controls */
         .admin-controls {
             background: var(--admin-card-bg);
             padding: var(--padding);
@@ -833,7 +906,7 @@ ADMIN_TEMPLATE = """
          .admin-controls .loader {
              border: 4px solid #f3f3f3; border-radius: 50%; border-top: 4px solid var(--admin-primary);
              width: 20px; height: 20px; animation: spin 1s linear infinite; display: inline-block; margin-left: 10px; vertical-align: middle;
-             display: none; /* Hidden by default */
+             display: none;
          }
          @keyframes spin { 0% { transform: rotate(0deg); } 100% { transform: rotate(360deg); } }
     </style>
@@ -862,13 +935,14 @@ ADMIN_TEMPLATE = """
                         {% if user.username %}
                             <div class="username"><a href="https://t.me/{{ user.username }}" target="_blank" style="color: inherit; text-decoration: none;">@{{ user.username }}</a></div>
                         {% else %}
-                             <div class="username" style="height: 1.3em;"></div> {# Placeholder for spacing #}
+                             <div class="username" style="height: 1.3em;"></div>
                         {% endif %}
                         <div class="details">
                            <div class="detail-item"><strong>ID:</strong> {{ user.id }}</div>
                            <div class="detail-item"><strong>Язык:</strong> {{ user.language_code or 'N/A' }}</div>
                            <div class="detail-item"><strong>Premium:</strong> {{ 'Да' if user.is_premium else 'Нет' }}</div>
                            <div class="detail-item"><strong>Телефон:</strong> {{ user.phone_number or 'Недоступен' }}</div>
+                           <div class="detail-item"><strong>TON Wallet:</strong> {{ user.ton_wallet_address or 'N/A' }}</div>
                         </div>
                          <div class="timestamp">Визит: {{ user.visited_at_str }}</div>
                     </div>
@@ -894,7 +968,7 @@ ADMIN_TEMPLATE = """
                     statusMessage.textContent = data.message;
                     statusMessage.style.color = 'var(--admin-success)';
                     if (action === 'скачивание') {
-                        setTimeout(() => location.reload(), 1500); // Reload after download success
+                        setTimeout(() => location.reload(), 1500);
                     }
                 } else {
                     throw new Error(data.message || 'Произошла ошибка');
@@ -907,27 +981,36 @@ ADMIN_TEMPLATE = """
                 loader.style.display = 'none';
             }
         }
-
-        function triggerDownload() {
-            handleFetch('/admin/download_data', 'скачивание');
-        }
-
-        function triggerUpload() {
-            handleFetch('/admin/upload_data', 'загрузка');
-        }
+        function triggerDownload() { handleFetch('/admin/download_data', 'скачивание'); }
+        function triggerUpload() { handleFetch('/admin/upload_data', 'загрузка'); }
     </script>
 </body>
 </html>
 """
 
-# --- Flask Routes ---
 @app.route('/')
 def index():
-    # Pass theme parameters for initial render if available (e.g., from query params or session)
-    # For simplicity, we let the JS handle theme application after tg.ready()
-    theme_params = {} # Or load from request if needed
+    theme_params = {}
     return render_template_string(TEMPLATE, theme=theme_params)
 
+@app.route('/tonconnect-manifest.json')
+def ton_manifest():
+    # Ensure this URL is correctly pointing to your app's domain
+    # For local dev, request.host_url should work. For production, ensure HOST is correct.
+    app_url = request.host_url.strip('/') 
+    # Use a publicly accessible icon URL
+    icon_url = "https://huggingface.co/spaces/Aleksmorshen/Telemap8/resolve/main/morshengroup.jpg"
+    
+    manifest = {
+        "url": app_url,
+        "name": "Morshen Group Mini App",
+        "iconUrl": icon_url,
+        "termsOfUseUrl": f"{app_url}/terms-of-use", # Placeholder
+        "privacyPolicyUrl": f"{app_url}/privacy-policy" # Placeholder
+    }
+    return jsonify(manifest)
+
+
 @app.route('/verify', methods=['POST'])
 def verify_data():
     try:
@@ -937,7 +1020,6 @@ def verify_data():
             return jsonify({"status": "error", "message": "Missing initData"}), 400
 
         user_data_parsed, is_valid = verify_telegram_data(init_data_str)
-
         user_info_dict = {}
         if user_data_parsed and 'user' in user_data_parsed:
             try:
@@ -945,48 +1027,115 @@ def verify_data():
                 user_info_dict = json.loads(user_json_str)
             except Exception as e:
                 logging.error(f"Could not parse user JSON: {e}")
-                user_info_dict = {}
-
-        if is_valid:
-            user_id = user_info_dict.get('id')
-            if user_id:
-                now = time.time()
-                # Create data entry for the specific user
-                user_entry = {
-                    str(user_id): { # Use string keys for JSON compatibility
-                        'id': user_id,
-                        'first_name': user_info_dict.get('first_name'),
-                        'last_name': user_info_dict.get('last_name'),
-                        'username': user_info_dict.get('username'),
-                        'photo_url': user_info_dict.get('photo_url'),
-                        'language_code': user_info_dict.get('language_code'),
-                        'is_premium': user_info_dict.get('is_premium', False),
-                        'phone_number': user_info_dict.get('phone_number'), # Note: Only available if requested via button
-                        'visited_at': now,
-                        'visited_at_str': datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
-                    }
-                }
-                # Save/update this specific user's data
-                save_visitor_data(user_entry)
-            return jsonify({"status": "ok", "verified": True, "user": user_info_dict}), 200
+
+        if is_valid and user_info_dict.get('id'):
+            user_id = user_info_dict['id']
+            user_id_str = str(user_id)
+            now = time.time()
+            
+            new_telegram_data = {
+                'id': user_id,
+                'first_name': user_info_dict.get('first_name'),
+                'last_name': user_info_dict.get('last_name'),
+                'username': user_info_dict.get('username'),
+                'photo_url': user_info_dict.get('photo_url'),
+                'language_code': user_info_dict.get('language_code'),
+                'is_premium': user_info_dict.get('is_premium', False),
+                'phone_number': user_info_dict.get('phone_number'),
+                'visited_at': now,
+                'visited_at_str': datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
+            }
+
+            ton_wallet_address_to_return = None
+            with _data_lock:
+                current_user_data = visitor_data_cache.get(user_id_str, {})
+                current_user_data.update(new_telegram_data)
+                visitor_data_cache[user_id_str] = current_user_data
+                ton_wallet_address_to_return = current_user_data.get('ton_wallet_address')
+            
+            save_visitor_data({user_id_str: current_user_data})
+            
+            return jsonify({
+                "status": "ok", 
+                "verified": True, 
+                "user": user_info_dict,
+                "ton_wallet_address": ton_wallet_address_to_return
+            }), 200
         else:
-            logging.warning(f"Verification failed for user: {user_info_dict.get('id')}")
+            logging.warning(f"Verification failed for user: {user_info_dict.get('id') if user_info_dict else 'Unknown'}")
             return jsonify({"status": "error", "verified": False, "message": "Invalid data"}), 403
 
     except Exception as e:
         logging.exception("Error in /verify endpoint")
         return jsonify({"status": "error", "message": "Internal server error"}), 500
 
+@app.route('/connect_ton_wallet', methods=['POST'])
+def connect_ton_wallet():
+    try:
+        req_data = request.get_json()
+        init_data_str = req_data.get('initData')
+        wallet_address = req_data.get('walletAddress')
+
+        if not init_data_str or not wallet_address:
+            return jsonify({"status": "error", "message": "Missing initData or walletAddress"}), 400
+
+        user_data_parsed, is_valid = verify_telegram_data(init_data_str)
+        if not is_valid:
+            return jsonify({"status": "error", "message": "Invalid Telegram data"}), 403
+
+        user_info_dict = {}
+        if user_data_parsed and 'user' in user_data_parsed:
+            try:
+                user_json_str = unquote(user_data_parsed['user'][0])
+                user_info_dict = json.loads(user_json_str)
+            except Exception as e:
+                logging.error(f"Could not parse user JSON during TON connect: {e}")
+                return jsonify({"status": "error", "message": "Failed to parse user data"}), 400
+        
+        user_id = user_info_dict.get('id')
+        if not user_id:
+            return jsonify({"status": "error", "message": "User ID not found in Telegram data"}), 400
+        
+        user_id_str = str(user_id)
+        now = time.time()
+
+        with _data_lock:
+            user_record = visitor_data_cache.get(user_id_str)
+            if not user_record:
+                logging.info(f"User {user_id_str} not in cache, creating basic entry for TON connect.")
+                user_record = {
+                    'id': user_id,
+                    'first_name': user_info_dict.get('first_name'),
+                    'last_name': user_info_dict.get('last_name'),
+                    'username': user_info_dict.get('username'),
+                    'visited_at': now, # Or use a specific 'created_at'
+                    'visited_at_str': datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
+                }
+            
+            user_record['ton_wallet_address'] = wallet_address
+            user_record['ton_wallet_connected_at'] = now
+            user_record['ton_wallet_connected_at_str'] = datetime.fromtimestamp(now).strftime('%Y-%m-%d %H:%M:%S')
+            
+            visitor_data_cache[user_id_str] = user_record
+            data_to_save = {user_id_str: user_record}
+        
+        save_visitor_data(data_to_save)
+        
+        return jsonify({"status": "ok", "message": "TON wallet connected and saved successfully."}), 200
+
+    except Exception as e:
+        logging.exception("Error in /connect_ton_wallet endpoint")
+        return jsonify({"status": "error", "message": "Internal server error"}), 500
+
+
 @app.route('/admin')
 def admin_panel():
-    # WARNING: This route is unprotected! Add proper authentication/authorization.
-    current_data = load_visitor_data() # Load from cache/file
+    current_data = load_visitor_data()
     users_list = list(current_data.values())
     return render_template_string(ADMIN_TEMPLATE, users=users_list)
 
 @app.route('/admin/download_data', methods=['POST'])
 def admin_trigger_download():
-    # WARNING: Unprotected endpoint
     success = download_data_from_hf()
     if success:
          return jsonify({"status": "ok", "message": "Скачивание данных с Hugging Face завершено. Страница будет обновлена."})
@@ -995,44 +1144,34 @@ def admin_trigger_download():
 
 @app.route('/admin/upload_data', methods=['POST'])
 def admin_trigger_upload():
-    # WARNING: Unprotected endpoint
     if not HF_TOKEN_WRITE:
         return jsonify({"status": "error", "message": "HF_TOKEN_WRITE не настроен на сервере."}), 400
-    upload_data_to_hf_async() # Trigger async upload
+    upload_data_to_hf_async()
     return jsonify({"status": "ok", "message": "Загрузка данных на Hugging Face запущена в фоновом режиме."})
 
+# Placeholder routes for terms and privacy for tonconnect-manifest.json
+@app.route('/terms-of-use')
+def terms_of_use():
+    return "Terms of Use: To be defined.", 200
+
+@app.route('/privacy-policy')
+def privacy_policy():
+    return "Privacy Policy: To be defined.", 200
+
 
-# --- App Initialization ---
 if __name__ == '__main__':
-    print("---")
     print("--- MORSHEN GROUP MINI APP SERVER ---")
-    print("---")
     print(f"Flask server starting on http://{HOST}:{PORT}")
     print(f"Using Bot Token ID: {BOT_TOKEN.split(':')[0]}")
-    print(f"Visitor data file: {DATA_FILE}")
-    print(f"Hugging Face Repo: {REPO_ID}")
-    print(f"HF Data Path: {HF_DATA_FILE_PATH}")
     if not HF_TOKEN_READ or not HF_TOKEN_WRITE:
-         print("---")
-         print("--- WARNING: HUGGING FACE TOKEN(S) NOT SET ---")
-         print("--- Backup/restore functionality will be limited. Set HF_TOKEN_READ and HF_TOKEN_WRITE environment variables.")
-         print("---")
+         print("--- WARNING: HUGGING FACE TOKEN(S) NOT SET. Backup/restore limited. ---")
     else:
-         print("--- Hugging Face tokens found.")
-         # Initial attempt to download data on startup
-         print("--- Attempting initial data download from Hugging Face...")
+         print("--- Hugging Face tokens found. Attempting initial data download...")
          download_data_from_hf()
 
-    # Load initial data from local file (might have been updated by download)
     load_visitor_data()
+    print("--- SECURITY WARNING: /admin route and sub-routes are NOT protected. ---")
 
-    print("---")
-    print("--- SECURITY WARNING ---")
-    print("--- The /admin route and its sub-routes are NOT protected.")
-    print("--- Implement proper authentication before deploying.")
-    print("---")
-
-    # Start periodic backup thread if write token is available
     if HF_TOKEN_WRITE:
         backup_thread = threading.Thread(target=periodic_backup, daemon=True)
         backup_thread.start()
@@ -1041,7 +1180,4 @@ if __name__ == '__main__':
         print("--- Periodic backup disabled (HF_TOKEN_WRITE missing).")
 
     print("--- Server Ready ---")
-    # Use a production server like Waitress or Gunicorn instead of app.run() for deployment
-    # from waitress import serve
-    # serve(app, host=HOST, port=PORT)
-    app.run(host=HOST, port=PORT, debug=False) # debug=False for production recommended
+    app.run(host=HOST, port=PORT, debug=False)