Skip to content

Commit bb9d004

Browse files
TatsuyaRyujinTatsuyaRyujin
authored
Merge branch 'code-differently:main' into evan_07
2 parents 249a1e4 + c668fa2 commit bb9d004

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6867
-11
lines changed

‎.github/workflows/check_lesson_07_pr.yaml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Check Lesson 07 Pull Request
2+
3+
on:
4+
pull_request:
5+
branches: [ "main" ]
6+
paths:
7+
- "lesson_07/conditionals/**"
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
16+
steps:
17+
- uses: actions/checkout@v4
18+
19+
- name: Use Node.js
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '20.x'
23+
24+
- name: Build Shared Lib with Node.js
25+
working-directory: ./lib/javascript/codedifferently-instructional
26+
run: npm ci
27+
28+
- name: Build Lesson 07 with Node.js
29+
working-directory: ./lesson_07/conditionals
30+
run: |
31+
npm ci
32+
npm run test

‎.github/workflows/check_push.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
- "lesson_03/quiz/**"
1111
- "lesson_06/quiz/**"
1212
- "lesson_06/expression/**"
13+
- "lesson_07/conditionals/**"
1314
jobs:
1415
build:
1516
runs-on: ubuntu-latest
@@ -86,3 +87,9 @@ jobs:
8687
run: |
8788
npm ci
8889
npm run compile
90+
91+
- name: Build Lesson 07 with Node.js
92+
working-directory: ./lesson_07/conditionals
93+
run: |
94+
npm ci
95+
npm run compile

‎lesson_00/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Lesson 00 - Developer Workflow: Git Fundamentals ([Slides](https://code-differently.github.io/code-differently-24-q4/slides/#/lesson_00))
1+
# Lesson 00 - Developer Workflow: Git Fundamentals ([Slides](https://code-differently.github.io/code-differently-25-q1/slides/#/lesson_00))
22

33
## Slides
44

‎lesson_01/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Lesson 01 - Developer Workflow: IDE Fundamentals ([Slides](https://code-differently.github.io/code-differently-24-q4/slides/#/lesson_01))
1+
# Lesson 01 - Developer Workflow: IDE Fundamentals ([Slides](https://code-differently.github.io/code-differently-25-q1/slides/#/lesson_01))
22

33
## Pre-work
44

‎lesson_02/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Lesson 02: Developer Workflow: Navigating the Terminal ([Slides](https://code-differently.github.io/code-differently-24-q4/slides/#/lesson_02))
1+
# Lesson 02: Developer Workflow: Navigating the Terminal ([Slides](https://code-differently.github.io/code-differently-25-q1/slides/#/lesson_02))
22

33
## Pre-work
44

‎lesson_03/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Lesson 03: How Computers Work ([Slides](https://code-differently.github.io/code-differently-24-q4/slides/#/lesson_03))
1+
# Lesson 03: How Computers Work ([Slides](https://code-differently.github.io/code-differently-25-q1/slides/#/lesson_03))
22

33
## Pre-work
44

‎lesson_03/quiz/quiz.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ quiz:
5050
- $2y$10$FquR69q7W4E68TX/SNCB7u8Ri0DOFRDqsUPdGfuyIBjZJRVFkNI.6
5151
- $2y$10$FSWRA7hulVpyVxd8s67Nxuq/1cdmviW24qqoUbqihBf79cR.w9yly
5252
- $2y$10$Qy1IsNsfuJvA384ypL/72uWubUuNbMRp4LD6j/LM0RIH66D/HIjF6
53+
justin:
54+
- $2y$10$yAoLMl8ij6NqmOWbedu/bu0jBUwJn29cr/l2riI9I89tSXvk6RD.q
55+
- $2y$10$6wlesIJWKciE1ljq3CC0W.kOlNyNhkCdUxaLUWFFd/4GKn5FUT/2O
56+
- $2y$10$5iFZunbLe8IG3LBzoRYGluE2.7gSl/L4cXEbib08pX3tYmiDyS/7G
5357
niapack:
5458
- $2y$10$AHKmPPaTlafHO3T5q..kAuAhAy4n8Kn.wcY7ZAeYgokCjitwyjqE2
5559
- $2y$10$Z0g.9UO7qwkwoeNe8byn3.MVNIiIKBxa6ztLVHzDz.m5Ao5ozGqh6
@@ -84,3 +88,4 @@ quiz:
8488
- $2y$10$7/GS4n5j/5TXQc5zjDzlc.2xBKwRqrsksWzcl7VKRwa.fDxzdficS
8589
- $2y$10$9mfdal67CXoVG2phPKe1s.BpAT6HQeyQIiDtStfFazkPMW2AaW6Zu
8690
- $2y$10$LiCnvad23bwZWZbxXLhs3.r/YdwIX9eAFtjofaW1AH3Htnc9sEU1G
91+

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import {
2+
AnswerChoice,
3+
MultipleChoiceQuizQuestion,
4+
QuizQuestion,
5+
QuizQuestionProvider,
6+
} from 'codedifferently-instructional';
7+
8+
export class JustinsQuiz implements QuizQuestionProvider {
9+
getProviderName(): string {
10+
return 'justin';
11+
}
12+
13+
makeQuizQuestions(): QuizQuestion[] {
14+
return [
15+
JustinsQuiz.makeQuestion0(),
16+
JustinsQuiz.makeQuestion1(),
17+
JustinsQuiz.makeQuestion2(),
18+
];
19+
}
20+
21+
private static makeQuestion0(): QuizQuestion {
22+
return new MultipleChoiceQuizQuestion(
23+
0,
24+
'How many planets are in our solar system?',
25+
new Map<AnswerChoice, string>([
26+
[AnswerChoice.A, '8'],
27+
[AnswerChoice.B, '9'],
28+
[AnswerChoice.C, '12'],
29+
[AnswerChoice.D, '10'],
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+
'How many states are there in the United States?',
39+
new Map<AnswerChoice, string>([
40+
[AnswerChoice.A, '53'],
41+
[AnswerChoice.B, '52'],
42+
[AnswerChoice.C, '48'],
43+
[AnswerChoice.D, '50'],
44+
]),
45+
AnswerChoice.UNANSWERED,
46+
); // Replace `UNANSWERED` with the correct answer.
47+
}
48+
private static makeQuestion2(): QuizQuestion {
49+
return new MultipleChoiceQuizQuestion(
50+
2,
51+
'What date does Christmas fall on?',
52+
new Map<AnswerChoice, string>([
53+
[AnswerChoice.A, 'December 25th'],
54+
[AnswerChoice.B, 'December 24th'],
55+
[AnswerChoice.C, 'December 26th'],
56+
[AnswerChoice.D, 'December 23rd'],
57+
]),
58+
AnswerChoice.UNANSWERED,
59+
); // Replace `UNANSWERED` with the correct answer.
60+
}
61+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import { MontezBradleyQuiz } from './montez_quiz.js';
2020
import { NiaPackquiz } from './nia_quiz.js';
2121
import { OliviaJamesQuiz } from './olivia_james_quiz.js';
2222
import { RasheedMillerQuiz } from './rasheed_miller_quiz.js';
23-
23+
import { JustinsQuiz } from './justin_eklund_quiz.js';
2424
export const Quizzes = Symbol.for('Quizzes');
2525

2626
// Add your quiz provider here.
@@ -40,13 +40,15 @@ const QUIZ_PROVIDERS = [
4040
KhaylaSaundersQuiz,
4141
DylanLaffertyQuiz,
4242
RasheedMillerQuiz,
43+
JustinsQuiz,
4344
NiaPackquiz,
4445
DavisDQuiz,
4546
AnanatawaQuiz,
4647
OliviaJamesQuiz,
4748
ChanelHuttQuiz,
4849
JeremiahWingQuiz,
4950
JasonWatsonQuiz,
51+
5052
];
5153

5254
@Module({

‎lesson_04/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Lesson 04: How to Be A Great Software Engineer ([Slides](https://code-differently.github.io/code-differently-24-q4/slides/#/lesson_04))
1+
# Lesson 04: How to Be A Great Software Engineer ([Slides](https://code-differently.github.io/code-differently-25-q1/slides/#/lesson_04))
22

33
## Pre-work
44

0 commit comments

Comments
 (0)