diff --git a/src/App.js b/src/App.js index 5adcfa1..4b2d09e 100644 --- a/src/App.js +++ b/src/App.js @@ -2,19 +2,19 @@ import React, {useState} from "react"; import CurrentScore from "./components/CurrentScore"; import Hangman from "./components/Hangman/Hangman"; import Header from "./components/Header"; -import PuzzleWord from "./components/Hangman/PuzzleWord/PuzzleWord"; +//import PuzzleWord from "./components/Hangman/PuzzleWord/PuzzleWord"; import Victory from "./components/Hangman/PuzzleWord/Victory"; import Defeat from "./components/Hangman/PuzzleWord/Defeat"; import Loading from "./components/Loading"; -import AlmacenateCurrentScore from "./components/Scripts/AlmacenateCurrentScore"; -import DetermineUserLanguage from "./components/Scripts/DetermineUserLanguage"; +import AlmacenateCurrentScore from "./Storage Scripts/AlmacenateCurrentScore"; +import DetermineUserLanguage from "./General Scripts/DetermineUserLanguage"; import Categories from "./components/Categories/Categories"; -import ChangeTitle from "./components/Scripts/ChangeTitle"; -import AlmacenateCategory from "./components/Scripts/AlmacenateCategory"; -import { RecoveryCurrentScore } from "./components/Scripts/RecoveryCurrentScore"; -import { RecoveryCurrentCategory } from "./components/Scripts/RecoveryCurrentCategory"; -import { RecoveryCurrentLanguage } from "./components/Scripts/RecoveryCurrentLanguage"; -import { AlmacenateLanguage } from "./components/Scripts/AlmacenateLanguage"; +import ChangeTitle from "./General Scripts/ChangeTitle"; +import AlmacenateCategory from "./Storage Scripts/AlmacenateCategory"; +import { RecoveryCurrentScore } from "./Storage Scripts/RecoveryCurrentScore"; +import { RecoveryCurrentCategory } from "./Storage Scripts/RecoveryCurrentCategory"; +import { RecoveryCurrentLanguage } from "./Storage Scripts/RecoveryCurrentLanguage"; +import { AlmacenateLanguage } from "./Storage Scripts/AlmacenateLanguage"; function App() { @@ -43,6 +43,7 @@ function App() { DetermineUserLanguage(setLanguage) RecoveryCurrentLanguage(setLanguage) + ChangeTitle(language) setLanguageIsReady(true) @@ -76,7 +77,7 @@ function App() {
-
+ :null } @@ -97,32 +98,7 @@ function App() { language={language} /> - {!displayApp ? : null } - - - - + {!displayApp ? : null } {isVictory ? : null} {isDefeat ? : null} diff --git a/src/components/Scripts/Capilazate.js b/src/General Scripts/Capilazate.js similarity index 100% rename from src/components/Scripts/Capilazate.js rename to src/General Scripts/Capilazate.js diff --git a/src/components/Scripts/ChangeTitle.js b/src/General Scripts/ChangeTitle.js similarity index 100% rename from src/components/Scripts/ChangeTitle.js rename to src/General Scripts/ChangeTitle.js diff --git a/src/components/Scripts/DetermineUserLanguage.js b/src/General Scripts/DetermineUserLanguage.js similarity index 100% rename from src/components/Scripts/DetermineUserLanguage.js rename to src/General Scripts/DetermineUserLanguage.js diff --git a/src/components/Scripts/SelectRandomWord.js b/src/General Scripts/SelectRandomWord.js similarity index 100% rename from src/components/Scripts/SelectRandomWord.js rename to src/General Scripts/SelectRandomWord.js diff --git a/src/components/Scripts/AlmacenateCategory.js b/src/Storage Scripts/AlmacenateCategory.js similarity index 100% rename from src/components/Scripts/AlmacenateCategory.js rename to src/Storage Scripts/AlmacenateCategory.js diff --git a/src/components/Scripts/AlmacenateCurrentScore.js b/src/Storage Scripts/AlmacenateCurrentScore.js similarity index 100% rename from src/components/Scripts/AlmacenateCurrentScore.js rename to src/Storage Scripts/AlmacenateCurrentScore.js diff --git a/src/components/Scripts/AlmacenateLanguage.js b/src/Storage Scripts/AlmacenateLanguage.js similarity index 100% rename from src/components/Scripts/AlmacenateLanguage.js rename to src/Storage Scripts/AlmacenateLanguage.js diff --git a/src/components/Scripts/RecoveryCurrentCategory.js b/src/Storage Scripts/RecoveryCurrentCategory.js similarity index 100% rename from src/components/Scripts/RecoveryCurrentCategory.js rename to src/Storage Scripts/RecoveryCurrentCategory.js diff --git a/src/components/Scripts/RecoveryCurrentLanguage.js b/src/Storage Scripts/RecoveryCurrentLanguage.js similarity index 100% rename from src/components/Scripts/RecoveryCurrentLanguage.js rename to src/Storage Scripts/RecoveryCurrentLanguage.js diff --git a/src/components/Scripts/RecoveryCurrentScore.js b/src/Storage Scripts/RecoveryCurrentScore.js similarity index 100% rename from src/components/Scripts/RecoveryCurrentScore.js rename to src/Storage Scripts/RecoveryCurrentScore.js diff --git a/src/components/Categories/Categories.jsx b/src/components/Categories/Categories.jsx index c44c464..9d69cc7 100644 --- a/src/components/Categories/Categories.jsx +++ b/src/components/Categories/Categories.jsx @@ -1,7 +1,7 @@ import React from "react" -import AlmacenateCategory from "../Scripts/AlmacenateCategory" -import AlmacenateCurrentScore from "../Scripts/AlmacenateCurrentScore" -import { AlmacenateLanguage } from "../Scripts/AlmacenateLanguage" +import AlmacenateCategory from "../../Storage Scripts/AlmacenateCategory" +import AlmacenateCurrentScore from "../../Storage Scripts/AlmacenateCurrentScore" +import { AlmacenateLanguage } from "../../Storage Scripts/AlmacenateLanguage" import Bring_All_Categories from "./Firebase Querys/Bring All Categories" import Bring_All_Languages from "./Firebase Querys/Bring All Languages" diff --git a/src/components/Categories/Firebase Querys/Bring All Categories.js b/src/components/Categories/Firebase Querys/Bring All Categories.js index 3a5a467..aea242b 100644 --- a/src/components/Categories/Firebase Querys/Bring All Categories.js +++ b/src/components/Categories/Firebase Querys/Bring All Categories.js @@ -1,7 +1,7 @@ import { firestore } from "../../../Firebase/Firebase_Config" import { getFirestore, collection, getDocs } from 'firebase/firestore/lite'; -import AdjustHeightCategories from "../../Scripts/AdjustHeightCategories"; -import capitalize from "../../Scripts/Capilazate"; +import AdjustHeightCategories from "../Scripts/AdjustHeightCategories"; +import capitalize from "../../../General Scripts/Capilazate"; const Bring_All_Categories = async (setCategories, setStrech, language) => { diff --git a/src/components/Categories/Firebase Querys/Bring All Languages.js b/src/components/Categories/Firebase Querys/Bring All Languages.js index 6ae0904..606a6ae 100644 --- a/src/components/Categories/Firebase Querys/Bring All Languages.js +++ b/src/components/Categories/Firebase Querys/Bring All Languages.js @@ -1,6 +1,6 @@ import { getDocs, getFirestore, collection } from "@firebase/firestore/" import { firestore } from "../../../Firebase/Firebase_Config" -import capitalize from "../../Scripts/Capilazate" +import capitalize from "../../../General Scripts/Capilazate" const Bring_All_Languages = async (setLanguage) => { diff --git a/src/components/Scripts/AdjustHeightCategories.js b/src/components/Categories/Scripts/AdjustHeightCategories.js similarity index 100% rename from src/components/Scripts/AdjustHeightCategories.js rename to src/components/Categories/Scripts/AdjustHeightCategories.js diff --git a/src/components/Hangman/PuzzleWord/AddLettersRegistered.js b/src/components/Hangman/PuzzleWord/AddLettersRegistered.js deleted file mode 100644 index 2f5e063..0000000 --- a/src/components/Hangman/PuzzleWord/AddLettersRegistered.js +++ /dev/null @@ -1,23 +0,0 @@ -import alphabet from './alphabet' - -const AddLettersRegistered = (lastLetterRegistered, setLastLetterRegistered) => { - - const addLetterHistory = (event) => { - - const currentKey = event.key - - if (!lastLetterRegistered.includes(currentKey.toUpperCase()) && alphabet.includes(currentKey.toLowerCase())) { - - const array = [...lastLetterRegistered, currentKey.toUpperCase()] - - setLastLetterRegistered(array) - console.log(lastLetterRegistered) - } - - window.removeEventListener('keyup', addLetterHistory) - } - - window.addEventListener('keyup', addLetterHistory) -} - -export default AddLettersRegistered diff --git a/src/components/Hangman/PuzzleWord/CheckVictory.js b/src/components/Hangman/PuzzleWord/CheckVictory.js deleted file mode 100644 index 66c5554..0000000 --- a/src/components/Hangman/PuzzleWord/CheckVictory.js +++ /dev/null @@ -1,24 +0,0 @@ -//import Victory from "../Hangman/PuzzleWord/Victory"; - -const CheckVictory = (setIsVictory) => { - - let allChildrenHaveText = true - - const puzzleWord = document.getElementById('puzzleWord') - const childrens = [...puzzleWord.children] - - childrens.forEach(children => { - - if (children.textContent === '') { - allChildrenHaveText = false - } - }); - - if (allChildrenHaveText) { - - setIsVictory(true) - - } -} - -export default CheckVictory diff --git a/src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWords.js b/src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWord.js similarity index 100% rename from src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWords.js rename to src/components/Hangman/PuzzleWord/Firebase Querys/BringTheWord.js diff --git a/src/components/Hangman/PuzzleWord/PuzzleWord.jsx b/src/components/Hangman/PuzzleWord/PuzzleWord.jsx deleted file mode 100644 index f36426c..0000000 --- a/src/components/Hangman/PuzzleWord/PuzzleWord.jsx +++ /dev/null @@ -1,83 +0,0 @@ -import React, {useState} from 'react' -import Register_Input from '../../Scripts/Register input' -import SelectRandomWord from '../../Scripts/SelectRandomWord' -import BringTheWords from './Firebase Querys/BringTheWords' - -const PuzzleWord = ({hangmanFrame, setHangmanFrame, currentScore, setCurrentScore, setIsVictory, setIsDefeat, displayApp, setDisplayApp, language, category, categoryIsReady}) => { - - const [actualWord, setActualWord] = useState('') - - React.useEffect(() => { - - 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) - } - - const definePuzzle = async () => { - - const words = await BringTheWords(language, category, actualWord) - const wordSelection = await SelectRandomWord(words) - - const word = await words[wordSelection] - - setActualWord(word) - - } - - if (!displayApp && !actualWord) { - - definePuzzle() - - } - - - if (actualWord && !displayApp) { - - generatePuzzleWord() - setDisplayApp(true) - - } - - }, [actualWord, category, displayApp, language, setDisplayApp]) - - if (displayApp && actualWord) { - - Register_Input(actualWord, hangmanFrame, setHangmanFrame, setIsVictory, setIsDefeat) - } - React.useEffect(() => { - - - - - - - }, [hangmanFrame, displayApp, actualWord, setHangmanFrame, setIsDefeat, setIsVictory, categoryIsReady, category]) - - - - - return ( - <> -
- - ) -} - -export default PuzzleWord diff --git a/src/components/Hangman/PuzzleWord/Register input.js b/src/components/Hangman/PuzzleWord/Register input.js deleted file mode 100644 index c708148..0000000 --- a/src/components/Hangman/PuzzleWord/Register input.js +++ /dev/null @@ -1,86 +0,0 @@ -import CheckVictory from "./CheckVictory"; -import alphabet from './alphabet.js' - -const Register_Input = (actualWord, hangmanFrame, setHangmanFrame, setIsVictory, setIsDefeat) => { - - const keyRegister = (event) => { - - const currentKey = event.key.toLowerCase() - - if (hangmanFrame <= 5 && alphabet.includes(currentKey) ) { - - actualWord = actualWord.toLowerCase() - - const puzzleWord = document.getElementById('puzzleWord') - - const letters = [] - - if (actualWord.search(currentKey) + 1) { - - for (let i = 0; i < actualWord.length; i++) { - - if (currentKey === actualWord[i]) { - letters.push(i) - } - } - - letters.forEach(letter => { - - const index = letter - - if (index === 0) { - - puzzleWord.children[index].textContent = currentKey.toUpperCase() - } - - else { - puzzleWord.children[index].textContent = currentKey - } - - - }); - - - CheckVictory(setIsVictory) - - } else { - - setHangmanFrame(hangmanFrame + 1) - - if (hangmanFrame === 5) { - - for (let i = 0; i < actualWord.length; i++) { - - let letter = document.createElement('span') - - letter.className = 'letter' - - letter.textContent = actualWord[i] - - if (i === 0) { - - letter.textContent = letter.textContent.toUpperCase() - } - - - puzzleWord.replaceChild(letter, puzzleWord.children[i]) - } - - setIsDefeat(true) - - } - - } - - } - } - - const removeRegisterInput = () => { - - window.removeEventListener('keyup', keyRegister) - } - - window.addEventListener('keyup', keyRegister) -} - -export default Register_Input diff --git a/src/components/Hangman/PuzzleWord/Victory.jsx b/src/components/Hangman/PuzzleWord/Victory.jsx index b25165f..bacc7ed 100644 --- a/src/components/Hangman/PuzzleWord/Victory.jsx +++ b/src/components/Hangman/PuzzleWord/Victory.jsx @@ -10,7 +10,7 @@ const Victory = ({currentScore, setCurrentScore}) => { return (
-

VICTORIA

+

VICTORY

) } diff --git a/src/components/LettersRegistered/LettersRegistered.jsx b/src/components/LettersRegistered/LettersRegistered.jsx deleted file mode 100644 index 05ececd..0000000 --- a/src/components/LettersRegistered/LettersRegistered.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import React from 'react' - -const LettersRegistered = ({lettersRegistered, setLettersRegistered}) => { - - return ( -
- { - lettersRegistered.map(letter => - - {letter} - ) - } -
- ) -} - -export default LettersRegistered diff --git a/src/components/Loading.jsx b/src/components/Loading.jsx index dfa52e1..9b78f4e 100644 --- a/src/components/Loading.jsx +++ b/src/components/Loading.jsx @@ -1,5 +1,5 @@ import React from 'react' -import loadingGifLightTheme from './img/loading-light-theme.png' +import loadingGifLightTheme from '../img/loading-light-theme.png' const Loading = () => { return ( diff --git a/src/components/Scripts/CheckVictory.js b/src/components/Scripts/CheckVictory.js deleted file mode 100644 index 2528e0c..0000000 --- a/src/components/Scripts/CheckVictory.js +++ /dev/null @@ -1,24 +0,0 @@ -import Victory from "../Hangman/PuzzleWord/Victory"; - -const CheckVictory = (setIsVictory) => { - - let allChildrenHaveText = true - - const puzzleWord = document.getElementById('puzzleWord') - const childrens = [...puzzleWord.children] - - childrens.forEach(children => { - - if (children.textContent === '') { - allChildrenHaveText = false - } - }); - - if (allChildrenHaveText) { - - setIsVictory(true) - - } -} - -export default CheckVictory diff --git a/src/components/Scripts/Register input.js b/src/components/Scripts/Register input.js deleted file mode 100644 index 2ce7622..0000000 --- a/src/components/Scripts/Register input.js +++ /dev/null @@ -1,88 +0,0 @@ -import CheckVictory from "./CheckVictory"; - -const Register_Input = (actualWord, hangmanFrame, setHangmanFrame, setIsVictory, setIsDefeat) => { - - const alphabet = ["a", "á", "b","c","d","e", "é", "f","g","h","i", "í", "j","k","l","m","n", "ñ","o", "ó","p","q","r","s","t","u","ú","v","w","x","y","z"]; - - const keyRegister = (event) => { - - const currentKey = event.key.toLowerCase() - - if (hangmanFrame <= 5 && alphabet.includes(currentKey) ) { - - actualWord = actualWord.toLowerCase() - - const puzzleWord = document.getElementById('puzzleWord') - - const letters = [] - - if (actualWord.search(currentKey) + 1) { - - for (let i = 0; i < actualWord.length; i++) { - - if (currentKey === actualWord[i]) { - letters.push(i) - } - } - - letters.forEach(letter => { - - const index = letter - - if (index === 0) { - - puzzleWord.children[index].textContent = currentKey.toUpperCase() - } - - else { - puzzleWord.children[index].textContent = currentKey - } - - - }); - - CheckVictory(setIsVictory) - - } else { - - const quantity = hangmanFrame + 1 - setHangmanFrame(quantity) - - if (hangmanFrame === 5) { - - for (let i = 0; i < actualWord.length; i++) { - - let letter = document.createElement('span') - - letter.className = 'letter' - - letter.textContent = actualWord[i] - - if (i === 0) { - - letter.textContent = letter.textContent.toUpperCase() - } - - - puzzleWord.replaceChild(letter, puzzleWord.children[i]) - } - - setIsDefeat(true) - - } - - removeRegisterInput() - } - - } - } - - const removeRegisterInput = () => { - - window.removeEventListener('keyup', keyRegister) - } - - window.addEventListener('keyup', keyRegister) -} - -export default Register_Input diff --git a/src/components/img/loading-dark-theme.png b/src/img/loading-dark-theme.png similarity index 100% rename from src/components/img/loading-dark-theme.png rename to src/img/loading-dark-theme.png diff --git a/src/components/img/loading-light-theme.png b/src/img/loading-light-theme.png similarity index 100% rename from src/components/img/loading-light-theme.png rename to src/img/loading-light-theme.png