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

JavaScript Quiz

- + - - - \ No newline at end of file + diff --git a/src/index.js b/src/index.js index 03737ba3..c3a65671 100644 --- a/src/index.js +++ b/src/index.js @@ -10,71 +10,85 @@ document.addEventListener("DOMContentLoaded", () => { const questionContainer = document.querySelector("#question"); const choiceContainer = document.querySelector("#choices"); const nextButton = document.querySelector("#nextButton"); + const restartButton = document.querySelector("#restartButton"); + const timeRemainingContainer = document.getElementById("timeRemaining"); // 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 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}`; + //Show initial timer before countdown + updateTimeDisplay(); // Show first question showQuestion(); - /************ TIMER ************/ - let timer; - + startTimer(); /************ 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 + // updateTimeDisplay() - Updates the remaining time (min+sec) depending on current remainingtime - + // Convert the time remaining in seconds to minutes and seconds, and pad the numbers with zeros if needed + function updateTimeDisplay() { + 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 + timeRemainingContainer.innerText = `${minutes}:${seconds}`; + } function showQuestion() { // If the quiz has ended, show the results @@ -82,83 +96,100 @@ document.addEventListener("DOMContentLoaded", () => { showResults(); return; } - // Clear the previous question text and question choices questionContainer.innerText = ""; choiceContainer.innerHTML = ""; // Get the current question from the quiz by calling the Quiz class method `getQuestion()` const question = quiz.getQuestion(); + // console.log(question); + // console.log(question.choices); + // console.log(typeof question.choices); // 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 - - + 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 + 1) / questions.length) * 100 + }%`; + // 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 = `Question ${quiz.currentQuestionIndex + 1} of ${ + questions.length + }`; + + //const quizChoicesArr = (); + //console.log(quizChoicesArr); - // 4. Create and display new radio input element with a label for each choice. // Loop through the current question `choices`. + for (const answerOption of 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: - /* + const optionList = document.querySelector("#choices"); + // CREATE LIST ELEMENT + const listEntry = document.createElement("li"); + // CREATE RADIO BUTTON + const radioButton = document.createElement("input"); + radioButton.type = "radio"; + radioButton.name = "choice"; + radioButton.value = answerOption; + //CREATE LABEL + const buttonLabel = document.createElement("label"); + buttonLabel.innerHTML = answerOption; + const space = document.createElement("br"); + + listEntry.append(radioButton, buttonLabel, space); + optionList.appendChild(listEntry); + } + // 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. } - - - - 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. - - // 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()`. - } - + const choices = document.querySelectorAll("#choices input"); + for (const choice of choices) { + if (choice.checked) selectedAnswer = choice.value; + } + // 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. + quiz.checkAnswer(selectedAnswer); + // Move to the next question by calling the quiz method `moveToNextQuestion()`. + quiz.moveToNextQuestion(); + // Show the next question by calling the function `showQuestion()`. + showQuestion(); + } function showResults() { - // YOUR CODE HERE: // // 1. Hide the quiz view (div#quizView) @@ -166,9 +197,42 @@ document.addEventListener("DOMContentLoaded", () => { // 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 ${questions.length} correct answers!`; // This value is hardcoded as a placeholder + + // Stop the timer + clearInterval(timer); + } + function restartButtonHandler() { + //Hide End view + endView.style.display = "none"; + //Show Quiz view + quizView.style.display = "flex"; + //Reset Quiz + //reset currentQ index + quiz.currentQuestionIndex = 0; + //reset correctAnswers + quiz.correctAnswers = 0; + //reset passed time + quiz.timeRemaining = quizDuration; + //shuffle questons + quiz.shuffleQuestions(); + //show first question + showQuestion(); + updateTimeDisplay(); + startTimer(); + } + function startTimer() { + timer = setInterval(() => { + if (quiz.timeRemaining >= 0) { + --quiz.timeRemaining; + updateTimeDisplay(); + } + if (quiz.timeRemaining === 0) { + clearInterval(timer); + showResults(); + } + }, 1000); } - -}); \ No newline at end of file +}); diff --git a/src/question.js b/src/question.js index 68f6631a..c65a26ba 100644 --- a/src/question.js +++ b/src/question.js @@ -1,7 +1,14 @@ class Question { - // YOUR CODE HERE: - // - // 1. constructor (text, choices, answer, difficulty) - - // 2. shuffleChoices() -} \ No newline at end of file + constructor(text, choices, answer, difficulty) { + this.text = text; + this.choices = choices; + this.answer = answer; + this.difficulty = difficulty; + } + 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]]; + } + } +} diff --git a/src/quiz.js b/src/quiz.js index d94cfd14..c0f42d49 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; + } + getQuestion() { + return this.questions[this.currentQuestionIndex]; + } - // 2. getQuestion() - - // 3. moveToNextQuestion() + moveToNextQuestion() { + this.currentQuestionIndex++; + } - // 4. shuffleQuestions() + 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], + ]; + } + } - // 5. checkAnswer(answer) + checkAnswer(answer) { + const question = this.getQuestion(); + const isCorrectAnswer = question.answer === answer; + if (isCorrectAnswer) { + ++this.correctAnswers; + } + } - // 6. hasEnded() -} \ No newline at end of file + hasEnded() { + return this.currentQuestionIndex === this.questions.length; + } + + filterQuestionsByDifficulty(difficulty) { + if (difficulty <= 3 && difficulty >= 1) { + this.questions = this.questions.filter(function (question) { + if (question.difficulty === difficulty) return question.difficulty; + }); + } + } + + averageDifficulty() { + const sumOfDifficulty = this.questions.reduce(function ( + subtotal, + question + ) { + return subtotal + question.difficulty; + }, + 0); + return sumOfDifficulty / this.questions.length; + } +}