From 1329de64a342fe04de30eb748201b1fa3b529ac2 Mon Sep 17 00:00:00 2001
From: arnavg24-arch <arnavg24@vt.edu>
Date: Fri, 6 Feb 2026 08:49:10 -0500
Subject: [PATCH 1/2] Fix CoStar Coloring: smooth typing, drag-and-drop UI
 labels, and focus fixes

---
 frontend/src/components/CostarColoring.tsx | 132 ++++++++++++++++-----
 1 file changed, 100 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/CostarColoring.tsx b/frontend/src/components/CostarColoring.tsx
index efe9ee51..d41141be 100644
--- a/frontend/src/components/CostarColoring.tsx
+++ b/frontend/src/components/CostarColoring.tsx
@@ -32,6 +32,14 @@ const availableParts = [
   "letter_r",
 ];
 
+// Helper function to format display names (e.g., "letter_c" -> "Letter C")
+const formatDisplayName = (name: string): string => {
+  return name
+    .split("_")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(" ");
+};
+
 enum AlertType {
   NONE,
   SUCCESS,
@@ -54,6 +62,7 @@ export function CostarColoring({
     letter_a: "",
     letter_r: "",
   });
+  const [rowColors, setRowColors] = useState<string[]>(["", "", "", "", "", ""]);
 
   const [currentColorIndex, setCurrentColorIndex] = useState(0);
   const colorNextPart = (color: string) => {
@@ -91,36 +100,74 @@ export function CostarColoring({
         });
       }
     };
+    const handleValueOnBlur = (value: string, isColorInput: boolean = false) => {
+      const val = value.toLowerCase().trim();
 
-    const handleValueOnBlur = (value: string) => {
-      if (
-        !availableColors.includes(value) &&
-        !availableParts.includes(value) &&
-        value !== ""
-      ) {
-        setCurrentAlert({
-          type: AlertType.FAILURE,
-          message: "That isn't quite one of the options. Try again.",
-        });
+
+      if (isColorInput) {
+        const strippedValue = val.startsWith('"') && val.endsWith('"')
+          ? val.substring(1, val.length - 1)
+          : val;
+
+        if (
+          !availableColors.includes(strippedValue) &&
+          value !== ""
+        ) {
+          setCurrentAlert({
+            type: AlertType.FAILURE,
+            message: "That isn't quite one of the options. Try again.",
+          });
+        }
+      } else {
+        // For letter input
+        if (
+          !availableParts.includes(val) &&
+          value !== ""
+        ) {
+          setCurrentAlert({
+            type: AlertType.FAILURE,
+            message: "That isn't quite one of the options. Try again.",
+          });
+        }
       }
     };
 
-    const handleColorChange = (part: string, value: string) => {
+
+
+    const handleColorChange = (part: string, value: string, rowIndex?: number) => {
       const val = value.toLowerCase();
       if (availableParts.includes(val)) {
         setCurrentAlert({
           type: AlertType.FAILURE,
           message: "This value is a color, not a body part!",
         });
+        return;
       }
       if (value.startsWith('"') && value.endsWith('"')) {
         const strippedValue = val.substring(1, val.length - 1);
-        if (availableColors.includes(strippedValue) && part !== "") {
+        if (availableColors.includes(strippedValue)) {
           setCurrentAlert({ type: AlertType.SUCCESS, message: "Correct!" });
-          setColors((prevColors) => ({
-            ...prevColors,
-            [part]: strippedValue,
-          }));
+
+          // If typeVariable mode, store by row index
+          if (props?.typeVariable && rowIndex !== undefined) {
+            const updatedRowColors = [...rowColors];
+            updatedRowColors[rowIndex] = strippedValue;
+            setRowColors(updatedRowColors);
+
+            // Also update the actual variable if it's been typed
+            if (part && part !== "") {
+              setColors((prevColors) => ({
+                ...prevColors,
+                [part]: strippedValue,
+              }));
+            }
+          } else {
+            // Normal mode - store by variable name
+            setColors((prevColors) => ({
+              ...prevColors,
+              [part]: strippedValue,
+            }));
+          }
         } else if (availableParts.includes(strippedValue)) {
           setCurrentAlert({
             type: AlertType.FAILURE,
@@ -130,6 +177,8 @@ export function CostarColoring({
       }
     };
 
+
+
     function handleOnDrop(e: React.DragEvent, part: string) {
       const color = e.dataTransfer.getData("Color") as string;
       const temp = (colors[part as keyof CostarColorState] = color);
@@ -188,40 +237,41 @@ export function CostarColoring({
                 onDragOver={(e) => handleDragOver(e)}
                 className="border-2 flex flex-row rounded-sm outline-dotted text-center"
               >
-                <label htmlFor={`${part}Text`}>
+                <label htmlFor={`${availablePart}Text`}>
                   {props?.typeVariable ? (
                     <input
-                      key={`${part}Text1`}
+                      key={`${availablePart}Text1`}
                       className={`rounded-sm w-24`}
                       type="text"
                       placeholder="Type a letter"
-                      onBlur={(e) => handleValueOnBlur(e.target.value)}
+                      onBlur={(e) => handleValueOnBlur(e.target.value, false)}
                       onChange={(e) => handlePart(index, e.target.value)}
                       defaultValue={part[index]}
                       disabled={!props.type}
                     />
                   ) : (
-                    `${availablePart}`
+                    formatDisplayName(availablePart)
                   )}
                   {"="}
                   <input
-                    key={`${part}Text2`}
+                    key={`${availablePart}Text2-${rowColors[index]}`}
                     type="text"
                     className={`rounded-sm w-24`}
                     placeholder={
                       props?.type ? "Type a color here" : "Drag a color here"
                     }
-                    onBlur={(e) => handleValueOnBlur(e.target.value)}
+
                     onChange={(e) =>
                       handleColorChange(
-                        props?.typeVariable ? part[index] : availablePart,
+                        props?.typeVariable && part[index] ? part[index] : availablePart,
                         e.target.value,
+                        props?.typeVariable ? index : undefined
                       )
                     }
                     defaultValue={
                       props?.typeVariable
-                        ? colors[part[index] as keyof CostarColorState]
-                          ? `"${colors[part[index] as keyof CostarColorState]}"`
+                        ? rowColors[index]
+                          ? `"${rowColors[index]}"`
                           : ""
                         : colors[availablePart as keyof CostarColorState]
                           ? `"${colors[availablePart as keyof CostarColorState]}"`
@@ -229,9 +279,13 @@ export function CostarColoring({
                     }
                     disabled={!props.type}
                   />
+
                 </label>
               </div>
             ))}
+
+
+
           </div>
           <div className="flex flex-col px-2">
             <h1 className="font-bold text-center">Options:</h1>
@@ -263,7 +317,9 @@ export function CostarColoring({
                       if (!props?.type) colorNextPart(color);
                     }}
                   >
-                    <q className={`text-white`}>{color}</q>
+                    <span className={`text-white`}>
+  {props?.type ? `"${color}"` : formatDisplayName(color)}
+</span>
                   </div>
                 ))}
               </div>
@@ -275,6 +331,18 @@ export function CostarColoring({
   }
 
   function CostarColor() {
+    // Determine which colors to display based on mode
+    const displayColors = props?.typeVariable
+      ? {
+        letter_c: rowColors[0] || "",
+        letter_o: rowColors[1] || "",
+        letter_s: rowColors[2] || "",
+        letter_t: rowColors[3] || "",
+        letter_a: rowColors[4] || "",
+        letter_r: rowColors[5] || "",
+      }
+      : colors;
+
     return (
       <div className="flex flex-col flex-grow justify-center items-center relative">
         <img
@@ -287,42 +355,42 @@ export function CostarColoring({
         <img
           src="/Costar_Images/Letter_C.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_c} `}
+          className={`absolute center-left img-${displayColors.letter_c.replace(/"/g, "")} `}
           width={500}
           height={500}
         />
         <img
           src="/Costar_Images/Letter_O.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_o} `}
+          className={`absolute center-left img-${displayColors.letter_o.replace(/"/g, "")} `}
           width={500}
           height={500}
         />
         <img
           src="/Costar_Images/Letter_S.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_s} `}
+          className={`absolute center-left img-${displayColors.letter_s.replace(/"/g, "")} `}
           width={500}
           height={500}
         />
         <img
           src="/Costar_Images/Letter_T.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_t} `}
+          className={`absolute center-left img-${displayColors.letter_t.replace(/"/g, "")} `}
           width={500}
           height={500}
         />
         <img
           src="/Costar_Images/Letter_A.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_a} `}
+          className={`absolute center-left img-${displayColors.letter_a.replace(/"/g, "")} `}
           width={500}
           height={500}
         />
         <img
           src="/Costar_Images/Letter_R.png"
           alt="book"
-          className={`absolute center-left img-${colors.letter_r} `}
+          className={`absolute center-left img-${displayColors.letter_r.replace(/"/g, "")} `}
           width={500}
           height={500}
         />

From c2539d3476b8ce7d51f2622b5aeb533b3ec1959b Mon Sep 17 00:00:00 2001
From: arnavg24-arch <arnavg24@vt.edu>
Date: Fri, 13 Feb 2026 09:22:02 -0500
Subject: [PATCH 2/2] fix: improve Binary Converter UX and text sizing\n\n-
 Remove 'Invalid' message when input field is empty\n- Add responsive text
 sizing to Binary Converter (text-lg md:text-xl xl:text-2xl)\n- Add responsive
 text sizing to book content panel (text-base md:text-lg lg:text-xl
 xl:text-2xl)\n- Improve readability across all screen sizes

---
 frontend/src/components/BinaryConverter.tsx |  4 ++--
 frontend/src/pages/BookPage.tsx             | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/BinaryConverter.tsx b/frontend/src/components/BinaryConverter.tsx
index b0fd16ba..1b2f6d16 100644
--- a/frontend/src/components/BinaryConverter.tsx
+++ b/frontend/src/components/BinaryConverter.tsx
@@ -47,7 +47,7 @@ export default function BinaryConverter({
     dec = parseInt(binary, 2);
   }
   return (
-    <div className="p-2 flex flex-col gap-2">
+    <div className="p-2 flex flex-col gap-2 text-lg md:text-xl xl:text-2xl">
       <label className="py-2">Enter a binary number:</label>
       <input
         type="text"
@@ -61,7 +61,7 @@ export default function BinaryConverter({
         className="p-2"
         style={{ color: dec === undefined || isNaN(dec) ? "red" : "black" }}
       >
-        {dec === undefined || isNaN(dec) ? "Invalid" : dec}
+        {binary === "" ? "" : (dec === undefined || isNaN(dec) ? "Invalid" : dec)}
       </div>
       <div className="p-2">
         {dec !== undefined && !isNaN(dec) && conversionSteps
diff --git a/frontend/src/pages/BookPage.tsx b/frontend/src/pages/BookPage.tsx
index df364ea4..953d6314 100644
--- a/frontend/src/pages/BookPage.tsx
+++ b/frontend/src/pages/BookPage.tsx
@@ -19,7 +19,7 @@ import { useTheme } from "../context/ThemeContext";
 function BookContent({ content }: { content: string[] }) {
   return (
     <div className="h-[calc(100vh-9rem)] xl:h-[calc(100vh-13rem)] overflow-y-scroll flex flex-col justify-center gap-1 items-center w-full">
-      <ul className="flex flex-col justify-center py-2 md:space-y-1 xl:space-y-4">
+      <ul className="flex flex-col justify-center py-2 md:space-y-1 xl:space-y-4 text-base md:text-lg lg:text-xl xl:text-2xl">
         {content.map((line, i) => (
           <li key={i}>
             <Reader text={line} />
@@ -220,11 +220,10 @@ export function HintsWindow({
           className={`
     flex-1 overflow-y-auto text-gray-800
     scrollbar-thin scrollbar-thumb-gray-300 scrollbar-track-transparent
-    ${
-      showFullAnswer
-        ? "px-3 py-3" // normal padding for full answer
-        : "px-4 py-6 sm:py-8"
-    }      // more top/bottom padding for hints
+    ${showFullAnswer
+              ? "px-3 py-3" // normal padding for full answer
+              : "px-4 py-6 sm:py-8"
+            }      // more top/bottom padding for hints
   `}
         >
           {!showFullAnswer ? (