Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RMT Jan25 Leen Zien and Victor Dias MiniLab Complete #198

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<link rel="stylesheet" href="styles/style.css" />
</head>
<body>
<div class="container">
<div class="container">
<header>
<h1>JavaScript Quiz</h1>
</header>
Expand All @@ -22,6 +22,8 @@ <h1>JavaScript Quiz</h1>
<div class="content">
<div id="question"></div>
<ul id="choices"></ul>


</div>
<div id="timeRemaining">Remaining Time: <span>00:00</span></div>
<button id="nextButton" class="button-primary">Answer</button>
Expand All @@ -39,7 +41,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="button-secondary">Restart Quiz</button>
</div>
</div>

Expand Down
137 changes: 99 additions & 38 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ document.addEventListener("DOMContentLoaded", () => {
const quizView = document.querySelector("#quizView");
const endView = document.querySelector("#endView");

// Quiz view elements
// Quiz view elements
const progressBar = document.querySelector("#progressBar");
const questionCount = document.querySelector("#questionCount");
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");
Expand All @@ -23,7 +24,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),
Expand All @@ -36,7 +37,7 @@ document.addEventListener("DOMContentLoaded", () => {


/************ QUIZ INSTANCE ************/

// Create a new Quiz instance object
const quiz = new Quiz(questions, quizDuration, quizDuration);
// Shuffle the quiz questions
Expand All @@ -53,18 +54,43 @@ document.addEventListener("DOMContentLoaded", () => {
const timeRemainingContainer = document.getElementById("timeRemaining");
timeRemainingContainer.innerText = `${minutes}:${seconds}`;


// Show first question
showQuestion();


/************ TIMER ************/

let timer;
let timer = quiz.timeRemaining;

function updateDisplay() {
const minutes = Math.floor(timer / 60).toString().padStart(2, "0");
const seconds = (timer % 60).toString().padStart(2, "0");
const timeRemainingContainer = document.getElementById("timeRemaining");
timeRemainingContainer.innerText = `${minutes}:${seconds}`;
}

function gameTimer() {
let intervalId = setInterval(() => {
timer--;
updateDisplay();

if (timer < 0) {
clearInterval(intervalId);
showResults();

}
}, 1000)
}


gameTimer();


/************ EVENT LISTENERS ************/

nextButton.addEventListener("click", nextButtonHandler);
restartButton.addEventListener("click", restartButtonHandler);



Expand All @@ -91,68 +117,99 @@ document.addEventListener("DOMContentLoaded", () => {
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

progressBar.style.width = ((questions.indexOf(question) + 1) / 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 ${questions.indexOf(question) + 1} of ${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.
question.choices.forEach(currentQuestion => {
const newRadio = document.createElement("input");
const newRadioLabel = document.createElement("label")
newRadio.setAttribute("type", "radio")
newRadio.setAttribute("name", "choice")
newRadio.setAttribute("value", currentQuestion)
newRadioLabel.innerText = currentQuestion
choiceContainer.appendChild(newRadio);
choiceContainer.appendChild(newRadioLabel);
choiceContainer.appendChild(document.createElement("br"));
});


}



function nextButtonHandler () {
let selectedAnswer; // A variable to store the selected answer value

function nextButtonHandler() {
const allChoices = document.querySelectorAll("input[name='choice']");

let selectedAnswer = null;

allChoices.forEach(function (choice) {
if (choice.checked) {
selectedAnswer = choice.value;
}
});


if (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()`.
}



Expand All @@ -166,9 +223,13 @@ document.addEventListener("DOMContentLoaded", () => {

// 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 ${questions.length} correct answers!`; // This value is hardcoded as a placeholder
}

});

});

function restartButtonHandler() {
location.reload()
}
17 changes: 14 additions & 3 deletions src/question.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
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 randomIndex = Math.floor(Math.random() * (i + 1));
[this.choices[i], this.choices[randomIndex]] = [this.choices[randomIndex], this.choices[i]];
}
}
}
63 changes: 54 additions & 9 deletions src/quiz.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,60 @@
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;
};

// 4. shuffleQuestions()
getQuestion(){

return this.questions[this.currentQuestionIndex];

};

moveToNextQuestion(){
this.currentQuestionIndex++;
};


shuffleQuestions(){

for (let i = this.questions.length - 1; i > 0; i--) {
const randomIndex = Math.floor(Math.random() * (i + 1));
[this.questions[i], this.questions[randomIndex]] = [this.questions[randomIndex], this.questions[i]];
}

};

checkAnswer(answer){
if(this.questions[this.currentQuestionIndex].answer === answer){
this.correctAnswers++;
}
};

hasEnded(){

if(this.currentQuestionIndex < this.questions.length){
return false;

}else if(this.currentQuestionIndex === this.questions.length){
return true;
}
};

filterQuestionsByDifficulty(difficulty) {
if (difficulty < 1 || difficulty > 3 || typeof difficulty != "number") {return};
this.questions = this.questions.filter(question => question.difficulty === difficulty);

};

averageDifficulty() {
return this.questions.reduce((acc , curr)=> acc + curr.difficulty ,0)/ this.questions.length;
}

}

// 5. checkAnswer(answer)

// 6. hasEnded()
}