-
+
diff --git a/src/index.js b/src/index.js
index 03737ba3..c943a397 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,7 +10,7 @@ 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");
@@ -55,17 +55,39 @@ document.addEventListener("DOMContentLoaded", () => {
// Show first question
showQuestion();
+
+
/************ TIMER ************/
let timer;
+ function startCountDown() {
+ timer = setInterval(() => {
+ quiz.timeRemaining--;
+ let minutesNew = Math.floor(quiz.timeRemaining / 60).toString().padStart(2, "0");
+ let secondsNew = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+ console.log("WTF")
+ timeRemainingContainer.innerText = `${minutesNew}:${secondsNew}`;
+ if (quiz.timeRemaining === 0) {
+ clearInterval(timer);
+ showResults();
+ }
+ }, 1000);
+ }
+
+ startCountDown();
+
+
+
/************ EVENT LISTENERS ************/
nextButton.addEventListener("click", nextButtonHandler);
+ restartButton.addEventListener("click", restartButtonHandler)
+
/************ FUNCTIONS ************/
@@ -98,19 +120,20 @@ document.addEventListener("DOMContentLoaded", () => {
//
// 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/quiz.questions.length)*100}%`; // 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} of ${quiz.questions.length}`; // This value is hardcoded as a placeholder
@@ -127,32 +150,57 @@ document.addEventListener("DOMContentLoaded", () => {
// 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 newInput = document.createElement("input");
+ const newLabel = document.createElement("label");
+ const newBr = document.createElement("br")
+
+ newInput.type = "radio";
+ newInput.name = "answer";
+ newInput.value = choice;
+
+ newLabel.innerText = choice;
+ choiceContainer.appendChild(newInput);
+ choiceContainer.appendChild(newLabel);
+ choiceContainer.appendChild(newBr)
+ });
+ }
- 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.
-
+ function nextButtonHandler() {
+ let selectedAnswer;
+
+ const choices = document.querySelectorAll("input[name='answer']");
+ choices.forEach((choice) => {
+ if (choice.checked) {
+ selectedAnswer = choice.value;
+ }
+ });
+
+ if (selectedAnswer) {
+ const currentQuestion = quiz.getQuestion();
+ if (selectedAnswer === currentQuestion.answer) {
+ quiz.checkAnswer(true);
+ }
+
+ quiz.moveToNextQuestion();
+ showQuestion();
+ }
+ }
- // 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 restartButtonHandler() {
+ quiz.timeRemaining = quizDuration;
+ quiz.currentQuestionIndex = 0;
+ quiz.correctAnswers = 0;
+ quiz.shuffleQuestions();
+ showQuestion();
+ startCountDown();
+ quizView.style.display = "block";
+ endView.style.display = "none";
-
- // 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()`.
- }
+ }
@@ -162,13 +210,14 @@ document.addEventListener("DOMContentLoaded", () => {
// YOUR CODE HERE:
//
// 1. Hide the quiz view (div#quizView)
+ clearInterval(timer);
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
}
});
\ No newline at end of file
diff --git a/src/question.js b/src/question.js
index 68f6631a..38d381ed 100644
--- a/src/question.js
+++ b/src/question.js
@@ -1,7 +1,16 @@
class Question {
- // YOUR CODE HERE:
- //
- // 1. constructor (text, choices, answer, difficulty)
- // 2. shuffleChoices()
+ constructor(text, choice, answer, difficulty){
+ this.text = text;
+ this.choices = choice;
+ 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)); // Pick a random index from 0 to i
+ [this.choices[i], this.choices[j]] = [this.choices[j], this.choices[i]]; // Swap
+ }
+ }
}
\ No newline at end of file
diff --git a/src/quiz.js b/src/quiz.js
index d94cfd14..899ea784 100644
--- a/src/quiz.js
+++ b/src/quiz.js
@@ -1,15 +1,58 @@
class Quiz {
- // YOUR CODE HERE:
- //
- // 1. constructor (questions, timeLimit, timeRemaining)
-
- // 2. getQuestion()
- // 3. moveToNextQuestion()
+ 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];
+ }
+
+ moveToNextQuestion(){
+ return this.currentQuestionIndex++;
+ }
+
+ shuffleQuestions() {
+ for (let i = this.questions.length - 1; i > 0; i--) {
+ const j = Math.floor(Math.random() * (i + 1)); // Pick a random index from 0 to i
+ [this.questions[i], this.questions[j]] = [this.questions[j], this.questions[i]]; // Swap
+ }
+ }
+
+ checkAnswer(answer){
+ if (answer){
+ return this.correctAnswers++;
+ }
+ }
+
+ hasEnded(){
+ if (this.currentQuestionIndex < this.questions.length){
+ return false;
+ }else{
+ return true;
+ }
+ }
- // 4. shuffleQuestions()
+ filterQuestionsByDifficulty(difficulty) {
+ if (typeof difficulty !== "number" || difficulty < 1 || difficulty > 3){
+ return;
+ }
+
+ this.questions = this.questions.filter((question) => {
+ return question.difficulty === difficulty;
+ })
+ }
- // 5. checkAnswer(answer)
+ averageDifficulty() {
+ const total = this.questions.reduce((sum, question) => {
+ return sum + question.difficulty;
+ }, 0)
- // 6. hasEnded()
+ return total/(this.questions.length);
+ }
}
\ No newline at end of file