Dia 1

index.html

@@ -39,7 +39,7 @@ <h1>JavaScript Quiz</h1>
           <div id="result"></div>
         </div>
         <!-- The below 'Restart Quiz' button is commented out because it is not used initially -->
-        <!-- <button id="restartButton" class="button-secondary">Restart Quiz</button> -->
+        <button id="restartButton" class="buttonSecondary">Restart Quiz</button> 
       </div>
     </div>
 

src/index.js

@@ -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),
@@ -32,11 +32,12 @@ document.addEventListener("DOMContentLoaded", () => {
     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
@@ -55,11 +56,27 @@ document.addEventListener("DOMContentLoaded", () => {
 
   // Show first question
   showQuestion();
-
+  startCountdown();
 
   /************  TIMER  ************/
+function startCountdown() {
+
+    let timer = quiz.timeRemaining;
+    // const numbers = document.getElementById('timeRemaining');
+
+    timeRemainingContainer.innerText = timer
+
+    const intervalId = setInterval(() => {
+      timer--;
+      timeRemainingContainer.innerText = timer;
+      if (timer === 0) {
+        clearInterval(intervalId);
+
+      }
+    }, 1000);
+  }
+
 
-  let timer;
 
 
   /************  EVENT LISTENERS  ************/
@@ -84,91 +101,127 @@ document.addEventListener("DOMContentLoaded", () => {
     }
 
     // Clear the previous question text and question choices
-    questionContainer.innerText = "";
+    questionContainer.innerText = ""
     choiceContainer.innerHTML = "";
 
     // 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
 
-
+    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
+
+
+    const percentage = (quiz.currentQuestionIndex / quiz.questions.length) * 100;
+
+
+    progressBar.style.width = `${percentage}%`; // 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:
-      /* 
-          <input type="radio" name="choice" value="CHOICE TEXT HERE">
-          <label>CHOICE TEXT HERE</label>
-        <br>
-      */
-      // 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:
+    /* 
+        <input type="radio" name="choice" value="CHOICE TEXT HERE">
+        <label>CHOICE TEXT HERE</label>
+      <br>
+    */
+    // 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.
+
+    // choiceContainer.innerHTML = question.choices
+    question.choices.forEach(text => {
+
+      // const radio = document.createElement("input");
+
+      choiceContainer.innerHTML += `
+            <input type="radio" name="choice" value="${text}">
+            <label>${text}</label>
+            <br>
+        `
+    });
 
   }
 
 
-  
-  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 choiceElements = document.querySelectorAll(`input[name="choice"]`)
 
+    choiceElements.forEach(element => {
+      if (element.checked) {
+        selectedAnswer = element.value
+      }
 
-    // 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()`.
-  }  
+    if (selectedAnswer) {
+      quiz.checkAnswer(selectedAnswer)
+      quiz.moveToNextQuestion();
+      showQuestion();
+    }
+  }
 
 
 
 
-  function showResults() {
 
-    // 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
-  }
-
-});
+
+
+    function showResults() {
+
+      // 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 ${quiz.correctAnswers} out of ${questions.length} correct answers!`; // This value is hardcoded as a placeholder
+    }
+
+    const restartBtn = document.querySelector(".buttonSecondary")
+
+    restartBtn.addEventListener("click",() => {
+      location.reload();
+    })
+  });
+
+
+
+

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]];
+        }
+    }
+}

src/quiz.js

@@ -1,15 +1,59 @@
 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];
+    }
+
+    moveToNextQuestion() {
+        return this.currentQuestionIndex++
+    }
+
+    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]];
+        }
+    }
+    checkAnswer(answer) {
+        const currentQuestion = this.getQuestion();
+
+        if (answer === currentQuestion.answer) {
+            this.correctAnswers++;
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    hasEnded() {
+        return this.currentQuestionIndex >= this.questions.length;
+    }
+
+    filterQuestionsByDifficulty(difficulty) {
+        if (difficulty !== 1 && difficulty !== 2 && difficulty !== 3) {
+            return;
+        }
+
+        this.questions = this.questions.filter(q => q.difficulty === difficulty);
+    }
+    averageDifficulty() {
+        const average = this.questions.reduce(function (acc, current) {
+            return acc + current.difficulty
+        }, 0)
+
+        return average / this.questions.length
+    }
+}
 
-    // 2. getQuestion()
-
-    // 3. moveToNextQuestion()
 
-    // 4. shuffleQuestions()
 
-    // 5. checkAnswer(answer)
 
-    // 6. hasEnded()
-}