-
+
diff --git a/src/index.js b/src/index.js
index 03737ba3..36c1e100 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,63 +10,102 @@ 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");
-
/************ 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)
-
+ const quizDuration = 20; // 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 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}`;
-
+ let timer;
// Show first question
showQuestion();
-
-
+ startTimer();
/************ TIMER ************/
-
- let timer;
-
+ function startTimer() {
+ timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+
+ timer = setInterval(() => {
+ // console.log(quiz.timeRemaining)
+ const minutes = Math.floor(quiz.timeRemaining / 60)
+ .toString()
+ .padStart(2, "0");
+ const seconds = (quiz.timeRemaining % 60).toString().padStart(2, "0");
+
+ if (quiz.timeRemaining) {
+ timeRemainingContainer.innerText = `${minutes}:${seconds}`;
+ } else if (!quiz.timeRemaining) {
+ clearInterval(timer);
+ showResults();
+ }
+
+ quiz.timeRemaining--;
+ }, 1000);
+ }
/************ EVENT LISTENERS ************/
nextButton.addEventListener("click", nextButtonHandler);
-
+ restartButton.addEventListener("click", () => {
+ endView.style.display = "none";
+ quizView.style.display = "block";
+ quiz.currentQuestionIndex = 0;
+ quiz.correctAnswers = 0;
+ quiz.shuffleQuestions();
+ quiz.timeRemaining = quizDuration;
+ startTimer();
+ showQuestion();
+ });
/************ FUNCTIONS ************/
@@ -74,8 +113,6 @@ document.addEventListener("DOMContentLoaded", () => {
// 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()) {
@@ -89,76 +126,83 @@ 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
+ questionContainer.innerText = question.text;
+ const questionNumber = 1;
-
// 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 progressPercent =
+ ((quiz.currentQuestionIndex + 1) / quiz.questions.length) * 100 + "%";
+ console.log(progressPercent, quiz.currentQuestionIndex);
+ progressBar.style.width = `${progressPercent}`; // 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 ${
+ quiz.questions.length
+ }`; // This value is hardcoded as a placeholder
+
+ quiz.questions[quiz.currentQuestionIndex].choices.forEach((choice) => {
+ const choiceDiv = document.createElement("div");
+ choiceDiv.innerHTML = `
+
+ `;
+ choiceContainer.appendChild(choiceDiv);
+ });
// 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:
- /*
+ // 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
-
-
+ const allChoices = document.querySelectorAll("input");
+ // console.log(allChoices)
+ allChoices.forEach((choice) => {
+ if (choice.checked) {
+ selectedAnswer = choice.value;
+ console.log(selectedAnswer);
+ }
+ });
+ quiz.checkAnswer(selectedAnswer);
+ quiz.moveToNextQuestion();
+ showQuestion();
// 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.
+ // 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()`.
- }
-
-
-
+ // 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)
@@ -166,9 +210,9 @@ document.addEventListener("DOMContentLoaded", () => {
// 2. Show the end view (div#endView)
endView.style.display = "flex";
-
+ clearInterval(timer);
+
// 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..ed407d68 100644
--- a/src/question.js
+++ b/src/question.js
@@ -1,7 +1,35 @@
+// class Question {
+// // YOUR CODE HERE:
+// //
+// // 1. constructor (text, choices, answer, difficulty)
+
+// // 2. shuffleChoices()
+
+
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;
+
+ }
+
+ shuffleChoices() {
+ let currentIndex = this.choices.length;
+ while(currentIndex != 0){
+ let randomIndex = Math.floor(Math.random() * currentIndex);
+ currentIndex--;
+ var temp = this.choices[currentIndex];
+ this.choices[currentIndex]= this.choices[randomIndex];
+ this.choices[randomIndex] = temp;
+ }
+
+
+}
+
+}
+
- // 2. shuffleChoices()
-}
\ No newline at end of file
+// let question1 = new Question("food",[1, 7, 4, 5], 4, "hard");
+// console.log(question1.shuffleChoices());
diff --git a/src/quiz.js b/src/quiz.js
index d94cfd14..2e6f0984 100644
--- a/src/quiz.js
+++ b/src/quiz.js
@@ -1,15 +1,130 @@
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;
+ }
+
+
// 2. getQuestion()
+
+ getQuestion() {
+ return this.questions[this.currentQuestionIndex];
+
+ }
// 3. moveToNextQuestion()
+ moveToNextQuestion() {
+ this.currentQuestionIndex++;
+ }
+
// 4. shuffleQuestions()
+ shuffleQuestions() {
+ let currentIndex = this.questions.length;
+ while(currentIndex != 0){
+ let randomIndex = Math.floor(Math.random() * currentIndex);
+ currentIndex--;
+ var temp = this.questions[currentIndex];
+ this.questions[currentIndex]= this.questions[randomIndex];
+ this.questions[randomIndex] = temp;
+ }
+
+
+ }
+
+
// 5. checkAnswer(answer)
- // 6. hasEnded()
-}
\ No newline at end of file
+ checkAnswer(answer){
+ let currentQuestion = this.getQuestion();
+ if (currentQuestion.answer == answer){
+ this.correctAnswers++;
+ }
+
+ }
+
+ hasEnded() {
+ if(this.currentQuestionIndex < this.questions.length){
+ return false;
+ }
+ else{
+ return true;
+ }
+ }
+
+ filterQuestionsByDifficulty(difficulty) {
+
+ if( difficulty >= 1 && difficulty <=3){
+ this.questions = this.questions.filter(question =>{
+ if(question.difficulty === difficulty){
+ return true;
+ }
+ })
+ return this.questions
+ }else{
+ return this.questions
+ }
+
+
+ }
+
+ averageDifficulty() {
+
+ const totalDifficulty = this.questions.reduce ((acc, question) => {
+ return acc + question.difficulty;
+
+ }, 0);
+
+ const average = totalDifficulty / this.questions.length;
+ return average
+ }
+
+
+}
+
+// const questions = [
+// {
+// text: "Question 1",
+// choices: ["a", "b", "c"],
+// answer: "a",
+// difficulty: 1,
+// },
+// {
+// text: "Question 2",
+// choices: ["d", "e", "f"],
+// answer: "d",
+// difficulty: 2,
+// },
+// {
+// text: "Question 3",
+// choices: ["g", "h", "i"],
+// answer: "g",
+// difficulty: 2,
+// },
+// {
+// text: "Question 4",
+// choices: ["j", "k", "l"],
+// answer: "j",
+// difficulty: 1,
+// },
+// {
+// text: "Question 5",
+// choices: ["m", "n", "o"],
+// answer: "m",
+// difficulty: 3,
+// },
+// ];
+// let question1 = new Quiz(questions, "test", 60);
+
+// console.log(question1.filterQuestionsByDifficulty(1))
+