diff --git a/index.html b/index.html index 534cd886..a5fee0b6 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@

JavaScript Quiz

- + diff --git a/src/index.js b/src/index.js index 03737ba3..50794c52 100644 --- a/src/index.js +++ b/src/index.js @@ -89,86 +89,105 @@ document.addEventListener("DOMContentLoaded", () => { // Get the current question from the quiz by calling the Quiz class method `getQuestion()` 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 - - - // 2. Update the green progress bar - // Update the green progress bar (div#progressBar) width so that it shows the percentage of questions answered + // Update the green progress bar + const progressPercentage = ((quiz.currentQuestionIndex + 1) / quiz.questions.length) * 100; + progressBar.style.width = `${progressPercentage}%`; - progressBar.style.width = `65%`; // This value is hardcoded as a placeholder - - + // Update the question count text + questionCount.innerText = `Question ${quiz.currentQuestionIndex + 1} of ${quiz.questions.length}`; + + // Display the question text + questionContainer.innerText = question.text; + + // Create and display new radio input with a label for each choice + question.choices.forEach((choice, index) => { + // Create radio input element + const radioInput = document.createElement("input"); + radioInput.type = "radio"; + radioInput.name = "choice"; + radioInput.id = `choice${index}`; + radioInput.value = choice; + + // Create label element + const label = document.createElement("label"); + label.htmlFor = `choice${index}`; + label.innerText = choice; + + // Create a div to contain the radio and label + const choiceDiv = document.createElement("div"); + choiceDiv.classList.add("choice"); + choiceDiv.appendChild(radioInput); + choiceDiv.appendChild(label); + + // Add the choice to the choice container + choiceContainer.appendChild(choiceDiv); + }); + } - // 3. Update the question count text - // Update the question count (div#questionCount) show the current question out of total questions + function nextButtonHandler() { + const choiceElements = document.querySelectorAll('input[name="choice"]'); + let selectedAnswer = null; - questionCount.innerText = `Question 1 of 10`; // This value is hardcoded as a placeholder - - + choiceElements.forEach(choiceElement => { + if (choiceElement.checked) { + selectedAnswer = choiceElement.value; + } + }); - // 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. - + if (selectedAnswer !== null) { + quiz.checkAnswer(selectedAnswer); + quiz.moveToNextQuestion(); + showQuestion(); + } else { + alert("Please select an answer before proceeding!"); + } } + function showResults() { + quizView.style.display = "none"; + endView.style.display = "flex"; + resultContainer.innerText = `You scored ${quiz.correctAnswers} out of ${quiz.questions.length} correct answers!`; + clearInterval(timer); + } - - 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. - + function startTimer() { + timer = setInterval(() => { + quiz.timeRemaining--; - // 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()`. - } - - - - - function showResults() { + const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0"); + const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0"); - // YOUR CODE HERE: - // - // 1. Hide the quiz view (div#quizView) - quizView.style.display = "none"; + const timeRemainingContainer = document.getElementById("timeRemaining"); + timeRemainingContainer.innerText = `${minutes}:${seconds}`; + + if (quiz.timeRemaining <= 0) { + clearInterval(timer); + showResults(); + } + }, 1000); + } - // 2. Show the end view (div#endView) - endView.style.display = "flex"; + function resetQuizHandler() { + endView.style.display = "none"; + quizView.style.display = "block"; - // 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 + quiz.currentQuestionIndex = 0; + quiz.correctAnswers = 0; + quiz.timeRemaining = quiz.timeLimit; + + const minutes = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0"); + const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0"); + timeRemainingContainer.innerText = `${minutes}:${seconds}`; + + quiz.shuffleQuestions(); + + clearInterval(timer); + startTimer(); + + showQuestion(); } - }); \ No newline at end of file diff --git a/src/question.js b/src/question.js index 68f6631a..837b0a75 100644 --- a/src/question.js +++ b/src/question.js @@ -1,7 +1,15 @@ 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() { + 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]]; + } + } } \ No newline at end of file diff --git a/src/quiz.js b/src/quiz.js index d94cfd14..51dd6ff1 100644 --- a/src/quiz.js +++ b/src/quiz.js @@ -1,15 +1,62 @@ class Quiz { - // YOUR CODE HERE: - // - // 1. constructor (questions, timeLimit, timeRemaining) - - // 2. getQuestion() + constructor(questions, timeLimit, timeRemaining) { + this.questions = questions; + this.timeLimit = timeLimit; + this.timeRemaining = timeRemaining; + this.correctAnswers = 0; + this.currentQuestionIndex = 0; // Fixed: changed from correctQuestionIndex to currentQuestionIndex + } + + getQuestion() { + return this.questions[this.currentQuestionIndex]; + } - // 3. moveToNextQuestion() + moveToNextQuestion() { + this.currentQuestionIndex++; // Fixed: increment index, don't return question + } - // 4. shuffleQuestions() + shuffleQuestions() { + for (let i = this.questions.length - 1; i > 0; i--) { // Fixed: changed i-0 to i>0 + 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 currentQuestion = this.getQuestion(); + if (answer === currentQuestion.answer) { + this.correctAnswers++; + return true; + } + return false; + } - // 6. hasEnded() -} \ No newline at end of file + hasEnded() { + return this.currentQuestionIndex >= this.questions.length; + } + filterQuestionsByDifficulty(difficulty) { + // Check if difficulty is a number between 1 and 3 + if (typeof difficulty === 'number' && difficulty >= 1 && difficulty <= 3) { + // Use filter() to keep only questions with the specified difficulty + this.questions = this.questions.filter(question => { + return question.difficulty === difficulty; + }); + } + // If difficulty is not valid (not a number between 1-3), do nothing + } + averageDifficulty() { + // Handle edge case: empty questions array + if (this.questions.length === 0) { + return 0; + } + + // Use reduce() to sum up all difficulty values + const totalDifficulty = this.questions.reduce((sum, question) => { + // Add current question's difficulty to the running sum + return sum + question.difficulty; + }, 0); // Start with initial value of 0 + + // Calculate and return the average + return totalDifficulty / this.questions.length; + } +}