Update app.py

app.py

@@ -39,7 +39,6 @@ if not st.session_state.authenticated:
     col1, col2 = st.columns([1, 1])
 
     with col1:
-        # FIXED: Changed use_column_width to use_container_width
         st.image("https://images.pexels.com/photos/265216/pexels-photo-265216.jpeg",
                  caption="Photo by Pixabay", use_container_width=True)
         st.markdown("""
@@ -111,19 +110,23 @@ with col2:
         st.session_state.username = None
         st.rerun()
 
-# Sidebar navigation
+# --- NAVIGATION LOGIC ---
 st.sidebar.title("Navigation")
-page = st.sidebar.radio("Go to", [
-    "🏠 Home",
-    "✍️ Submit Wisdom",
-    "📖 Browse Knowledge",
-    "🗺️ Knowledge Map",
-    "🔍 Search",
-    "🌐 Translation Hub",
-    "📊 Export Data",
-    "👤 Profile"
-], label_visibility="collapsed")
-
+# NEW: Define a callback function to change pages
+def set_page(page_name):
+    st.session_state.page_selection = page_name
+
+page_options = [
+    "🏠 Home", "✍️ Submit Wisdom", "📖 Browse Knowledge",
+    "🗺️ Knowledge Map", "🔍 Search", "🌐 Translation Hub",
+    "📊 Export Data", "👤 Profile"
+]
+page = st.sidebar.radio(
+    "Go to",
+    page_options,
+    key="page_selection",  # NEW: Assign a key to the radio button
+    label_visibility="collapsed"
+)
 
 # --- Home Page ---
 if page == "🏠 Home":
@@ -144,38 +147,40 @@ if page == "🏠 Home":
     st.markdown("### 🚀 Getting Started")
     gs_cols = st.columns(3)
     with gs_cols[0]:
-        with st.container(border=True):
+        with st.container(border=True, height=180):
             st.markdown("#### ✍️ Share Knowledge")
-            st.markdown("Go to the **Submit Wisdom** page to contribute your traditional farming knowledge.")
+            st.markdown("Contribute your traditional farming knowledge to the archive.")
+            # NEW: Clickable button to navigate
+            st.button("Share Now", on_click=set_page, args=("✍️ Submit Wisdom",), use_container_width=True)
     with gs_cols[1]:
-        with st.container(border=True):
+        with st.container(border=True, height=180):
             st.markdown("#### 📖 Explore Entries")
-            st.markdown("Visit the **Browse Knowledge** page to explore wisdom shared by the community.")
+            st.markdown("Explore wisdom shared by farmers from all across India.")
+            st.button("Explore Now", on_click=set_page, args=("📖 Browse Knowledge",), use_container_width=True)
     with gs_cols[2]:
-        with st.container(border=True):
+        with st.container(border=True, height=180):
             st.markdown("#### 🗺️ Discover on Map")
-            st.markdown("Use the **Knowledge Map** to find location-specific farming practices.")
+            st.markdown("Find location-specific farming practices on our interactive map.")
+            st.button("View Map", on_click=set_page, args=("🗺️ Knowledge Map",), use_container_width=True)
             
-# --- Submit Wisdom Page ---
+# --- Submit Wisdom Page (LOGICALLY REDESIGNED WITH EXPANDERS) ---
 elif page == "✍️ Submit Wisdom":
-    st.header("✍️ Submit Farming Wisdom")
-    st.markdown("Use the helpers to set your location or record audio, then fill out the form and submit.")
+    st.header("✍️ Submit New Farming Wisdom")
+    st.markdown("Follow the steps below to contribute. Fields marked with `*` are required.")
 
     if 'form_data' not in st.session_state:
         st.session_state.form_data = {
-            'title': '', 'description': '', 'language': get_languages()[0],
-            'category': get_categories()[0], 'location_name': '',
-            'manual_lat': 20.5937, 'manual_lon': 78.9629 # Default to India
+            'title': '', 'description': '', 'language': 'English', 'category': 'Other Farming Practices',
+            'location_name': '', 'manual_lat': 20.5937, 'manual_lon': 78.9629
         }
 
-    # --- HELPER TOOLS (OUTSIDE THE FORM) ---
-    st.subheader("Helper Tools (Optional)")
+    # Helper Tools remain outside the form
+    st.subheader("Step 1: Use Helper Tools (Optional)")
     with st.container(border=True):
-        # Geocode Helper
-        st.markdown("**1. Find Location on Map**")
+        st.markdown("**Pin a Location on the Map**")
         geocode_cols = st.columns([3, 1])
-        geocode_input = geocode_cols[0].text_input("Search for a place to pin on the map...", label_visibility="collapsed")
-        if geocode_cols[1].button("🌍 Geocode", use_container_width=True):
+        geocode_input = geocode_cols[0].text_input("Search for a place to pin on the map", label_visibility="collapsed", placeholder="e.g., Hyderabad, Telangana")
+        if geocode_cols[1].button("📍 Find Location", use_container_width=True):
             if geocode_input:
                 coords = geocode_location(geocode_input)
                 if coords:
@@ -183,65 +188,60 @@ elif page == "✍️ Submit Wisdom":
                     st.success(f"Found and pinned: {geocode_input}")
                 else:
                     st.error(f"Could not find coordinates for '{geocode_input}'")
-
-        # Speech-to-Text Helper
-        st.markdown("**2. Record Description with Voice**")
+        
+        st.markdown("---")
+        st.markdown("**Record Description with Voice**")
         speech_cols = st.columns([3, 1])
         speech_language = speech_cols[0].selectbox("Language for Speech Recognition", get_languages(), key="speech_lang")
-        if speech_cols[1].button("🎤 Record", use_container_width=True):
+        if speech_cols[1].button("🎤 Record Audio", use_container_width=True):
              with st.spinner("Listening..."):
                 recorded_text = speech_to_text(speech_language)
                 if recorded_text:
                     st.session_state.form_data['description'] = recorded_text
-                    st.success(f"Recorded text has been added to the description field.")
-                    st.rerun() # Rerun to update the text_area in the form
+                    st.success(f"Text successfully recorded!")
+                    st.rerun()
                 else:
-                    st.error("Could not record speech. Please try again.")
+                    st.error("Could not record speech.")
 
     st.markdown("---")
     
-    # --- MAIN SUBMISSION FORM ---
-    st.subheader("Entry Details Form")
+    # NEW: The form now uses an accordion-style layout with expanders
+    st.subheader("Step 2: Complete and Submit the Form")
     with st.form("entry_form", clear_on_submit=True):
-        tab1, tab2, tab3 = st.tabs(["**✍️ Content**", "**📍 Location**", "**📁 Media Files**"])
-
-        with tab1:
-            st.markdown("##### Main Information")
-            title = st.text_input("Title*", value=st.session_state.form_data.get('title', ''), placeholder="e.g., Natural Pest Repellent using Neem")
-            # Use .get() for description to handle reruns from speech-to-text
-            description = st.text_area("Description*", value=st.session_state.form_data.get('description', ''), height=200, placeholder="Describe the wisdom, practice, or story in detail...")
+        with st.expander("**Part 1: Essential Information**", expanded=True):
+            st.caption("This is the core of your submission. Describe the farming wisdom clearly.")
+            title = st.text_input("Title*", value=st.session_state.form_data.get('title', ''), placeholder="e.g., Natural Pest Repellent using Neem Leaves")
+            description = st.text_area("Description*", value=st.session_state.form_data.get('description', ''), height=250, placeholder="Describe the wisdom, practice, or story in detail...")
             
             col1, col2 = st.columns(2)
-            language = col1.selectbox("Language*", get_languages(), index=get_languages().index(st.session_state.form_data.get('language', get_languages()[0])))
-            category = col2.selectbox("Category*", get_categories(), index=get_categories().index(st.session_state.form_data.get('category', get_categories()[0])))
+            category = col1.selectbox("Category*", get_categories(), index=get_categories().index(st.session_state.form_data.get('category', 'Other Farming Practices')))
+            language = col2.selectbox("Language of this Entry*", get_languages(), index=get_languages().index(st.session_state.form_data.get('language', 'English')))
+
+        with st.expander("**Part 2: Geographic Context**"):
+            st.caption("Specify where this knowledge comes from. Use the helper tool above to search, or click the map to fine-tune.")
+            location_name = st.text_input("Location Name (e.g., Village, District, State)", value=st.session_state.form_data.get('location_name', ''))
 
-        with tab2:
-            st.markdown("##### Geographic Details")
-            location_name = st.text_input("Location Name", value=st.session_state.form_data.get('location_name', ''), placeholder="e.g., Warangal, Telangana")
-            
-            # Map for location selection
             map_center = [st.session_state.form_data['manual_lat'], st.session_state.form_data['manual_lon']]
-            m = folium.Map(location=map_center, zoom_start=6)
-            folium.Marker(map_center, popup="Your Selected Location").add_to(m)
+            m = folium.Map(location=map_center, zoom_start=7)
+            folium.Marker(map_center, popup="Your Selected Location", tooltip="Current Location").add_to(m)
             map_data = st_folium(m, width=700, height=400)
 
             if map_data and map_data['last_clicked']:
                 st.session_state.form_data['manual_lat'] = map_data['last_clicked']['lat']
                 st.session_state.form_data['manual_lon'] = map_data['last_clicked']['lng']
-                st.rerun() # Rerun to update the number inputs below
-
-            col3, col4 = st.columns(2)
-            manual_lat = col3.number_input("Latitude", value=st.session_state.form_data['manual_lat'], format="%.6f")
-            manual_lon = col4.number_input("Longitude", value=st.session_state.form_data['manual_lon'], format="%.6f")
+                st.rerun()
 
-        with tab3:
-            st.markdown("##### Upload Files (Optional)")
+            loc_cols = st.columns(2)
+            manual_lat = loc_cols[0].text_input("Latitude (Set by Map)", value=f"{st.session_state.form_data['manual_lat']:.6f}", disabled=True)
+            manual_lon = loc_cols[1].text_input("Longitude (Set by Map)", value=f"{st.session_state.form_data['manual_lon']:.6f}", disabled=True)
+            
+        with st.expander("**Part 3: Supporting Media (Optional)**"):
+            st.caption("Upload an image or a pre-recorded audio file that relates to this wisdom.")
             uploaded_image = st.file_uploader("Upload an Image", type=['jpg', 'jpeg', 'png'])
             uploaded_audio = st.file_uploader("Upload an Audio Recording", type=['mp3', 'wav', 'ogg'])
 
-        # Form submission button (outside tabs)
         st.markdown("---")
-        submitted = st.form_submit_button("✅ Submit Entry", type="primary", use_container_width=True)
+        submitted = st.form_submit_button("✅ Submit My Contribution", type="primary", use_container_width=True)
 
         if submitted:
             if title and description:
@@ -260,10 +260,10 @@ elif page == "✍️ Submit Wisdom":
                 entry = {
                     'id': len(st.session_state.entries) + 1, 'title': title, 'description': description,
                     'language': language, 'category': category, 'location_name': location_name,
-                    'latitude': manual_lat if manual_lat != 0.0 else None,
-                    'longitude': manual_lon if manual_lon != 0.0 else None,
+                    'latitude': st.session_state.form_data['manual_lat'],
+                    'longitude': st.session_state.form_data['manual_lon'],
                     'image_path': image_path, 'audio_path': audio_path,
-                    'timestamp': datetime.datetime.now().isoformat(),
+                    'timestamp': datetime.datetime.now(datetime.timezone.utc).isoformat(),
                     'contributor': st.session_state.username,
                     'contributor_full_name': user_info.get('full_name', st.session_state.username)
                 }
@@ -271,15 +271,12 @@ elif page == "✍️ Submit Wisdom":
                 if save_entry(entry):
                     st.session_state.entries.append(entry)
                     update_user_entry_count(st.session_state.username)
-                    st.success("Farming wisdom submitted successfully!")
-                    # Clear form data from session state
+                    st.success("Farming wisdom submitted successfully! Thank you.")
                     st.session_state.pop('form_data', None)
                 else:
                     st.error("Failed to save entry. Please try again.")
             else:
-                st.error("Please fill in all required fields marked with * in the 'Content' tab.")
-
-# All other pages remain unchanged from the previous version...
+                st.error("Please fill in the required fields: Title and Description.")
 
 # --- Browse Knowledge Page ---
 elif page == "📖 Browse Knowledge":
@@ -427,7 +424,7 @@ elif page == "📊 Export Data":
             if not filtered_entries:
                 st.warning("No entries match the selected filters.")
             else:
-                timestamp = datetime.datetime.now().strftime('%Y%m%d')
+                timestamp = datetime.datetime.now(datetime.timezone.utc).strftime('%Y%m%d')
                 if export_format == "CSV":
                     export_data = export_to_csv(filtered_entries, True, True)
                     st.download_button(
@@ -480,4 +477,4 @@ elif page == "👤 Profile":
 
 # --- Footer ---
 st.sidebar.markdown("---")
-st.sidebar.info("🌾 **Farming Wisdom Archive v1.1**")
+st.sidebar.info("🌾 **Farming Wisdom Archive v1.4**")