Update app.py

app.py

@@ -2,6 +2,8 @@ import streamlit as st
 from datetime import datetime
 import pandas as pd
 import plotly.express as px
+import firebase_admin
+from firebase_admin import credentials, firestore, auth, exceptions
 
 # Configure page first
 st.set_page_config(
@@ -11,19 +13,17 @@ st.set_page_config(
     menu_items={
         'Get Help': 'https://github.com',
         'Report a bug': "https://github.com",
-        'About': "# Task Management System v3.3"
+        'About': "# Task Management System v4.0"
     }
 )
 
 # Custom CSS for enhanced UI
 st.markdown("""
 <style>
-    /* Modern UI Enhancements */
     .main .block-container {
         padding-top: 1.5rem;
         max-width: 1400px;
     }
-    
     .header {
         background: linear-gradient(135deg, #2c3e50, #3498db);
         color: white;
@@ -32,7 +32,6 @@ st.markdown("""
         margin-bottom: 2rem;
         box-shadow: 0 4px 6px rgba(0,0,0,0.1);
     }
-    
     .status-badge {
         padding: 6px 14px;
         border-radius: 20px;
@@ -41,27 +40,41 @@ st.markdown("""
         align-items: center;
         gap: 8px;
     }
-    
     .pending { background: #fff3cd; color: #856404; }
     .in-progress { background: #cce5ff; color: #004085; }
     .completed { background: #d4edda; color: #155724; }
+    .progress-container {
+        background: #f0f0f0;
+        border-radius: 10px;
+        height: 10px;
+        overflow: hidden;
+    }
+    .progress-bar {
+        height: 100%;
+        background: #3498db;
+        transition: width 0.3s ease;
+    }
 </style>
 """, unsafe_allow_html=True)
 
 def initialize_firebase():
-    import firebase_admin
-    from firebase_admin import credentials, firestore, auth
-    
     if not firebase_admin._apps:
         cred = credentials.Certificate("firebase_credentials.json")
         firebase_admin.initialize_app(cred)
     return firestore.client(), auth
 
-def create_default_admin(auth):
+def create_default_admin(auth, db):
     try:
         admin_email = "admin@example.com"
         try:
-            auth.get_user_by_email(admin_email)
+            admin_user = auth.get_user_by_email(admin_email)
+            admin_ref = db.collection("users").document(admin_user.uid)
+            if not admin_ref.get().exists:
+                admin_ref.set({
+                    "email": admin_email,
+                    "is_admin": True,
+                    "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                })
         except auth.UserNotFoundError:
             admin_user = auth.create_user(
                 email=admin_email,
@@ -69,14 +82,18 @@ def create_default_admin(auth):
                 display_name="Admin"
             )
             auth.set_custom_user_claims(admin_user.uid, {'admin': True})
-            return admin_user
+            db.collection("users").document(admin_user.uid).set({
+                "email": admin_email,
+                "is_admin": True,
+                "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+            })
     except Exception as e:
         st.error(f"Admin setup error: {str(e)}")
 
 def main():
     # Initialize Firebase
-    db, auth = initialize_firebase()
-    create_default_admin(auth)
+    db, firebase_auth = initialize_firebase()
+    create_default_admin(firebase_auth, db)
 
     # Session State Management
     if "authenticated" not in st.session_state:
@@ -100,15 +117,18 @@ def main():
                     password = st.text_input("🔒 Password", type="password")
                     if st.form_submit_button("🚀 Login"):
                         try:
-                            user = auth.get_user_by_email(email)
+                            user = firebase_auth.get_user_by_email(email)
                             user_doc = db.collection("users").document(user.uid).get()
-                            custom_claims = user.custom_claims or {}
                             
+                            is_admin = user.custom_claims.get('admin', False) if user.custom_claims else False
+                            if user_doc.exists:
+                                is_admin = user_doc.to_dict().get('is_admin', is_admin)
+
                             st.session_state.update({
                                 "authenticated": True,
                                 "email": user.email,
                                 "user_uid": user.uid,
-                                "is_admin": custom_claims.get('admin', False) or user_doc.get('is_admin') or False
+                                "is_admin": is_admin
                             })
                             st.rerun()
                         except Exception as e:
@@ -121,7 +141,7 @@ def main():
                     new_password = st.text_input("🔏 New Password", type="password")
                     if st.form_submit_button("🌟 Register"):
                         try:
-                            user = auth.create_user(email=new_email, password=new_password)
+                            user = firebase_auth.create_user(email=new_email, password=new_password)
                             db.collection("users").document(user.uid).set({
                                 "email": new_email,
                                 "is_admin": False,
@@ -132,7 +152,7 @@ def main():
                             st.error(f"⚠️ Registration failed: {str(e)}")
         return
 
-    # Main Application
+    # Main Application Interface
     st.markdown(f"""
     <div class='header'>
         <h1>📋 To-Do List Management System</h1>
@@ -185,7 +205,7 @@ def main():
                 st.info("🌟 All tasks are up to date!")
         st.session_state.first_login = False
 
-    # Navigation
+    # Navigation Menu
     menu_items = ["🏠 Dashboard", "📥 Task Entry", "👀 Task Explorer", "✏️ Edit Tasks", "⚙️ Settings"]
     if st.session_state.is_admin:
         menu_items.insert(3, "🏗️ Project Management")
@@ -330,7 +350,7 @@ def main():
         else:
             st.info("📭 No tasks to edit")
 
-    # Project Management
+    # Project Management (Admin Only)
     elif menu == "🏗️ Project Management" and st.session_state.is_admin:
         st.subheader("🏗️ Project Management")
         projects = [p.id for p in db.collection("projects").stream()]