From fac1305cfc9c0eea5f202e701e46402231bcd815 Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Thu, 14 Oct 2021 02:14:04 -0300 Subject: [PATCH] bk commit --- src/App.js | 41 ++++++++++++++++++- .../Hangman/PuzzleWord/PuzzleWord.jsx | 22 +++++----- .../{CheckVictory.jsx => CheckVictory.js} | 1 + src/components/Scripts/Register input.js | 7 +--- 4 files changed, 53 insertions(+), 18 deletions(-) rename src/components/Scripts/{CheckVictory.jsx => CheckVictory.js} (98%) diff --git a/src/App.js b/src/App.js index 9e43c75..c72fd35 100644 --- a/src/App.js +++ b/src/App.js @@ -3,6 +3,8 @@ import CurrentScore from "./components/CurrentScore"; import Hangman from "./components/Hangman/Hangman"; import Header from "./components/Header"; import PuzzleWord from "./components/Hangman/PuzzleWord/PuzzleWord"; +import Victory from "./components/Hangman/PuzzleWord/Victory"; +import Defeat from "./components/Hangman/PuzzleWord/Defeat"; function App() { @@ -11,6 +13,24 @@ function App() { const [hangmanFrame, setHangmanFrame] = useState(0) + const [isVictory, setIsVictory] = useState(false) + const [isDefeat, setIsDefeat] = useState(false) + + const [keyPuzzleWord, setKeyPuzzleWord] = useState(1) + + if (isVictory || isDefeat) { + + + setTimeout(() => { + setHangmanFrame(0) + + setIsVictory(false) + setIsDefeat(false) + + setKeyPuzzleWord(keyPuzzleWord + 1) + }, 3000) + } + return ( <>
@@ -25,14 +45,31 @@ function App() {
- + + isVictory={isVictory} + setIsVictory={setIsVictory} + + isDefeat={isDefeat} + setIsDefeat={setIsDefeat} + /> + + } + + + {isVictory ? : null} + {isDefeat ? : null}
diff --git a/src/components/Hangman/PuzzleWord/PuzzleWord.jsx b/src/components/Hangman/PuzzleWord/PuzzleWord.jsx index 3c4e892..702a5aa 100644 --- a/src/components/Hangman/PuzzleWord/PuzzleWord.jsx +++ b/src/components/Hangman/PuzzleWord/PuzzleWord.jsx @@ -3,30 +3,31 @@ import Register_Input from '../../Scripts/Register input' import Defeat from './Defeat' import Victory from './Victory' -const PuzzleWord = ({hangmanFrame, setHangmanFrame, currentScore, setCurrentScore}) => { +const PuzzleWord = ({hangmanFrame, setHangmanFrame, currentScore, setCurrentScore, setIsVictory, setIsDefeat}) => { const [actualWord, setActualWord] = useState('papa') - const [isVictory, setIsVictory] = useState(false) - const [isDefeat, setIsDefeat] = useState(false) - const generatePuzzleWord = () => { + + const generatePuzzleWord = () => { + const puzzleWord = document.getElementById('puzzleWord') for (let i = 0; i < actualWord.length; i++) { - + let letter = document.createElement('span') letter.className = 'letter' letter.textContent = '' - + puzzleWord.appendChild(letter) } - + const counter = document.createElement('span') counter.className = 'counter' counter.textContent = '(' + actualWord.length + ')' - + puzzleWord.appendChild(counter) + } React.useEffect(() => { @@ -42,13 +43,12 @@ const PuzzleWord = ({hangmanFrame, setHangmanFrame, currentScore, setCurrentScor Register_Input(actualWord, hangmanFrame, setHangmanFrame, setIsVictory, setIsDefeat) }, [hangmanFrame]) + + return ( <>
- - {isVictory ? : null} - {isDefeat ? : null} ) } diff --git a/src/components/Scripts/CheckVictory.jsx b/src/components/Scripts/CheckVictory.js similarity index 98% rename from src/components/Scripts/CheckVictory.jsx rename to src/components/Scripts/CheckVictory.js index bebac6a..4a188bd 100644 --- a/src/components/Scripts/CheckVictory.jsx +++ b/src/components/Scripts/CheckVictory.js @@ -19,6 +19,7 @@ const CheckVictory = (setIsVictory) => { if (allChildrenHaveText) { setIsVictory(true) + } } diff --git a/src/components/Scripts/Register input.js b/src/components/Scripts/Register input.js index bb2387d..7ea7594 100644 --- a/src/components/Scripts/Register input.js +++ b/src/components/Scripts/Register input.js @@ -1,4 +1,4 @@ -import CheckVictory from "./CheckVictory.jsx"; +import CheckVictory from "./CheckVictory"; const Register_Input = (actualWord, hangmanFrame, setHangmanFrame, setIsVictory, setIsDefeat) => { @@ -46,7 +46,6 @@ const Register_Input = (actualWord, hangmanFrame, setHangmanFrame, setIsVictory, }); CheckVictory(setIsVictory) - } else { @@ -61,9 +60,7 @@ const Register_Input = (actualWord, hangmanFrame, setHangmanFrame, setIsVictory, removeRegisterInput() } - } - - + } } const removeRegisterInput = () => {