Skip to content

Commit bd78d26

Browse files
txtran224txtran224
committed
fix: merge conflicts lesson 3
2 parents 525b56b + 3c9857e commit bd78d26

File tree

5 files changed

+211
-2
lines changed

5 files changed

+211
-2
lines changed

‎lesson_03/quiz/quiz.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ quiz:
66
anotherone:
77
- $2y$10$8eHSzy3aCu4Ry3LzO9nWCeGpofSxsNVbnF.wCfn3ZADwQ6MEtN/KK
88
- $2y$10$dGB0CGv7.XQC5OqfyY6iXOiJsdVyxU3ve5YE0gt4m2I8P8H13lNXa
9+
jamescapparell:
10+
- $2y$10$iLvL/AaFPzcGZrcna7umMuHqkZe1f9at/ix77NUI6uakDGNuVKQCy
11+
- $2y$10$FLxmGXJLm5EziyhA5D33ju0kUjXhiDbuUdImciLQz8lBRu5ou0hee
12+
- $2y$10$hQTJ1d2giJ40AI8rSgBqWOij7j3WVqsvAMYOLFiixbYTcvETuF5cC
913
xaviercruz:
1014
- $2y$10$1WMmkMjazP78KVns1l85zOC5r8cwgTnxLLs/scOzIkgCQ8HP28Y.q
1115
- $2y$10$9D.oRC8h/PD/10NMSR6MMOzjVAJKm.vfw4te8Rxgw1M1.0Q9x8pjK
@@ -42,4 +46,12 @@ quiz:
4246
tommytran:
4347
- $2y$10$6Mf9m8JXRHUyCgRNPn4nceimRZVOhtmsZbOGoFnI4ZJp..RluHmwy
4448
- $2y$10$Xr6W53IVq52orDvf6.TQQuXeMGaysQdgAu1cm5DYi1NyCskG2ByPe
45-
- $2y$10$x8BG/EcIbVohTU1s/thyc.TIzlfc8f/aVZaD4/1yMpcks2OWzKKMe
49+
- $2y$10$x8BG/EcIbVohTU1s/thyc.TIzlfc8f/aVZaD4/1yMpcks2OWzKKMe
50+
zionbuchanan:
51+
- $2y$10$ufNCdP1efvioBYIih6K92uye33p5ckN/IrxfCvw4n7agHjN8aNfhe
52+
- $2y$10$Mb7LA1kqlDRWlN9jdBYvF.u1B8cmJqXWkrxQeMr/3ETRVOAzFlflG
53+
- $2y$10$9bTVOlLmkj4y5f9u1b3sgeTQ9hIrVFrGiz71B0HTxiIidqq0VXHGS
54+
shawndunsmore:
55+
- $2y$10$Kpde4LAfDyEhgWezFoI5texc53Sge6QQs8y5hR8DA7zHfyK8It5LW
56+
- $2y$10$T061IZuccoHb2XGjaICB/Olchf62DqrSDVIE0TE9Q9qidfLAL7sHS
57+
- $2y$10$T061IZuccoHb2XGjaICB/Olchf62DqrSDVIE0TE9Q9qidfLAL7sHS

‎lesson_03/quiz/src/quizzes/james_capparell_quiz.ts

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class JamesCapparellQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'jamescapparell';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
JamesCapparellQuiz.makeQuestion0(),
16+
JamesCapparellQuiz.makeQuestion1(),
17+
JamesCapparellQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'What county in Delaware is Code differently offices in?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'Sussex County'],
27+
[AnswerChoice.B, 'Kent County'],
28+
[AnswerChoice.C, 'New Castle County'],
29+
[AnswerChoice.D, 'Lancaster County'],
30+
]),
31+
AnswerChoice.UNANSWERED,
32+
); // Replace `UNANSWERED` with the correct answer.
33+
}
34+
private static makeQuestion1(): QuizQuestion {
35+
return new MultipleChoiceQuizQuestion(
36+
1,
37+
'Which video game charcter has the most games in their series?',
38+
new Map<AnswerChoice, string>([
39+
[AnswerChoice.A, 'Mario'],
40+
[AnswerChoice.B, 'Sonic'],
41+
[AnswerChoice.C, 'Mega Man'],
42+
[AnswerChoice.D, 'Pikachu'],
43+
]),
44+
AnswerChoice.UNANSWERED,
45+
); // Replace `UNANSWERED` with the correct answer.
46+
}
47+
48+
private static makeQuestion2(): QuizQuestion {
49+
return new QuizQuestion(
50+
2,
51+
'Type the full answer while filling in the blanks! A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
52+
'A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
53+
); // Provide an answer.
54+
}
55+
}

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,32 @@ import { AnotherQuiz } from './another_quiz.js';
55
import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
66
import { ChigazoGrahamsQuiz } from './chigazo_graham_quiz.js';
77
import { DasiaEnglishQuiz } from './dasia_english_quiz.js';
8+
import { JamesCapparellQuiz } from './james_capparell_quiz.js';
89
import { JosephCaballeroQuiz } from './joseph_caballero_quiz.js';
910
import { OyeyemiJimohQuiz } from './oyeyemi_jimoh_quiz.js';
10-
import { TommyTranQuiz } from './tommy_tran_quiz.js';
11+
import { ShawnDunsmoreQuiz } from './shawn_dunsmore_quiz.js';
12+
import { TommyTranQuiz } from './tommy.tran.quiz.js';
1113
import { XavierCruzQuiz } from './xavier_cruz_quiz.js';
1214
import { YafiahAbdullahQuiz } from './yafiah_abdullah_quiz.js';
15+
import { ZionBuchananQuiz } from './zion_buchanan_quiz.js';
1316

1417
export const Quizzes = Symbol.for('Quizzes');
1518

1619
// Add your quiz provider here.
1720
const QUIZ_PROVIDERS = [
1821
AnthonyMaysQuiz,
1922
YafiahAbdullahQuiz,
23+
JamesCapparellQuiz,
2024
AnotherQuiz,
2125
JosephCaballeroQuiz,
2226
AngelicaCQuiz,
2327
OyeyemiJimohQuiz,
28+
ShawnDunsmoreQuiz,
2429
DasiaEnglishQuiz,
2530
ChigazoGrahamsQuiz,
2631
AmiyahJonesQuiz,
2732
XavierCruzQuiz,
33+
ZionBuchananQuiz,
2834
TommyTranQuiz,
2935
];
3036

‎lesson_03/quiz/src/quizzes/shawn_dunsmore_quiz.ts

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class ShawnDunsmoreQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'shawndunsmore';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
ShawnDunsmoreQuiz.makeQuestion0(),
16+
ShawnDunsmoreQuiz.makeQuestion1(),
17+
ShawnDunsmoreQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'What is Davids Favorite Color?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'Idc'],
27+
[AnswerChoice.B, 'Blue'],
28+
[AnswerChoice.C, 'Black'],
29+
[AnswerChoice.D, 'Whatever you think it is.'],
30+
]),
31+
AnswerChoice.UNANSWERED,
32+
); // Replace `UNANSWERED` with the correct answer.
33+
}
34+
35+
private static makeQuestion1(): QuizQuestion {
36+
return new MultipleChoiceQuizQuestion(
37+
1,
38+
'What is Jordan famous for?',
39+
new Map<AnswerChoice, string>([
40+
[AnswerChoice.A, 'Photography'],
41+
[AnswerChoice.B, 'Being short'],
42+
[AnswerChoice.C, 'Pickleball'],
43+
[AnswerChoice.D, 'Trampoline Dunking.'],
44+
]),
45+
AnswerChoice.UNANSWERED,
46+
); // Replace `UNANSWERED` with the correct answer.
47+
}
48+
49+
private static makeQuestion2(): QuizQuestion {
50+
return new MultipleChoiceQuizQuestion(
51+
2,
52+
'How mnay states are there?',
53+
new Map<AnswerChoice, string>([
54+
[AnswerChoice.A, '50'],
55+
[AnswerChoice.B, '35'],
56+
[AnswerChoice.C, '20'],
57+
[AnswerChoice.D, '65'],
58+
]),
59+
AnswerChoice.UNANSWERED,
60+
); // Replace `UNANSWERED` with the correct answer.
61+
}
62+
}

‎lesson_03/quiz/src/quizzes/zion_buchanan_quiz.ts

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class ZionBuchananQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'zionbuchanan';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
ZionBuchananQuiz.makeQuestion0(),
16+
ZionBuchananQuiz.makeQuestion1(),
17+
ZionBuchananQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'What is a computer?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, 'A machine that transforms input data to output'],
27+
[AnswerChoice.B, 'A device that only stores information'],
28+
[AnswerChoice.C, 'A system that requires no user input to function'],
29+
[
30+
AnswerChoice.D,
31+
'A machine that operates only when connected to the internet.',
32+
],
33+
]),
34+
AnswerChoice.UNANSWERED,
35+
); // Replace `UNANSWERED` with the correct answer.
36+
}
37+
38+
private static makeQuestion1(): QuizQuestion {
39+
return new MultipleChoiceQuizQuestion(
40+
1,
41+
'Why do we use IDEs?',
42+
new Map<AnswerChoice, string>([
43+
[AnswerChoice.A, 'to issue tracking and debugging'],
44+
[AnswerChoice.B, 'Managing source control'],
45+
[AnswerChoice.C, 'Refactoring code'],
46+
[AnswerChoice.D, 'All of the above'],
47+
]),
48+
AnswerChoice.UNANSWERED,
49+
); // Replace `UNANSWERED` with the correct answer.
50+
}
51+
52+
private static makeQuestion2(): QuizQuestion {
53+
return new MultipleChoiceQuizQuestion(
54+
2,
55+
'What is a branch?',
56+
new Map<AnswerChoice, string>([
57+
[
58+
AnswerChoice.A,
59+
'A kind of software program that runs on every computer automatically.',
60+
],
61+
[AnswerChoice.B, 'Both Choices A and D'],
62+
[
63+
AnswerChoice.C,
64+
'A specialized type of car engine designed for off-road vehicles.',
65+
],
66+
[
67+
AnswerChoice.D,
68+
'A copy of the repository that allows you to make changes and merge them back later.',
69+
],
70+
]),
71+
AnswerChoice.UNANSWERED,
72+
); // Replace `UNANSWERED` with the correct answer.
73+
}
74+
}

0 commit comments

Comments
 (0)