doc.id)
+ console.log(result)
+
+ const words = await result.docs.map(doc => doc.id)
+
+ console.log(words)
const word = await SelectRandomWord(await words)
return await word
diff --git a/src/Firebase Querys/GetRandomCategory.js b/src/Firebase Querys/GetRandomCategory.js
index 0af7cba..28e48b8 100644
--- a/src/Firebase Querys/GetRandomCategory.js
+++ b/src/Firebase Querys/GetRandomCategory.js
@@ -1,7 +1,7 @@
import {firestore} from '../Firebase/Firebase_Config'
import { getFirestore, collection, doc, getDocs, getDoc } from 'firebase/firestore/lite';
-const GetRandomCategory = async () => {
+const GetRandomCategory = async (language) => {
let categoriesList = []
@@ -12,14 +12,17 @@ const GetRandomCategory = async () => {
const data = collection(db, `categories`)
const result = await getDocs(data)
- result.docs.map(doc => categoriesList.push(doc.id.toLowerCase()))
+ console.log(result)
+ result.docs.map(doc => categoriesList.push(doc.get(language)))
+
+ console.log(categoriesList)
const randomNumber = Math.trunc(
Math.random() * (categoriesList.length - 0) + 0
)
- return categoriesList[randomNumber]
+ return categoriesList[randomNumber].toLowerCase()
} catch (error) {
console.log(error)
diff --git a/src/General Scripts/DetermineUserLanguage.js b/src/General Scripts/DetermineUserLanguage.js
index 604adbd..5467715 100644
--- a/src/General Scripts/DetermineUserLanguage.js
+++ b/src/General Scripts/DetermineUserLanguage.js
@@ -1,13 +1,19 @@
const DetermineUserLanguage = (setLanguage) => {
- console.log(navigator.language)
+ if (!localStorage.getItem('languageDetermined')) {
- if (navigator.language === 'es') {
- setLanguage('spanish')
- }
+
+ console.log(navigator.language)
+
+ if (navigator.language === 'es') {
+ setLanguage('spanish')
+ }
+
+ if (navigator.language === 'en' || navigator.language === 'en-US') {
+ setLanguage('english')
+ }
- if (navigator.language === 'en' || navigator.language === 'en-US') {
- setLanguage('english')
+ localStorage.setItem('languageDetermined', 'true')
}
}
diff --git a/src/components/Victory && Defeat/Defeat.jsx b/src/components/Victory && Defeat/Defeat.jsx
index cccd1c4..37217d5 100644
--- a/src/components/Victory && Defeat/Defeat.jsx
+++ b/src/components/Victory && Defeat/Defeat.jsx
@@ -1,7 +1,26 @@
-const Defeat = () => {
+import React from "react"
+
+const Defeat = ({language}) => {
+
+ const [text, setText] = React.useState('')
+
+ React.useEffect(() => {
+
+ if (language === 'english') {
+
+ setText('DEFEAT')
+ }
+
+ if (language === 'spanish') {
+
+ setText('PERDISTE')
+ }
+
+ }, [])
+
return (
-
DEFEAT
+ {text}
)
}
diff --git a/src/components/Victory && Defeat/Victory.jsx b/src/components/Victory && Defeat/Victory.jsx
index bacc7ed..b7d4ce6 100644
--- a/src/components/Victory && Defeat/Victory.jsx
+++ b/src/components/Victory && Defeat/Victory.jsx
@@ -1,16 +1,28 @@
import React from 'react'
-const Victory = ({currentScore, setCurrentScore}) => {
+const Victory = ({currentScore, setCurrentScore, language}) => {
+
+ const [text, setText] = React.useState('')
React.useEffect(() => {
setCurrentScore(parseInt(currentScore) + 1)
+
+ if (language === 'english') {
+
+ setText('VICTORY')
+ }
+
+ if (language === 'spanish') {
+
+ setText('VICTORIA')
+ }
}, [])
return (
-
VICTORY
+ {text}
)
}
diff --git a/src/components/Word/Word.jsx b/src/components/Word/Word.jsx
index ffb882b..4f32797 100644
--- a/src/components/Word/Word.jsx
+++ b/src/components/Word/Word.jsx
@@ -1,6 +1,9 @@
import React from 'react'
const Word = ({selectedWord, correctLetters}) => {
+
+ let blankSpaces = 0
+
return (
{
@@ -8,6 +11,16 @@ const Word = ({selectedWord, correctLetters}) => {
letter = letter.toLowerCase()
+ if (letter === ' ') {
+
+ blankSpaces++
+ return (
+
+
+
+ )
+ }
+
if (i === 0) {
letter = letter.toUpperCase()
}
@@ -21,7 +34,7 @@ const Word = ({selectedWord, correctLetters}) => {
}
- ({selectedWord.length})
+ ({selectedWord.length - blankSpaces})
)