Merge pull request #127 from nirakarpatel/main

 Feature Overhaul & Critical Bug Fixes: XP Sync, Leaderboard & Profile UI

Author: sky-ruler

admin-client/src/pages/Dashboard.jsx

@@ -170,7 +170,7 @@ const Dashboard = () => {
       {/* ── Greeting ────────────────────────── */}
       <motion.div {...fd(0.04)}>
         <h1 className="text-3xl font-black text-primary mb-1">
-          {greeting.heading.replace("{username}", user?.username || "Operative")}
+          {greeting.heading.replace("{username}", user?.name || user?.username || "Operative")}
         </h1>
         <p className="text-secondary text-sm">
           {greeting.subtext}

admin-client/src/pages/admin/QuestionSetsTab.jsx

@@ -262,7 +262,7 @@ const QuestionSetsTab = () => {
                 <div><label className="field-label">Week Number</label>
                   <div className="relative"><FiCalendar className="absolute left-3 top-1/2 -translate-y-1/2 text-tertiary"/><input required type="number" min="1" className="field-input pl-9" value={form.weekNumber} onChange={e=>setForm({...form,weekNumber:Number(e.target.value)})}/></div>
                 </div>
-                <div><label className="field-label">Deadline</label><input required type="date" className="field-input" value={form.deadline} onChange={e=>setForm({...form,deadline:e.target.value})}/></div>
+                <div><label className="field-label">Deadline</label><input required type="date" min={new Date().toISOString().split('T')[0]} className="field-input" value={form.deadline} onChange={e=>setForm({...form,deadline:e.target.value})}/></div>
               </div>
             </BaseCard>
 

admin-client/src/pages/chief/admin/QuestionSetsTab.jsx

@@ -158,7 +158,7 @@ const QuestionSetsTab = () => {
                 </div>
                 <div>
                   <label className="field-label">Deadline</label>
-                  <input required type="date" className="field-input" value={form.deadline} onChange={e => setForm({...form, deadline: e.target.value})} />
+                  <input required type="date" min={new Date().toISOString().split('T')[0]} className="field-input" value={form.deadline} onChange={e => setForm({...form, deadline: e.target.value})} />
                 </div>
               </div>
             </BaseCard>

client/src/components/Footer.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 import { FiInstagram, FiLinkedin } from 'react-icons/fi';
-import { FaWhatsapp, FaDiscord } from 'react-icons/fa';
+import { FaWhatsapp } from 'react-icons/fa';
 import Logo from './Logo';
 
 const Footer = () => {
@@ -82,16 +82,7 @@ const Footer = () => {
               >
                 <FiLinkedin size={16} />
               </a>
-              <a 
-                href="https://discord.gg/csMG6yKzc" 
-                target="_blank" 
-                rel="noopener noreferrer"
-                title="Discord"
-                className="w-10 h-10 rounded-full border flex items-center justify-center text-secondary hover:text-accent hover:border-accent hover:bg-accent/5 transition-all duration-300"
-                style={{ borderColor: `rgba(var(--accent-rgb), 0.25)` }}
-              >
-                <FaDiscord size={16} />
-              </a>
+
             </div>
           </div>
         </div>

client/src/components/ProfileSidebar.jsx

@@ -32,35 +32,58 @@ const FALLBACK_BADGES = [
 /* ── XP Level helper ─────────────────────────────────────── */
 const XP_PER_LEVEL = 500;
 const getLevel = (xp) => Math.floor(xp / XP_PER_LEVEL) + 1;
-const getLevelPct = (xp) => ((xp % XP_PER_LEVEL) / XP_PER_LEVEL) * 100;
 
 /* ── Animated XP bar ─────────────────────────────────────── */
-const XPBar = ({ xp }) => {
+const XPBar = ({ xp, loginXp = 0, challengeXp = 0, loginCount = 0 }) => {
   const ref = useRef(null);
   const inView = useInView(ref, { once: true });
-  const pct = getLevelPct(xp);
+  const currentLevelXp = xp % XP_PER_LEVEL;
+  const pct = (currentLevelXp / XP_PER_LEVEL) * 100;
   const lvl = getLevel(xp);
+  
+  const loginRatio = xp > 0 ? loginXp / xp : 0;
+
   return (
-    <div ref={ref} className="space-y-1.5">
+    <div ref={ref} className="space-y-1.5 relative group">
       <div className="flex items-center justify-between text-[10px] font-black uppercase tracking-widest">
         <span className="text-tertiary">Level {lvl}</span>
-        <span style={{ color: "rgb(var(--accent-rgb))" }}>{xp} XP</span>
+        <span style={{ color: "rgb(var(--accent-rgb))" }}>{currentLevelXp} / {XP_PER_LEVEL} XP</span>
       </div>
-      <div className="h-1.5 rounded-full bg-black/[0.06] dark:bg-white/[0.06] overflow-hidden">
+      
+      {/* XP Breakdown Tooltip */}
+      <div className="absolute bottom-full left-1/2 -translate-x-1/2 mb-2 w-max bg-black/90 dark:bg-white/90 text-white dark:text-black text-[10px] font-bold p-2 rounded-lg opacity-0 group-hover:opacity-100 transition-opacity z-50 shadow-xl shadow-black/20 text-center flex flex-col gap-1 pointer-events-none">
+        <div className="flex justify-between gap-4">
+           <span className="text-[#3b82f6]">Daily Login XP:</span>
+           <span>{loginXp} XP ({loginCount} days)</span>
+        </div>
+        <div className="flex justify-between gap-4">
+           <span className="text-[#ec4899]">Challenges XP:</span>
+           <span>{challengeXp} XP</span>
+        </div>
+        <div className="mt-1 pt-1 border-t border-white/20 dark:border-black/20 flex justify-between gap-4">
+           <span className="text-white/60 dark:text-black/60">Total XP:</span>
+           <span>{xp} XP</span>
+        </div>
+        {/* Little triangle pointing down */}
+        <div className="absolute top-full left-1/2 -translate-x-1/2 border-4 border-transparent border-t-black/90 dark:border-t-white/90" />
+      </div>
+
+      <div className="h-1.5 rounded-full bg-black/[0.06] dark:bg-white/[0.06] overflow-hidden flex">
         <motion.div
           className="h-full rounded-full"
           style={{
-            background: "linear-gradient(90deg, rgba(var(--accent-rgb),0.9), rgba(168,85,247,0.9))",
-            boxShadow: "0 0 10px rgba(var(--accent-rgb),0.5)",
+            background: `linear-gradient(90deg, #3b82f6 0%, #a855f7 ${loginRatio * 100}%, #ec4899 100%)`,
+            boxShadow: `0 0 10px rgba(168,85,247,0.5)`
           }}
           initial={{ width: 0 }}
           animate={{ width: inView ? `${pct}%` : 0 }}
           transition={{ duration: 1.4, ease: "easeOut" }}
         />
       </div>
-      <p className="text-[10px] text-tertiary">
-        {XP_PER_LEVEL - (xp % XP_PER_LEVEL)} XP to Level {lvl + 1}
-      </p>
+      <div className="flex justify-between text-[10px] text-tertiary">
+        <span>{XP_PER_LEVEL - currentLevelXp} XP to Level {lvl + 1}</span>
+        <span className="font-semibold text-secondary">Total: {xp} XP</span>
+      </div>
     </div>
   );
 };
@@ -115,6 +138,9 @@ const ProfileSidebar = ({ user, summary, profile, badges }) => {
   const streak = profile?.streak ?? 0;
   const maxStreak = profile?.maxStreak ?? 0;
   const xp = profile?.stats?.totalPoints ?? profile?.totalPoints ?? 0;
+  const loginXp = profile?.stats?.loginXp ?? profile?.loginXp ?? 0;
+  const challengeXp = profile?.stats?.challengeXp ?? profile?.challengeXp ?? 0;
+  const loginCount = profile?.stats?.loginCount ?? profile?.loginCount ?? 0;
   const rank = profile?.rank ?? "—";
   const roleName = user?.customTitle || (user?.role === "admin" ? "Admin"
     : user?.role === "clan-chief" ? "Clan Chief"
@@ -295,7 +321,7 @@ const ProfileSidebar = ({ user, summary, profile, badges }) => {
           </div>
 
           {/* XP Level bar */}
-          <XPBar xp={xp} />
+          <XPBar xp={xp} loginXp={loginXp} challengeXp={challengeXp} loginCount={loginCount} />
 
           {/* Divider */}
           <div className="h-px bg-black/[0.08] dark:bg-white/[0.08]" />

client/src/pages/ChallengeDetails.jsx

@@ -568,7 +568,11 @@ const ChallengeDetails = () => {
           <span className="hidden sm:inline">Missions</span>
         </Link>
         <div className="w-px h-4 bg-black/10 dark:bg-white/10" />
-        <a href={challenge.link} target="_blank" rel="noopener noreferrer">
+        <a 
+          href={challenge.link || `https://leetcode.com/problems/${challenge.title.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/^-|-$/g, '')}/`} 
+          target="_blank" 
+          rel="noopener noreferrer"
+        >
           <h1 className="text-sm sm:text-base font-bold truncate flex flex-row items-center gap-1.5 hover:text-accent transition-colors">
             {challenge.title} <FiExternalLink size={12} />
           </h1>

client/src/pages/Dashboard.jsx

@@ -392,7 +392,7 @@ const Dashboard = () => {
       {/* ── Greeting ────────────────────────── */}
       <motion.div {...fd(0.04)}>
         <h2 className="text-2xl font-black text-primary mb-1 font-h2">
-          {greeting.heading.replace("{username}", user?.username || "Operative")}
+          {greeting.heading.replace("{username}", user?.name || user?.username || "Operative")}
         </h2>
         <p className="text-secondary text-sm">
           {greeting.subtext}

client/src/pages/Leaderboard.jsx

@@ -217,7 +217,17 @@ const Leaderboard = () => {
     );
   }, [rows, search]);
 
-  const topThree = visibleRows.slice(0, 3);
+  const topThree = useMemo(() => {
+    if (search.trim()) {
+      return visibleRows.slice(0, 3);
+    }
+    
+    if (leaderType === "individual") {
+      return leaderboardQuery.data?.meta?.topThree || visibleRows.slice(0, 3);
+    }
+    
+    return visibleRows.slice(0, 3);
+  }, [leaderType, search, visibleRows, leaderboardQuery.data?.meta?.topThree]);
   const myRow =
     leaderType === "individual"
       ? rows.find((row) => row.username === user?.username)

server/fix_badges.js

@@ -403,9 +403,21 @@ const googleLogin = async (req, res, next) => {
     const lastLogin = user.lastLoginDate ? new Date(user.lastLoginDate) : null;
     const isFirstLoginToday = !lastLogin || lastLogin < today;
 
-    if (isFirstLoginToday && user.usernameSet) {
+    const XpLog = require('../users/XpLog.model');
+    const existingDailyLog = await XpLog.exists({
+      userId: user._id,
+      reason: 'Daily Login',
+      createdAt: { $gte: today }
+    });
+
+    if (isFirstLoginToday && !existingDailyLog && user.usernameSet) {
       user.points = (user.points || 0) + 50;
       dailyXpAwarded = true;
+      await XpLog.create({
+        userId: user._id,
+        amount: 50,
+        reason: 'Daily Login',
+      });
     }
 
     user.lastLoginDate = now;
@@ -548,11 +560,24 @@ const getMe = async (req, res, next) => {
     const now = new Date();
     const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
     const lastLogin = user.lastLoginDate ? new Date(user.lastLoginDate) : null;
+    const isFirstLoginToday = !lastLogin || lastLogin < today;
 
-    if (!lastLogin || lastLogin < today) {
+    const XpLog = require('../users/XpLog.model');
+    const existingDailyLog = await XpLog.exists({
+      userId: user._id,
+      reason: 'Daily Login',
+      createdAt: { $gte: today }
+    });
+
+    if (isFirstLoginToday && !existingDailyLog) {
       if (user.usernameSet) {
         user.points = (user.points || 0) + 50;
         dailyXpAwarded = true;
+        await XpLog.create({
+          userId: user._id,
+          amount: 50,
+          reason: 'Daily Login',
+        });
       }
       user.lastLoginDate = now;
       await User.findByIdAndUpdate(user._id, {