Added working review view

lefun-fun · Jul 3, 2024 · 8d4286c · 8d4286c
1 parent cad12be
commit 8d4286c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/game/src/index.ts b/game/src/index.ts
@@ -54,19 +54,21 @@ const moves: Moves<B, PB> = {
       const { answer, index } = payload as WritePayload;
       const { round } = board;
       playerboard.answers[round][index] = answer;
-
       //Go to review phase when any player has entered 10 answers
-      if (playerboard.answers[round].some(a => a !== "")) {
+      if (playerboard.answers[round].every(a => a.length > 0)) {
         board.phase = "review" as const;
      }
     },
-  },
-  [REVIEW]: {
-    executeNow({ board, playerboard, userId }) {
+    execute({ board, playerboards }) {
+      if(board.phase !== "review"){
+        return;
+      }
       board.answers = {};
-      board.answers[userId] = playerboard.answers[board.round];
-    },
+      for (const [userId, playerboard] of Object.entries(playerboards)) {
+        board.answers![userId] = playerboard.answers[board.round];
+      }
     }
+  }
 };
 
 const game: GameDef<B, PB> = {

diff --git a/ui/src/Board.tsx b/ui/src/Board.tsx
@@ -104,7 +104,6 @@ function AnswerInput({ index }: { index: number }) {
           const { value } = e.target;
           setNewAnswer(value);
           dispatch(write({ index, answer: value }));
-          checkPhase();
         }}
         onFocus={() => setFocused(true)}
         onBlur={() => setFocused(false)}
@@ -113,17 +112,6 @@ function AnswerInput({ index }: { index: number }) {
   );
 }
 
-function checkPhase () {
-  const phase = useSelector((state) => state.board.phase);
-  const userId = useSelector(
-    (state) => state.playerboard.userId
-  );
-  const dispatch = useDispatch();
-  if (phase === 'review') {
-    dispatch(review(userId));
-  }
-}
-
 function ReviewContent () {
   const userIds = useSelector((state) => state.board.userIds)
   return (
@@ -135,14 +123,13 @@ function ReviewContent () {
 
 function Player({userId}: {userId: UserId}) {
   const username = useUsername(userId);
-  const round = useSelector((state) => state.board.round)
   const roundStep = useSelector((state) => state.board.roundStep)
   const answers = useSelector((state) => state.board.answers![userId])
   const answer = answers[roundStep];
 
   return(
    <div className={classNames(!answer && 'opacity-70')}>
-     <div>{username}</div>
+     <div><b>{username}</b></div>
      <div>{answer}</div>
    </div>
   )
@@ -152,6 +139,8 @@ function Board() {
   useFonts();
   const phase = useSelector((state) => state.board.phase);
   const numCategories = useSelector((state) => state.board.categories.length);
+  const roundstep = useSelector((state) => state.board.roundStep)
+  const category = useSelector((state) => state.board.categories[roundstep])
   if(phase === 'write'){
     return (
       <div className="flex flex-col items-center justify-center w-full h-full overflow-hidden">
@@ -173,6 +162,7 @@ function Board() {
       <div className="flex flex-col items-center justify-center w-full h-full overflow-hidden">
         <div className="w-full max-w-96 h-full max-h-vmd bg-neutral-50 flex flex-col rounded">
           <Header />
+          <div className="flex justify-center">{category}</div>
           <div className="flex-1 flex flex-col justify-between p-2 vmd:p-3 space-y-3.5 overflow-y-auto">
             {ReviewContent()}
           </div>