Update app.py

app.py

@@ -302,68 +302,51 @@ def feedback_ui():
 
 #section for messaging 
 
-# Send a message to the receiver_email from the sender_email
+# Function to send a message
 def send_message(sender_email, receiver_email, message_content):
     try:
-        # Add a new document to the 'messages' collection
+        # Add message to Firestore
         db_firestore.collection('messages').add({
             'sender_email': sender_email,
             'receiver_email': receiver_email,
             'message_content': message_content,
             'timestamp': firestore.SERVER_TIMESTAMP
         })
-        log_action(sender_email, "Sent message")
         return "Message sent successfully!"
     except Exception as e:
         return f"Failed to send message: {str(e)}"
 
 # Function to retrieve messages for a user
-@st_cache
 def get_messages(user_email):
     try:
         messages = db_firestore.collection('messages').where('receiver_email', '==', user_email).order_by('timestamp', direction=firestore.Query.DESCENDING).stream()
-        log_action(user_email, "Viewed messages")
-        return messages  # Return the Firestore query snapshot
+        return messages
     except Exception as e:
-        st.error(f"Failed to retrieve messages: {str(e)}")
         return None
 
-# Streamlit interface for sending messages
-def send_message_ui():
-    st.title("Send Message")
-    sender_email = st.session_state.auth_state["user"].email
-    receiver_email = st.text_input("Receiver's Email", help="Enter the receiver's email address")
-    message_content = st.text_area("Message Content")
-    if st.button("Send Message", key="send_message_btn"):  # Add unique key to the button
-        result = send_message(sender_email, receiver_email, message_content)
-        st.write(result)
-
-# Streamlit interface for viewing messages
-def view_messages_ui():
-    st.title("Messages")
-    user_email = st.session_state.auth_state["user"].email
-    messages = get_messages(user_email)
-    if messages is not None:
-        for message in messages:
-            message_dict = message.to_dict()  # Convert Firestore document to dictionary
-            st.write(f"From: {message_dict['sender_email']}")
-            st.write(f"Message: {message_dict['message_content']}")
-            st.write("---")
-
-# Streamlit interface for messenger using tabs
-def messenger_ui():
-    st.title("💬 Messenger")
-    tabs = st.columns(2)
-    if tabs[0].button("Send Message"):
-        st.session_state["messenger_tab"] = "Send Message"
-    if tabs[1].button("View Messages"):
-        st.session_state["messenger_tab"] = "View Messages"
-
-    selected_tab = st.session_state.get("messenger_tab", "Send Message")
-    if selected_tab == "Send Message":
-        send_message_ui()
-    elif selected_tab == "View Messages":
-        view_messages_ui()
+# Streamlit interface for messaging
+def messaging_ui():
+    st.title("Messaging")
+
+    if st.session_state.auth_state["signed_in"]:
+        sender_email = st.session_state.auth_state["user"].email
+        receiver_email = st.text_input("Receiver's Email", help="Enter the receiver's email address")
+        message_content = st.text_area("Message Content")
+
+        if st.button("Send Message"):
+            result = send_message(sender_email, receiver_email, message_content)
+            st.write(result)
+
+        messages = get_messages(sender_email)
+        if messages:
+            st.write("Your messages:")
+            for message in messages:
+                message_data = message.to_dict()
+                st.write(f"From: {message_data['sender_email']}")
+                st.write(f"Message: {message_data['message_content']}")
+                st.write("---")
+    else:
+        st.write("Please sign in to send and view messages.")
         
 #end of messaging section