Update app.py

app.py

@@ -23,7 +23,8 @@ app.secret_key = os.getenv("FLASK_SECRET_KEY", 'your_unique_secret_key_korea_glo
 app.config.update(
     SESSION_COOKIE_SAMESITE="None",
     SESSION_COOKIE_SECURE=True,
-    SESSION_COOKIE_HTTPONLY=True
+    SESSION_COOKIE_HTTPONLY=True,
+    PREFERRED_URL_SCHEME="https"
 )
 
 DATA_FILE = 'data_kglobal.json'
@@ -42,7 +43,6 @@ CURRENCY_NAME = 'Доллар США ($)'
 DOWNLOAD_RETRIES = 3
 DOWNLOAD_DELAY = 5
 UPLOAD_DELAY = 2
-BACKUP_INTERVAL = 1800
 
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
@@ -137,9 +137,6 @@ def _load_from_file(file_path, default_value, lock):
                     if 'orders' not in content: content['orders'] = {}
                 elif file_path == USERS_FILE:
                     if not isinstance(content, dict): raise ValueError("Users file is not a dictionary")
-
-
-                    pass
                 return content
     except (FileNotFoundError, json.JSONDecodeError, ValueError) as e:
         logging.error(f"Error loading local file {file_path}: {e}. Returning default.")
@@ -183,7 +180,9 @@ def save_data(new_data):
             with open(DATA_FILE, 'w', encoding='utf-8') as file:
                 json.dump(app_data, file, ensure_ascii=False, indent=4)
             logging.info(f"Data successfully saved to {DATA_FILE} and memory cache updated.")
-            return True
+        
+        upload_db_to_hf(DATA_FILE)
+        return True
     except Exception as e:
         logging.error(f"Error saving data to {DATA_FILE}: {e}", exc_info=True)
         return False
@@ -203,7 +202,9 @@ def save_users(new_users):
             with open(USERS_FILE, 'w', encoding='utf-8') as file:
                 json.dump(app_users, file, ensure_ascii=False, indent=4)
             logging.info(f"User data successfully saved to {USERS_FILE} and memory cache updated.")
-            return True
+
+        upload_db_to_hf(USERS_FILE)
+        return True
     except Exception as e:
         logging.error(f"Error saving user data to {USERS_FILE}: {e}", exc_info=True)
         return False
@@ -221,16 +222,14 @@ def upload_db_to_hf(specific_file=None):
         for file_name in files_to_upload:
             if os.path.exists(file_name):
                 try:
-                    lock = data_lock if file_name == DATA_FILE else users_lock
-                    with lock:
-                         api.upload_file(
-                             path_or_fileobj=file_name,
-                             path_in_repo=file_name,
-                             repo_id=REPO_ID,
-                             repo_type="dataset",
-                             token=HF_TOKEN_WRITE,
-                             commit_message=f"Sync {file_name} {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
-                         )
+                    api.upload_file(
+                        path_or_fileobj=file_name,
+                        path_in_repo=file_name,
+                        repo_id=REPO_ID,
+                        repo_type="dataset",
+                        token=HF_TOKEN_WRITE,
+                        commit_message=f"Sync {file_name} {datetime.now().strftime('%Y-%m-%d %H:%M:%S')}"
+                    )
                     logging.info(f"File {file_name} successfully uploaded to Hugging Face.")
                     time.sleep(UPLOAD_DELAY)
                 except Exception as e:
@@ -246,21 +245,6 @@ def upload_db_to_hf(specific_file=None):
         logging.error(f"General error during Hugging Face upload initialization or process: {e}", exc_info=True)
         return False
 
-def periodic_backup():
-    logging.info(f"Setting up periodic backup every {BACKUP_INTERVAL} seconds.")
-    while True:
-        time.sleep(BACKUP_INTERVAL)
-        logging.info("Starting periodic backup...")
-        try:
-            upload_success = upload_db_to_hf()
-            if upload_success:
-                 logging.info("Periodic backup finished successfully.")
-            else:
-                 logging.warning("Periodic backup finished with errors (some files might not have been uploaded).")
-        except Exception as e:
-            logging.error(f"Error during periodic backup execution: {e}", exc_info=True)
-
-
 CATALOG_TEMPLATE = '''
     <!DOCTYPE html>
     <html lang="ru">
@@ -344,7 +328,7 @@ CATALOG_TEMPLATE = '''
             .cart-item-price { font-size: 0.9rem; color: #444c5a; }
             body.dark-mode .cart-item-price { color: #8aa9b5; }
             .cart-item-total { font-weight: bold; text-align: right; grid-column: 3; font-size: 1rem; }
-            .cart-item-remove { grid-column: 4; background:none; border:none; color:#f56565; cursor:pointer; font-size: 1.3em; padding: 5px; line-height: 1; }
+            .cart-item-remove { background:none; border:none; color:#f56565; cursor:pointer; font-size: 1.3em; padding: 5px; line-height: 1; }
             .cart-item-remove:hover { color: #c53030; }
             .quantity-input, .color-select { width: 100%; max-width: 180px; padding: 10px; border: 1px solid #d4d9e3; border-radius: 8px; font-size: 1rem; margin: 10px 0; box-sizing: border-box; }
             body.dark-mode .quantity-input, body.dark-mode .color-select { background-color: #1a114f; border-color: #102a50; color: #c8d0e0; }
@@ -1117,8 +1101,8 @@ ADMIN_TEMPLATE = '''
                         <button type="submit" class="button download-hf-button" title="Скачать файлы (перезапишет локальные)"><i class="fas fa-download"></i> Скачать БД</button>
                     </form>
                 </div>
-                 <p style="font-size: 0.85rem; color: #5e6e75;">Резервное копирование происходит автоматически каждые {{ backup_interval // 60 }} минут. Используйте эти кнопки для немедленной синхронизации.</p>
-                 <p style="font-size: 0.85rem; color: #5e6e75;">Сохранение данных (товары, пользователи, категории) происходит только локально, синхронизация с датацентром - по расписанию или принудительно.</p>
+                 <p style="font-size: 0.85rem; color: #5e6e75;">Резервное копирование происходит автоматически после каждого сохранения изменений. Используйте эти кнопки для немедленной синхронизации.</p>
+                 <p style="font-size: 0.85rem; color: #5e6e75;">Сохранение данных (товары, пользователи, категории) происходит локально, синхронизация с датацентром - автоматически после сохранения или принудительно.</p>
             </div>
 
 
@@ -1703,9 +1687,13 @@ def login():
                     localStorage.setItem('kglobalUserToken', '{token_attempt}');
                     console.log('Stored token in localStorage.');
                 }} catch (e) {{ console.error("Error saving token to localStorage:", e); }}
-                window.location.href = "{url_for('catalog')}";
+                if (window.parent && window.parent.location.href !== window.location.href) {{
+                    window.parent.location.reload(true); // Attempt to reload parent frame for session re-check
+                }} else {{
+                    window.location.href = "{url_for('catalog', _external=True, _scheme=app.config['PREFERRED_URL_SCHEME'])}";
+                }}
              </script>
-             <p>Вход выполнен успешно. Перенаправление в <a href="{url_for('catalog')}">каталог</a>...</p>
+             <p>Вход выполнен успешно. Перенаправление в <a href="{url_for('catalog', _external=True, _scheme=app.config['PREFERRED_URL_SCHEME'])}">каталог</a>...</p>
              </body></html>
              '''
             return login_response_html
@@ -1758,9 +1746,13 @@ def logout():
             localStorage.removeItem('kglobalUserToken');
             console.log('Removed stored token from localStorage.');
          }} catch (e) {{ console.error("Error removing from localStorage:", e); }}
-         window.location.href = "{url_for('catalog')}";
+         if (window.parent && window.parent.location.href !== window.location.href) {{
+            window.parent.location.reload(true);
+         }} else {{
+            window.location.href = "{url_for('catalog', _external=True, _scheme=app.config['PREFERRED_URL_SCHEME'])}";
+         }}
      </script>
-      <p>Выход выполнен. Перенаправление на <a href="{url_for('catalog')}">главную страницу</a>...</p>
+      <p>Выход выполнен. Перенаправление на <a href="{url_for('catalog', _external=True, _scheme=app.config['PREFERRED_URL_SCHEME'])}">главную страницу</a>...</p>
      </body></html>
     '''
     return logout_response_html
@@ -2275,8 +2267,7 @@ def admin():
         categories=display_categories,
         users=display_users_sorted_dict,
         repo_id=REPO_ID,
-        currency_code=CURRENCY_CODE,
-        backup_interval=BACKUP_INTERVAL
+        currency_code=CURRENCY_CODE
     )
 
 @app.route('/force_upload', methods=['POST'])
@@ -2289,8 +2280,8 @@ def force_upload():
         else:
             flash("Во время загрузки на Hugging Face произошли ошибки (не все файлы могли быть загружены). Проверьте логи.", 'warning')
     except Exception as e:
-        logging.error(f"Error during forced upload: {e}", exc_info=True)
-        flash(f"Критическая ошибка при принудительной загрузке на Hugging Face: {e}", 'error')
+        logging.error(f"Critical error during forced upload: {e}", exc_info=True)
+        flash(f"Critical error during forced upload to Hugging Face: {e}", 'error')
     return redirect(url_for('admin'))
 
 @app.route('/force_download', methods=['POST'])
@@ -2303,8 +2294,8 @@ def force_download():
          else:
              flash("Не удалось скачать данные с Hugging Face после нескольких попыток. Используются текущие локальные данные. Проверьте логи.", 'error')
      except Exception as e:
-         logging.error(f"Error during forced download: {e}", exc_info=True)
-         flash(f"Критическая ошибка при принудительном скачивании с Hugging Face: {e}", 'error')
+         logging.error(f"Critical error during forced download: {e}", exc_info=True)
+         flash(f"Critical error during forced download from Hugging Face: {e}", 'error')
      return redirect(url_for('admin'))
 
 
@@ -2315,20 +2306,13 @@ if __name__ == '__main__':
     load_initial_data()
     logging.info("Initial data load complete.")
 
-    if HF_TOKEN_WRITE:
-        backup_thread = threading.Thread(target=periodic_backup, daemon=True)
-        backup_thread.start()
-        logging.info("Periodic backup thread started.")
-    else:
-        logging.warning("Periodic backup thread *not* started (HF_TOKEN_WRITE not set).")
-
     port = int(os.environ.get('PORT', 7860))
-    logging.info(f"Starting Flask app server on host 0.0.0.0 and port {port}")
+    logging.info(f"Starting Flask app server on host 0.0.0.0 and port {port}. Ensure HTTPS is configured for session cookies with SameSite=None to work correctly in iframes.")
 
     try:
         from waitress import serve
         serve(app, host='0.0.0.0', port=port, threads=8)
     except ImportError:
-        logging.warning("Waitress not found. Falling back to Flask development server.")
+        logging.warning("Waitress not found. Falling back to Flask development server. NOT FOR PRODUCTION USE.")
         logging.warning("Install waitress for a production-ready server: pip install waitress")
         app.run(debug=False, host='0.0.0.0', port=port)