Merge branch 'main' into Chutt_lesson03

Author: NelltheWiz

lesson_03/quiz/quiz.yaml

@@ -10,6 +10,10 @@ quiz:
       - $2y$10$AD1YHmrZZivus7DoM91UMuErNnpi63ueluFs7DcSQSrZbXwDycAOi
       - $2y$10$KvnxAYKh3A151RyOOFtOv.wfImRzZMgbBgKy3gyLd1uUSSjHaN.4u
       - $2y$10$qJDpo1X1kFXRD1M6Kpi8WeKg.a8dgzd8RawXX/3RuMqM82biBc6iK
+    khaylasaunders:
+      - $2y$10$GLR8QrgP55Rjj5Ljf/JgQuyemzq2HzMysMbk6W.m0OkBSJbVHBdxC
+      - $2y$10$PnjXjW6fUxWSQyFZzy8gDunAxwzHjSHbILe3QW5TRimFeXIqs6tym
+      - $2y$10$JbCDPrCLcwYFlOzPdXsQS.l4DYQgjaW3AeGqs4PDYRUbMDszhK.Gq
     computerparts:
       - $2y$10$7TUXmYaJlWnRZTzYR..CsefgVcOZJMGt7ctxyAf.G3obBBFEAB342
       - $2y$10$0ghuTDegle177q8VjCgQ2OhManKjotYXrcDT3SLyUF8KvI152Wd0.

lesson_03/quiz/src/quizzes/khayla_quiz.ts

@@ -0,0 +1,73 @@
+import {
+  AnswerChoice,
+  MultipleChoiceQuizQuestion,
+  QuizQuestion,
+  QuizQuestionProvider,
+} from 'codedifferently-instructional';
+
+export class KhaylaSaundersQuiz implements QuizQuestionProvider {
+  getProviderName(): string {
+    return 'khaylasaunders';
+  }
+
+  makeQuizQuestions(): QuizQuestion[] {
+    return [
+      KhaylaSaundersQuiz.makeQuestion0(),
+      KhaylaSaundersQuiz.makeQuestion1(),
+      KhaylaSaundersQuiz.makeQuestion2(),
+    ];
+  }
+
+  private static makeQuestion0(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      0,
+      'Your team is working on a shared Git repository. Which of the following is not the best practice to follow for smooth collaboration?',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, 'Always pull before pushing to avoid conflicts.'],
+        [
+          AnswerChoice.B,
+          'Work directly on the main branch to keep the workflow simple.',
+        ],
+        [AnswerChoice.C, 'Use branches for separate work streams.'],
+        [
+          AnswerChoice.D,
+          'Use Git stash to temporarily save uncommitted changes. ',
+        ],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+
+  private static makeQuestion1(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      1,
+      'When should you use git rebase --skip while resolving conflicts in Git?',
+      new Map<AnswerChoice, string>([
+        [
+          AnswerChoice.A,
+          ' When you want to discard the conflicted commit during a rebase.',
+        ],
+        [AnswerChoice.B, 'When resolving conflicts during a merge.'],
+        [
+          AnswerChoice.C,
+          'When you want to keep the changes from the conflicted commit.',
+        ],
+        [AnswerChoice.D, 'When you need to undo the last commit '],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+  private static makeQuestion2(): QuizQuestion {
+    return new MultipleChoiceQuizQuestion(
+      2,
+      'What languge is best to communiate with computers ',
+      new Map<AnswerChoice, string>([
+        [AnswerChoice.A, '0s & 1s '],
+        [AnswerChoice.B, 'JavaScript'],
+        [AnswerChoice.C, 'Supersets'],
+        [AnswerChoice.D, 'Git'],
+      ]),
+      AnswerChoice.UNANSWERED,
+    ); // Replace `UNANSWERED` with the correct answer.
+  }
+}

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

@@ -4,6 +4,9 @@ import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
 import { ChanelHuttQuiz } from './Chanel_Huttquiz.js';
 import { DavidAdenaikeQuiz } from './david_adenaike_quiz.js';
 import { Jbeyquiz } from './jbeyquiz.js';
+import { DavidAdenaikeQuiz } from './david_adenaike_quiz.js';
+import { Jbeyquiz } from './jbeyquiz.js';
+import { KhaylaSaundersQuiz } from './khayla_quiz.js';
 import { MeikoStephensQuiz } from './meiko_stephens_quiz.js';
 import { MercedesMathewsQuiz } from './mercedes_mathews_quiz.js';
 import { RasheedMillerQuiz } from './rasheed_miller_quiz.js';
@@ -18,6 +21,7 @@ const QUIZ_PROVIDERS = [
   MercedesMathewsQuiz,
   Jbeyquiz,
   DavidAdenaikeQuiz,
+  KhaylaSaundersQuiz,
   RasheedMillerQuiz,
   ChanelHuttQuiz,
 ];