resolved

index.html

@@ -28,7 +28,7 @@ <h1>JavaScript Quiz</h1>
       </div>
 
       <!-- End Quiz View -->
-      <!-- Note: this view is initially hidden using the style attribute 'display: none' -->      
+      <!-- Note: this view is initially hidden using the style attribute 'display: none' -->
       <div id="endView" class="view" style="display: none">
         <div id="result-progress">
           <div id="resultProgressBar"></div>
@@ -39,16 +39,16 @@ <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="button-secondary">
+          Restart Quiz
+        </button>
       </div>
     </div>
 
-
     <!-- The scripts are placed at the end of the document so that all the HTML elements are loaded before we try to access them -->
     <!-- Important: Leave this as it is. Do not change the order of the scripts! -->
     <script src="src/question.js"></script>
     <script src="src/quiz.js"></script>
     <script src="src/index.js"></script>
-
   </body>
-</html>
+</html>

src/index.js

@@ -13,69 +13,90 @@ document.addEventListener("DOMContentLoaded", () => {
 
   // End view elements
   const resultContainer = document.querySelector("#result");
-
+  const restartButton = document.getElementById("restartButton");
 
   /************  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();
-
+  startTimer();
 
   /************  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");
+  // 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}`;
+  // // Display the time remaining in the time remaining container
+  // const timeRemainingContainer = document.getElementById("timeRemaining");
+  // timeRemainingContainer.innerText = `${minutes}:${seconds}`;
 
+  /************  TIMER  ************/
+  function startTimer(setTimer) {
+    let timer = setTimer;
+    timer = setInterval(function () {
+      quiz.timeRemaining--;
+      console.log(quiz.timeRemaining);
+      // Convert time
+      const minutes = Math.floor(quiz.timeRemaining / 60)
+        .toString()
+        .padStart(2, "0");
+      const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+      // Update Time in HTML
+      const timeRemainingContainer = document.getElementById("timeRemaining");
+      timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+    }, 1000);
+  }
   // Show first question
   showQuestion();
 
-
-  /************  TIMER  ************/
-
-  let timer;
-
-
   /************  EVENT LISTENERS  ************/
 
   nextButton.addEventListener("click", nextButtonHandler);
 
-
-
   /************  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()) {
@@ -88,87 +109,119 @@ document.addEventListener("DOMContentLoaded", () => {
     choiceContainer.innerHTML = "";
 
     // Get the current question from the quiz by calling the Quiz class method `getQuestion()`
+    console.log(quiz);
     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 currentIndexPercent = quiz.currentQuestionIndex * 25;
 
+    // 3
 
-    // 3. Update the question count text 
+    progressBar.style.width = `${currentIndexPercent}%`; // 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.
+
+    quiz.questions[quiz.currentQuestionIndex].choices.forEach((oneChoice) => {
+      choiceContainer.innerHTML += `<input type="radio" name="choice" value="${oneChoice}">
+          <label>${oneChoice}</label>
+        <br>`;
+    });
+
     // 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:
+    /* 
           <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.
-
+    // 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.
 
+    const allChoiceElements = 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.
 
-
-    // 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()`.
-  }  
+    allChoiceElements.forEach((oneChoice) => {
+      if (oneChoice.checked === true) {
+        selectedAnswer = oneChoice.value;
+      } else {
+        return false;
+      }
+    });
+
+    console.log(selectedAnswer);
 
+    // 3. If an answer is selected (`selectedAnswer`), check if it is correct and move to the next question
+    // if (selectedAnswer === )
 
+    if (selectedAnswer) {
+      quiz.checkAnswer(selectedAnswer);
+      quiz.moveToNextQuestion();
+      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()`.
+  }
 
   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
+
+    if (quiz.hasEnded() === true) {
+      // 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 ${quiz.questions.length} correct answers!`;
+      // 4. Stop the timer
+      // Clear Timer
+      clearInterval(timer);
+    }
+  }
+
+  restartButton.addEventListener("click", restartQuiz);
+  function restartQuiz() {
+    endView.style.display = "none";
+    quizView.style.display = "block";
+    quiz.currentQuestionIndex = 0;
+    quiz.correctAnswers = 0;
+    quiz.shuffleQuestions();
+    showQuestion();
+    quiz.timeRemaining = quizDuration;
+    startTimer(0);
   }
-
-});
+});

src/question.js

@@ -1,7 +1,12 @@
 class Question {
-    // YOUR CODE HERE:
-    //
-    // 1. constructor (text, choices, answer, difficulty)
-
-    // 2. shuffleChoices()
+    constructor(text, choices, answer, difficulty) {
+        this.text = text;
+        this.choices = choices;
+        this.answer = answer;
+        this.difficulty = difficulty;
+    };
+    shuffleChoices() {
+        const shuffledArray = this.choices.sort((a, b) => 0.5 - Math.random());
+        return shuffledArray;
+    }
 }

src/quiz.js

@@ -1,15 +1,59 @@
 class Quiz {
-    // YOUR CODE HERE:
-    //
-    // 1. constructor (questions, timeLimit, timeRemaining)
+  constructor(questions, timeLimit, timeRemaining) {
+    this.questions = questions; // array
+    this.timeLimit = timeLimit; // number
+    this.timeRemaining = timeRemaining; // number
+    this.correctAnswers = 0;
+    this.currentQuestionIndex = 0;
+  }
 
-    // 2. getQuestion()
-
-    // 3. moveToNextQuestion()
+  getQuestion() {
+    return this.questions[this.currentQuestionIndex];
+  }
 
-    // 4. shuffleQuestions()
+  moveToNextQuestion() {
+    this.currentQuestionIndex += 1;
+  }
 
-    // 5. checkAnswer(answer)
+  shuffleQuestions() {
+    const shuffledQuestions = this.questions.sort(
+      (a, b) => 0.5 - Math.random()
+    );
+    return shuffledQuestions;
+  }
+  checkAnswer(answer) {
+    if (answer === this.questions[this.currentQuestionIndex].answer) {
+      this.correctAnswers += 1;
+    }
+  }
 
-    // 6. hasEnded()
-}
+  hasEnded() {
+    if (this.currentQuestionIndex < this.questions.length) {
+      return false;
+    } else {
+      return true;
+    }
+  }
+
+  filterQuestionsByDifficulty(difficulty) {
+    // difficulty between 1 - 3
+    if (difficulty > 0 && difficulty <= 3) {
+      const filteredQuestions = this.questions.filter((oneQuestion) => {
+        if (oneQuestion.difficulty === difficulty) {
+          return true;
+        } else {
+          return false;
+        }
+      });
+      this.questions = filteredQuestions;
+    } else {
+      return false;
+    }
+  }
+  averageDifficulty() {
+    const difficultySum = this.questions.reduce((acc, current) => {
+      return acc + current.difficulty;
+    }, 0);
+    return difficultySum / this.questions.length;
+  }
+}