mirror of
https://github.com/FranP-code/Hangman-game-with-React.git
synced 2025-10-13 00:42:32 +00:00
Fixes and change of Firebase API KEY
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -22,9 +22,11 @@ npm-debug.log*
|
|||||||
yarn-debug.log*
|
yarn-debug.log*
|
||||||
yarn-error.log*
|
yarn-error.log*
|
||||||
|
|
||||||
/src/Firebase/Firebase_Config.js
|
# /src/Firebase/Firebase_Config.js
|
||||||
/public/Hover.css/css
|
# /public/Hover.css/css
|
||||||
|
|
||||||
/package-lock.json
|
/package-lock.json
|
||||||
/package-lock.json.save
|
/package-lock.json.save
|
||||||
/package-lock.json.save.1
|
/package-lock.json.save.1
|
||||||
|
|
||||||
|
/.env
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
"@testing-library/react": "^11.2.7",
|
"@testing-library/react": "^11.2.7",
|
||||||
"@testing-library/user-event": "^12.8.3",
|
"@testing-library/user-event": "^12.8.3",
|
||||||
"emailjs-com": "^3.2.0",
|
"emailjs-com": "^3.2.0",
|
||||||
"firebase": "^9.1.3",
|
"firebase": "^9.6.7",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.2",
|
||||||
"react-router-dom": "^5.3.0",
|
"react-router-dom": "^5.3.0",
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
import {firestore} from '../Firebase/Firebase_Config'
|
import {firestore} from '../Firebase/Firebase_Config'
|
||||||
import { getFirestore, collection, doc, getDocs, getDoc } from 'firebase/firestore/lite';
|
import { getFirestore, collection, doc, getDocs, getDoc } from 'firebase/firestore';
|
||||||
import GetRandomCategory from './GetRandomCategory';
|
import GetRandomCategory from './GetRandomCategory';
|
||||||
import SelectRandomWord from './SelectRandomWord';
|
import SelectRandomWord from './SelectRandomWord';
|
||||||
|
|
||||||
const BringTheWords = async (language = 'english', category = false, selectedWord) => {
|
const BringTheWords = async (language, category, selectedWord) => {
|
||||||
|
|
||||||
if (!selectedWord) {
|
if (!selectedWord) {
|
||||||
|
|
||||||
if (!category || category === 'false') {
|
if (!category || category === 'false') {
|
||||||
|
|
||||||
category = await GetRandomCategory(language)
|
category = await GetRandomCategory(language)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -26,6 +25,7 @@ const BringTheWords = async (language = 'english', category = false, selectedWor
|
|||||||
return await word
|
return await word
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.log(error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ const GetRandomCategory = async (language) => {
|
|||||||
return categoriesList[randomNumber].toLowerCase()
|
return categoriesList[randomNumber].toLowerCase()
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
console.log(error)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
19
src/Firebase/Firebase_Config.js
Normal file
19
src/Firebase/Firebase_Config.js
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
// Import the functions you need from the SDKs you need
|
||||||
|
import { initializeApp } from "firebase/app";
|
||||||
|
// TODO: Add SDKs for Firebase products that you want to use
|
||||||
|
// https://firebase.google.com/docs/web/setup#available-libraries
|
||||||
|
|
||||||
|
// Your web app's Firebase configuration
|
||||||
|
const firebaseConfig = {
|
||||||
|
apiKey: process.env.REACT_APP_FIREBASE_API_KEY,
|
||||||
|
authDomain: "hangman-game-with-react.firebaseapp.com",
|
||||||
|
projectId: "hangman-game-with-react",
|
||||||
|
storageBucket: "hangman-game-with-react.appspot.com",
|
||||||
|
messagingSenderId: "836415057159",
|
||||||
|
appId: process.env.REACT_APP_FIREBASE_APP_ID
|
||||||
|
};
|
||||||
|
|
||||||
|
// Initialize Firebase
|
||||||
|
const firestore = initializeApp(firebaseConfig);
|
||||||
|
|
||||||
|
export {firestore}
|
||||||
@@ -1,16 +1,15 @@
|
|||||||
export const RecoveryCurrentCategory = (setCategory) => {
|
export const RecoveryCurrentCategory = (setCategory) => {
|
||||||
|
|
||||||
if (localStorage.getItem('category')) {
|
if (localStorage.getItem('category')) {
|
||||||
|
|
||||||
const category = localStorage.getItem('category')
|
const category = localStorage.getItem('category')
|
||||||
|
|
||||||
setCategory(category)
|
setCategory(category)
|
||||||
localStorage.removeItem('category')
|
localStorage.removeItem('category')
|
||||||
|
|
||||||
if (localStorage.getItem('category') === 'false') {
|
if (localStorage.getItem('category') === 'false') {
|
||||||
|
|
||||||
//setCategory(false)
|
//setCategory(false)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
export const RecoveryCurrentLanguage = (setLanguage) => {
|
export const RecoveryCurrentLanguage = (setLanguage) => {
|
||||||
|
|
||||||
if (localStorage.getItem('language')) {
|
if (localStorage.getItem('language')) {
|
||||||
|
|
||||||
setLanguage(localStorage.getItem('language'))
|
setLanguage(localStorage.getItem('language'))
|
||||||
localStorage.removeItem('language')
|
localStorage.removeItem('language')
|
||||||
}
|
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,8 +96,6 @@ const AddWord = () => {
|
|||||||
splitedWords = splitedWords.map(word => word.toLowerCase())
|
splitedWords = splitedWords.map(word => word.toLowerCase())
|
||||||
splitedWords = splitedWords.map(word => capitalize(word))
|
splitedWords = splitedWords.map(word => capitalize(word))
|
||||||
|
|
||||||
console.log(categoryForDatabase);
|
|
||||||
|
|
||||||
const uploadWordsPromise = new Promise((resolve, reject) => {
|
const uploadWordsPromise = new Promise((resolve, reject) => {
|
||||||
|
|
||||||
splitedWords.forEach(async (word, index) => {
|
splitedWords.forEach(async (word, index) => {
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ const getCategoryForDatabase = async (categorySelection, LanguageSelection) => {
|
|||||||
const categoryLocalizated = categoryFirebase.data()[LanguageSelection]
|
const categoryLocalizated = categoryFirebase.data()[LanguageSelection]
|
||||||
|
|
||||||
return await categoryLocalizated
|
return await categoryLocalizated
|
||||||
console.log(categoryLocalizated)
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
||||||
|
|||||||
@@ -6,39 +6,6 @@ const DeleteCategoryFirebase = async (category, setData) => {
|
|||||||
try {
|
try {
|
||||||
|
|
||||||
const db = getFirestore(firestore)
|
const db = getFirestore(firestore)
|
||||||
|
|
||||||
// const categoryEnglishRef = await doc(db, 'categories', category)
|
|
||||||
// const categoryEnglishSnap = await getDoc(categoryEnglishRef)
|
|
||||||
// const categoryEnglish = categoryEnglishSnap.data()['english'].toLowerCase()
|
|
||||||
|
|
||||||
// const categorySpanishRef = await doc(db, 'categories', category)
|
|
||||||
// const categorySpanishSnap = await getDoc(categorySpanishRef)
|
|
||||||
// const categorySpanish = categorySpanishSnap.data()['spanish'].toLowerCase()
|
|
||||||
|
|
||||||
// console.log(categoryEnglish)
|
|
||||||
// console.log(categorySpanish)
|
|
||||||
|
|
||||||
// const collectionWordsCategoryEnglish = await collection(db, `hangman_words/english/${categoryEnglish}`)
|
|
||||||
// const wordsCategoryEnglishRef = await getDocs(collectionWordsCategoryEnglish)
|
|
||||||
// const wordsCategoryEnglish = await wordsCategoryEnglishRef.docs
|
|
||||||
|
|
||||||
// console.log(wordsCategoryEnglish)
|
|
||||||
|
|
||||||
// const deleteWordsCategoryEnglishPromise = new Promise((resolve, reject) => {
|
|
||||||
|
|
||||||
// wordsCategoryEnglish.forEach(async (documentInCategory, index) => {
|
|
||||||
|
|
||||||
// console.log(await documentInCategory.id)
|
|
||||||
// await deleteDoc(doc(db, `hangman_words/english/${categoryEnglish}`, documentInCategory.id))
|
|
||||||
|
|
||||||
// if (index === wordsCategoryEnglish.length -1) resolve();
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
|
|
||||||
// deleteWordsCategoryEnglishPromise.then(() => {
|
|
||||||
// deleteDoc(doc(db, `hangman_words/english/`, categoryEnglish))
|
|
||||||
// })
|
|
||||||
|
|
||||||
await deleteDoc(doc(db, 'categories', category))
|
await deleteDoc(doc(db, 'categories', category))
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -65,10 +65,10 @@ function Game() {
|
|||||||
setSelectedWord('a')
|
setSelectedWord('a')
|
||||||
|
|
||||||
let word = await BringTheWords(language, category, selectedWord)
|
let word = await BringTheWords(language, category, selectedWord)
|
||||||
word = word.toLowerCase()
|
word = word.toLowerCase()
|
||||||
|
|
||||||
await setSelectedWord(word)
|
setSelectedWord(word)
|
||||||
await setDisplayApp(true)
|
setDisplayApp(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +172,7 @@ function Game() {
|
|||||||
AlmacenateLanguage(language)
|
AlmacenateLanguage(language)
|
||||||
|
|
||||||
window.location.reload(false)
|
window.location.reload(false)
|
||||||
}, 3000)
|
}, 3000)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ import {getFirestore, collection, doc, setDoc } from "firebase/firestore/lite";
|
|||||||
|
|
||||||
const AddPokemonToFirebaseQuery = async (language, pokemon) => {
|
const AddPokemonToFirebaseQuery = async (language, pokemon) => {
|
||||||
|
|
||||||
console.log(pokemon)
|
|
||||||
console.log(language)
|
|
||||||
try {
|
try {
|
||||||
const db = await getFirestore(firestore)
|
const db = await getFirestore(firestore)
|
||||||
const result = await setDoc(doc(db, `hangman_words/${language}/pokemons`, pokemon.name), {
|
const result = await setDoc(doc(db, `hangman_words/${language}/pokemons`, pokemon.name), {
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ const PokemonScripts = () => {
|
|||||||
const response = await fetch('https://pokeapi.co/api/v2/pokemon?limit=151')
|
const response = await fetch('https://pokeapi.co/api/v2/pokemon?limit=151')
|
||||||
const pokemons = await response.json()
|
const pokemons = await response.json()
|
||||||
|
|
||||||
console.log(pokemons)
|
|
||||||
|
|
||||||
const uploadWordsPromise = new Promise((resolve, reject) => {
|
const uploadWordsPromise = new Promise((resolve, reject) => {
|
||||||
|
|
||||||
@@ -24,14 +23,6 @@ const PokemonScripts = () => {
|
|||||||
|
|
||||||
await uploadWordsPromise.then(() => {})
|
await uploadWordsPromise.then(() => {})
|
||||||
|
|
||||||
// await pokemons.results.forEach(async (pokemon) => {
|
|
||||||
// console.log(pokemon.name)
|
|
||||||
|
|
||||||
// await AddPokemonToFirebaseQuery('english', pokemon)
|
|
||||||
// });
|
|
||||||
|
|
||||||
console.log(pokemons.results.length)
|
|
||||||
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user