From 9cb74858e00c7adbe897ade27fe1b2a17dbaf3ae Mon Sep 17 00:00:00 2001 From: Francisco Pessano Date: Wed, 2 Mar 2022 19:02:49 -0300 Subject: [PATCH] Fixes and change of Firebase API KEY --- .env | 1 - .gitignore | 8 +++-- package.json | 2 +- src/Firebase Querys/BringTheWord.js | 6 ++-- src/Firebase Querys/GetRandomCategory.js | 1 + src/Firebase/Firebase_Config.js | 19 +++++++++++ .../RecoveryCurrentCategory.js | 17 +++++----- .../RecoveryCurrentLanguage.js | 12 ++++--- .../Control Panel/Actions/AddWord/AddWord.jsx | 2 -- .../Firebase Querys/getCategoryForDatabase.js | 1 - .../Firebase Querys/DeleteCategoryFirebase.js | 33 ------------------- src/components/Game/Game.jsx | 8 ++--- .../AddPokemonToFirebaseQuery.js | 2 -- .../Pokemon Scripts/PokemonScripts.jsx | 9 ----- 14 files changed, 48 insertions(+), 73 deletions(-) delete mode 100644 .env create mode 100644 src/Firebase/Firebase_Config.js diff --git a/.env b/.env deleted file mode 100644 index 1831105..0000000 --- a/.env +++ /dev/null @@ -1 +0,0 @@ -SKIP_PREFLIGHT_CHECK=true diff --git a/.gitignore b/.gitignore index ba98342..ce95396 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,11 @@ npm-debug.log* yarn-debug.log* yarn-error.log* -/src/Firebase/Firebase_Config.js -/public/Hover.css/css +# /src/Firebase/Firebase_Config.js +# /public/Hover.css/css /package-lock.json /package-lock.json.save -/package-lock.json.save.1 \ No newline at end of file +/package-lock.json.save.1 + +/.env \ No newline at end of file diff --git a/package.json b/package.json index 77c93a3..8497ebd 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "@testing-library/react": "^11.2.7", "@testing-library/user-event": "^12.8.3", "emailjs-com": "^3.2.0", - "firebase": "^9.1.3", + "firebase": "^9.6.7", "react": "^17.0.2", "react-dom": "^17.0.2", "react-router-dom": "^5.3.0", diff --git a/src/Firebase Querys/BringTheWord.js b/src/Firebase Querys/BringTheWord.js index a6a447d..ec8c8b3 100644 --- a/src/Firebase Querys/BringTheWord.js +++ b/src/Firebase Querys/BringTheWord.js @@ -1,16 +1,15 @@ 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 SelectRandomWord from './SelectRandomWord'; -const BringTheWords = async (language = 'english', category = false, selectedWord) => { +const BringTheWords = async (language, category, selectedWord) => { if (!selectedWord) { if (!category || category === 'false') { category = await GetRandomCategory(language) - } try { @@ -26,6 +25,7 @@ const BringTheWords = async (language = 'english', category = false, selectedWor return await word } catch (error) { + console.log(error) } } } diff --git a/src/Firebase Querys/GetRandomCategory.js b/src/Firebase Querys/GetRandomCategory.js index 71aafc2..06bd2f7 100644 --- a/src/Firebase Querys/GetRandomCategory.js +++ b/src/Firebase Querys/GetRandomCategory.js @@ -22,6 +22,7 @@ const GetRandomCategory = async (language) => { return categoriesList[randomNumber].toLowerCase() } catch (error) { + console.log(error) } } diff --git a/src/Firebase/Firebase_Config.js b/src/Firebase/Firebase_Config.js new file mode 100644 index 0000000..66d2c8a --- /dev/null +++ b/src/Firebase/Firebase_Config.js @@ -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} \ No newline at end of file diff --git a/src/Storage Scripts/RecoveryCurrentCategory.js b/src/Storage Scripts/RecoveryCurrentCategory.js index 0f7a4ae..b1f3b8f 100644 --- a/src/Storage Scripts/RecoveryCurrentCategory.js +++ b/src/Storage Scripts/RecoveryCurrentCategory.js @@ -1,16 +1,15 @@ export const RecoveryCurrentCategory = (setCategory) => { - if (localStorage.getItem('category')) { + if (localStorage.getItem('category')) { - const category = localStorage.getItem('category') + const category = localStorage.getItem('category') - setCategory(category) - localStorage.removeItem('category') + setCategory(category) + localStorage.removeItem('category') - if (localStorage.getItem('category') === 'false') { + if (localStorage.getItem('category') === 'false') { - //setCategory(false) - } - - } + //setCategory(false) + } + } } diff --git a/src/Storage Scripts/RecoveryCurrentLanguage.js b/src/Storage Scripts/RecoveryCurrentLanguage.js index 8e82523..c3fe1be 100644 --- a/src/Storage Scripts/RecoveryCurrentLanguage.js +++ b/src/Storage Scripts/RecoveryCurrentLanguage.js @@ -1,8 +1,10 @@ export const RecoveryCurrentLanguage = (setLanguage) => { - - if (localStorage.getItem('language')) { + + if (localStorage.getItem('language')) { - setLanguage(localStorage.getItem('language')) - localStorage.removeItem('language') - } + setLanguage(localStorage.getItem('language')) + localStorage.removeItem('language') + + return + } } diff --git a/src/components/Admin/Control Panel/Actions/AddWord/AddWord.jsx b/src/components/Admin/Control Panel/Actions/AddWord/AddWord.jsx index ecb9b46..02ce677 100644 --- a/src/components/Admin/Control Panel/Actions/AddWord/AddWord.jsx +++ b/src/components/Admin/Control Panel/Actions/AddWord/AddWord.jsx @@ -96,8 +96,6 @@ const AddWord = () => { splitedWords = splitedWords.map(word => word.toLowerCase()) splitedWords = splitedWords.map(word => capitalize(word)) - console.log(categoryForDatabase); - const uploadWordsPromise = new Promise((resolve, reject) => { splitedWords.forEach(async (word, index) => { diff --git a/src/components/Admin/Control Panel/Actions/AddWord/Firebase Querys/getCategoryForDatabase.js b/src/components/Admin/Control Panel/Actions/AddWord/Firebase Querys/getCategoryForDatabase.js index a963e3a..6c533f0 100644 --- a/src/components/Admin/Control Panel/Actions/AddWord/Firebase Querys/getCategoryForDatabase.js +++ b/src/components/Admin/Control Panel/Actions/AddWord/Firebase Querys/getCategoryForDatabase.js @@ -12,7 +12,6 @@ const getCategoryForDatabase = async (categorySelection, LanguageSelection) => { const categoryLocalizated = categoryFirebase.data()[LanguageSelection] return await categoryLocalizated - console.log(categoryLocalizated) } catch (error) { diff --git a/src/components/Admin/Control Panel/Actions/DeleteCategory/Firebase Querys/DeleteCategoryFirebase.js b/src/components/Admin/Control Panel/Actions/DeleteCategory/Firebase Querys/DeleteCategoryFirebase.js index ad01beb..51f59c4 100644 --- a/src/components/Admin/Control Panel/Actions/DeleteCategory/Firebase Querys/DeleteCategoryFirebase.js +++ b/src/components/Admin/Control Panel/Actions/DeleteCategory/Firebase Querys/DeleteCategoryFirebase.js @@ -6,39 +6,6 @@ const DeleteCategoryFirebase = async (category, setData) => { try { 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)) } catch (error) { diff --git a/src/components/Game/Game.jsx b/src/components/Game/Game.jsx index 5e1e34d..104b7f1 100644 --- a/src/components/Game/Game.jsx +++ b/src/components/Game/Game.jsx @@ -65,10 +65,10 @@ function Game() { setSelectedWord('a') let word = await BringTheWords(language, category, selectedWord) - word = word.toLowerCase() + word = word.toLowerCase() - await setSelectedWord(word) - await setDisplayApp(true) + setSelectedWord(word) + setDisplayApp(true) } } @@ -172,7 +172,7 @@ function Game() { AlmacenateLanguage(language) window.location.reload(false) - }, 3000) + }, 3000) } return ( diff --git a/src/components/Pokemon Scripts/AddPokemonToFirebaseQuery.js b/src/components/Pokemon Scripts/AddPokemonToFirebaseQuery.js index f5f1086..1664272 100644 --- a/src/components/Pokemon Scripts/AddPokemonToFirebaseQuery.js +++ b/src/components/Pokemon Scripts/AddPokemonToFirebaseQuery.js @@ -3,8 +3,6 @@ import {getFirestore, collection, doc, setDoc } from "firebase/firestore/lite"; const AddPokemonToFirebaseQuery = async (language, pokemon) => { - console.log(pokemon) - console.log(language) try { const db = await getFirestore(firestore) const result = await setDoc(doc(db, `hangman_words/${language}/pokemons`, pokemon.name), { diff --git a/src/components/Pokemon Scripts/PokemonScripts.jsx b/src/components/Pokemon Scripts/PokemonScripts.jsx index cad7fb3..60fb883 100644 --- a/src/components/Pokemon Scripts/PokemonScripts.jsx +++ b/src/components/Pokemon Scripts/PokemonScripts.jsx @@ -10,7 +10,6 @@ const PokemonScripts = () => { const response = await fetch('https://pokeapi.co/api/v2/pokemon?limit=151') const pokemons = await response.json() - console.log(pokemons) const uploadWordsPromise = new Promise((resolve, reject) => { @@ -24,14 +23,6 @@ const PokemonScripts = () => { await uploadWordsPromise.then(() => {}) - // await pokemons.results.forEach(async (pokemon) => { - // console.log(pokemon.name) - - // await AddPokemonToFirebaseQuery('english', pokemon) - // }); - - console.log(pokemons.results.length) - } catch (error) { }