Logic/issue 49

src/api/getQuizQuestions.js

@@ -1,4 +1,4 @@
-import Question from '../model/question.js';
+import Question from '../model/Question.js';
 
 const QUESTION_TEXT = 'Name the breed:';
 
@@ -14,8 +14,6 @@ export const getQuizQuestions = async (animal, numberOfQuestions) => {
   if (data) {
     questions.push(...mapDataToQuestions(data));
   }
-
-  console.log(questions);
   return questions;
 };
 

src/components/Answer/Answer.js

@@ -1,4 +1,4 @@
-import Question from '../../model/question';
+import Question from '../../model/Question.js';
 
 export default class Answer {
   timeOfAnswer;
@@ -8,4 +8,4 @@ export default class Answer {
   static getScore() {
     return 1;
   }
-}
+}

src/model/question.js

@@ -1,19 +1,3 @@
-/* how to use Question class Question has {imageUrl, correct, incorrectAnswers, question} and .getAnswers method
-
-try this example: 
-const firstQuestion = new Question(
-  'url',
-  'Ala',
-  ['Ula', 'Ela', 'Ola'],
-  "Mirror, mirror on the wall who's the fairest of them all?",
-);
-
-console.log(firstQuestion.question);
-console.log(firstQuestion.getAnswers());
-console.log('The correct answer is:');
-setTimeout(() => console.log(firstQuestion.correct), 3000);
-*/
-
 export default class Question {
   constructor(imageUrl, correct, incorrectAnswers, question) {
     this.imageUrl = imageUrl;

src/model/randomizer.js

@@ -0,0 +1,12 @@
+import { getQuizQuestions } from '../api/getQuizQuestions.js';
+
+export async function getRandomQuizQuestions(animal, numberOfQuestions) {
+  const questionToRandomize = await getQuizQuestions(animal);
+  const randomQuestions = questionToRandomize.sort(() => Math.random() - 0.5);
+
+  if (numberOfQuestions < randomQuestions.length) {
+    return randomQuestions.slice(0, numberOfQuestions);
+  } else {
+    return randomQuestions;
+  }
+}

src/views/QuizView/quizView.js

@@ -1,13 +1,13 @@
 import { QuizSettings } from '../quiz-settings/quiz-settings';
 import { createTimer, startTimer, stopTimer } from '../../components/timer/quiz-timer';
-import { getQuizQuestions } from '../../api/getQuizQuestions';
+import { getRandomQuizQuestions } from '../../model/randomizer.js';
 import Button from '../../components/Button/Button';
 
 let questions;
 let current;
 
 export async function renderQuizView() {
-  questions = await getQuizQuestions(QuizSettings.quizAbout.toUpperCase(), QuizSettings.questionsNum);
+  questions = await getRandomQuizQuestions(QuizSettings.quizAbout.toUpperCase(), QuizSettings.questionsNum);
   current = 0;
   document.querySelector('#app').append(createLayout());
   startTimer();