From ff5c40ef56ca3f591d88b7ac7316f8d6a2f5a8da Mon Sep 17 00:00:00 2001
From: Syeda Marium Younus <mariumyounus4@gmail.com>
Date: Mon, 18 Jan 2021 13:58:26 +1100
Subject: [PATCH 1/5] tasks added

---
 index.html  |   4 +--
 js/index.js | 101 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index bb8a7dc..cda7606 100644
--- a/index.html
+++ b/index.html
@@ -31,7 +31,7 @@ <h5 class="card-title">Test your knowledge</h5>
     <div class="container" id="quizBlock" style="display: none">
       <div class="mb-5">
         <h2>Test your knowledge</h2>
-        - Time remaining <span id="time">01:00</span>
+        -  <span id="time">01:00</span>
       </div>
       <div id="quizWrap"></div>
 
@@ -39,7 +39,7 @@ <h2>Test your knowledge</h2>
         <button type="button" class="btn btn-primary" id="btnSubmit">
           Submit Quiz
         </button>
-        <button type="button" class="btn btn-primary" id="btnReset">
+        <button type="reset" class="btn btn-primary" id="btnReset" onClick="window.location.reload()">
           Reset Quiz
         </button>
         <span id="score"></span>
diff --git a/js/index.js b/js/index.js
index 67d45f0..71d08d2 100644
--- a/js/index.js
+++ b/js/index.js
@@ -20,36 +20,46 @@
 *************************** */
 
 window.addEventListener('DOMContentLoaded', () => {
-  const start = document.querySelector('#start');
-  start.addEventListener('click', function (e) {
-    document.querySelector('#quizBlock').style.display = 'block';
-    start.style.display = 'none';
+  const start = document.querySelector("#start");
+  start.addEventListener("click", function (e) {
+    document.querySelector("#quizBlock").style.display = "block";
+    start.style.display = "none";
   });
   // quizArray QUESTIONS & ANSWERS
   // q = QUESTION, o = OPTIONS, a = CORRECT ANSWER
   // Basic ideas from https://code-boxx.com/simple-javascript-quiz/
   const quizArray = [
     {
-      q: 'Which is the third planet from the sun?',
-      o: ['Saturn', 'Earth', 'Pluto', 'Mars'],
+      q: "Which is the third planet from the sun?",
+      o: ["Saturn", "Earth", "Pluto", "Mars"],
       a: 1, // array index 1 - so Earth is the correct answer here
     },
     {
-      q: 'Which is the largest ocean on Earth?',
-      o: ['Atlantic Ocean', 'Indian Ocean', 'Arctic Ocean', 'Pacific Ocean'],
+      q: "Which is the largest ocean on Earth?",
+      o: ["Atlantic Ocean", "Indian Ocean", "Arctic Ocean", "Pacific Ocean"],
       a: 3,
     },
     {
-      q: 'What is the capital of Australia',
-      o: ['Sydney', 'Canberra', 'Melbourne', 'Perth'],
+      q: "What is the capital of Australia",
+      o: ["Sydney", "Canberra", "Melbourne", "Perth"],
       a: 1,
     },
+    {
+      q: "What is the largest city in Australia?",
+      o: ["Melbourne", "Perth", "Sydney", "Wollongong"],
+      a: 2,
+    },
+    {
+      q: "What is the smallest planet in the Solar System?",
+      o: ["Mercury", "Jupiter", "Venus", "Earth"],
+      a: 0,
+    },
   ];
 
   // function to Display the quiz questions and answers from the object
   const displayQuiz = () => {
-    const quizWrap = document.querySelector('#quizWrap');
-    let quizDisplay = '';
+    const quizWrap = document.querySelector("#quizWrap");
+    let quizDisplay = "";
     quizArray.map((quizItem, index) => {
       quizDisplay += `<ul class="list-group">
                    Q - ${quizItem.q}
@@ -65,26 +75,83 @@ window.addEventListener('DOMContentLoaded', () => {
 
   // Calculate the score
   const calculateScore = () => {
-    let score = 0;
+  
+   
+
     quizArray.map((quizItem, index) => {
-      for (let i = 0; i < 4; i++) {
+      for (let i = 0; i < 6; i++) {
+      //  quizItem[a] == quizItem[i];
+        //score = score + 1; //Increment the score by 1 for every correct answer given
+        //console.log("you got " + score "out of " + total);
+
         //highlight the li if it is the correct answer
         let li = `li_${index}_${i}`;
         let r = `radio_${index}_${i}`;
-        liElement = document.querySelector('#' + li);
-        radioElement = document.querySelector('#' + r);
+        liElement = document.querySelector("#" + li);
+        radioElement = document.querySelector("#" + r);
 
         if (quizItem.a == i) {
           //change background color of li element here
+        
+          liElement.style.color = "green";
+          radioElement.style.color="red";
+         
         }
 
         if (radioElement.checked) {
-          // code for task 1 goes here
+          //code for task 1 goes here
+          let score = 0;
+          let total = 5; //max score
+          for(let i=0;i<6;i++)
+          {
+            quizItem.a[i]==quizItem.o[i]
+            score=score+1;
+            
+          }
+           
         }
+        alert("your score is ");
+        
       }
+     
     });
+    
+    
   };
 
+  
+  //Task 2
+  const btnSubmit = document.querySelector("#btnSubmit");
+
+  btnSubmit.addEventListener("click", calculateScore);
+ 
+
+
   // call the displayQuiz function
   displayQuiz();
+  
+  
+  //Task 5
+
+  //Add a countdown timer - when the time is up, end the quiz, display the score and highlight the correct answers
+
+  var total_seconds = 20 * 1;
+  var c_minutes = parseInt(total_seconds / 60);
+  var c_seconds = parseInt(total_seconds % 60);
+  var timer;
+
+  function CheckTime() {
+    document.getElementById("time").innerHTML =
+      "Time Left: " + c_minutes + " minutes " + c_seconds + " seconds ";
+
+    if (total_seconds <= 0) {
+      calculateScore();
+    } else {
+      total_seconds = total_seconds - 1;
+      c_minutes = parseInt(total_seconds / 60);
+      c_seconds = parseInt(total_seconds % 60);
+      timer = setTimeout(CheckTime, 1000);
+    }
+  }
+  timer = setTimeout(CheckTime, 1000);
 });

From 5178b3baa49531298dbaa7ee81f7e30167145343 Mon Sep 17 00:00:00 2001
From: Syeda Marium Younus <mariumyounus4@gmail.com>
Date: Mon, 18 Jan 2021 14:42:04 +1100
Subject: [PATCH 2/5] adding task

---
 js/index.js | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/js/index.js b/js/index.js
index 71d08d2..ce9c899 100644
--- a/js/index.js
+++ b/js/index.js
@@ -76,10 +76,10 @@ window.addEventListener('DOMContentLoaded', () => {
   // Calculate the score
   const calculateScore = () => {
   
-   
+   let score=0;
 
     quizArray.map((quizItem, index) => {
-      for (let i = 0; i < 6; i++) {
+      for (let i = 0; i < 4; i++) {
       //  quizItem[a] == quizItem[i];
         //score = score + 1; //Increment the score by 1 for every correct answer given
         //console.log("you got " + score "out of " + total);
@@ -91,31 +91,29 @@ window.addEventListener('DOMContentLoaded', () => {
         radioElement = document.querySelector("#" + r);
 
         if (quizItem.a == i) {
-          //change background color of li element here
+
         
-          liElement.style.color = "green";
-          radioElement.style.color="red";
-         
+          //change background color of li element here
+          liElement.style.backgroundColor="green";
         }
+        elseif(radioElement.checked && quizItem.a !=i)
+        {
+            
+          liElement.style.backgroundColor="red";
+        }
+      
+      }
 
         if (radioElement.checked) {
           //code for task 1 goes here
-          let score = 0;
-          let total = 5; //max score
-          for(let i=0;i<6;i++)
-          {
-            quizItem.a[i]==quizItem.o[i]
-            score=score+1;
-            
-          }
-           
+        if(quizItem.a ==i){
+          score+=1;
+        }
         }
-        alert("your score is ");
-        
-      }
      
     });
-    
+    const scoreCard=document.querySelector("#score");
+    scoreCard.innerHTML=`you have got ${score}`;
     
   };
 

From 30581fa66f17a36a077ec4d4acd68ef33fdb89ca Mon Sep 17 00:00:00 2001
From: Syeda Marium Younus <mariumyounus4@gmail.com>
Date: Mon, 18 Jan 2021 14:45:03 +1100
Subject: [PATCH 3/5] adding task

---
 js/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/js/index.js b/js/index.js
index ce9c899..24f261a 100644
--- a/js/index.js
+++ b/js/index.js
@@ -96,11 +96,7 @@ window.addEventListener('DOMContentLoaded', () => {
           //change background color of li element here
           liElement.style.backgroundColor="green";
         }
-        elseif(radioElement.checked && quizItem.a !=i)
-        {
-            
-          liElement.style.backgroundColor="red";
-        }
+        
       
       }
 

From 94a74af2e43699f23d7702e6c654c5b3db9c8ba0 Mon Sep 17 00:00:00 2001
From: Syeda Marium Younus <mariumyounus4@gmail.com>
Date: Mon, 18 Jan 2021 15:12:48 +1100
Subject: [PATCH 4/5] adding score

---
 index.html  |  2 +-
 js/index.js | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/index.html b/index.html
index cda7606..b7ec678 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ <h2>Test your knowledge</h2>
         <button type="button" class="btn btn-primary" id="btnSubmit">
           Submit Quiz
         </button>
-        <button type="reset" class="btn btn-primary" id="btnReset" onClick="window.location.reload()">
+        <button type="reset" class="btn btn-primary" id="btnReset" >
           Reset Quiz
         </button>
         <span id="score"></span>
diff --git a/js/index.js b/js/index.js
index 24f261a..91dfb19 100644
--- a/js/index.js
+++ b/js/index.js
@@ -76,13 +76,13 @@ window.addEventListener('DOMContentLoaded', () => {
   // Calculate the score
   const calculateScore = () => {
   
-   let score=0;
+   let totalScore = 0;
 
     quizArray.map((quizItem, index) => {
+      
       for (let i = 0; i < 4; i++) {
-      //  quizItem[a] == quizItem[i];
-        //score = score + 1; //Increment the score by 1 for every correct answer given
-        //console.log("you got " + score "out of " + total);
+      
+        
 
         //highlight the li if it is the correct answer
         let li = `li_${index}_${i}`;
@@ -96,20 +96,22 @@ window.addEventListener('DOMContentLoaded', () => {
           //change background color of li element here
           liElement.style.backgroundColor="green";
         }
-        
+        if (radioElement.checked) {
+          //code for task 1 goes here
+          if (quizItem.a == i) {
+            totalScore = totalScore + 1;
+          }
+        } 
       
       }
 
-        if (radioElement.checked) {
-          //code for task 1 goes here
-        if(quizItem.a ==i){
-          score+=1;
-        }
-        }
+       
      
     });
-    const scoreCard=document.querySelector("#score");
-    scoreCard.innerHTML=`you have got ${score}`;
+
+    document.getElementById("score").innerHTML=totalScore;
+   // const scoreCard=document.querySelector("#score");
+    //scoreCard.innerHTML=`you have got ${score}`;
     
   };
 

From 6ac5ec52256270f014b1f3093359c9d37eec0415 Mon Sep 17 00:00:00 2001
From: Syeda Marium Younus <mariumyounus4@gmail.com>
Date: Mon, 18 Jan 2021 18:05:52 +1100
Subject: [PATCH 5/5] adding reload

---
 .vscode/settings.json |  3 +++
 index.html            |  2 +-
 js/index.js           | 39 ++++++++++++++++-----------------------
 3 files changed, 20 insertions(+), 24 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index b7ec678..c49b8c5 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@ <h2>Test your knowledge</h2>
         <button type="button" class="btn btn-primary" id="btnSubmit">
           Submit Quiz
         </button>
-        <button type="reset" class="btn btn-primary" id="btnReset" >
+        <button type="reset" class="btn btn-primary" id="btnReset" onClick="document.location.reload(true)">
           Reset Quiz
         </button>
         <span id="score"></span>
diff --git a/js/index.js b/js/index.js
index 91dfb19..036ff16 100644
--- a/js/index.js
+++ b/js/index.js
@@ -75,15 +75,10 @@ window.addEventListener('DOMContentLoaded', () => {
 
   // Calculate the score
   const calculateScore = () => {
-  
-   let totalScore = 0;
+    let totalScore = 0;
 
     quizArray.map((quizItem, index) => {
-      
       for (let i = 0; i < 4; i++) {
-      
-        
-
         //highlight the li if it is the correct answer
         let li = `li_${index}_${i}`;
         let r = `radio_${index}_${i}`;
@@ -91,42 +86,36 @@ window.addEventListener('DOMContentLoaded', () => {
         radioElement = document.querySelector("#" + r);
 
         if (quizItem.a == i) {
-
-        
           //change background color of li element here
-          liElement.style.backgroundColor="green";
+          liElement.style.backgroundColor = "green";
         }
         if (radioElement.checked) {
           //code for task 1 goes here
           if (quizItem.a == i) {
             totalScore = totalScore + 1;
           }
-        } 
-      
+        }
       }
-
-       
-     
     });
 
-    document.getElementById("score").innerHTML=totalScore;
-   // const scoreCard=document.querySelector("#score");
-    //scoreCard.innerHTML=`you have got ${score}`;
+    document.getElementById("score").innerHTML = totalScore;
     
-  };
+  }
 
-  
   //Task 2
   const btnSubmit = document.querySelector("#btnSubmit");
 
   btnSubmit.addEventListener("click", calculateScore);
- 
-
+  //Task 4Reload the page when the reset button is clicked (hint: search window.location)
+  
 
   // call the displayQuiz function
   displayQuiz();
-  
-  
+   //const btnReset = document.querySelector("#btnReset");
+   //btnReset.addEventListener("click", window .location.reload);
+    
+ 
+//document.getElementById(("btnReset").reset());
   //Task 5
 
   //Add a countdown timer - when the time is up, end the quiz, display the score and highlight the correct answers
@@ -148,6 +137,10 @@ window.addEventListener('DOMContentLoaded', () => {
       c_seconds = parseInt(total_seconds % 60);
       timer = setTimeout(CheckTime, 1000);
     }
+    
   }
   timer = setTimeout(CheckTime, 1000);
+  
 });
+
+