Skip to content

Develop #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Removed console.logs
  • Loading branch information
jamesqquick committed Jun 11, 2020
commit d792edc6a13e16cd7e1e49493951300a3f2c4b0e
1 change: 0 additions & 1 deletion 10. Fetch Questions from Local JSON File/end.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ username.addEventListener('keyup', () => {
});

saveHighScore = (e) => {
console.log('clicked the save button!');
e.preventDefault();

const score = {
Expand Down
117 changes: 58 additions & 59 deletions 10. Fetch Questions from Local JSON File/game.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const question = document.getElementById("question");
const choices = Array.from(document.getElementsByClassName("choice-text"));
const progressText = document.getElementById("progressText");
const scoreText = document.getElementById("score");
const progressBarFull = document.getElementById("progressBarFull");
const question = document.getElementById('question');
const choices = Array.from(document.getElementsByClassName('choice-text'));
const progressText = document.getElementById('progressText');
const scoreText = document.getElementById('score');
const progressBarFull = document.getElementById('progressBarFull');
let currentQuestion = {};
let acceptingAnswers = false;
let score = 0;
Expand All @@ -11,79 +11,78 @@ let availableQuesions = [];

let questions = [];

fetch("questions.json")
.then(res => {
return res.json();
})
.then(loadedQuestions => {
console.log(loadedQuestions);
questions = loadedQuestions;
startGame();
})
.catch(err => {
console.error(err);
});
fetch('questions.json')
.then((res) => {
return res.json();
})
.then((loadedQuestions) => {
questions = loadedQuestions;
startGame();
})
.catch((err) => {
console.error(err);
});

//CONSTANTS
const CORRECT_BONUS = 10;
const MAX_QUESTIONS = 3;

startGame = () => {
questionCounter = 0;
score = 0;
availableQuesions = [...questions];
getNewQuestion();
questionCounter = 0;
score = 0;
availableQuesions = [...questions];
getNewQuestion();
};

getNewQuestion = () => {
if (availableQuesions.length === 0 || questionCounter >= MAX_QUESTIONS) {
localStorage.setItem("mostRecentScore", score);
//go to the end page
return window.location.assign("/end.html");
}
questionCounter++;
progressText.innerText = `Question ${questionCounter}/${MAX_QUESTIONS}`;
//Update the progress bar
progressBarFull.style.width = `${(questionCounter / MAX_QUESTIONS) * 100}%`;
if (availableQuesions.length === 0 || questionCounter >= MAX_QUESTIONS) {
localStorage.setItem('mostRecentScore', score);
//go to the end page
return window.location.assign('/end.html');
}
questionCounter++;
progressText.innerText = `Question ${questionCounter}/${MAX_QUESTIONS}`;
//Update the progress bar
progressBarFull.style.width = `${(questionCounter / MAX_QUESTIONS) * 100}%`;

const questionIndex = Math.floor(Math.random() * availableQuesions.length);
currentQuestion = availableQuesions[questionIndex];
question.innerText = currentQuestion.question;
const questionIndex = Math.floor(Math.random() * availableQuesions.length);
currentQuestion = availableQuesions[questionIndex];
question.innerText = currentQuestion.question;

choices.forEach(choice => {
const number = choice.dataset["number"];
choice.innerText = currentQuestion["choice" + number];
});
choices.forEach((choice) => {
const number = choice.dataset['number'];
choice.innerText = currentQuestion['choice' + number];
});

availableQuesions.splice(questionIndex, 1);
acceptingAnswers = true;
availableQuesions.splice(questionIndex, 1);
acceptingAnswers = true;
};

choices.forEach(choice => {
choice.addEventListener("click", e => {
if (!acceptingAnswers) return;
choices.forEach((choice) => {
choice.addEventListener('click', (e) => {
if (!acceptingAnswers) return;

acceptingAnswers = false;
const selectedChoice = e.target;
const selectedAnswer = selectedChoice.dataset["number"];
acceptingAnswers = false;
const selectedChoice = e.target;
const selectedAnswer = selectedChoice.dataset['number'];

const classToApply =
selectedAnswer == currentQuestion.answer ? "correct" : "incorrect";
const classToApply =
selectedAnswer == currentQuestion.answer ? 'correct' : 'incorrect';

if (classToApply === "correct") {
incrementScore(CORRECT_BONUS);
}
if (classToApply === 'correct') {
incrementScore(CORRECT_BONUS);
}

selectedChoice.parentElement.classList.add(classToApply);
selectedChoice.parentElement.classList.add(classToApply);

setTimeout(() => {
selectedChoice.parentElement.classList.remove(classToApply);
getNewQuestion();
}, 1000);
});
setTimeout(() => {
selectedChoice.parentElement.classList.remove(classToApply);
getNewQuestion();
}, 1000);
});
});

incrementScore = num => {
score += num;
scoreText.innerText = score;
incrementScore = (num) => {
score += num;
scoreText.innerText = score;
};
1 change: 0 additions & 1 deletion 11. Fetch API Questions from Open Trivia API/end.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ username.addEventListener('keyup', () => {
});

saveHighScore = (e) => {
console.log('clicked the save button!');
e.preventDefault();

const score = {
Expand Down
1 change: 0 additions & 1 deletion 11. Fetch API Questions from Open Trivia API/game.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ fetch(
return res.json();
})
.then((loadedQuestions) => {
console.log(loadedQuestions.results);
questions = loadedQuestions.results.map((loadedQuestion) => {
const formattedQuestion = {
question: loadedQuestion.question,
Expand Down
1 change: 0 additions & 1 deletion 12. Create a Spinning Loader/end.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ username.addEventListener('keyup', () => {
});

saveHighScore = (e) => {
console.log('clicked the save button!');
e.preventDefault();

const score = {
Expand Down
167 changes: 83 additions & 84 deletions 12. Create a Spinning Loader/game.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const question = document.getElementById("question");
const choices = Array.from(document.getElementsByClassName("choice-text"));
const progressText = document.getElementById("progressText");
const scoreText = document.getElementById("score");
const progressBarFull = document.getElementById("progressBarFull");
const loader = document.getElementById("loader");
const game = document.getElementById("game");
const question = document.getElementById('question');
const choices = Array.from(document.getElementsByClassName('choice-text'));
const progressText = document.getElementById('progressText');
const scoreText = document.getElementById('score');
const progressBarFull = document.getElementById('progressBarFull');
const loader = document.getElementById('loader');
const game = document.getElementById('game');
let currentQuestion = {};
let acceptingAnswers = false;
let score = 0;
Expand All @@ -14,101 +14,100 @@ let availableQuesions = [];
let questions = [];

fetch(
"https://opentdb.com/api.php?amount=10&category=9&difficulty=easy&type=multiple"
'https://opentdb.com/api.php?amount=10&category=9&difficulty=easy&type=multiple'
)
.then(res => {
return res.json();
})
.then(loadedQuestions => {
console.log(loadedQuestions.results);
questions = loadedQuestions.results.map(loadedQuestion => {
const formattedQuestion = {
question: loadedQuestion.question
};

const answerChoices = [...loadedQuestion.incorrect_answers];
formattedQuestion.answer = Math.floor(Math.random() * 4) + 1;
answerChoices.splice(
formattedQuestion.answer - 1,
0,
loadedQuestion.correct_answer
);

answerChoices.forEach((choice, index) => {
formattedQuestion["choice" + (index + 1)] = choice;
});

return formattedQuestion;
.then((res) => {
return res.json();
})
.then((loadedQuestions) => {
questions = loadedQuestions.results.map((loadedQuestion) => {
const formattedQuestion = {
question: loadedQuestion.question,
};

const answerChoices = [...loadedQuestion.incorrect_answers];
formattedQuestion.answer = Math.floor(Math.random() * 4) + 1;
answerChoices.splice(
formattedQuestion.answer - 1,
0,
loadedQuestion.correct_answer
);

answerChoices.forEach((choice, index) => {
formattedQuestion['choice' + (index + 1)] = choice;
});

return formattedQuestion;
});

startGame();
})
.catch((err) => {
console.error(err);
});

startGame();
})
.catch(err => {
console.error(err);
});

//CONSTANTS
const CORRECT_BONUS = 10;
const MAX_QUESTIONS = 3;

startGame = () => {
questionCounter = 0;
score = 0;
availableQuesions = [...questions];
getNewQuestion();
game.classList.remove("hidden");
loader.classList.add("hidden");
questionCounter = 0;
score = 0;
availableQuesions = [...questions];
getNewQuestion();
game.classList.remove('hidden');
loader.classList.add('hidden');
};

getNewQuestion = () => {
if (availableQuesions.length === 0 || questionCounter >= MAX_QUESTIONS) {
localStorage.setItem("mostRecentScore", score);
//go to the end page
return window.location.assign("/end.html");
}
questionCounter++;
progressText.innerText = `Question ${questionCounter}/${MAX_QUESTIONS}`;
//Update the progress bar
progressBarFull.style.width = `${(questionCounter / MAX_QUESTIONS) * 100}%`;

const questionIndex = Math.floor(Math.random() * availableQuesions.length);
currentQuestion = availableQuesions[questionIndex];
question.innerText = currentQuestion.question;

choices.forEach(choice => {
const number = choice.dataset["number"];
choice.innerText = currentQuestion["choice" + number];
});

availableQuesions.splice(questionIndex, 1);
acceptingAnswers = true;
if (availableQuesions.length === 0 || questionCounter >= MAX_QUESTIONS) {
localStorage.setItem('mostRecentScore', score);
//go to the end page
return window.location.assign('/end.html');
}
questionCounter++;
progressText.innerText = `Question ${questionCounter}/${MAX_QUESTIONS}`;
//Update the progress bar
progressBarFull.style.width = `${(questionCounter / MAX_QUESTIONS) * 100}%`;

const questionIndex = Math.floor(Math.random() * availableQuesions.length);
currentQuestion = availableQuesions[questionIndex];
question.innerText = currentQuestion.question;

choices.forEach((choice) => {
const number = choice.dataset['number'];
choice.innerText = currentQuestion['choice' + number];
});

availableQuesions.splice(questionIndex, 1);
acceptingAnswers = true;
};

choices.forEach(choice => {
choice.addEventListener("click", e => {
if (!acceptingAnswers) return;
choices.forEach((choice) => {
choice.addEventListener('click', (e) => {
if (!acceptingAnswers) return;

acceptingAnswers = false;
const selectedChoice = e.target;
const selectedAnswer = selectedChoice.dataset["number"];
acceptingAnswers = false;
const selectedChoice = e.target;
const selectedAnswer = selectedChoice.dataset['number'];

const classToApply =
selectedAnswer == currentQuestion.answer ? "correct" : "incorrect";
const classToApply =
selectedAnswer == currentQuestion.answer ? 'correct' : 'incorrect';

if (classToApply === "correct") {
incrementScore(CORRECT_BONUS);
}
if (classToApply === 'correct') {
incrementScore(CORRECT_BONUS);
}

selectedChoice.parentElement.classList.add(classToApply);
selectedChoice.parentElement.classList.add(classToApply);

setTimeout(() => {
selectedChoice.parentElement.classList.remove(classToApply);
getNewQuestion();
}, 1000);
});
setTimeout(() => {
selectedChoice.parentElement.classList.remove(classToApply);
getNewQuestion();
}, 1000);
});
});

incrementScore = num => {
score += num;
scoreText.innerText = score;
incrementScore = (num) => {
score += num;
scoreText.innerText = score;
};
Loading