Update app.py

app.py

@@ -7,7 +7,7 @@ import sqlite3
 import os
 import logging
 from config import init_app
-
+import re
 from typing import Tuple  # Add this import at the top
 from utils.security import log_security_event 
 
@@ -26,7 +26,6 @@ from dashboard_components import apply_custom_css
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-
 CREATOR_INFO = {
     "name": "MUHAMMAD SHAHEER",
     "version": "1.0.0",
@@ -34,17 +33,30 @@ CREATOR_INFO = {
 }
 
 def initialize_session_state():
+    """Initialize all required session state variables"""
     if 'initialized' not in st.session_state:
         try:
-            st.session_state.db = sqlite3.connect('digital_heir.db', check_same_thread=False)
-            st.session_state.digital_heir = init_app()
+            # Initialize basic session state variables
+            st.session_state.initialized = False
             st.session_state.page = 'login'
             st.session_state.user = None
-            st.session_state.creator = Creator.get_info()
-            st.session_state.initialized = True
+            st.session_state.login_attempts = {}  # Dictionary to track login attempts
+            
+            # Initialize database connection
+            if 'db' not in st.session_state:
+                st.session_state.db = sqlite3.connect('digital_heir.db', check_same_thread=False)
+            
+            # Initialize application state
+            if 'digital_heir' not in st.session_state:
+                st.session_state.digital_heir = init_app()
+            
+            # Initialize database tables
             initialize_database()
+            
+            st.session_state.initialized = True
             return True
         except Exception as e:
+            logger.error(f"Initialization error: {str(e)}")
             st.error(f"Failed to initialize: {str(e)}")
             return False
     return True
@@ -70,19 +82,30 @@ def handle_database_error(e: Exception, operation: str):
     return False
 
 def main():
-    if 'initialized' not in st.session_state:
-        initialize_session_state()
+    """Main application entry point"""
+    # Initialize session state first
+    init_success = initialize_session_state()
+    
+    if not init_success:
+        st.error("Failed to initialize application. Please try again.")
+        return
     
-    if not st.session_state.user:
+    # Check if user is logged in
+    if 'user' not in st.session_state or st.session_state.user is None:
         show_login_page()
     else:
+        # Define available pages
         pages = {
             'dashboard': show_dashboard,
             'add_account': show_add_account_page,
             'manage_heirs': show_heir_management_page,
             'security': show_security_settings_page
         }
+        
+        # Get current page from session state, default to dashboard
         current_page = st.session_state.get('page', 'dashboard')
+        
+        # Show the current page
         pages.get(current_page, show_dashboard)()
 
 if __name__ == "__main__":