elkay frontend game xp

phase/Student_view/game.py

@@ -1,7 +1,9 @@
 import streamlit as st
 from utils import db as dbapi
 import os
+import utils.api as api
 
+USE_LOCAL_DB = os.getenv("DISABLE_DB", "1") != "1"
 
 # --- Load external CSS (optional) ---
 def load_css(file_name: str):
@@ -132,36 +134,40 @@ def _load_leaderboard(user_id: int, limit: int = 10) -> list[dict]:
     class_id = st.session_state.get("current_class_id")
 
     # try to pick a class automatically if none set (optional)
-    if not class_id and hasattr(dbapi, "list_classes_for_student"):
+    if not class_id:
         try:
-            classes = dbapi.list_classes_for_student(user_id) or []
+            # Prefer backend if DB disabled
+            if USE_LOCAL_DB and hasattr(dbapi, "list_classes_for_student"):
+                classes = dbapi.list_classes_for_student(user_id) or []
+            else:
+                classes = api.list_classes_for_student(user_id) or []
             if classes:
                 class_id = classes[0]["class_id"]
                 st.session_state.current_class_id = class_id
         except Exception:
             pass
 
-    # fetch rows from DB
+    # Fetch rows
+    rows = []
     try:
-        if class_id and hasattr(dbapi, "leaderboard_for_class"):
+        if USE_LOCAL_DB and hasattr(dbapi, "leaderboard_for_class") and class_id:
             rows = dbapi.leaderboard_for_class(class_id, limit=limit) or []
-        elif hasattr(dbapi, "leaderboard_global"):
+        elif USE_LOCAL_DB and hasattr(dbapi, "leaderboard_global"):
             rows = dbapi.leaderboard_global(limit=limit) or []
         else:
-            # fallback using existing function if needed
-            rows = []
-            if class_id and hasattr(dbapi, "class_student_metrics"):
-                for m in dbapi.class_student_metrics(class_id) or []:
-                    xp = int(m.get("total_xp", 0))
+            # Backend path: we do not have dedicated leaderboard endpoints,
+            # so build from class_student_metrics which includes total_xp.
+            if class_id:
+                metrics = api.class_student_metrics(class_id) or []
+                for m in metrics:
                     rows.append({
                         "user_id": m.get("student_id"),
                         "name": m.get("name") or m.get("email") or "Student",
-                        "xp": xp,
-                        "level": dbapi.level_from_xp(xp),
+                        "xp": int(m.get("total_xp", 0)),
+                        "level": int(dbapi.level_from_xp(m.get("total_xp", 0))) if USE_LOCAL_DB else int((int(m.get("total_xp", 0)) // 500) + 1),
                     })
     except Exception as e:
         st.warning(f"Leaderboard error: {e}")
-        rows = []
 
     # ensure current user present
     if not any(r.get("user_id") == user_id for r in rows):
@@ -250,30 +256,44 @@ def show_games():
         )
 
     with col2:
-        # pull live XP/level from DB
+        # pull live XP/level
         user_id = st.session_state.user["user_id"]
-        try:
-            stats = dbapi.user_xp_and_level(user_id)   # {'xp': int, 'level': int, 'streak': int}
-            total_xp = int(stats.get("xp", 0))
-            level    = int(stats.get("level", 1))
-            # keep session in sync (optional)
-            st.session_state.xp     = total_xp
-            st.session_state.streak = stats.get("streak", 0)
-        except Exception:
-            # safe fallback if DB hiccups
-            total_xp = int(st.session_state.get("xp", 0))
-            level    = max(1, (total_xp // 500) + 1)
-
-        # leveling curve: every 500 XP is a level
-        level_floor = (level - 1) * 500           # XP at start of this level
-        level_cap   = level * 500                  # XP needed to reach next level
-        in_level_xp = max(0, total_xp - level_floor)
-        span        = max(1, level_cap - level_floor)  # usually 500
-        progress_pct = int((in_level_xp / span) * 100)
 
-        st.write(f"Level {level}  Experience Points")
-
-        # progress bar shows progress within *current* level
+        # Prefer local DB only if enabled. Otherwise call backend.
+        if USE_LOCAL_DB and hasattr(dbapi, "user_xp_and_level"):
+            stats = dbapi.user_xp_and_level(user_id)   # {'xp', 'level', 'streak', maybe 'into','need'}
+        else:
+            try:
+                stats = api.user_stats(user_id)        # backend /students/{id}/stats
+            except Exception as e:
+                # hard fallback so the page still renders
+                stats = {"xp": int(st.session_state.get("xp", 0)), "level": 1, "streak": 0}
+
+        total_xp = int(stats.get("xp", 0))
+        level    = int(stats.get("level", 1))
+        st.session_state.xp     = total_xp
+        st.session_state.streak = int(stats.get("streak", 0))
+
+        # Use server-provided per-level values when available
+        into = stats.get("into")
+        need = stats.get("need")
+
+        # Fallback if backend has not been updated yet
+        if into is None or need in (None, 0):
+            base = 500
+            level = max(1, total_xp // base + 1)
+            start = (level - 1) * base
+            into = total_xp - start
+            need = base
+            if into == need:
+                level += 1
+                into = 0
+
+        into = int(max(0, into))
+        need = int(max(1, need))
+        progress_pct = min(100, int(round((into / need) * 100)))
+
+        st.write(f"Level {level} Experience Points")
         st.markdown(f"""
             <div style="background:#e0e0e0;border-radius:12px;padding:3px;width:100%;">
                 <div style="
@@ -281,13 +301,15 @@ def show_games():
                     background:linear-gradient(135deg,#22c55e,#059669);
                     height:24px;border-radius:10px;text-align:right;
                     color:white;font-weight:bold;padding-right:8px;line-height:24px;">
-                    {total_xp:,} / {level_cap:,} XP
+                    {into:,} / {need:,} XP
                 </div>
             </div>
+            <div style="font-size:12px;color:#6b7280;margin-top:6px;">Total XP: {total_xp:,}</div>
         """, unsafe_allow_html=True)
 
 
 
+
     st.markdown("---")
 
         # Game list