From 80e1260ac89be0296388dfb0a0998bb7c4e68873 Mon Sep 17 00:00:00 2001
From: pireu2 <sebi.duica@gmail.com>
Date: Thu, 28 Sep 2023 22:11:27 +0300
Subject: [PATCH 1/2] game x sound to come from admin panel like the other
 sounds

---
 src/screens/Game.tsx                    |  3 ---
 src/shared/GameRound/GameRoundAdmin.tsx | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/screens/Game.tsx b/src/screens/Game.tsx
index a0bf113..18bfacd 100644
--- a/src/screens/Game.tsx
+++ b/src/screens/Game.tsx
@@ -38,13 +38,10 @@ const Game = () => {
       return;
     }
     const audio = new Audio(wrongAnswerSound);
-    const { play, stop } = useSounds(audio);
-    play(audio);
     setWrongAnswers(Math.min(3, game.wrongAnswer));
 
     setTimeout(() => {
       setWrongAnswers(0);
-      stop(audio);
     }, 2000);
   }, [game?.wrongAnswer]);
 
diff --git a/src/shared/GameRound/GameRoundAdmin.tsx b/src/shared/GameRound/GameRoundAdmin.tsx
index 2fe0248..2902bc8 100644
--- a/src/shared/GameRound/GameRoundAdmin.tsx
+++ b/src/shared/GameRound/GameRoundAdmin.tsx
@@ -20,6 +20,7 @@ import { NormalGame } from '../../types/game';
 import { useSounds } from '../../hooks/useSounds.hook';
 import round_start from '../../static/round_start.mp3';
 import correct_answer from '../../static/correct_answer.mp3';
+import wrongAnswerSound from '../../static/x.mp3';
 
 const GameRoundAdmin = (props: any) => {
   const [questions, setQuestions] = useState<DBQuestion[]>([]);
@@ -101,6 +102,9 @@ const GameRoundAdmin = (props: any) => {
   };
 
   const setAllWrong = () => {
+    if (counterWrongAnswers != 3){
+      playSound(wrongAnswerSound, 5000);
+    }
     GamesService.update(selectedGame, {
       ...game,
       wrongAnswer: 3
@@ -380,12 +384,20 @@ const GameRoundAdmin = (props: any) => {
           </div>
           <div style={{ marginTop: 10, width: '100%' }}>
             <p style={{ textAlign: 'center' }}>Wrong answers</p>
-            <Button variant="outlined" onClick={() => setAllWrong()} style={{ marginRight: 10 }}>
+            <Button variant="outlined" onClick={() => {
+              setAllWrong();
+              }} 
+              style={{ marginRight: 10 }}>
               Set All wrong
             </Button>
             <Button
               variant="outlined"
-              onClick={() => setCounterWrongAnswers((prevState) => Math.min(prevState + 1, 3))}
+              onClick={() => {
+                setCounterWrongAnswers((prevState) => Math.min(prevState + 1, 3))
+                if (counterWrongAnswers <= 3){
+                  playSound(wrongAnswerSound, 5000);
+                }
+              }}
               style={{ marginRight: 10 }}
             >
               {counterWrongAnswers} wrong (click for +1)

From dc1ff89e061d2352ee3b6c7baae05f2f1bd62485 Mon Sep 17 00:00:00 2001
From: pireu2 <sebi.duica@gmail.com>
Date: Fri, 29 Sep 2023 11:46:14 +0300
Subject: [PATCH 2/2] x sound time and x show time consistend and made it a
 constant

---
 src/screens/Game.tsx                    | 6 ++----
 src/shared/GameRound/GameRoundAdmin.tsx | 5 +++--
 src/utils/contants.ts                   | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/screens/Game.tsx b/src/screens/Game.tsx
index 18bfacd..b976231 100644
--- a/src/screens/Game.tsx
+++ b/src/screens/Game.tsx
@@ -10,10 +10,9 @@ import '../static/styles/home.css';
 import { useParams } from 'react-router-dom';
 import useGame from '../hooks/useGame';
 import QuestionsService from '../services/questions.service';
-import wrongAnswerSound from '../static/x.mp3';
 import wrongAnswerPng from '../static/x.png';
 import { truncateQuestion } from '../helpers/truncate-question';
-import { useSounds } from '../hooks/useSounds.hook';
+import { WRONG_ANSWER_TIME } from '../utils/contants';
 
 const Game = () => {
   const [currentQuestion, setCurrentQuestion] = useState<DBQuestion>();
@@ -37,12 +36,11 @@ const Game = () => {
     if (game?.wrongAnswer === 0) {
       return;
     }
-    const audio = new Audio(wrongAnswerSound);
     setWrongAnswers(Math.min(3, game.wrongAnswer));
 
     setTimeout(() => {
       setWrongAnswers(0);
-    }, 2000);
+    }, WRONG_ANSWER_TIME);
   }, [game?.wrongAnswer]);
 
   useEffect(() => {
diff --git a/src/shared/GameRound/GameRoundAdmin.tsx b/src/shared/GameRound/GameRoundAdmin.tsx
index 2902bc8..8591ac2 100644
--- a/src/shared/GameRound/GameRoundAdmin.tsx
+++ b/src/shared/GameRound/GameRoundAdmin.tsx
@@ -21,6 +21,7 @@ import { useSounds } from '../../hooks/useSounds.hook';
 import round_start from '../../static/round_start.mp3';
 import correct_answer from '../../static/correct_answer.mp3';
 import wrongAnswerSound from '../../static/x.mp3';
+import { WRONG_ANSWER_TIME } from '../../utils/contants';
 
 const GameRoundAdmin = (props: any) => {
   const [questions, setQuestions] = useState<DBQuestion[]>([]);
@@ -103,7 +104,7 @@ const GameRoundAdmin = (props: any) => {
 
   const setAllWrong = () => {
     if (counterWrongAnswers != 3){
-      playSound(wrongAnswerSound, 5000);
+      playSound(wrongAnswerSound, WRONG_ANSWER_TIME);
     }
     GamesService.update(selectedGame, {
       ...game,
@@ -395,7 +396,7 @@ const GameRoundAdmin = (props: any) => {
               onClick={() => {
                 setCounterWrongAnswers((prevState) => Math.min(prevState + 1, 3))
                 if (counterWrongAnswers <= 3){
-                  playSound(wrongAnswerSound, 5000);
+                  playSound(wrongAnswerSound, WRONG_ANSWER_TIME);
                 }
               }}
               style={{ marginRight: 10 }}
diff --git a/src/utils/contants.ts b/src/utils/contants.ts
index d792032..61f0a03 100644
--- a/src/utils/contants.ts
+++ b/src/utils/contants.ts
@@ -9,3 +9,4 @@ export enum environmentType {
 
 export const TIMER_LENGTH = 20;
 export const TIMER_BONUS = 5;
+export const WRONG_ANSWER_TIME = 3000;