-
+
diff --git a/src/index.js b/src/index.js
index 03737ba3..9c275db2 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,7 +13,7 @@ document.addEventListener("DOMContentLoaded", () => {
// End view elements
const resultContainer = document.querySelector("#result");
-
+ const resetButton = document.querySelector("#restartButton");
/************ SET VISIBILITY OF VIEWS ************/
@@ -23,7 +23,7 @@ document.addEventListener("DOMContentLoaded", () => {
/************ QUIZ DATA ************/
-
+
// Array with the quiz questions
const questions = [
new Question("What is 2 + 2?", ["3", "4", "5", "6"], "4", 1),
@@ -36,7 +36,7 @@ document.addEventListener("DOMContentLoaded", () => {
/************ QUIZ INSTANCE ************/
-
+
// Create a new Quiz instance object
const quiz = new Quiz(questions, quizDuration, quizDuration);
// Shuffle the quiz questions
@@ -45,27 +45,49 @@ document.addEventListener("DOMContentLoaded", () => {
/************ SHOW INITIAL CONTENT ************/
- // Convert the time remaining in seconds to minutes and seconds, and pad the numbers with zeros if needed
- const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
- const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+
// Display the time remaining in the time remaining container
const timeRemainingContainer = document.getElementById("timeRemaining");
- timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+
+ quizView.style.position = "relative";
+ timeRemainingContainer.style.position = "absolute";
+ timeRemainingContainer.style.top = "30px";
+ timeRemainingContainer.style.left = "500px";
+
+ const timeRemainingData = () => {
+ // Convert the time remaining in seconds to minutes and seconds, and pad the numbers with zeros if needed
+ const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
+ const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+
+ timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+ };
// Show first question
showQuestion();
/************ TIMER ************/
+ function updateCountdown() {
+ if (quiz.timeRemaining > 0) {
+ quiz.timeRemaining--;
+
+ timeRemainingData();
- let timer;
+ } else {
+ clearInterval(timer);
+
+ showResults();
+ }
+ }
+ // Call the function every second
+ let timer = setInterval(updateCountdown, 1000);
/************ EVENT LISTENERS ************/
nextButton.addEventListener("click", nextButtonHandler);
-
+ resetButton.addEventListener("click", resetQuiz);
/************ FUNCTIONS ************/
@@ -91,84 +113,140 @@ document.addEventListener("DOMContentLoaded", () => {
const question = quiz.getQuestion();
// Shuffle the choices of the current question by calling the method 'shuffleChoices()' on the question object
question.shuffleChoices();
-
-
+
+
// YOUR CODE HERE:
//
// 1. Show the question
// Update the inner text of the question container element and show the question text
+ /* Si lo hiciese iterando directamente sobre el array questions, la pregunta y las respuestas no se corresponderían*/
+ /* questions.forEach(question => { */
+ questionContainer.innerText = question.text;
+ /* }); */
-
// 2. Update the green progress bar
// Update the green progress bar (div#progressBar) width so that it shows the percentage of questions answered
-
- progressBar.style.width = `65%`; // This value is hardcoded as a placeholder
+ progressBar.style.width = `${(quiz.currentQuestionIndex) * 100 / (quiz.questions.length)}%`; // This value is hardcoded as a placeholder
// 3. Update the question count text
// Update the question count (div#questionCount) show the current question out of total questions
-
- questionCount.innerText = `Question 1 of 10`; // This value is hardcoded as a placeholder
+
+ questionCount.innerText = `Question ${quiz.currentQuestionIndex + 1} of ${quiz.questions.length}`; // This value is hardcoded as a placeholder
-
// 4. Create and display new radio input element with a label for each choice.
// Loop through the current question `choices`.
- // For each choice create a new radio input with a label, and append it to the choice container.
- // Each choice should be displayed as a radio input element with a label:
- /*
-
-
-
- */
- // Hint 1: You can use the `document.createElement()` method to create a new element.
- // Hint 2: You can use the `element.type`, `element.name`, and `element.value` properties to set the type, name, and value of an element.
- // Hint 3: You can use the `element.appendChild()` method to append an element to the choices container.
- // Hint 4: You can use the `element.innerText` property to set the inner text of an element.
+ // For each choice create a new radio input with a label, and append it to the choice container.
+ // Each choice should be displayed as a radio input element with a label:
+
+ /* quiz.questions[quiz.currentQuestionIndex] Sería otra opción si no pusiera 'question', haciendo referencia a la variable que llama al método quiz.getQuestion()*/
+ question.choices.forEach(choice => {
+ const newChoice = document.createElement("input");
+ newChoice.type = "radio";
+ newChoice.name = "choice";
+ newChoice.value = choice;
+ choiceContainer.appendChild(newChoice);
+
+ const newLabel = document.createElement("label");
+ newLabel.innerText = choice;
+ choiceContainer.appendChild(newLabel);
+
+ const breakTag = document.createElement("br");
+ choiceContainer.appendChild(breakTag);
+ });
+ /*
+
+
+
+ */
+
+ // Hint 1: You can use the `document.createElement()` method to create a new element.
+ // Hint 2: You can use the `element.type`, `element.name`, and `element.value` properties to set the type, name, and value of an element.
+ // Hint 3: You can use the `element.appendChild()` method to append an element to the choices container.
+ // Hint 4: You can use the `element.innerText` property to set the inner text of an element.
}
-
- function nextButtonHandler () {
+ function nextButtonHandler() {
let selectedAnswer; // A variable to store the selected answer value
-
-
// YOUR CODE HERE:
//
// 1. Get all the choice elements. You can use the `document.querySelectorAll()` method.
-
+ const choices = document.querySelectorAll("#choices input");
+ /* console.log(choices); */
// 2. Loop through all the choice elements and check which one is selected
- // Hint: Radio input elements have a property `.checked` (e.g., `element.checked`).
- // When a radio input gets selected the `.checked` property will be set to true.
- // You can use check which choice was selected by checking if the `.checked` property is true.
-
-
- // 3. If an answer is selected (`selectedAnswer`), check if it is correct and move to the next question
- // Check if selected answer is correct by calling the quiz method `checkAnswer()` with the selected answer.
- // Move to the next question by calling the quiz method `moveToNextQuestion()`.
- // Show the next question by calling the function `showQuestion()`.
- }
+ // Hint: Radio input elements have a property `.checked` (e.g., `element.checked`).
+ // When a radio input gets selected the `.checked` property will be set to true.
+ // You can use check which choice was selected by checking if the `.checked` property is true.
+ [...choices].forEach(currChoice => {
+ if (!currChoice.checked) return;
+ if (currChoice.checked) selectedAnswer = currChoice.value;
+ });
+ /* console.log(selectedAnswer); */
+ // 3. If an answer is selected (`selectedAnswer`), check if it is correct and move to the next question
+ // Check if selected answer is correct by calling the quiz method `checkAnswer()` with the selected answer.
+ // Move to the next question by calling the quiz method `moveToNextQuestion()`.
+ // Show the next question by calling the function `showQuestion()`.
+ quiz.checkAnswer(selectedAnswer);
+ quiz.moveToNextQuestion();
+ showQuestion();
+ }
function showResults() {
+ //clear the timer interval when the quiz ends
+ clearInterval(timer);
+
// YOUR CODE HERE:
//
// 1. Hide the quiz view (div#quizView)
quizView.style.display = "none";
+
// 2. Show the end view (div#endView)
endView.style.display = "flex";
-
+
// 3. Update the result container (div#result) inner text to show the number of correct answers out of total questions
- resultContainer.innerText = `You scored 1 out of 1 correct answers!`; // This value is hardcoded as a placeholder
+ resultContainer.innerText = `You scored ${quiz.correctAnswers} out of ${quiz.questions.length} correct answers!`; // This value is hardcoded as a placeholder
+ }
+
+ function resetQuiz() {
+ // 1. Hide the end view (div#endView)
+ endView.style.display = "none";
+
+ // 2. Show the quiz view (div#quizView)
+ quizView.style.display = "block";
+
+ // 3. Reset the currentQuestionIndex to 0
+ quiz.currentQuestionIndex = 0;
+
+ // 3. Reset the correctAnswers to 0
+ quiz.correctAnswers = 0;
+
+ // 3. Shuffle the questions
+ quiz.shuffleQuestions();
+
+ // 3. Show the first question
+ showQuestion();
+
+ // 4. reset the timeRemaining
+ quiz.timeRemaining = quizDuration;
+
+ timeRemainingData();
+
+ timer = setInterval(updateCountdown, 1000);
}
-
-});
\ No newline at end of file
+});
+
+
+
+
diff --git a/src/question.js b/src/question.js
index 68f6631a..e9e1142d 100644
--- a/src/question.js
+++ b/src/question.js
@@ -1,7 +1,13 @@
class Question {
// YOUR CODE HERE:
- //
- // 1. constructor (text, choices, answer, difficulty)
+ constructor (text, choices, answer, difficulty) {
+ this.text = text;
+ this.choices = choices;
+ this.answer = answer;
+ this.difficulty = difficulty;
+ }
- // 2. shuffleChoices()
+ shuffleChoices() {
+ this.choices.sort(() => Math.random() - 0.5);
+ }
}
\ No newline at end of file
diff --git a/src/quiz.js b/src/quiz.js
index d94cfd14..4a306fa4 100644
--- a/src/quiz.js
+++ b/src/quiz.js
@@ -1,15 +1,57 @@
class Quiz {
// YOUR CODE HERE:
- //
- // 1. constructor (questions, timeLimit, timeRemaining)
+ constructor(questions, timeLimit, timeRemaining) {
+ this.questions = questions;
+ this.timeLimit = timeLimit;
+ this.timeRemaining = timeRemaining;
+ this.correctAnswers = 0;
+ this.currentQuestionIndex = 0;
+ }
- // 2. getQuestion()
-
- // 3. moveToNextQuestion()
+ getQuestion() {
+ return this.questions[this.currentQuestionIndex];
+ }
- // 4. shuffleQuestions()
+ moveToNextQuestion() {
+ this.currentQuestionIndex++;
+ }
- // 5. checkAnswer(answer)
+ shuffleQuestions() {
+ this.questions.sort(() => Math.random() - 0.5);
+ }
- // 6. hasEnded()
+
+ checkAnswer(answer) {
+ /* quiz.questions[quiz.currentQuestionIndex] */
+ if (!answer || this.currentQuestionIndex >= this.questions.length) {
+ return;
+ }
+ if (answer === this.getQuestion().answer) {
+ this.correctAnswers++;
+ }
+ }
+
+ hasEnded() {
+ if (this.currentQuestionIndex < this.questions.length) {
+ return false;
+ } else {
+ return true;
+ };
+ }
+
+ filterQuestionsByDifficulty(difficulty) {
+ if (difficulty > 0 && difficulty < 4) {
+ const filteredQuestions = this.questions.filter(question => question.difficulty === difficulty);
+ this.questions = filteredQuestions;
+ }
+ }
+
+ averageDifficulty() {
+ const sumDifficulties = this.questions.reduce(
+ (accumulator, currentValue) => accumulator + currentValue.difficulty,
+ 0,
+ );
+ const avgDifficulty = sumDifficulties / this.questions.length;
+ return avgDifficulty;
+ }
}
\ No newline at end of file