diff --git a/src/components/WordInput.js b/src/components/WordInput.js index f27033b06239d4416c4e484c0aae85bbb671d55e..80006c8c3dca92ff872b3f1ff050ae24f1a7f78e 100644 --- a/src/components/WordInput.js +++ b/src/components/WordInput.js @@ -51,20 +51,14 @@ const WordInput = () => { } setAnswer(response.res); }); - for (let i = 0; i < WORD_LENGTH; i++) { - charBoxes.push({ char: "", answer: answer }); - } - for (let i = 0; i < NUM_TRY; i++) { - setAllWords(prev => [...prev, <WordBox chars={charBoxes} />]); - } + Array(WORD_LENGTH).fill().map((_, __) => (charBoxes.push({ char: "", answer: answer }))); + Array(NUM_TRY).fill().map((_, __) => (setAllWords(prev => [...prev, <WordBox chars={charBoxes} />]))); resetInputBox(); }; const resetInputBox = () => { const initInputBox = []; - for (let i = 0; i < WORD_LENGTH; i++) { - initInputBox.push(<CharBox char=""/>); - } + Array(WORD_LENGTH).fill().map((_, __) => (initInputBox.push(<CharBox char=""/>))); setInputBox(initInputBox); setWord([]); } @@ -128,7 +122,7 @@ const WordInput = () => { setCurrentTry(prev => prev + 1); setPopUp({ show: true, - text: "You got it!", + text: "You lose! Correct answer is " + answer, buttonText: "OK", buttonHandler: resetGame, }); diff --git a/src/helpers/validateInput.js b/src/helpers/validateInput.js index 9d960a02e203234fc879a51ea10c2f9845bfd1b8..312febc2e59862a70f7f1bba0a9dceac7629e556 100644 --- a/src/helpers/validateInput.js +++ b/src/helpers/validateInput.js @@ -44,13 +44,12 @@ function checkInputLength(input, length) { } async function checkInputDefined(input) { - const response = await axios({ + return await axios({ method: 'get', url: 'https://katla-backend2-vzlajmqxxq-et.a.run.app/check/' + input.join(""), - }); - if (response.statusText === "OK") { + }).then((response) => { return { "res": response.data, "error": null }; - } else { - return { "res": null, "error": response.statusText }; - } + }).catch((error) => { + return { "res": null, "error": error }; + }) } diff --git a/src/pages/Home.js b/src/pages/Home.js index bed9fd5cb12d42654e3ca311249be7e5c8c32db0..d89ecb3fd2e4fbbfb6484ee530b6beffd6df605c 100644 --- a/src/pages/Home.js +++ b/src/pages/Home.js @@ -3,9 +3,7 @@ import WordInput from '../components/WordInput'; export default function Home() { const wordBoxes = []; - for (let i = 0; i < 1; i++) { - wordBoxes.push(<WordInput />); - } + wordBoxes.push(<WordInput />); return ( <div className="App">