fix: merge conflicts

lesson_03/quiz/quiz.yaml

@@ -14,7 +14,8 @@ quiz:
       - $2y$10$hRwUbEYSqz761B.cG79T2uYsYPiEtKu.JgD3Aj7.Mofx27TtX5YHa
       - $2y$10$qE/gXxpq62FEGJOJd9MDA.vpDYLTNSsZbqZLpD/0368CKkcNBzW1y
       - $2y$10$yI/2BgOyqQfLdHM3ixPE5uLu89su/sHRJB2c5szDFIAYXDhRakS.C
-    rmill:
-      - $2y$10$FquR69q7W4E68TX/SNCB7u8Ri0DOFRDqsUPdGfuyIBjZJRVFkNI.6
-      - $2y$10$FSWRA7hulVpyVxd8s67Nxuq/1cdmviW24qqoUbqihBf79cR.w9yly
-      - $2y$10$Qy1IsNsfuJvA384ypL/72uWubUuNbMRp4LD6j/LM0RIH66D/HIjF6
+    evanphilakhong:
+      - $2y$10$jPemAebScV6nhwb4gjCmyu/1ZfDaCTdjZvDk2Mf/ASO3NhpK0Zikm
+      - $2y$10$EgDoBI4YWx7i8W6m74OQ/.peaijZ.PGPUUTR.5I4dNlRT.xo17yTm
+      - $2y$10$KRwSNIERrR6Zc1EoxvGoKu0wEzoKcT93gZyZLcIxcbDj/An3aazY6
+      - $2y$10$jdfCYoBCrarAT/ZBLI.5/utzDkMjX5kOc5aVvn3Z09x5iCM6TR//O

lesson_03/quiz/src/quizzes/evan_philakhong_quiz.ts

@@ -0,0 +1,77 @@
+import {
+  AnswerChoice,
+  MultipleChoiceQuizQuestion,
+  QuizQuestion,
+  QuizQuestionProvider,
+} from 'codedifferently-instructional';
+
+export class EvanPhilakhongQuiz implements QuizQuestionProvider {
+  getProviderName(): string {
+    return 'evanphilakhong';
+  }
+
+  makeQuizQuestions(): QuizQuestion[] {
+    return [
+      EvanPhilakhongQuiz.makeQuestion0(),
+      EvanPhilakhongQuiz.makeQuestion1(),
+      EvanPhilakhongQuiz.makeQuestion2(),
+      EvanPhilakhongQuiz.makeQuestion3(),
+    ];
+  }
+
+  private static makeQuestion0(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      0,
+      'What is a CPU?',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, 'Computer Power Unit'],
+        [AnswerChoice.B, 'Complex Processing Unit'],
+        [AnswerChoice.C, 'Central Processing Unit'],
+        [AnswerChoice.D, 'Coding Processor Unit'],
+      ]),
+      AnswerChoice.UNANSWERED, // replace UNANSWERED with correct answer
+    );
+  }
+
+  private static makeQuestion1(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      1,
+      'What is a GPU?',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, 'Graphics Processing Unit'],
+        [AnswerChoice.B, 'Gaming Power Unit'],
+        [AnswerChoice.C, 'Graphical Programming Unit'],
+        [AnswerChoice.D, 'Gaming Processor Unit'],
+      ]),
+      AnswerChoice.UNANSWERED, // replace UNANSWERED with correct answer
+    );
+  }
+
+  private static makeQuestion2(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      2,
+      'What is a PSU?',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, 'Programming Super Unit'],
+        [AnswerChoice.B, 'Power Supply Unit'],
+        [AnswerChoice.C, 'Power Supplier Unit'],
+        [AnswerChoice.D, 'Power Storing Unit'],
+      ]),
+      AnswerChoice.UNANSWERED, // repleace UNANSWERED with correct answer
+    );
+  }
+
+  private static makeQuestion3(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      3,
+      'RAM is short for ___?',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, 'Randomly Advanced Memory'],
+        [AnswerChoice.B, 'Random Access Memory'],
+        [AnswerChoice.C, 'Temporary Memory'],
+        [AnswerChoice.D, 'Readlily Access Memory'],
+      ]),
+      AnswerChoice.UNANSWERED, // replace UNANSWERED with correct answer
+    );
+  }
+}

lesson_03/quiz/src/quizzes/quizzes.module.ts

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { AnotherQuiz } from './another_quiz.js';
 import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
+import { EvanPhilakhongQuiz } from './evan_philakhong_quiz.js';
 import { Jbeyquiz } from './jbeyquiz.js';
 import { MercedesMathewsQuiz } from './mercedes_mathews_quiz.js';
 import { RasheedMillerQuiz } from './rasheed_miller_quiz.js';
@@ -13,6 +14,7 @@ const QUIZ_PROVIDERS = [
   AnotherQuiz,
   MercedesMathewsQuiz,
   Jbeyquiz,
+  EvanPhilakhongQuiz,
   RasheedMillerQuiz,
 ];