diff --git a/index.html b/index.html index 534cd886..4c9a654d 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,7 @@

JavaScript Quiz

-
Remaining Time: 00:00
+
@@ -39,7 +39,7 @@

JavaScript Quiz

- + diff --git a/src/index.js b/src/index.js index 03737ba3..4942a864 100644 --- a/src/index.js +++ b/src/index.js @@ -10,43 +10,57 @@ document.addEventListener("DOMContentLoaded", () => { const questionContainer = document.querySelector("#question"); const choiceContainer = document.querySelector("#choices"); const nextButton = document.querySelector("#nextButton"); + const restartButton = document.querySelector("#restartButton"); // End view elements const resultContainer = document.querySelector("#result"); - /************ SET VISIBILITY OF VIEWS ************/ // Show the quiz view (div#quizView) and hide the end view (div#endView) quizView.style.display = "block"; endView.style.display = "none"; - /************ QUIZ DATA ************/ - + // Array with the quiz questions const questions = [ new Question("What is 2 + 2?", ["3", "4", "5", "6"], "4", 1), - new Question("What is the capital of France?", ["Miami", "Paris", "Oslo", "Rome"], "Paris", 1), - new Question("Who created JavaScript?", ["Plato", "Brendan Eich", "Lea Verou", "Bill Gates"], "Brendan Eich", 2), - new Question("What is the mass–energy equivalence equation?", ["E = mc^2", "E = m*c^2", "E = m*c^3", "E = m*c"], "E = mc^2", 3), + new Question( + "What is the capital of France?", + ["Miami", "Paris", "Oslo", "Rome"], + "Paris", + 1, + ), + new Question( + "Who created JavaScript?", + ["Plato", "Brendan Eich", "Lea Verou", "Bill Gates"], + "Brendan Eich", + 2, + ), + new Question( + "What is the mass–energy equivalence equation?", + ["E = mc^2", "E = m*c^2", "E = m*c^3", "E = m*c"], + "E = mc^2", + 3, + ), // Add more questions here ]; const quizDuration = 120; // 120 seconds (2 minutes) - /************ QUIZ INSTANCE ************/ - + // Create a new Quiz instance object const quiz = new Quiz(questions, quizDuration, quizDuration); // Shuffle the quiz questions quiz.shuffleQuestions(); - /************ 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 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 @@ -56,26 +70,50 @@ document.addEventListener("DOMContentLoaded", () => { // Show first question showQuestion(); - /************ TIMER ************/ let timer; + - /************ EVENT LISTENERS ************/ + timer = setInterval(() => { + quiz.timeRemaining--; - nextButton.addEventListener("click", nextButtonHandler); + + const timerElement =document.querySelector("#timeRemaining"); + timerElement.innerHTML = quiz.timeRemaining; + + if(timerElement){ + const minutes = Math.floor(quiz.timeRemaining / 60); + const seconds = quiz.timeRemaining % 60; + timerElement.textContent = `${minutes}: ${seconds < 10 ? "0" : ""} ${seconds}` + + } + + if(quiz.timeRemaining <= 0) { + clearInterval(timer); + showResults(); + } + }, 1000) + + + + + + /************ EVENT LISTENERS ************/ + + nextButton.addEventListener("click", nextButtonHandler); + restartButton.addEventListener("click", restartButtonHandler); + /************ FUNCTIONS ************/ // showQuestion() - Displays the current question and its choices // nextButtonHandler() - Handles the click on the next button // showResults() - Displays the end view and the quiz results - - function showQuestion() { // If the quiz has ended, show the results if (quiz.hasEnded()) { @@ -91,84 +129,134 @@ 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 + const questionText = document.createElement("p"); + questionText.innerHTML = question.text; + questionContainer.appendChild(questionText); - // 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) / 10}%`; // This value is hardcoded as a placeholder - // 3. Update the question count text + // 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 = `Quest ${quiz.currentQuestionIndex} out of 10`; // 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: - /* + // 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. - + // 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. + question.choices.forEach((choice) => { + const listElement = document.createElement("li"); + const inputElement = document.createElement("input"); + const labelElement = document.createElement("label"); + + labelElement.innerHTML = choice; + inputElement.type = "radio"; + inputElement.name = choice; + inputElement.value = choice; + + listElement.appendChild(inputElement); + listElement.appendChild(labelElement); + + choiceContainer.appendChild(listElement); + }); } - - - 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 choicesInput = document.querySelectorAll("input"); // 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. + // 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. + choicesInput.forEach((input) => { + if (input.checked) { + selectedAnswer = input.name; + } + }); - // 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()`. - } - - - + // 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() { - // YOUR CODE HERE: + clearInterval(timer); + + // // 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 restartButtonHandler() { + + + + //quiz.timeRemaining = 60; + quizView.style.display = "flex"; + endView.style.display = "none"; + + quiz.currentQuestionIndex = 0; + quiz.correctAnswers = 0; + quiz.shuffleQuestions(); + //clearInterval(timer); + showQuestion(); + + timer = setInterval(() => { + quiz.timeRemaining--; + -}); \ No newline at end of file + const timerElement =document.querySelector("#timeRemaining"); + timerElement.innerHTML = quiz.timeRemaining; + + if(timerElement){ + const minutes = Math.floor(quiz.timeRemaining / 60); + const seconds = quiz.timeRemaining % 60; + timerElement.textContent = `${minutes}: ${seconds < 10 ? "0" : ""} ${seconds}` + + } + + if(quiz.timeRemaining <= 0) { + clearInterval(timer); + + showResults(); + } + + + }, 1000); +} + +}); diff --git a/src/question.js b/src/question.js index 68f6631a..f12e8fa2 100644 --- a/src/question.js +++ b/src/question.js @@ -1,7 +1,16 @@ 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() -} \ No newline at end of file + shuffleChoices = () => { + for (let i = this.choices.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)); + [this.choices[i], this.choices[j]] = [this.choices[j], this.choices[i]]; + } + return this.choices; + }; +} diff --git a/src/quiz.js b/src/quiz.js index d94cfd14..eb76c54e 100644 --- a/src/quiz.js +++ b/src/quiz.js @@ -1,15 +1,55 @@ 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 = () => { + console.log(this.questions); + return this.questions[this.currentQuestionIndex]; + }; - // 4. shuffleQuestions() + moveToNextQuestion = () => { + this.currentQuestionIndex++; + }; - // 5. checkAnswer(answer) + shuffleQuestions = () => { + for (let i = this.questions.length - 1; i > 0; i--) { + const j = Math.floor(Math.random() * (i + 1)); + [this.questions[i], this.questions[j]] = [ + this.questions[j], + this.questions[i], + ]; + } + return this.questions; + }; - // 6. hasEnded() + checkAnswer = (answer) => { + let question = this.getQuestion(); + if (answer === question.answer) { + this.correctAnswers++; + } + }; + + hasEnded = () => { + return this.currentQuestionIndex >= this.questions.length; + }; + + filterQuestionsByDifficulty = (difficulty) => { + if (typeof difficulty !== "number" || difficulty < 1 || difficulty > 3) { + return this.questions; + } + + this.questions = this.questions.filter((question) => question.difficulty === difficulty); + return this.questions; + }; + + averageDifficulty = () => { + let difficulties = this.questions.map((question) => question.difficulty) + let sumOfDifficulties = difficulties.reduce((accum, currentValue) => accum + currentValue, 0) + return sumOfDifficulties / difficulties.length + } } \ No newline at end of file