Update app.py

app.py

@@ -15,7 +15,7 @@ from matching import calculate_local_matches
 from feedback import save_feedback
 from ui_styles import BASE_CSS
 
-# ---------------- Streamlit Config ----------------
+# ---------- Streamlit Config ----------
 st.set_page_config(
     page_title="AI Skill Swap",
     page_icon="🤝",
@@ -24,26 +24,9 @@ st.set_page_config(
 
 st.markdown(f"<style>{BASE_CSS}</style>", unsafe_allow_html=True)
 
-# ---------------- Session State Defaults ----------------
-def init_session_state():
-    defaults = {
-        "username_input": "",
-        "offers_text_input": "",
-        "wants_text_input": "",
-        "availability_input": "",
-        "preferences_input": "",
-        "feedback_input": "",
-    }
-    for k, v in defaults.items():
-        if k not in st.session_state:
-            st.session_state[k] = v
-
-init_session_state()
-
-# ---------------- Store ----------------
 store = ProfileStore()
 
-# ---------------- Header ----------------
+# ---------- Header ----------
 col_logo, col_title = st.columns([1, 6])
 with col_logo:
     st.image(
@@ -54,161 +37,176 @@ with col_title:
     st.title("AI Skill Swap")
     st.caption("Teach what you know • Learn what you love • Match intelligently")
 
-# ---------------- Tabs ----------------
-tabs = st.tabs(["Community", "AI Matchmaking", "About"])
+# ---------- Sidebar: Profile Management ----------
+with st.sidebar:
+    st.header("👤 Profile Manager")
 
-# ---------------- Tab 1: Community ----------------
-with tabs[0]:
-    st.header("👥 Community Profiles")
+    profiles = store.load_all()
+    usernames = [p.username for p in profiles]
 
-    # Sidebar-like form inside tab
-    with st.expander("📝 Create / Update Profile", expanded=True):
-        profiles = store.load_all()
-        usernames = [p.username for p in profiles]
+    selected_user = st.selectbox(
+        "Select profile",
+        ["— Create New —"] + usernames,
+    )
 
-        selected_user = st.selectbox(
-            "Select profile",
-            ["— Create New —"] + usernames,
-            key="selected_user"
-        )
+    st.markdown("### 📝 Profile Details")
+    username = st.text_input(
+        "Username",
+        value="" if selected_user == "— Create New —" else selected_user,
+    )
 
-        # Input fields
-        username = st.text_input(
-            "Username",
-            value=st.session_state["username_input"],
-            key="username_input"
-        )
-        offers_text = st.text_area(
-            "Skills you can teach",
-            height=80,
-            value=st.session_state["offers_text_input"],
-            placeholder="Python, React, Data Science",
-            key="offers_text_input"
-        )
-        wants_text = st.text_area(
-            "Skills you want to learn",
-            height=80,
-            value=st.session_state["wants_text_input"],
-            placeholder="LLMs, DevOps, UI Design",
-            key="wants_text_input"
-        )
-        availability = st.text_input(
-            "Availability",
-            placeholder="Evenings / Weekends",
-            value=st.session_state["availability_input"],
-            key="availability_input"
-        )
-        preferences = st.text_input(
-            "Language / Preferences",
-            placeholder="English, Hindi, Urdu",
-            value=st.session_state["preferences_input"],
-            key="preferences_input"
-        )
-        avatar_file = st.file_uploader(
-            "Upload Avatar (Max 800MB)",
-            type=["png", "jpg", "jpeg"]
-        )
+    offers_text = st.text_area(
+        "Skills you can teach",
+        height=90,
+        value=st.session_state.get("offers_text", ""),
+        placeholder="Python, React, Data Science",
+    )
 
-        # Avatar preview
-        if avatar_file:
-            st.image(avatar_file, width=150, caption="Preview of avatar")
-            if avatar_file.size > 800 * 1024 * 1024:
-                st.error("File exceeds maximum size of 800MB!")
-                avatar_file = None
-
-        # Buttons
-        col1, col2, col3 = st.columns([1, 1, 1])
-
-        with col1:
-            if st.button("➕ Create", use_container_width=True):
-                if not username.strip():
-                    st.error("Username is required!")
-                elif store.find_by_username(username):
-                    st.error("Profile already exists. Use Update.")
-                else:
-                    avatar_path = None
-                    if avatar_file:
-                        safe = re.sub(r"[^A-Za-z0-9_.-]", "_", username)
-                        ext = Path(avatar_file.name).suffix
-                        avatar_path = str(
-                            AVATAR_DIR / f"{safe}_{int(time.time())}{ext}"
-                        )
-                        with open(avatar_path, "wb") as f:
-                            f.write(avatar_file.getbuffer())
-
-                    profile = Profile(
-                        id=str(uuid.uuid4()),
-                        username=username.strip(),
-                        offers=normalize_skill_list(offers_text),
-                        wants=normalize_skill_list(wants_text),
-                        availability=availability.strip(),
-                        preferences=preferences.strip(),
-                        avatar=avatar_path,
+    wants_text = st.text_area(
+        "Skills you want to learn",
+        height=90,
+        value=st.session_state.get("wants_text", ""),
+        placeholder="LLMs, DevOps, UI Design",
+    )
+
+    availability = st.text_input(
+        "Availability",
+        placeholder="Evenings / Weekends",
+        value=st.session_state.get("availability", ""),
+    )
+
+    preferences = st.text_input(
+        "Language / Preferences",
+        placeholder="English, Hindi, Urdu",
+        value=st.session_state.get("preferences", ""),
+    )
+
+    avatar_file = st.file_uploader(
+        "Upload Avatar (Max 800MB)",
+        type=["png", "jpg", "jpeg"],
+    )
+
+    # ---------- Avatar Preview ----------
+    if avatar_file:
+        st.image(avatar_file, width=150, caption="Preview of avatar")
+        if avatar_file.size > 800 * 1024 * 1024:
+            st.error("File exceeds maximum size of 800MB!")
+            avatar_file = None
+
+    st.markdown("---")
+    col_create, col_update = st.columns(2)
+
+    # ---------- CREATE PROFILE ----------
+    with col_create:
+        if st.button("➕ Create", use_container_width=True):
+            if not username.strip():
+                st.error("Username is required!")
+            elif store.find_by_username(username):
+                st.error("Profile already exists. Use Update.")
+            else:
+                avatar_path = None
+                if avatar_file:
+                    safe = re.sub(r"[^A-Za-z0-9_.-]", "_", username)
+                    ext = Path(avatar_file.name).suffix
+                    avatar_path = str(
+                        AVATAR_DIR / f"{safe}_{int(time.time())}{ext}"
                     )
+                    with open(avatar_path, "wb") as f:
+                        f.write(avatar_file.getbuffer())
 
-                    ok, msg = store.add_or_update(profile)
-                    if ok:
-                        st.success(msg)
-                        # Clear inputs after creation
-                        st.session_state["username_input"] = ""
-                        st.session_state["offers_text_input"] = ""
-                        st.session_state["wants_text_input"] = ""
-                        st.session_state["availability_input"] = ""
-                        st.session_state["preferences_input"] = ""
-                        st.experimental_rerun()
-                    else:
-                        st.error(msg)
-
-        with col2:
-            if st.button("💾 Update", use_container_width=True):
-                existing = store.find_by_username(username)
-                if not existing:
-                    st.error("Profile does not exist. Use Create.")
+                profile = Profile(
+                    id=str(uuid.uuid4()),
+                    username=username.strip(),
+                    offers=normalize_skill_list(offers_text),
+                    wants=normalize_skill_list(wants_text),
+                    availability=availability.strip(),
+                    preferences=preferences.strip(),
+                    avatar=avatar_path,
+                )
+
+                ok, msg = store.add_or_update(profile)
+                if ok:
+                    st.success(msg)
+                    # Clear all fields after creation
+                    st.session_state["username"] = ""
+                    st.session_state["offers_text"] = ""
+                    st.session_state["wants_text"] = ""
+                    st.session_state["availability"] = ""
+                    st.session_state["preferences"] = ""
+                    st.rerun()
                 else:
-                    existing.offers = normalize_skill_list(offers_text)
-                    existing.wants = normalize_skill_list(wants_text)
-                    existing.availability = availability.strip()
-                    existing.preferences = preferences.strip()
-                    if avatar_file:
-                        safe = re.sub(r"[^A-Za-z0-9_.-]", "_", username)
-                        ext = Path(avatar_file.name).suffix
-                        avatar_path = str(
-                            AVATAR_DIR / f"{safe}_{int(time.time())}{ext}"
-                        )
-                        with open(avatar_path, "wb") as f:
-                            f.write(avatar_file.getbuffer())
-                        existing.avatar = avatar_path
-
-                    store.add_or_update(existing)
-                    st.success("Profile updated")
-                    st.experimental_rerun()
-
-        with col3:
-            if selected_user != "— Create New —":
-                if st.button("🗑️ Delete Profile", use_container_width=True):
-                    store.delete(selected_user)
-                    st.warning("Profile deleted")
-                    st.session_state["username_input"] = ""
-                    st.session_state["offers_text_input"] = ""
-                    st.session_state["wants_text_input"] = ""
-                    st.session_state["availability_input"] = ""
-                    st.session_state["preferences_input"] = ""
-                    st.experimental_rerun()
-
-    # Display community profiles
-    st.subheader("🌍 All Profiles")
+                    st.error(msg)
+
+    # ---------- UPDATE PROFILE ----------
+    with col_update:
+        if st.button("💾 Update", use_container_width=True):
+            existing = store.find_by_username(username)
+            if not existing:
+                st.error("Profile does not exist. Use Create.")
+            else:
+                existing.offers = normalize_skill_list(offers_text)
+                existing.wants = normalize_skill_list(wants_text)
+                existing.availability = availability.strip()
+                existing.preferences = preferences.strip()
+
+                if avatar_file:
+                    safe = re.sub(r"[^A-Za-z0-9_.-]", "_", username)
+                    ext = Path(avatar_file.name).suffix
+                    avatar_path = str(
+                        AVATAR_DIR / f"{safe}_{int(time.time())}{ext}"
+                    )
+                    with open(avatar_path, "wb") as f:
+                        f.write(avatar_file.getbuffer())
+                    existing.avatar = avatar_path
+
+                store.add_or_update(existing)
+                st.success("Profile updated")
+                # Keep fields after update
+                st.session_state["username"] = username
+                st.session_state["offers_text"] = offers_text
+                st.session_state["wants_text"] = wants_text
+                st.session_state["availability"] = availability
+                st.session_state["preferences"] = preferences
+                st.rerun()
+
+    # ---------- DELETE PROFILE ----------
+    if selected_user != "— Create New —":
+        if st.button("🗑️ Delete Profile", type="secondary"):
+            store.delete(selected_user)
+            st.warning("Profile deleted")
+            # Clear fields after deletion
+            st.session_state["username"] = ""
+            st.session_state["offers_text"] = ""
+            st.session_state["wants_text"] = ""
+            st.session_state["availability"] = ""
+            st.session_state["preferences"] = ""
+            time.sleep(0.3)
+            st.rerun()
+
+# ---------- MAIN CONTENT ----------
+left, right = st.columns([2, 3])
+
+# ---------- COMMUNITY PROFILES ----------
+with left:
+    st.subheader("🌍 Community Profiles")
     profiles = store.load_all()
+
     if not profiles:
-        st.info("No profiles yet. Create one from the form above.")
+        st.info("No profiles yet. Create one from the sidebar.")
     else:
         for p in profiles:
             st.markdown("<div class='card'>", unsafe_allow_html=True)
             cols = st.columns([1, 4])
+
             with cols[0]:
                 if p.avatar and Path(p.avatar).exists():
                     st.image(p.avatar, width=120)
                 else:
-                    st.image("https://via.placeholder.com/120", width=120)
+                    st.image(
+                        "https://via.placeholder.com/120",
+                        width=120,
+                    )
+
             with cols[1]:
                 st.markdown(f"**{p.username}**")
                 st.caption(f"{p.availability} • {p.preferences}")
@@ -216,26 +214,32 @@ with tabs[0]:
                 st.markdown(f"🎯 **Wants:** {', '.join(p.wants) or '—'}")
             st.markdown("</div>", unsafe_allow_html=True)
 
-# ---------------- Tab 2: AI Matchmaking ----------------
-with tabs[1]:
-    st.header("🤖 AI Matchmaking")
-    profiles = store.load_all()
+# ---------- AI MATCHMAKING ----------
+with right:
+    st.subheader("🤖 AI Matchmaking")
+
     if not profiles:
         st.info("Add profiles to enable matchmaking.")
     else:
-        pick = st.selectbox("Choose your profile", [p.username for p in profiles])
+        pick = st.selectbox(
+            "Choose your profile",
+            [p.username for p in profiles],
+        )
+
         if st.button("✨ Find Best Matches"):
             with st.spinner("Analyzing profiles..."):
                 current = store.find_by_username(pick)
+
                 try:
                     sys_msg, user_msg = make_prompt_for_matching(current, profiles, 3)
                     matches = ask_groq_for_matches(sys_msg, user_msg)
                 except Exception:
                     matches = calculate_local_matches(
-                        current, [p for p in profiles if p.id != current.id], 3
+                        current,
+                        [p for p in profiles if p.id != current.id],
+                        3,
                     )
 
-                st.subheader("Top Matches")
                 for m in matches:
                     st.markdown("<div class='card'>", unsafe_allow_html=True)
                     st.markdown(f"### {m.get('username')}")
@@ -245,57 +249,21 @@ with tabs[1]:
                     st.caption(m.get("reason", "AI Match"))
                     st.markdown("</div>", unsafe_allow_html=True)
 
-# ---------------- Tab 3: About ----------------
-with tabs[2]:
-    st.header("ℹ️ About AI Skill Swap")
-    st.markdown("""
-**AI Skill Swap** is a platform designed to help people **teach and learn skills** from each other.
-    
-**Purpose:**  
-- Connect learners with mentors in your community.
-- Discover new skills efficiently using AI matchmaking.
-- Encourage skill exchange without formal courses.
-
-**Features:**  
-- Create, Update, Delete personal profiles with skills, availability, and preferences.
-- AI-based matchmaking to find top compatible skill partners.
-- Community tab to see all profiles.
-- Feedback submission for continuous improvement.
-
-**Technologies Used:**  
-- Python, Streamlit (Frontend & Backend)
-- Groq API / Local AI Matching
-- File handling for avatar uploads
-- Persistent storage (ProfileStore)
-
-**Why it's helpful:**  
-- Makes skill exchange easy and organized.
-- Learners and teachers connect automatically with AI suggestions.
-- Saves time compared to manually searching for mentors or learners.
-
-**How to Use:**  
-1. Create a profile in the Community tab.  
-2. View other community profiles.  
-3. Go to AI Matchmaking tab to find best skill partners.  
-4. Submit feedback via sidebar form.  
-
-*Enjoy teaching, learning, and growing together!*  
-""")
-
-# ---------------- Feedback Sidebar ----------------
+# ---------- FEEDBACK ----------
 with st.sidebar:
     st.markdown("---")
     with st.expander("💬 Feedback"):
-        fb = st.text_area("Your feedback", value=st.session_state["feedback_input"], key="feedback_input")
-        if st.button("Submit Feedback", key="submit_feedback"):
+        fb = st.text_area("Your feedback")
+        if st.button("Submit Feedback"):
             if fb.strip():
-                save_feedback({
-                    "timestamp": time.time(),
-                    "feedback": fb.strip(),
-                    "username": st.session_state.get("username_input", "anonymous")
-                })
-                st.success("Thank you for your feedback!")
-                st.session_state["feedback_input"] = ""
-                st.experimental_rerun()
+                save_feedback(
+                    {
+                        "timestamp": time.time(),
+                        "feedback": fb,
+                        "username": st.session_state.get("username", "anonymous"),
+                    }
+                )
+                st.success("Thank you!")
+                st.rerun()
             else:
                 st.warning("Please write feedback.")