Update app.py

app.py

@@ -1,26 +1,19 @@
-# app.py - COMPLETE WORKING VERSION
+# app.py - COMPLETE FIXED VERSION
 import streamlit as st
 import os
 
 # ============================================
-# COMPATIBILITY FUNCTIONS
+# SESSION FIX
 # ============================================
 
-def get_query_params():
-    """Get query params with backward compatibility"""
-    try:
-        # Try new method (Streamlit 1.28+)
-        return st.query_params
-    except AttributeError:
-        # Fallback to old method
-        return st.experimental_get_query_params()
-
-def clear_query_params():
-    """Clear query params with backward compatibility"""
-    try:
-        st.query_params.clear()
-    except AttributeError:
-        st.experimental_set_query_params()
+# Check if we have OAuth code in URL but no session
+try:
+    query_params = st.query_params if hasattr(st, 'query_params') else st.experimental_get_query_params()
+    if "code" in query_params and "authenticated" not in st.session_state:
+        # We need to process OAuth callback
+        st.switch_page("pages/oauth_callback.py")
+except:
+    pass
 
 # ============================================
 # MAIN DASHBOARD
@@ -28,6 +21,13 @@ def clear_query_params():
 
 def show_dashboard():
     """Show the main dashboard after login"""
+    # Verify session
+    if "user_info" not in st.session_state:
+        st.error("Session expired. Please login again.")
+        st.session_state.clear()
+        st.rerun()
+        return
+    
     user = st.session_state.user_info
     
     # Apply your original styling
@@ -51,7 +51,7 @@ def show_dashboard():
     </div>
     """, unsafe_allow_html=True)
 
-    # Sidebar with user info and logout
+    # Sidebar with user info and logout - FIXED
     with st.sidebar:
         if user.get('picture'):
             st.image(user.get('picture'), width=80)
@@ -62,7 +62,8 @@ def show_dashboard():
         st.write(f"📧 {user.get('email', '')}")
         st.markdown("---")
         
-        if st.button("🚪 Logout", use_container_width=True):
+        # LOGOUT BUTTON - This should show now
+        if st.button("🚪 Logout", use_container_width=True, type="primary"):
             st.session_state.clear()
             st.rerun()
     
@@ -144,89 +145,36 @@ def show_login_page():
     GOOGLE_CLIENT_ID = os.getenv("GOOGLE_CLIENT_ID", "")
     
     if not GOOGLE_CLIENT_ID:
-        st.error("""
-        ⚠️ **Google OAuth not configured!**
-        
-        Please add these secrets to HuggingFace Space Settings:
-        
-        1. Go to: Settings → Repository Secrets
-        2. Add: `GOOGLE_CLIENT_ID` (your Google Client ID)
-        3. Add: `GOOGLE_CLIENT_SECRET` (your Google Client Secret)
-        4. Restart the Space
-        """)
+        st.error("Google OAuth not configured")
         return
     
-    # Apply styling for login page
-    st.markdown("""
-    <style>
-        .login-container {
-            max-width: 500px;
-            margin: 0 auto;
-            padding: 2rem;
-            text-align: center;
-        }
-        .google-btn {
-            background: linear-gradient(135deg, #4285F4, #34A853);
-            color: white;
-            padding: 15px 30px;
-            border-radius: 8px;
-            border: none;
-            cursor: pointer;
-            font-size: 18px;
-            font-weight: 600;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-            gap: 12px;
-            margin: 20px 0;
-            text-decoration: none;
-            transition: all 0.3s ease;
-        }
-        .google-btn:hover {
-            transform: translateY(-2px);
-            box-shadow: 0 6px 20px rgba(66, 133, 244, 0.4);
-        }
-    </style>
-    """, unsafe_allow_html=True)
-    
-    # Login page content
-    st.markdown("""
-    <div class="login-container">
-        <h1>🔐 Social Media Data Extractor</h1>
-        <p style="font-size: 1.2rem; opacity: 0.9;">Secure login required to access extraction tools</p>
-        <hr style="margin: 2rem 0;">
-    </div>
-    """, unsafe_allow_html=True)
-    
+    st.title("🔐 Social Media Data Extractor")
     st.markdown("### Welcome! Please login to continue")
     
     # Create login URL
     redirect_uri = "https://refat81-social-media-data-extractor-chatbot.hf.space/oauth_callback"
     login_url = f"https://accounts.google.com/o/oauth2/v2/auth?client_id={GOOGLE_CLIENT_ID}&redirect_uri={redirect_uri}&response_type=code&scope=openid%20email%20profile&access_type=offline&prompt=consent"
     
-    # Google login button
     st.markdown(f"""
-    <div style="text-align: center;">
-        <a href="{login_url}" class="google-btn">
-            <img src="https://cdn-icons-png.flaticon.com/512/2991/2991148.png" width="24" height="24">
+    <a href="{login_url}">
+        <div style="
+            background-color: #4285F4;
+            color: white;
+            padding: 15px 30px;
+            border-radius: 8px;
+            border: none;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: 600;
+            text-align: center;
+            margin: 30px 0;
+            display: inline-block;
+        ">
+            <img src="https://cdn-icons-png.flaticon.com/512/2991/2991148.png" width="24" height="24" style="vertical-align: middle; margin-right: 12px;">
             Sign in with Google
-        </a>
-    </div>
+        </div>
+    </a>
     """, unsafe_allow_html=True)
-    
-    # Instructions
-    st.markdown("---")
-    with st.expander("ℹ️ About this login", expanded=False):
-        st.markdown("""
-        **Why login is required:**
-        - Securely store your extracted data
-        - Prevent unauthorized access
-        - Personalize your experience
-        - Track your usage history
-        
-        **Privacy:** We only access your email and profile picture.
-        Your data is never shared with third parties.
-        """)
 
 # ============================================
 # MAIN APP
@@ -241,7 +189,11 @@ def main():
         initial_sidebar_state="expanded"
     )
     
-    # Check if user is logged in
+    # DEBUG: Remove this after fixing
+    if "user_info" in st.session_state:
+        st.sidebar.success(f"Logged in as: {st.session_state.user_info.get('name')}")
+    
+    # Check authentication
     if "authenticated" in st.session_state and st.session_state.authenticated:
         show_dashboard()
     else: