Update app.py

app.py

@@ -167,15 +167,14 @@ def upload_to_firebase(user_id, content):
 
 
 def fetch_trustbuilders(user_id):
+    """
+    Fetch TrustBuilders for a specific user from Firebase.
+    """
     try:
-        st.write(f"Fetching TrustBuilders for user: {user_id}")
         trustbuilders = db.child("users").child(user_id).child("TrustBuilders").get()
         if trustbuilders.each():
-            st.write("Raw TrustBuilders fetched from Firebase:")
-            st.json(trustbuilders.val())
             return {item.key(): item.val() for item in trustbuilders.each()}
         else:
-            st.warning("No TrustBuilders found in Firebase.")
             return {}
     except Exception as e:
         st.error(f"Error fetching TrustBuilders: {e}")
@@ -498,16 +497,17 @@ def load_user_content(user_id):
 
 
 
-def save_content(user_id, brand, message, bucket):
+def save_content(user_id, content, bucket):
+    """
+    Save TrustBuilder to Firebase under a specified bucket.
+    """
     try:
-        trustbuilder_id = str(uuid.uuid4())
-        path = f"users/{user_id}/TrustBuilders/{trustbuilder_id}"
-        data = {"brand": brand, "message": message, "bucket": bucket}
-        st.write(f"Saving TrustBuilder to path: {path}")
-        db.child("users").child(user_id).child("TrustBuilders").child(trustbuilder_id).set(data)
-        st.success(f"TrustBuilder saved successfully under '{bucket}'!")
+        entry_id = str(uuid.uuid4())
+        full_message = f"[{bucket}] {content}"  # Append bucket name to the content
+        db.child("users").child(user_id).child("TrustBuilders").child(entry_id).set({"message": full_message})
+        st.success(f"TrustBuilder saved under '{bucket}'!")
     except Exception as e:
-        st.error(f"Error saving TrustBuilder: {e}")
+        st.error(f"Could not save TrustBuilder. Error: {e}")
 
         
 def ai_allocate_trust_bucket(trust_builder_text):
@@ -744,42 +744,44 @@ def side():
                 st.warning("Please select at least one file to upload.")
     
         
+        st.subheader("Save TrustBuilders®")
+        bucket_to_save = st.selectbox("Choose Trust Bucket to Save", trust_buckets)
+        brand = st.text_input("Brand/Product/Person")
+        trust_builder_message = st.text_area("Type/paste Trust Builder®")
+        
+        if st.button("Save TrustBuilder"):
+            if bucket_to_save and trust_builder_message.strip():
+                save_content(
+                    user_id=st.session_state.get("wix_user_id"),  # Replace "demo_user" with actual user ID logic
+                    content=trust_builder_message.strip(),
+                    bucket=bucket_to_save
+                )
+            else:
+                st.warning("Please fill in all fields before saving.")
+        
+        # Show My TrustBuilders Section
         st.subheader("Show My TrustBuilders®")
         search_query = st.text_input("Search by keyword")
         selected_bucket = st.selectbox("Select Trust Bucket", ["All"] + trust_buckets)
         
         if st.button("Show TrustBuilders"):
-            trustbuilders = fetch_trustbuilders(st.session_state["wix_user_id"])
+            trustbuilders = fetch_trustbuilders(st.session_state.get("wix_user_id", "demo_user"))  # Replace "demo_user" with actual user ID logic
             st.write(f"Filtering TrustBuilders for keyword='{search_query}' and bucket='{selected_bucket}'")
-            
+        
             if trustbuilders:
                 filtered = {
                     key: value for key, value in trustbuilders.items()
-                    if (selected_bucket == "All" or value.get("bucket") == selected_bucket)
+                    if (selected_bucket == "All" or f"[{selected_bucket}]" in value.get("message", ""))
                     and (not search_query or search_query.lower() in value.get("message", "").lower())
                 }
                 if filtered:
                     for trustbuilder_id, data in filtered.items():
                         with st.expander(f"TrustBuilder ID: {trustbuilder_id[:8]}"):
-                            st.write(f"**Brand:** {data['brand']}")
                             st.write(f"**Message:** {data['message']}")
-                            st.write(f"**Bucket:** {data['bucket']}")
                 else:
                     st.write("No TrustBuilders found matching the criteria.")
             else:
                 st.write("No TrustBuilders found.")
-        
-        # Save TrustBuilder Section
-        st.subheader("Save TrustBuilders®")
-        selected_save_bucket = st.selectbox("Choose Trust Bucket to Save", trust_buckets)
-        brand = st.text_input("Brand/Product/Person")
-        trust_builder_message = st.text_area("Type/paste Trust Builder®")
-    
-        if st.button("Save TrustBuilder"):
-            if selected_save_bucket and trust_builder_message.strip():
-                save_content(st.session_state["wix_user_id"], brand, trust_builder_message.strip(), selected_save_bucket)
-            else:
-                st.warning("Please fill in all fields before saving.")
     
                             
 side()