From 5d140906c3fbd592049cc344c86bad24aaf1b8f2 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Wed, 14 Jan 2026 00:47:40 +0530
Subject: [PATCH 1/8] Fix matchmaking UI stuck in searching state after page
 refresh

---
 frontend/src/components/Matchmaking.tsx | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/frontend/src/components/Matchmaking.tsx b/frontend/src/components/Matchmaking.tsx
index aa7f4b5..ac3e255 100644
--- a/frontend/src/components/Matchmaking.tsx
+++ b/frontend/src/components/Matchmaking.tsx
@@ -24,6 +24,8 @@ interface MatchmakingMessage {
   error?: string;
 }
 
+
+
 const Matchmaking: React.FC = () => {
   const [pool, setPool] = useState<MatchmakingPool[]>([]);
   const [isConnected, setIsConnected] = useState(false);
@@ -33,6 +35,13 @@ const Matchmaking: React.FC = () => {
   const wsRef = useRef<WebSocket | null>(null);
   const navigate = useNavigate();
 
+    // Reset matchmaking UI state on page refresh
+    useEffect(() => {
+      setIsInPool(false);
+      setWaitTime(0);
+    }, []);
+
+
   useEffect(() => {
     // If still loading, wait
     if (isLoading) {

From 79e4423d09e1ab49821ed9be3e70ccb0f648c5bc Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Fri, 16 Jan 2026 23:03:40 +0530
Subject: [PATCH 2/8] fix(ui): make mobile drawer and nav items theme-aware

---
 frontend/src/components/Header.tsx | 37 +++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Header.tsx b/frontend/src/components/Header.tsx
index ea41336..5b1900c 100644
--- a/frontend/src/components/Header.tsx
+++ b/frontend/src/components/Header.tsx
@@ -57,21 +57,26 @@ function Header() {
 
   return (
     <>
-      <header className="flex items-center justify-between h-16 px-4 border-b border-gray-200">
-        <div className="text-lg font-semibold">{getBreadcrumbs()}</div>
+      <header className="flex items-center justify-between h-16 px-4 border-b border-border bg-background">
+        <div className="text-lg font-semibold text-foreground">
+          {getBreadcrumbs()}
+        </div>
+
         <div className="flex items-center gap-4">
           <button className="relative">
-            <Bell className="w-5 h-5 text-gray-600" />
-            <span className="absolute -top-1 -right-1 block h-2 w-2 rounded-full bg-red-500" />
+            <Bell className="w-5 h-5 text-muted-foreground" />
+            <span className="absolute -top-1 -right-1 block h-2 w-2 rounded-full bg-destructive" />
           </button>
+
           <img
             src={avatarImage}
             alt="User avatar"
-            className="w-8 h-8 rounded-full border-2 border-gray-300 object-cover"
+            className="w-8 h-8 rounded-full border-2 border-border object-cover"
           />
+
           <button
             onClick={toggleDrawer}
-            className="md:hidden p-2 rounded-md text-gray-600 hover:bg-gray-100"
+            className="md:hidden p-2 rounded-md text-muted-foreground hover:bg-muted"
             aria-label="Open menu"
           >
             <Menu className="h-6 w-6" />
@@ -82,13 +87,14 @@ function Header() {
       {isDrawerOpen && (
         <div className="fixed inset-0 z-[1000] md:hidden">
           <div
-            className="absolute inset-0 bg-black bg-opacity-50"
+            className="absolute inset-0 bg-black/50"
             onClick={toggleDrawer}
-          ></div>
-          <div className="relative w-64 h-full bg-white shadow-lg transform transition-transform duration-300 ease-in-out translate-x-0 ml-auto">
-            <div className="flex items-center justify-between h-16 px-4 border-b border-gray-200">
+          />
+
+          <div className="relative w-64 h-full bg-background border-l border-border shadow-lg ml-auto">
+            <div className="flex items-center justify-between h-16 px-4 border-b border-border">
               <div className="flex items-center gap-2">
-                <span className="text-xl font-bold text-gray-900">
+                <span className="text-xl font-bold text-foreground">
                   DebateAI by
                 </span>
                 <img
@@ -97,14 +103,16 @@ function Header() {
                   className="h-8 w-auto object-contain"
                 />
               </div>
+
               <button
                 onClick={toggleDrawer}
-                className="p-2 text-gray-600 hover:text-gray-900"
+                className="p-2 text-muted-foreground hover:text-foreground"
                 aria-label="Close menu"
               >
                 <X className="h-6 w-6" />
               </button>
             </div>
+
             <nav className="flex-1 px-2 py-4 space-y-2">
               <NavItem
                 to="/startDebate"
@@ -153,8 +161,8 @@ function NavItem({ to, label, icon, onClick }: NavItemProps) {
       className={({ isActive }) =>
         `group flex items-center px-2 py-2 text-sm font-medium rounded-md ${
           isActive
-            ? "bg-gray-200 text-gray-900"
-            : "text-gray-600 hover:bg-gray-100 hover:text-gray-900"
+            ? "bg-muted text-foreground"
+            : "text-muted-foreground hover:bg-muted hover:text-foreground"
         }`
       }
     >
@@ -164,4 +172,5 @@ function NavItem({ to, label, icon, onClick }: NavItemProps) {
   );
 }
 
+
 export default Header;

From 00e3ab0a0f189f8e2853fffdbf463e8071c7ae41 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Fri, 16 Jan 2026 23:25:31 +0530
Subject: [PATCH 3/8] fix(a11y): improve Select hover contrast in High Contrast
 theme

---
 frontend/src/components/ui/select.tsx | 9 ++++++++-
 frontend/src/index.css                | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ui/select.tsx b/frontend/src/components/ui/select.tsx
index 70fe140..36f8adb 100644
--- a/frontend/src/components/ui/select.tsx
+++ b/frontend/src/components/ui/select.tsx
@@ -115,7 +115,12 @@ const SelectItem = React.forwardRef<
   <SelectPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none",
+      "text-foreground",
+      "data-[highlighted]:bg-muted data-[highlighted]:text-foreground",
+      "high-contrast:data-[highlighted]:bg-[hsl(var(--hc-hover-bg))]",
+      "high-contrast:data-[highlighted]:text-[hsl(var(--hc-hover-text))]",
+      "data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
       className
     )}
     {...props}
@@ -125,11 +130,13 @@ const SelectItem = React.forwardRef<
         <CheckIcon className="h-4 w-4" />
       </SelectPrimitive.ItemIndicator>
     </span>
+
     <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
   </SelectPrimitive.Item>
 ))
 SelectItem.displayName = SelectPrimitive.Item.displayName
 
+
 const SelectSeparator = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Separator>,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 42fc935..4410639 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -85,6 +85,10 @@
     --chart-5: 180 100% 50%;
   }
 }
+.high-contrast {
+  --hc-hover-bg: 48 100% 50%;      
+  --hc-hover-text: 0 0% 0%;       
+}
 
 @layer base {
   * {

From 16bf344fb4d691c660b8458cf90f794c58c615b0 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Fri, 16 Jan 2026 23:41:38 +0530
Subject: [PATCH 4/8] fix(a11y): improve select item contrast in high-contrast
 theme

---
 frontend/src/components/ui/select.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ui/select.tsx b/frontend/src/components/ui/select.tsx
index 36f8adb..b6df8e5 100644
--- a/frontend/src/components/ui/select.tsx
+++ b/frontend/src/components/ui/select.tsx
@@ -131,12 +131,15 @@ const SelectItem = React.forwardRef<
       </SelectPrimitive.ItemIndicator>
     </span>
 
-    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+    <SelectPrimitive.ItemText>
+      {children}
+    </SelectPrimitive.ItemText>
   </SelectPrimitive.Item>
 ))
 SelectItem.displayName = SelectPrimitive.Item.displayName
 
 
+
 const SelectSeparator = React.forwardRef<
   React.ElementRef<typeof SelectPrimitive.Separator>,
   React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>

From d6299a886fbc295797079b195a66217c37383bc7 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Sat, 17 Jan 2026 21:19:51 +0530
Subject: [PATCH 5/8] fix: prevent judgment popup crash and duplicate judge API
 calls

---
 frontend/src/Pages/DebateRoom.tsx          | 57 ++++++++++++++--------
 frontend/src/components/JudgementPopup.tsx |  1 +
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/frontend/src/Pages/DebateRoom.tsx b/frontend/src/Pages/DebateRoom.tsx
index 5581141..9f52df8 100644
--- a/frontend/src/Pages/DebateRoom.tsx
+++ b/frontend/src/Pages/DebateRoom.tsx
@@ -7,6 +7,11 @@ import JudgmentPopup from "@/components/JudgementPopup";
 import { Mic, MicOff } from "lucide-react";
 import { useAtom } from "jotai";
 import { userAtom } from "@/state/userAtom";
+import { useNavigate } from "react-router-dom";
+
+
+const judgingRef = useRef(false);
+const navigate = useNavigate();
 
 // Bot type definition (same as in BotSelection)
 interface Bot {
@@ -549,50 +554,56 @@ const DebateRoom: React.FC = () => {
     }
   };
 
-  const judgeDebateResult = async (messages: Message[]) => {
+    const judgeDebateResult = async (messages: Message[]) => {
+    if (judgingRef.current) {
+      console.log("Judging already in progress, skipping duplicate call");
+      return;
+    }
+
+    judgingRef.current = true;
+
     try {
       console.log("Starting judgment with messages:", messages);
       const { result } = await judgeDebate({
         history: messages,
         userId: debateData.userId,
       });
+
       console.log("Raw judge result:", result);
-      
+
       const jsonString = extractJSON(result);
       console.log("Extracted JSON string:", jsonString);
-      
+
       let judgment: JudgmentData;
       try {
         judgment = JSON.parse(jsonString);
       } catch (parseError) {
         console.error("JSON parse error:", parseError, "Trying to fix JSON...");
-        // Try to fix common JSON issues
         const fixedJson = jsonString
-          .replace(/'/g, '"') // Replace single quotes with double quotes
-          .replace(/(\w+):/g, '"$1":') // Add quotes to keys
-          .replace(/,\s*}/g, '}') // Remove trailing commas
-          .replace(/,\s*]/g, ']'); // Remove trailing commas in arrays
-        try {
-          judgment = JSON.parse(fixedJson);
-        } catch (e) {
-          throw new Error(`Failed to parse JSON: ${e}`);
-        }
+          .replace(/'/g, '"')
+          .replace(/(\w+):/g, '"$1":')
+          .replace(/,\s*}/g, '}')
+          .replace(/,\s*]/g, ']');
+
+        judgment = JSON.parse(fixedJson);
       }
-      
+
       console.log("Parsed judgment:", judgment);
       setJudgmentData(judgment);
       setPopup({ show: false, message: "" });
       setShowJudgment(true);
+
     } catch (error) {
       console.error("Judging error:", error);
-      // Show error to user
+
       setPopup({
         show: true,
-        message: `Judgment error: ${error instanceof Error ? error.message : "Unknown error"}. Showing default results.`,
+        message: `Judgment error: ${
+          error instanceof Error ? error.message : "Unknown error"
+        }. Showing default results.`,
         isJudging: false,
       });
-      
-      // Set default judgment data
+
       setJudgmentData({
         opening_statement: {
           user: { score: 0, reason: "Error occurred during judgment" },
@@ -618,13 +629,18 @@ const DebateRoom: React.FC = () => {
           opponent_analysis: "",
         },
       });
+
       setTimeout(() => {
         setPopup({ show: false, message: "" });
         setShowJudgment(true);
       }, 3000);
+
+    } finally {
+      judgingRef.current = false;
     }
   };
 
+
   const formatTime = (seconds: number) => {
     const timeStr = `${Math.floor(seconds / 60)}:${(seconds % 60)
       .toString()
@@ -722,7 +738,10 @@ const DebateRoom: React.FC = () => {
           userStance={state.userStance}
           botStance={state.botStance}
           botDesc={bot.desc}
-          onClose={() => setShowJudgment(false)}
+          onClose={() => {
+            setShowJudgment(false);
+            navigate("/"); 
+          }}
         />
       )}
 
diff --git a/frontend/src/components/JudgementPopup.tsx b/frontend/src/components/JudgementPopup.tsx
index 1640dac..2c17b66 100644
--- a/frontend/src/components/JudgementPopup.tsx
+++ b/frontend/src/components/JudgementPopup.tsx
@@ -113,6 +113,7 @@ const JudgmentPopup: React.FC<JudgmentPopupProps> = ({
   botName,
   userStance,
   botStance,
+  botDesc,       
   forRole,
   againstRole,
   localRole = null,

From 6ff58601499529d0cedc9eaa2cd5e765cf251e79 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Thu, 22 Jan 2026 21:31:46 +0530
Subject: [PATCH 6/8] fix: remove duplicate coach routes and clean routing
 structure

---
 frontend/src/App.tsx | 102 ++++++++++++++++++++++---------------------
 1 file changed, 52 insertions(+), 50 deletions(-)

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 2cbe4b1..75e2b02 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -50,57 +50,59 @@ function AppRoutes() {
   }
   const { isAuthenticated } = authContext;
   return (
-    <Routes>
-      {/* Public routes */}
-      <Route
-        path='/'
-        element={
-          isAuthenticated ? <Navigate to='/startDebate' replace /> : <Home />
-        }
-      />
-      <Route path='/auth' element={<Authentication />} />
-      <Route path='/admin/login' element={<AdminSignup />} />
-      <Route path='/admin/dashboard' element={<AdminDashboard />} />
-      {/* Protected routes with layout */}
-      <Route element={<ProtectedRoute />}>
-        <Route path='/' element={<Layout />}>
-          <Route path='startDebate' element={<StartDebate />} />
-          <Route path='leaderboard' element={<Leaderboard />} />
-          <Route path='profile' element={<Profile />} />
-          <Route path='community' element={<CommunityFeed />} />
-          <Route path='about' element={<About />} />
-          <Route path='team-builder' element={<TeamBuilder />} />
-          <Route path='game/:userId' element={<DebateApp />} />
-          <Route path='bot-selection' element={<BotSelection />} />
-          <Route path='/tournaments' element={<TournamentHub />} />
-          <Route path='/coach' element={<CoachPage />} />
-          <Route
-            path='/tournament/:id/bracket'
-            element={<TournamentDetails />}
-          />
-          <Route
-            path='coach/strengthen-argument'
-            element={<StrengthenArgument />}
-          />
-          <Route path='/coach' element={<CoachPage />} />
-          <Route
-            path='coach/strengthen-argument'
-            element={<StrengthenArgument />}
-          />{' '}
-          {/* Add this route */}
-          <Route path='coach/pros-cons' element={<ProsConsChallenge />} />
+      <Routes>
+        {/* Public routes */}
+        <Route
+          path="/"
+          element={
+            isAuthenticated ? <Navigate to="/startDebate" replace /> : <Home />
+          }
+        />
+        <Route path="/auth" element={<Authentication />} />
+        <Route path="/admin/login" element={<AdminSignup />} />
+        <Route path="/admin/dashboard" element={<AdminDashboard />} />
+
+        {/* Protected routes */}
+        <Route element={<ProtectedRoute />}>
+          <Route element={<Layout />}>
+            <Route path="startDebate" element={<StartDebate />} />
+            <Route path="leaderboard" element={<Leaderboard />} />
+            <Route path="profile" element={<Profile />} />
+            <Route path="community" element={<CommunityFeed />} />
+            <Route path="about" element={<About />} />
+            <Route path="team-builder" element={<TeamBuilder />} />
+            <Route path="game/:userId" element={<DebateApp />} />
+            <Route path="bot-selection" element={<BotSelection />} />
+            <Route path="tournaments" element={<TournamentHub />} />
+            <Route
+              path="tournament/:id/bracket"
+              element={<TournamentDetails />}
+            />
+
+            {/* Coach routes */}
+            <Route path="coach" element={<CoachPage />}>
+              <Route
+                path="strengthen-argument"
+                element={<StrengthenArgument />}
+              />
+              <Route path="pros-cons" element={<ProsConsChallenge />} />
+            </Route>
+          </Route>
+
+          {/* Debate routes (outside layout) */}
+          <Route path="debate/:roomId" element={<DebateRoom />} />
+          <Route path="debate-room/:roomId" element={<OnlineDebateRoom />} />
+          <Route path="team-debate/:debateId" element={<TeamDebateRoom />} />
+          <Route path="spectator/:roomId" element={<ChatRoom />} />
+          <Route path="debate/:debateID/view" element={<ViewDebate />} />
+          <Route path="view-debate/:debateID" element={<ViewDebate />} />
+          <Route path="speech-test" element={<SpeechTest />} />
         </Route>
-        <Route path='/debate/:roomId' element={<DebateRoom />} />
-        <Route path='/debate-room/:roomId' element={<OnlineDebateRoom />} />
-        <Route path='/team-debate/:debateId' element={<TeamDebateRoom />} />
-        <Route path='/spectator/:roomId' element={<ChatRoom />} />
-        <Route path='/debate/:debateID/view' element={<ViewDebate />} />
-        <Route path='/view-debate/:debateID' element={<ViewDebate />} />
-        <Route path='/speech-test' element={<SpeechTest />} />
-      </Route>
-      {/* Redirect unknown routes */}
-      <Route path='*' element={<Navigate to='/' replace />} />
-    </Routes>
+
+        {/* Redirect unknown routes */}
+        <Route path="*" element={<Navigate to="/" replace />} />
+  </Routes>
+
   );
 }
 

From 1358d1b6ea506be987b30cac1c575f7842c1987c Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Thu, 22 Jan 2026 21:45:30 +0530
Subject: [PATCH 7/8] fix: move hooks inside DebateRoom component

---
 frontend/src/Pages/DebateRoom.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/Pages/DebateRoom.tsx b/frontend/src/Pages/DebateRoom.tsx
index ae59d74..a1a4441 100644
--- a/frontend/src/Pages/DebateRoom.tsx
+++ b/frontend/src/Pages/DebateRoom.tsx
@@ -10,9 +10,6 @@ import { userAtom } from "@/state/userAtom";
 import { useNavigate } from "react-router-dom";
 
 
-const judgingRef = useRef(false);
-const navigate = useNavigate();
-
 // Bot type definition (same as in BotSelection)
 interface Bot {
   name: string;
@@ -222,6 +219,8 @@ const extractJSON = (response: string): string => {
 };
 
 const DebateRoom: React.FC = () => {
+  const judgingRef = useRef(false);
+  const navigate = useNavigate();
   const location = useLocation();
   const navigate = useNavigate();
   const debateData = location.state as DebateProps;

From 308d690269fc7e8ff119f0b5935807d6057bc729 Mon Sep 17 00:00:00 2001
From: Abhishek Dhatrak <dhatraka77@gmail.com>
Date: Thu, 22 Jan 2026 21:49:51 +0530
Subject: [PATCH 8/8] fix: move hooks inside DebateRoom component

---
 frontend/src/Pages/DebateRoom.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/Pages/DebateRoom.tsx b/frontend/src/Pages/DebateRoom.tsx
index a1a4441..b078848 100644
--- a/frontend/src/Pages/DebateRoom.tsx
+++ b/frontend/src/Pages/DebateRoom.tsx
@@ -7,8 +7,6 @@ import JudgmentPopup from "@/components/JudgementPopup";
 import { Mic, MicOff } from "lucide-react";
 import { useAtom } from "jotai";
 import { userAtom } from "@/state/userAtom";
-import { useNavigate } from "react-router-dom";
-
 
 // Bot type definition (same as in BotSelection)
 interface Bot {