Update app.py

app.py

@@ -2,17 +2,17 @@ import streamlit as st
 
 # Configure page first
 st.set_page_config(
-    page_title="TODO LIST FOR DAILY TASK MANAGEMENT AND MONITORING",
+    page_title="To-DO-LIST FOR DAILY TASK MANAGEMENT AND MONITORING",
     layout="wide",
     page_icon="📋",
     menu_items={
         'Get Help': 'https://github.com',
         'Report a bug': "https://github.com",
-        'About': "# Task Management System v3.0"
+        'About': "# Task Management System v3.2"
     }
 )
 
-# Enhanced UI CSS
+# Custom CSS for enhanced UI
 st.markdown("""
 <style>
     /* Modern UI Enhancements */
@@ -31,32 +31,46 @@ st.markdown("""
         box-shadow: 0 4px 6px rgba(0,0,0,0.1);
     }
     
-    /* Popup Styling */
-    .popup {
-        border-radius: 15px;
-        padding: 1.5rem;
-        margin: 1rem 0;
-        box-shadow: 0 4px 6px rgba(0,0,0,0.1);
+    /* Status Badges */
+    .status-badge {
+        padding: 6px 14px;
+        border-radius: 20px;
+        font-weight: 500;
+        display: inline-flex;
+        align-items: center;
+        gap: 8px;
+    }
+    
+    .pending { background: #fff3cd; color: #856404; }
+    .in-progress { background: #cce5ff; color: #004085; }
+    .completed { background: #d4edda; color: #155724; }
+    
+    /* Progress Bars */
+    .progress-container {
+        background: #f0f0f0;
+        border-radius: 10px;
+        height: 10px;
+        overflow: hidden;
     }
     
-    /* Other styles remain same from previous version */
+    .progress-bar {
+        height: 100%;
+        background: #3498db;
+        transition: width 0.3s ease;
+    }
 </style>
 """, unsafe_allow_html=True)
 
-import firebase_admin
-from firebase_admin import credentials, firestore, auth, exceptions
-import pandas as pd
-import plotly.express as px
-from datetime import datetime, timedelta
-
-# Initialize Firebase
-if not firebase_admin._apps:
-    cred = credentials.Certificate("firebase_credentials.json")
-    firebase_admin.initialize_app(cred)
-db = firestore.client()
+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
 
-# -------------------- Admin Setup -------------------- 
-def create_default_admin():
+def create_default_admin(auth):
     try:
         admin_email = "admin@example.com"
         try:
@@ -68,39 +82,16 @@ def create_default_admin():
                 display_name="Admin"
             )
             auth.set_custom_user_claims(admin_user.uid, {'admin': True})
-            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")
-            })
+            return admin_user
     except Exception as e:
-        print(f"Admin setup error: {str(e)}")
+        st.error(f"Admin setup error: {str(e)}")
 
-create_default_admin()
-
-# -------------------- Authentication --------------------
-def register_user(email, password):
-    try:
-        user = auth.create_user(email=email, password=password)
-        db.collection("users").document(user.uid).set({
-            "email": email,
-            "is_admin": False,
-            "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        })
-        st.success("🎉 Registration successful! Please sign in.")
-    except Exception as e:
-        st.error(f"⚠️ Error: {e}")
-
-def authenticate_user(email):
-    try:
-        return auth.get_user_by_email(email)
-    except Exception as e:
-        st.error(f"🔐 Authentication error: {str(e)}")
-        return None
-
-# -------------------- Main App --------------------
 def main():
-    # Session State Initialization
+    # Initialize Firebase within Streamlit context
+    db, auth = initialize_firebase()
+    create_default_admin(auth)
+
+    # Session State Management
     if "authenticated" not in st.session_state:
         st.session_state.update({
             "authenticated": False,
@@ -114,37 +105,45 @@ def main():
     if not st.session_state.authenticated:
         st.markdown("<div class='header'><h1>📋 To-Do List Management System</h1><h3>Daily Task Monitoring & Productivity Tracking</h3></div>", unsafe_allow_html=True)
         
-        auth_col1, auth_col2 = st.columns(2)
-        with auth_col1:
+        col1, col2 = st.columns(2)
+        with col1:
             with st.expander("🔑 Sign In", expanded=True):
                 with st.form("signin_form"):
                     email = st.text_input("📧 Email")
                     password = st.text_input("🔒 Password", type="password")
                     if st.form_submit_button("🚀 Login"):
-                        user = authenticate_user(email)
-                        if user:
-                            custom_claims = user.custom_claims or {}
+                        try:
+                            user = auth.get_user_by_email(email)
                             user_doc = db.collection("users").document(user.uid).get().to_dict()
                             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', False)
+                                "is_admin": user.custom_claims.get('admin', False) if user.custom_claims else user_doc.get('is_admin', False)
                             })
                             st.rerun()
+                        except Exception as e:
+                            st.error(f"🔐 Authentication failed: {str(e)}")
         
-        with auth_col2:
+        with col2:
             with st.expander("📝 Sign Up", expanded=True):
                 with st.form("signup_form"):
                     new_email = st.text_input("📨 New Email")
                     new_password = st.text_input("🔏 New Password", type="password")
                     if st.form_submit_button("🌟 Register"):
-                        if new_email and new_password:
-                            register_user(new_email, new_password)
+                        try:
+                            user = auth.create_user(email=new_email, password=new_password)
+                            db.collection("users").document(user.uid).set({
+                                "email": new_email,
+                                "is_admin": False,
+                                "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                            })
+                            st.success("🎉 Registration successful! Please sign in.")
+                        except Exception as e:
+                            st.error(f"⚠️ Registration failed: {str(e)}")
         return
 
-    # -------------------- Authenticated User Flow --------------------
-    # Custom Header
+    # Authenticated User Flow
     st.markdown(f"""
     <div class='header'>
         <h1>📋 To-Do List Management System</h1>
@@ -152,11 +151,11 @@ def main():
     </div>
     """, unsafe_allow_html=True)
 
-    # Task Management Functions
+    # Core Functions
     def get_tasks():
         try:
-            tasks_ref = db.collection("tasks").where("user", "==", st.session_state.email)
-            return [{"id": task.id, **task.to_dict()} for task in tasks_ref.stream()]
+            tasks = db.collection("tasks").where("user", "==", st.session_state.email).stream()
+            return [{"id": task.id, **task.to_dict()} for task in tasks]
         except Exception as e:
             st.error(f"📦 Error loading tasks: {str(e)}")
             return []
@@ -169,38 +168,35 @@ def main():
         except Exception as e:
             st.error(f"❌ Delete failed: {str(e)}")
 
-    # Popup Reminders
-    def show_reminders():
-        tasks = get_tasks()
-        overdue = []
-        due_soon = []
-        
-        for task in tasks:
-            if task['status'] != "Completed":
-                task_date = datetime.strptime(task['date'], "%Y-%m-%d").date()
-                delta = (task_date - datetime.today().date()).days
-                if delta < 0:
-                    overdue.append(task)
-                elif 0 <= delta <= 3:
-                    due_soon.append(task)
-        
-        if overdue or due_soon:
-            with st.expander("🔔 Task Reminders", expanded=True):
-                if overdue:
-                    st.error("##### ⚠️ Overdue Tasks")
-                    for task in overdue:
-                        st.markdown(f"**{task['task']}** ({task['project']}) - Due {task['date']}")
-                if due_soon:
-                    st.warning("##### ⏳ Upcoming Deadlines")
-                    for task in due_soon:
-                        st.markdown(f"**{task['task']}** ({task['project']}) - Due {task['date']}")
-
-    # Show reminders on first login
+    # Reminders System
     if st.session_state.first_login:
-        show_reminders()
+        with st.expander("🔔 Task Reminders", expanded=True):
+            tasks = get_tasks()
+            overdue = []
+            due_soon = []
+            
+            for task in tasks:
+                if task['status'] != "Completed":
+                    task_date = datetime.strptime(task['date'], "%Y-%m-%d").date()
+                    delta = (task_date - datetime.today().date()).days
+                    if delta < 0:
+                        overdue.append(task)
+                    elif 0 <= delta <= 3:
+                        due_soon.append(task)
+            
+            if overdue:
+                st.error("##### ⚠️ Overdue Tasks")
+                for task in overdue:
+                    st.markdown(f"**{task['task']}** ({task['project']}) - Due {task['date']}")
+            if due_soon:
+                st.warning("##### ⏳ Upcoming Deadlines")
+                for task in due_soon:
+                    st.markdown(f"**{task['task']}** ({task['project']}) - Due {task['date']}")
+            if not overdue and not due_soon:
+                st.info("🌟 All tasks are up to date!")
         st.session_state.first_login = False
 
-    # Sidebar Navigation
+    # Navigation
     menu_items = ["🏠 Dashboard", "📥 Task Entry", "👀 Task Explorer", "✏️ Edit Tasks", "⚙️ Settings"]
     if st.session_state.is_admin:
         menu_items.insert(3, "🏗️ Project Management")
@@ -209,225 +205,188 @@ def main():
         st.title("🔍 Navigation")
         menu = st.radio("", menu_items, label_visibility="collapsed")
 
-    # Dashboard View (Simplified without timeline)
+    # Dashboard View
     if menu == "🏠 Dashboard":
         tasks = get_tasks()
         if tasks:
             df = pd.DataFrame(tasks)
             
-            # Metrics
-            m1, m2, m3, m4 = st.columns(4)
-            m1.metric("📌 Total Tasks", len(df))
-            m2.metric("✅ Completed", len(df[df['status'] == "Completed"]))
-            m3.metric("⏳ In Progress", len(df[df['status'] == "In Progress"]))
-            m4.metric("📭 Pending", len(df[df['status'] == "Pending"]))
+            col1, col2, col3, col4 = st.columns(4)
+            col1.metric("📌 Total Tasks", len(df))
+            col2.metric("✅ Completed", len(df[df['status'] == "Completed"]))
+            col3.metric("⏳ In Progress", len(df[df['status'] == "In Progress"]))
+            col4.metric("📭 Pending", len(df[df['status'] == "Pending"]))
             
-            # Single Visualization
             with st.container(border=True):
                 st.subheader("📊 Task Status Distribution")
                 fig = px.pie(df, names='status', hole=0.4,
-                            color_discrete_sequence=px.colors.qualitative.Pastel1,
-                            width=800, height=400)
+                            color_discrete_sequence=px.colors.qualitative.Pastel1)
                 st.plotly_chart(fig, use_container_width=True)
         else:
             st.info("📭 No tasks found. Start by adding new tasks!")
 
-    # Task Entry (Remains same from previous version)
-    elif menu == "📝 Task Entry":
-        st.title("📝 Add New Task")
-        try:
-            projects_ref = db.collection("projects")
-            projects = [proj.id for proj in projects_ref.stream()]
-            projects.append("Add New Project")
-        except Exception as e:
-            st.error(f"Error loading projects: {str(e)}")
-            projects = ["Add New Project"]
-        
+    # Task Entry
+    elif menu == "📥 Task Entry":
         with st.form("task_form", clear_on_submit=True):
-            task = st.text_input("Task Description", help="Enter detailed task description")
-            task_type = st.selectbox("Task Type", ["Design", "Procurement", "Construction", "Testing", "Other"])
-            selected_project = st.selectbox("Project", projects)
-            
-            if selected_project == "Add New Project":
-                new_project = st.text_input("New Project Name")
-                if new_project:
-                    try:
-                        db.collection("projects").document(new_project).set({"created_by": st.session_state.email})
-                        selected_project = new_project
-                    except Exception as e:
-                        st.error(f"Error creating project: {str(e)}")
-            
+            st.subheader("➕ Add New Task")
             col1, col2 = st.columns(2)
+            
             with col1:
-                status = st.selectbox("Status", ["Pending", "In Progress", "Completed"])
+                task = st.text_area("📝 Task Description", height=100)
+                task_type = st.selectbox("📦 Task Type", 
+                    ["Design", "Procurement", "Construction", "Testing", "Other"])
+                
             with col2:
-                date = st.date_input("Target Date", min_value=datetime.today())
+                projects = [p.id for p in db.collection("projects").stream()] + ["Add New Project"]
+                project = st.selectbox("🏗️ Project", projects)
+                if project == "Add New Project":
+                    project = st.text_input("✨ New Project Name")
+                
+                status = st.selectbox("📌 Status", ["Pending", "In Progress", "Completed"])
+                date = st.date_input("📅 Due Date", min_value=datetime.today())
             
-            if st.form_submit_button("Add Task"):
+            if st.form_submit_button("💾 Save Task") and task:
                 try:
                     db.collection("tasks").add({
                         "user": st.session_state.email,
                         "task": task,
                         "type": task_type,
-                        "project": selected_project,
+                        "project": project,
                         "status": status,
                         "date": str(date)
                     })
-                    st.success("Task added successfully!")
+                    st.success("✅ Task saved successfully!")
                     st.rerun()
                 except Exception as e:
-                    st.error(f"Error saving task: {str(e)}")
+                    st.error(f"❌ Error: {str(e)}")
 
-    # Task Explorer with Delete (Remains same from previous version)
-    elif menu == "👀 View Tasks":
-        st.title("🔍 Task Explorer")
+    # Task Explorer
+    elif menu == "👀 Task Explorer":
         tasks = get_tasks()
-        
         if tasks:
             df = pd.DataFrame(tasks)
+            
             col1, col2, col3 = st.columns(3)
             with col1:
-                status_filter = st.multiselect("Status", df['status'].unique(), df['status'].unique())
+                status_filter = st.multiselect("📌 Status", df['status'].unique(), df['status'].unique())
             with col2:
-                project_filter = st.multiselect("Project", df['project'].unique())
+                project_filter = st.multiselect("🏗️ Project", df['project'].unique())
             with col3:
-                date_filter = st.date_input("Filter by Date")
+                date_filter = st.date_input("📅 Date")
             
-            filtered_df = df.copy()
-            if status_filter:
-                filtered_df = filtered_df[filtered_df['status'].isin(status_filter)]
-            if project_filter:
-                filtered_df = filtered_df[filtered_df['project'].isin(project_filter)]
-            if date_filter:
-                filtered_df = filtered_df[filtered_df['date'] == str(date_filter)]
+            filtered_df = df[
+                (df['status'].isin(status_filter)) &
+                (df['project'].isin(project_filter if project_filter else df['project'].unique())) &
+                (df['date'] == (str(date_filter) if date_filter else df['date']))
+            ]
             
             if not filtered_df.empty:
-                styled_df = filtered_df[['task', 'project', 'status', 'date']].copy()
-                styled_df['status'] = styled_df['status'].apply(
-                    lambda x: f'<span class="status-badge {x.lower().replace(" ", "-")}">{x}</span>'
-                )
-                st.markdown(styled_df.style.hide(axis="index")
-                            .set_table_styles([
-                                {'selector': 'th', 'props': 'background-color: #2c3e50; color: white;'},
-                                {'selector': 'td', 'props': 'padding: 12px; border-bottom: 1px solid #ddd;'}
-                            ]).to_html(), unsafe_allow_html=True)
+                for _, row in filtered_df.iterrows():
+                    col1, col2 = st.columns([5,1])
+                    with col1:
+                        st.markdown(f"""
+                        <div style="padding:1rem; margin:0.5rem 0; border-radius:10px; background:#f8f9fa;">
+                            <b>{row['task']}</b><br>
+                            <span class="status-badge {row['status'].lower().replace(' ', '-')}">
+                                {row['status']}
+                            </span>
+                            <span style="margin-left:1rem;">📅 {row['date']}</span>
+                        </div>
+                        """, unsafe_allow_html=True)
+                    with col2:
+                        if st.button("🗑️", key=f"del_{row['id']}"):
+                            delete_task(row['id'])
+                st.markdown(f"📄 Showing {len(filtered_df)} of {len(df)} tasks")
             else:
-                st.info("No tasks match the filters")
+                st.info("🔍 No tasks match filters")
         else:
-            st.info("No tasks found. Start by adding new tasks!")
+            st.info("📭 No tasks found")
 
-    # Edit Tasks (New Enhanced Version)
+    # Edit Tasks
     elif menu == "✏️ Edit Tasks":
-        st.subheader("✏️ Edit Task")
         tasks = get_tasks()
-        
         if tasks:
-            task_options = [f"{task['task']} ({task['project']} - {task['date']})" for task in tasks]
-            selected_task = st.selectbox("Select Task to Edit", task_options)
-            task_id = next(task['id'] for task in tasks if f"{task['task']} ({task['project']} - {task['date']})" == selected_task)
-            task_to_edit = next(task for task in tasks if task['id'] == task_id)
+            task_options = [f"{t['task']} ({t['project']})" for t in tasks]
+            selected = st.selectbox("Select Task", task_options)
+            task = next(t for t in tasks if f"{t['task']} ({t['project']})" == selected)
             
             with st.form("edit_form"):
                 col1, col2 = st.columns(2)
                 with col1:
-                    new_task = st.text_area("Task Description", value=task_to_edit['task'], height=100)
-                    new_type = st.selectbox("Task Type", 
+                    new_task = st.text_area("Description", value=task['task'], height=100)
+                    new_type = st.selectbox("Type", 
                         ["Design", "Procurement", "Construction", "Testing", "Other"],
-                        index=["Design", "Procurement", "Construction", "Testing", "Other"].index(task_to_edit['type']))
-                    
+                        index=["Design", "Procurement", "Construction", "Testing", "Other"].index(task['type']))
                 with col2:
-                    projects_ref = db.collection("projects")
-                    projects = [proj.id for proj in projects_ref.stream()] + ["Add New Project"]
-                    new_project = st.selectbox("Project", projects, index=projects.index(task_to_edit['project']) if task_to_edit['project'] in projects else 0)
+                    projects = [p.id for p in db.collection("projects").stream()] + ["Add New Project"]
+                    new_project = st.selectbox("Project", projects, index=projects.index(task['project']) if task['project'] in projects else 0)
                     if new_project == "Add New Project":
                         new_project = st.text_input("New Project Name")
-                    
-                    new_status = st.selectbox("Status", 
-                        ["Pending", "In Progress", "Completed"],
-                        index=["Pending", "In Progress", "Completed"].index(task_to_edit['status']))
-                    new_date = st.date_input("Due Date", 
-                        value=datetime.strptime(task_to_edit['date'], "%Y-%m-%d"))
+                    new_status = st.selectbox("Status", ["Pending", "In Progress", "Completed"], index=["Pending", "In Progress", "Completed"].index(task['status']))
+                    new_date = st.date_input("Due Date", value=datetime.strptime(task['date'], "%Y-%m-%d"))
                 
                 if st.form_submit_button("💾 Save Changes"):
                     try:
-                        update_data = {
+                        db.collection("tasks").document(task['id']).update({
                             "task": new_task,
                             "type": new_type,
-                            "status": new_status,
                             "project": new_project,
+                            "status": new_status,
                             "date": str(new_date)
-                        }
-                        db.collection("tasks").document(task_id).update(update_data)
-                        st.success("✅ Task updated successfully!")
+                        })
+                        st.success("✅ Task updated!")
                         st.rerun()
                     except Exception as e:
                         st.error(f"❌ Update failed: {str(e)}")
         else:
-            st.info("📭 No tasks available for editing")
+            st.info("📭 No tasks to edit")
 
-    # Project Management (Admin Only - Remains same from previous version)
-    elif menu == "🏗️ Projects":
-        st.title("🏗️ Project Management")
-        try:
-            projects_ref = db.collection("projects")
-            projects = [proj.id for proj in projects_ref.stream()]
-        except Exception as e:
-            st.error(f"Error loading projects: {str(e)}")
-            projects = []
+    # 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()]
         
         if projects:
-            st.subheader("Existing Projects")
+            st.write("### Existing Projects")
             for project in projects:
-                col1, col2 = st.columns([3, 1])
+                col1, col2 = st.columns([4,1])
                 with col1:
-                    st.markdown(f"**{project}**")
+                    st.write(f"🏢 {project}")
                 with col2:
-                    if st.button(f"Delete {project}", key=f"del_{project}"):
-                        try:
-                            db.collection("projects").document(project).delete()
-                            st.rerun()
-                        except Exception as e:
-                            st.error(f"Error deleting project: {str(e)}")
+                    if st.button(f"🗑️ {project}", key=f"del_{project}"):
+                        db.collection("projects").document(project).delete()
+                        st.rerun()
         
-        st.subheader("Add New Project")
         with st.form("project_form"):
+            st.write("### Add New Project")
             new_project = st.text_input("Project Name")
-            if st.form_submit_button("Create Project"):
+            if st.form_submit_button("💾 Create Project"):
                 if new_project:
-                    try:
-                        db.collection("projects").document(new_project).set({
-                            "created_by": st.session_state.email,
-                            "created_at": datetime.now().strftime("%Y-%m-%d")
-                        })
-                        st.success("Project created successfully!")
-                        st.rerun()
-                    except Exception as e:
-                        st.error(f"Error creating project: {str(e)}")
+                    db.collection("projects").document(new_project).set({
+                        "created_by": st.session_state.email,
+                        "created_at": datetime.now().strftime("%Y-%m-%d")
+                    })
+                    st.rerun()
 
-    # Settings (Remains same from previous version)
-elif menu == "⚙️ Settings":
-        st.title("⚙️ Account Settings")
-        with st.form("password_change"):
-            st.subheader("Change Password")
-            old_password = st.text_input("Current Password", type="password")
-            new_password = st.text_input("New Password", type="password")
-            confirm_password = st.text_input("Confirm New Password", type="password")
+    # Settings
+    elif menu == "⚙️ Settings":
+        with st.form("password_form"):
+            st.subheader("🔒 Change Password")
+            old_pass = st.text_input("Current Password", type="password")
+            new_pass = st.text_input("New Password", type="password")
+            confirm_pass = st.text_input("Confirm Password", type="password")
             
-            if st.form_submit_button("Update Password"):
-                if new_password == confirm_password:
+            if st.form_submit_button("🔄 Update Password"):
+                if new_pass == confirm_pass:
                     try:
-                        auth.update_user(
-                            st.session_state.user_uid,
-                            password=new_password
-                        )
-                        st.success("Password updated successfully!")
+                        auth.update_user(st.session_state.user_uid, password=new_pass)
+                        st.success("🔑 Password updated!")
                     except Exception as e:
-                        st.error(f"Password update failed: {str(e)}")
+                        st.error(f"❌ Error: {str(e)}")
                 else:
-                    st.error("New passwords do not match")
+                    st.error("🔒 Passwords don't match!")
         
-        st.markdown("---")
-        if st.button("Logout", type="primary"):
+        if st.button("🚪 Logout"):
             st.session_state.authenticated = False
             st.rerun()