Эх сурвалжийг харах

Found and fixed the bug with the timer getting re-stored

Kirk Trombley 5 жил өмнө
parent
commit
8598c68dc8

+ 0 - 1
README.md

@@ -103,6 +103,5 @@ POST /game/{ID}/guesses/{round}
 
 - Asynchronously generate locations, allowing game creation to appear faster
 - Improve error handling in UI
-- Re-join a game you did not finish
 - Override google controls in streetview, make custom divs
 - Modify scoring to linear interp in the middle

+ 2 - 1
client/src/components/screens/GamePanel/GamePanel.jsx

@@ -5,7 +5,7 @@ import GuessPane from "./GuessPane";
 import PositionedStreetView from "./PositionedStreetView";
 import useRoundInfo from "../../../hooks/useRoundInfo";
 import { dispatch } from '../../../domain/gameStore';
-import { useTimerFromLocalStorage } from '../../../domain/localStorageMethods';
+import { useTimerFromLocalStorage, clearTimerFromLocalStorage } from '../../../domain/localStorageMethods';
 
 const Container = styled.div`
   height: 100%;
@@ -50,6 +50,7 @@ export default () => {
   const handleSubmitGuess = async () => {
     setSubmitDisabled(true);
     await dispatch.submitGuess(selectedPoint, currentRound, targetPoint);
+    clearTimerFromLocalStorage();
   }
 
   return (

+ 2 - 7
client/src/components/screens/GamePanel/RoundTimer.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import styled from "styled-components";
 import ms from "pretty-ms";
 import useCountdown from "../../../hooks/useCountdown";
-import { clearTimerFromLocalStorage, saveTimerToLocalStorage } from "../../../domain/localStorageMethods";
+import { saveTimerToLocalStorage } from "../../../domain/localStorageMethods";
 
 const TimerSpan = styled.span`
   padding: 1px;
@@ -14,12 +14,7 @@ const TimedOut = styled(TimerSpan)`
 `
 
 export default ({ seconds, onTimeout }) => {
-  console.log(seconds);
-  const [remaining] = useCountdown(seconds, () => {
-    clearTimerFromLocalStorage();
-    onTimeout(); 
-  });
-  console.log(remaining);
+  const [remaining] = useCountdown(seconds, () => onTimeout());
   
   if (remaining > 0) {
     saveTimerToLocalStorage(remaining);

+ 1 - 0
client/src/domain/localStorageMethods.js

@@ -14,6 +14,7 @@ export const clearGameInfoFromLocalStorage = () => {
   localStorage.removeItem(localStorageGameId);
   localStorage.removeItem(localStoragePlayerName);
   localStorage.removeItem(localStoragePlayerId);
+  localStorage.removeItem(localStorageTimer);
 }
 
 export const useGameInfoFromLocalStorage = () => {