Update app.py

app.py

@@ -1,9 +1,11 @@
 import streamlit as st
-import firebase_admin
-from firebase_admin import credentials, firestore, auth
-import pandas as pd
-import plotly.express as px
-from datetime import datetime, timedelta
+
+# Must be the FIRST Streamlit command
+st.set_page_config(
+    page_title="Construction To-Do List",
+    layout="wide",
+    page_icon="🏗️"
+)
 
 # Custom CSS for enhanced UI
 st.markdown("""
@@ -14,9 +16,9 @@ st.markdown("""
         max-width: 1200px;
     }
     
-    /* Sidebar animations and styling */
+    /* 3D Sidebar effects */
     [data-testid="stSidebar"] {
-        background: linear-gradient(145deg, #2c3e50, #3498db) !important;
+        background: linear-gradient(145deg, #2c3e50, #3498db);
         box-shadow: 5px 0 15px rgba(0,0,0,0.2);
     }
     
@@ -25,11 +27,13 @@ st.markdown("""
         border-radius: 8px;
         padding: 10px 15px;
         margin: 5px 0;
+        transform-style: preserve-3d;
     }
     
     .st-emotion-cache-1dj0hjr:hover {
-        transform: translateX(10px);
+        transform: translateX(10px) rotateY(15deg);
         background: rgba(255,255,255,0.1);
+        box-shadow: 5px 5px 15px rgba(0,0,0,0.3);
     }
     
     /* Professional table styling */
@@ -56,9 +60,27 @@ st.markdown("""
     .pending { background: #fff3cd; color: #856404; }
     .in-progress { background: #cce5ff; color: #004085; }
     .completed { background: #d4edda; color: #155724; }
+    
+    /* 3D Button effects */
+    .stButton>button {
+        transition: all 0.3s ease;
+        transform-style: preserve-3d;
+    }
+    
+    .stButton>button:hover {
+        transform: translateY(-2px) rotateX(15deg);
+        box-shadow: 0 5px 15px rgba(0,0,0,0.3);
+    }
 </style>
 """, unsafe_allow_html=True)
 
+import firebase_admin
+from firebase_admin import credentials, firestore, auth
+import pandas as pd
+import plotly.express as px
+from datetime import datetime, timedelta
+import hashlib
+
 # Initialize Firebase
 if not firebase_admin._apps:
     cred = credentials.Certificate("firebase_credentials.json")
@@ -66,9 +88,6 @@ if not firebase_admin._apps:
 db = firestore.client()
 
 # Authentication Functions
-def hash_password(password):
-    return hashlib.sha256(password.encode()).hexdigest()
-
 def register_user(email, password):
     try:
         user = auth.create_user(email=email, password=password)
@@ -81,269 +100,337 @@ def authenticate_user(email, password):
     try:
         user = auth.get_user_by_email(email)
         return user is not None
-    except Exception:
+    except Exception as e:
+        st.error(f"Authentication error: {str(e)}")
         return False
 
-# UI Layout
-st.set_page_config(page_title="Construction To-Do List", layout="wide")
-
-if "authenticated" not in st.session_state:
-    st.session_state["authenticated"] = False
-    st.session_state["email"] = ""
-    st.session_state["first_login"] = True
+# Main Application Logic
+def main():
+    # Session state initialization
+    if "authenticated" not in st.session_state:
+        st.session_state.authenticated = False
+        st.session_state.email = ""
+        st.session_state.first_login = True
+        st.session_state.user_uid = ""
 
-if not st.session_state["authenticated"]:
-    st.title("🔐 User Authentication")
-    choice = st.radio("Select Option", ["Sign In", "Sign Up"], horizontal=True)
+    # Authentication flow
+    if not st.session_state.authenticated:
+        st.title("🔐 User Authentication")
+        choice = st.radio("Select Option", ["Sign In", "Sign Up"], horizontal=True)
 
-    if choice == "Sign Up":
-        with st.form("signup_form"):
-            new_email = st.text_input("Enter your email")
-            new_password = st.text_input("Enter a password", type="password")
-            if st.form_submit_button("Register") and new_email and new_password:
-                register_user(new_email, new_password)
+        if choice == "Sign Up":
+            with st.form("signup_form"):
+                new_email = st.text_input("Email")
+                new_password = st.text_input("Password", type="password")
+                if st.form_submit_button("Register"):
+                    if new_email and new_password:
+                        try:
+                            register_user(new_email, new_password)
+                        except Exception as e:
+                            st.error(f"Registration failed: {str(e)}")
 
-    elif choice == "Sign In":
-        with st.form("signin_form"):
-            email = st.text_input("Enter your email")
-            password = st.text_input("Enter your password", type="password")
-            if st.form_submit_button("Login"):
-                if authenticate_user(email, password):
-                    st.session_state["authenticated"] = True
-                    st.session_state["email"] = email
-                    st.rerun()
-                else:
-                    st.error("Invalid email or password")
-    st.stop()
+        elif choice == "Sign In":
+            with st.form("signin_form"):
+                email = st.text_input("Email")
+                password = st.text_input("Password", type="password")
+                if st.form_submit_button("Login"):
+                    try:
+                        if authenticate_user(email, password):
+                            st.session_state.authenticated = True
+                            st.session_state.email = email
+                            # Get user UID for password updates
+                            user = auth.get_user_by_email(email)
+                            st.session_state.user_uid = user.uid
+                            st.rerun()
+                        else:
+                            st.error("Invalid credentials")
+                    except Exception as e:
+                        st.error(f"Login failed: {str(e)}")
+        return
 
-# Main Application
-def get_tasks():
-    tasks_ref = db.collection("tasks").where("user", "==", st.session_state["email"])
-    return [{"id": task.id, **task.to_dict()} for task in tasks_ref.stream()]
-
-def calculate_deadline_status(task_date):
-    today = datetime.today().date()
-    task_date = datetime.strptime(task_date, "%Y-%m-%d").date()
-    delta = (task_date - today).days
-    
-    if delta < 0:
-        return "Overdue", abs(delta)
-    elif delta == 0:
-        return "Due Today", 0
-    elif delta <= 3:
-        return f"Due in {delta} days", delta
-    else:
-        return "On Track", delta
-
-# Show reminders after login
-if st.session_state.get("first_login"):
-    tasks = get_tasks()
-    overdue = []
-    due_soon = []
-    
-    for task in tasks:
-        if task['status'] in ["Pending", "In Progress"]:
-            status, _ = calculate_deadline_status(task['date'])
-            if "Overdue" in status or "Due" in status:
-                overdue.append(task) if "Overdue" in status else due_soon.append(task)
-    
-    if overdue or due_soon:
-        with st.container():
-            st.markdown("---")
-            cols = st.columns([1, 4, 1])
-            with cols[1]:
-                st.subheader("🔔 Task Reminders")
-                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']}")
-                st.markdown("---")
-    st.session_state.first_login = False
+    # Main App Functionality
+    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()]
+        except Exception as e:
+            st.error(f"Error loading tasks: {str(e)}")
+            return []
 
-# Sidebar Navigation
-st.sidebar.title(f"Welcome, {st.session_state['email']}")
-menu = st.sidebar.radio("Navigation", [
-    "🏠 Dashboard",
-    "📝 Task Entry",
-    "👀 View Tasks",
-    "🏗️ Projects",
-    "⚙️ Settings"
-], label_visibility="collapsed")
+    def calculate_deadline_status(task_date):
+        try:
+            today = datetime.today().date()
+            task_date = datetime.strptime(task_date, "%Y-%m-%d").date()
+            delta = (task_date - today).days
+            if delta < 0: return "Overdue", abs(delta)
+            if delta == 0: return "Due Today", 0
+            if delta <= 3: return f"Due in {delta} days", delta
+            return "On Track", delta
+        except:
+            return "Invalid Date", 0
 
-# Dashboard View
-if menu == "🏠 Dashboard":
-    st.title("📊 Project Dashboard")
-    tasks = get_tasks()
-    
-    if tasks:
-        df = pd.DataFrame(tasks)
+    # Show reminders after login
+    if st.session_state.first_login:
+        tasks = get_tasks()
+        overdue = []
+        due_soon = []
         
-        # Metrics Row
-        col1, col2, col3, col4 = st.columns(4)
-        col1.metric("Total Tasks", len(df))
-        col2.metric("Completed", len(df[df['status'] == "Completed"]), "tasks")
-        col3.metric("In Progress", len(df[df['status'] == "In Progress"]), "tasks")
-        col4.metric("Pending", len(df[df['status'] == "Pending"]), "tasks")
+        for task in tasks:
+            if task['status'] in ["Pending", "In Progress"]:
+                status, _ = calculate_deadline_status(task['date'])
+                if "Overdue" in status or "Due" in status:
+                    overdue.append(task) if "Overdue" in status else due_soon.append(task)
         
-        # Visualizations
-        col1, col2 = st.columns(2)
-        with col1:
-            st.subheader("Status Distribution")
-            fig = px.pie(df, names='status', hole=0.3,
-                        color_discrete_sequence=px.colors.qualitative.Pastel)
-            st.plotly_chart(fig, use_container_width=True)
-        
-        with col2:
-            st.subheader("Project Timeline")
-            timeline_df = df.copy()
-            timeline_df['date'] = pd.to_datetime(timeline_df['date'])
-            fig = px.timeline(timeline_df, x_start="date", x_end="date", y="project",
-                            color="status", title="Project Timeline",
-                            color_discrete_map={
-                                "Pending": "#FFD700",
-                                "In Progress": "#87CEEB",
-                                "Completed": "#90EE90"
-                            })
-            st.plotly_chart(fig, use_container_width=True)
-    else:
-        st.info("No tasks found. Start by adding new tasks!")
+        if overdue or due_soon:
+            with st.container():
+                st.markdown("---")
+                cols = st.columns([1, 4, 1])
+                with cols[1]:
+                    st.subheader("🔔 Task Reminders")
+                    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']}")
+                    st.markdown("---")
+        st.session_state.first_login = False
 
-# Task Entry
-elif menu == "📝 Task Entry":
-    st.title("📝 Add New Task")
-    projects_ref = db.collection("projects")
-    projects = [proj.id for proj in projects_ref.stream()]
-    projects.append("Add New Project")
-    
-    with st.form("task_form", clear_on_submit=True):
-        task = st.text_input("Task Description", placeholder="Enter task details...")
-        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:
-                db.collection("projects").document(new_project).set({"created_by": st.session_state["email"]})
-                selected_project = new_project
-        
-        col1, col2 = st.columns(2)
-        with col1:
-            status = st.selectbox("Status", ["Pending", "In Progress", "Completed"])
-        with col2:
-            date = st.date_input("Target Date", min_value=datetime.today())
-        
-        if st.form_submit_button("Add Task"):
-            db.collection("tasks").add({
-                "user": st.session_state["email"],
-                "task": task,
-                "type": task_type,
-                "project": selected_project,
-                "status": status,
-                "date": str(date)
-            })
-            st.success("Task added successfully!")
-            st.rerun()
+    # Sidebar Navigation
+    st.sidebar.title(f"Welcome, {st.session_state.email}")
+    menu = st.sidebar.radio("Navigation", [
+        "🏠 Dashboard",
+        "📝 Task Entry",
+        "👀 View Tasks",
+        "✏️ Edit Tasks",
+        "🏗️ Projects",
+        "⚙️ Settings"
+    ], label_visibility="collapsed")
 
-# View Tasks
-elif menu == "👀 View Tasks":
-    st.title("🔍 Task Explorer")
-    tasks = get_tasks()
-    
-    if tasks:
-        df = pd.DataFrame(tasks)
-        
-        # Filters
-        col1, col2, col3 = st.columns(3)
-        with col1:
-            status_filter = st.multiselect("Filter by Status", 
-                                          options=df['status'].unique(),
-                                          default=df['status'].unique())
-        with col2:
-            project_filter = st.multiselect("Filter by Project", 
-                                           options=df['project'].unique())
-        with col3:
-            date_filter = st.date_input("Filter by Date")
+    # Dashboard View
+    if menu == "🏠 Dashboard":
+        st.title("📊 Project Dashboard")
+        tasks = get_tasks()
         
-        # Apply filters
-        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)]
-        
-        # Enhanced Table Display
-        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>'
-            )
+        if tasks:
+            df = pd.DataFrame(tasks)
+            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"]))
             
-            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)
+            col1, col2 = st.columns(2)
+            with col1:
+                st.subheader("Status Distribution")
+                fig = px.pie(df, names='status', hole=0.3,
+                            color_discrete_sequence=px.colors.qualitative.Pastel)
+                st.plotly_chart(fig, use_container_width=True)
+            
+            with col2:
+                st.subheader("Project Timeline")
+                timeline_df = df.copy()
+                timeline_df['date'] = pd.to_datetime(timeline_df['date'])
+                fig = px.timeline(timeline_df, x_start="date", x_end="date", y="project",
+                                color="status", color_discrete_map={
+                                    "Pending": "#FFD700",
+                                    "In Progress": "#87CEEB",
+                                    "Completed": "#90EE90"
+                                })
+                st.plotly_chart(fig, use_container_width=True)
         else:
-            st.info("No tasks match the selected filters")
-    else:
-        st.info("No tasks found. Start by adding new tasks!")
+            st.info("No tasks found. Start by adding new tasks!")
 
-# Project Management
-elif menu == "🏗️ Projects":
-    st.title("🏗️ Project Management")
-    
-    # Existing Projects
-    projects_ref = db.collection("projects")
-    projects = [proj.id for proj in projects_ref.stream()]
-    
-    if projects:
-        st.subheader("Existing Projects")
-        for project in projects:
-            col1, col2 = st.columns([3, 1])
+    # Task Entry
+    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"]
+        
+        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)}")
+            
+            col1, col2 = st.columns(2)
             with col1:
-                st.markdown(f"**{project}**")
+                status = st.selectbox("Status", ["Pending", "In Progress", "Completed"])
             with col2:
-                if st.button(f"Delete {project}", key=f"del_{project}"):
-                    db.collection("projects").document(project).delete()
+                date = st.date_input("Target Date", min_value=datetime.today())
+            
+            if st.form_submit_button("Add Task"):
+                try:
+                    db.collection("tasks").add({
+                        "user": st.session_state.email,
+                        "task": task,
+                        "type": task_type,
+                        "project": selected_project,
+                        "status": status,
+                        "date": str(date)
+                    })
+                    st.success("Task added successfully!")
                     st.rerun()
-    
-    # Add New Project
-    st.subheader("Add New Project")
-    with st.form("project_form"):
-        new_project = st.text_input("Project Name")
-        if st.form_submit_button("Create Project"):
-            if new_project:
-                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 saving task: {str(e)}")
 
-# Settings
-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")
+    # View Tasks with Filtering
+    elif menu == "👀 View Tasks":
+        st.title("🔍 Task Explorer")
+        tasks = get_tasks()
         
-        if st.form_submit_button("Update Password"):
-            if new_password == confirm_password:
-                # Implement password change logic
-                st.success("Password updated successfully!")
+        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())
+            with col2:
+                project_filter = st.multiselect("Project", df['project'].unique())
+            with col3:
+                date_filter = st.date_input("Filter by 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)]
+            
+            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)
             else:
-                st.error("New passwords do not match")
-    
-    st.markdown("---")
-    if st.button("Logout", type="primary"):
-        st.session_state.authenticated = False
-        st.rerun()
+                st.info("No tasks match the filters")
+        else:
+            st.info("No tasks found. Start by adding new tasks!")
+
+    # Edit Tasks
+    elif menu == "✏️ Edit Tasks":
+        st.title("✏️ 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)
+            
+            with st.form("edit_form"):
+                new_task = st.text_input("Task Description", value=task_to_edit['task'])
+                new_type = st.selectbox("Task Type", 
+                                       ["Design", "Procurement", "Construction", "Testing", "Other"],
+                                       index=["Design", "Procurement", "Construction", "Testing", "Other"].index(task_to_edit['type']))
+                new_status = st.selectbox("Status", 
+                                         ["Pending", "In Progress", "Completed"],
+                                         index=["Pending", "In Progress", "Completed"].index(task_to_edit['status']))
+                new_project = st.text_input("Project", value=task_to_edit['project'])
+                new_date = st.date_input("Target Date", 
+                                        value=datetime.strptime(task_to_edit['date'], "%Y-%m-%d"))
+                
+                if st.form_submit_button("Update Task"):
+                    try:
+                        db.collection("tasks").document(task_id).update({
+                            "task": new_task,
+                            "type": new_type,
+                            "status": new_status,
+                            "project": new_project,
+                            "date": str(new_date)
+                        })
+                        st.success("Task updated successfully!")
+                        st.rerun()
+                    except Exception as e:
+                        st.error(f"Error updating task: {str(e)}")
+        else:
+            st.info("No tasks available for editing")
+
+    # Project Management
+    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 = []
+        
+        if projects:
+            st.subheader("Existing Projects")
+            for project in projects:
+                col1, col2 = st.columns([3, 1])
+                with col1:
+                    st.markdown(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)}")
+        
+        st.subheader("Add New Project")
+        with st.form("project_form"):
+            new_project = st.text_input("Project Name")
+            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)}")
+
+    # Settings
+    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")
+            
+            if st.form_submit_button("Update Password"):
+                if new_password == confirm_password:
+                    try:
+                        auth.update_user(
+                            st.session_state.user_uid,
+                            password=new_password
+                        )
+                        st.success("Password updated successfully!")
+                    except Exception as e:
+                        st.error(f"Password update failed: {str(e)}")
+                else:
+                    st.error("New passwords do not match")
+        
+        st.markdown("---")
+        if st.button("Logout", type="primary"):
+            st.session_state.authenticated = False
+            st.rerun()
+
+if __name__ == "__main__":
+    main()