Update app.py

app.py

@@ -15,7 +15,9 @@ from matching import calculate_local_matches
 from feedback import save_feedback
 from ui_styles import BASE_CSS
 
-# ---------- Streamlit Config ----------
+# --------------------------------------------------
+# Page Config
+# --------------------------------------------------
 st.set_page_config(
     page_title="AI Skill Swap",
     page_icon="🤝",
@@ -24,283 +26,235 @@ st.set_page_config(
 
 st.markdown(f"<style>{BASE_CSS}</style>", unsafe_allow_html=True)
 
-# ---------- Header ----------
-col_logo, col_title = st.columns([1, 8])
+# --------------------------------------------------
+# Header
+# --------------------------------------------------
+h1, h2 = st.columns([1, 6])
 
-with col_logo:
-    try:
-        st.image("logo.jpg", width=100)
-    except:
-        st.image(
-            "https://via.placeholder.com/100x100/4F46E5/FFFFFF?text=🤝",
-            width=100,
-        )
+with h1:
+    st.image(
+        "https://via.placeholder.com/100x100/4F46E5/FFFFFF?text=🤝",
+        width=90,
+    )
 
-with col_title:
-    st.title("AI Skill Swap — Match & Exchange Skills")
-    st.caption("Connect, Learn, and Grow Together")
+with h2:
+    st.title("AI Skill Swap")
+    st.caption("Teach what you know • Learn what you love • Match intelligently")
 
-# ---------- Store ----------
 store = ProfileStore()
 
-# ---------- Sidebar: Profile Form ----------
+# --------------------------------------------------
+# SIDEBAR — PROFILE MANAGEMENT
+# --------------------------------------------------
 with st.sidebar:
-    st.header("Your profile")
-
-    with st.form("profile_form"):
-        username = st.text_input(
-            "Username",
-            value=st.session_state.get("username", ""),
-        )
-
-        offers_text = st.text_area(
-            "Skills you can teach",
-            value=st.session_state.get("offers_text", ""),
-        )
-
-        wants_text = st.text_area(
-            "Skills you want to learn",
-            value=st.session_state.get("wants_text", ""),
-        )
-
-        availability = st.text_input(
-            "Availability (Day/Night)",
-            value=st.session_state.get("availability", ""),
-        )
-
-        preferences = st.text_input(
-            "Language Preferences",
-            value=st.session_state.get("preferences", ""),
-        )
+    st.header("👤 Profile Manager")
 
-        avatar_file = st.file_uploader(
-            "Upload avatar (optional)",
-            type=["png", "jpg", "jpeg"],
-        )
+    profiles = store.load_all()
+    usernames = [p.username for p in profiles]
+
+    selected_user = st.selectbox(
+        "Select existing profile",
+        ["— Create New —"] + usernames,
+    )
+
+    st.markdown("### 📝 Profile Details")
+
+    username = st.text_input(
+        "Username",
+        value="" if selected_user == "— Create New —" else selected_user,
+    )
+
+    offers_text = st.text_area(
+        "Skills you can teach",
+        height=90,
+        value=st.session_state.get("offers_text", ""),
+        placeholder="Python, React, Data Science",
+    )
+
+    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",
+        type=["png", "jpg", "jpeg"],
+    )
 
-        save = st.form_submit_button("Save / Update profile")
+    st.markdown("---")
 
-        if save:
-            offers = normalize_skill_list(offers_text)
-            wants = normalize_skill_list(wants_text)
+    col_a, col_b = st.columns(2)
 
-            avatar_path = None
-            if avatar_file and username.strip():
-                safe = re.sub(r"[^A-Za-z0-9_.-]", "_", username.strip())
-                ext = Path(avatar_file.name).suffix
-                avatar_path = str(
-                    AVATAR_DIR / f"{safe}_{int(time.time())}{ext}"
+    # ---------------- CREATE PROFILE ----------------
+    with col_a:
+        if st.button("➕ Create", use_container_width=True):
+            if not username.strip():
+                st.error("Username 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,
                 )
-                with open(avatar_path, "wb") as f:
-                    f.write(avatar_file.getbuffer())
-
-            profile = Profile(
-                id=str(uuid.uuid4()),
-                username=username.strip(),
-                offers=offers,
-                wants=wants,
-                availability=availability.strip(),
-                preferences=preferences.strip(),
-                avatar=avatar_path,
-            )
-
-            ok, msg = store.add_or_update(profile)
-
-            if ok:
+
+                ok, msg = store.add_or_update(profile)
                 st.success(msg)
-                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()
+
+    # ---------------- UPDATE PROFILE ----------------
+    with col_b:
+        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:
-                st.error(msg)
+                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
 
-    st.markdown("---")
-    st.header("Load / Delete")
+                store.add_or_update(existing)
+                st.success("Profile updated")
+                st.rerun()
 
-    profiles = store.load_all()
-    options = ["-- new profile --"] + [p.username for p in profiles]
-    selected = st.selectbox("Choose profile", options)
-
-    if st.button("Load profile") and selected != "-- new profile --":
-        p = store.find_by_username(selected)
-        if p:
-            st.session_state["username"] = p.username
-            st.session_state["offers_text"] = "\n".join(p.offers)
-            st.session_state["wants_text"] = "\n".join(p.wants)
-            st.session_state["availability"] = p.availability
-            st.session_state["preferences"] = p.preferences
+    # ---------------- DELETE PROFILE ----------------
+    if selected_user != "— Create New —":
+        if st.button("🗑️ Delete Profile", type="secondary"):
+            store.delete(selected_user)
+            st.warning("Profile deleted")
+            time.sleep(0.3)
             st.rerun()
 
-    if st.button("Delete profile") and selected != "-- new profile --":
-        ok, msg = store.delete(selected)
-        if ok:
-            st.success(msg)
-            for k in [
-                "username",
-                "offers_text",
-                "wants_text",
-                "availability",
-                "preferences",
-            ]:
-                st.session_state.pop(k, None)
-            time.sleep(0.2)
-            st.rerun()
+# --------------------------------------------------
+# MAIN CONTENT
+# --------------------------------------------------
+left, right = st.columns([2, 3])
 
-# ---------- Main Layout ----------
-col1, col2 = st.columns([2, 3])
+# --------------------------------------------------
+# COMMUNITY PROFILES
+# --------------------------------------------------
+with left:
+    st.subheader("🌍 Community")
 
-# ---------- Community Profiles ----------
-with col1:
-    st.subheader("Community profiles")
     profiles = store.load_all()
 
     if not profiles:
-        st.info("No profiles yet.")
+        st.info("No profiles yet. Create one from the sidebar.")
     else:
         for p in profiles:
-            c1, c2 = st.columns([1, 4])
+            st.markdown("<div class='card'>", unsafe_allow_html=True)
+            cols = st.columns([1, 4])
 
-            with c1:
+            with cols[0]:
                 if p.avatar and Path(p.avatar).exists():
-                    st.image(p.avatar, width=64)
+                    st.image(p.avatar, width=60)
                 else:
-                    st.image(
-                        "https://via.placeholder.com/64?text=Avatar",
-                        width=64,
-                    )
+                    st.image("https://via.placeholder.com/60", width=60)
 
-            with c2:
+            with cols[1]:
                 st.markdown(f"**{p.username}**")
-                st.markdown(f"Offers: {', '.join(p.offers) or '—'}")
-                st.markdown(f"Wants: {', '.join(p.wants) or '—'}")
                 st.caption(f"{p.availability} • {p.preferences}")
+                st.markdown(f"🧠 **Offers:** {', '.join(p.offers) or '—'}")
+                st.markdown(f"🎯 **Wants:** {', '.join(p.wants) or '—'}")
 
-# ---------- AI Matchmaking ----------
-with col2:
-    st.subheader("Find Matches (AI)")
-    profiles = store.load_all()
+            st.markdown("</div>", unsafe_allow_html=True)
+
+# --------------------------------------------------
+# AI MATCHMAKING
+# --------------------------------------------------
+with right:
+    st.subheader("🤖 AI Matchmaking")
 
     if not profiles:
-        st.info("Add profiles first.")
+        st.info("Add profiles to enable matchmaking.")
     else:
         pick = st.selectbox(
-            "Match for profile",
+            "Choose your profile",
             [p.username for p in profiles],
         )
 
-        top_k = 3
-
-        if st.button("Run AI matchmaking"):
-            with st.spinner("Finding matches..."):
+        if st.button("✨ Find Best Matches"):
+            with st.spinner("Analyzing profiles..."):
                 current = store.find_by_username(pick)
 
-                if not current:
-                    st.error("Selected profile not found!")
-                    st.stop()
-
                 try:
-                    sys_ins, user_msg = make_prompt_for_matching(
-                        current,
-                        profiles,
-                        top_k,
+                    sys_msg, user_msg = make_prompt_for_matching(
+                        current, profiles, 3
                     )
-                    matches = ask_groq_for_matches(
-                        sys_ins,
-                        user_msg,
-                    )
-
-                    for m in matches:
-                        if "score" not in m:
-                            m["score"] = 0
-
-                except Exception as e:
-                    st.warning(
-                        f"AI matching failed: {e}. Using local matching..."
-                    )
-                    candidates = [
-                        p for p in profiles if p.id != current.id
-                    ]
+                    matches = ask_groq_for_matches(sys_msg, user_msg)
+                except Exception:
                     matches = calculate_local_matches(
                         current,
-                        candidates,
-                        top_k,
+                        [p for p in profiles if p.id != current.id],
+                        3,
                     )
 
-                st.markdown(
-                    "<div class='card'><b>Top Matches</b></div>",
-                    unsafe_allow_html=True,
-                )
-
                 for m in matches:
-                    c1, c2 = st.columns([1, 5])
-
-                    with c1:
-                        avatar = m.get("avatar")
-                        if avatar and Path(avatar).exists():
-                            st.image(avatar, width=72)
-                        else:
-                            st.image(
-                                "https://via.placeholder.com/72?text=User",
-                                width=72,
-                            )
-
-                    with c2:
-                        st.markdown(
-                            f"### {m.get('username', 'Unknown User')}"
-                        )
-
-                        score = m.get("score", 0)
-                        try:
-                            score = float(score)
-                        except:
-                            score = 0
-
-                        score = max(0, min(100, score))
-
-                        st.markdown(
-                            f"**Match score:** "
-                            f"<span class='match-score'>{score}%</span>",
-                            unsafe_allow_html=True,
-                        )
-
-                        st.progress(score / 100)
-                        st.caption(
-                            f"*{m.get('reason', 'AI matchmaking')}*"
-                        )
-
-# ---------- Floating Feedback Button ----------
-st.markdown(
-    """
-<div class='feedback-floating'
-     onclick="document.querySelector('.feedback-form').style.display='block'">
-💬
-</div>
-""",
-    unsafe_allow_html=True,
-)
-
-# ---------- Feedback ----------
+                    st.markdown("<div class='card'>", unsafe_allow_html=True)
+                    st.markdown(f"### {m.get('username')}")
+                    score = float(m.get("score", 0))
+                    st.progress(score / 100)
+                    st.caption(f"Match Score: {score}%")
+                    st.caption(m.get("reason", "AI Match"))
+                    st.markdown("</div>", unsafe_allow_html=True)
+
+# --------------------------------------------------
+# FEEDBACK
+# --------------------------------------------------
 with st.sidebar:
     st.markdown("---")
     with st.expander("💬 Feedback"):
-        feedback = st.text_area("Your feedback")
-
-        if st.button("Submit Feedback"):
-            if feedback.strip():
+        fb = st.text_area("Your feedback")
+        if st.button("Submit"):
+            if fb.strip():
                 save_feedback(
                     {
                         "timestamp": time.time(),
-                        "feedback": feedback.strip(),
-                        "username": st.session_state.get(
-                            "username",
-                            "anonymous",
-                        ),
+                        "feedback": fb,
+                        "username": st.session_state.get("username", "anonymous"),
                     }
                 )
-                st.success("Thank you for your feedback!")
-                time.sleep(1)
+                st.success("Thank you!")
                 st.rerun()
             else:
-                st.warning("Please enter some feedback.")
+                st.warning("Please write feedback.")