Skip to content

Commit abf8d17

Browse files
kksaunders251kksaunders251
authored
Merge branch 'code-differently:main' into main
2 parents fbef715 + f64fcf4 commit abf8d17

24 files changed

+6725
-2
lines changed

‎.github/workflows/check_lesson_02_pr.yaml

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

‎lesson_00/Davis D./Images/TheMixer1.jpeg

690 KB
Loading

‎lesson_00/Davis D./README.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Davis D. README
2+
3+
## Who is He??
4+
5+
Davis is a 20 year old man who serves in the army but, is also in search for his adult career. Born in Chester PA, Davis has seen the harsh realities of the world to those who let it's influence dictate their lives. His parents moved out of the city in hope he would have a prosperous and successful life which brings him here... An aspiring Software Engineer willing to sacrifice anything for success and stability in said field.
6+
7+
### The Motive
8+
9+
I've had the pressure on me since my early days as being referred to as the golden boy, Mr. Perfect, or Blessed by God. As well as all family members from grandparents to distant cousins all being compared to me or being told to be like me. This pressure only means failure isn't an option!
10+
11+
## The Drive
12+
13+
### What I do to be a productive Man and U.S Soldier
14+
15+
* 1-2hr workout everyday
16+
* R&B/Soul throughout the day to calm my mind
17+
* A great breakfast. I'm a foodie so i need a meal to get going!
18+
* 1hr of meditation or reading the word
19+
* Watch anime. ONE PIECE is Peak!!
20+
21+
## Cool Stuff
22+
23+
* I've played over 8 sports... Boxing, Basketball,and Track to name a few.
24+
* I was a Golf instructor for Education First Golf.
25+
* I'm in the Military, Army Guard.
26+
* I was ranked top 20 in the state of Delaware for wrestling!
27+
* I am skilled in being a physical trainer & Masseur(Male massage practitioner)
28+
29+
## The Moments
30+
31+
![Davis Lifestyle](Images/TheMixer1.jpeg)
32+
33+
## Reach Me
34+
35+
You can reach me via. <a href="https://www.linkedin.com/in/davisdw2004">LinkedIn</a>

‎lesson_01/mercedesmathews/images/headshot.JPG

127 KB
Loading

‎lesson_01/mercedesmathews/index.html

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>Read Me Using HTML</title>
7+
<link rel="stylesheet" href="styles.css"> </head>
8+
<body>
9+
<section></section>
10+
<h1>Mercedes Mathews README</h1>
11+
<hr>
12+
<img src="images/headshot.JPG" class="responsive">
13+
<h2>About Me</h2>
14+
<hr>
15+
<p>I am 23 years old and just graduated from the University of Delaware with a Computer Science degree. I was a gymnast for about 17 years and started when I was 18 months. I taught gymnastics for over 7 years and was a Tech Lead with Code Differently for almost 2 years.</p>
16+
<h2>Working With Me</h2>
17+
<hr>
18+
<p>I am a night owl even though my schedule doesn't reflect that currently. I prefer working and talking in person but I am best reached via the google chat or text. I'm a bit more of a visual learner so videos and diagrams are my go to.</p>
19+
<h2>My Current Schedule</h2>
20+
<hr>
21+
<ol>
22+
<li>Wake up and get prepped for the day (6:00am - 6:30am)</li>
23+
<li>Go to the gym (About 7:00am - 8:30am)
24+
<ul>
25+
<li>Weightlifting / Strength</li>
26+
</ul>
27+
</li>
28+
<li>Go to class (9:00am - 5:00pm)
29+
<ul>
30+
<li>Stay after if needed (up until 7:00pm)</li>
31+
</ul>
32+
</li>
33+
<li>Go to the gym again (30 - 60 mins)
34+
<ul>
35+
<li>Cardio / Endurance</li>
36+
</ul>
37+
</li>
38+
<li>Go home (yay 😄)</li>
39+
</ol>
40+
<hr class="thick">
41+
<blockquote>
42+
<p><em>I am training for a hybrid race called <a href="https://hyrox.com/the-fitness-race/" target="_blank">HYROX</a> which is why I workout multiple times a day.</em></p>
43+
<p><em>Some days are rest days or only have one workout depending on that day's training.</em></p>
44+
</blockquote>
45+
<h2>Things I like</h2>
46+
<hr>
47+
<ul>
48+
<li>Working out or weight lifting</li>
49+
<li>Coffee and matcha, I prefer them both iced</li>
50+
<li>Cava, El Diablo, Chic-fil-a</li>
51+
<li>Hanging out with my friends</li>
52+
<li>Traveling</li>
53+
<li>Going to the beach</li>
54+
<li>Music, concerts, and festivals</li>
55+
<li>Oreo Mcflurries</li>
56+
<li>Naps</li>
57+
</ul>
58+
<h2>Fun Facts</h2>
59+
<hr>
60+
<ul>
61+
<li>I studied abroad in Thailand for a month</li>
62+
<li>My dad was a gymnast, taught gymnastics/cheer, and was the main reason I started gymnastics</li>
63+
<li>My parents were bodybuilders and the reason I'm big into weightlifting</li>
64+
<li>I'm not a natural redhead</li>
65+
</ul>
66+
</body>
67+
</html>

‎lesson_01/mercedesmathews/styles.css

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
body {
2+
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
3+
font-size: 16px;
4+
line-height: 1.5;
5+
color: #1f2328;
6+
margin: 35px;
7+
}
8+
9+
h1, h2 {
10+
font-weight: 600;
11+
margin-bottom: 0;
12+
}
13+
14+
img {
15+
width: auto;
16+
}
17+
18+
hr {
19+
border: .5px solid #dae0e7;
20+
margin-top: .25rem;
21+
margin-bottom: 1rem;
22+
}
23+
24+
p{
25+
margin-top: 0;
26+
margin-bottom: 1rem;
27+
28+
}
29+
30+
blockquote {
31+
color: #59636e;
32+
border-left: .25em solid #dae0e7;
33+
padding: 0 1em;
34+
margin-left: 0;
35+
}
36+
37+
.thick {
38+
border: 2px solid #dae0e7;
39+
margin-top: 1.5rem;
40+
margin-bottom: 1.5rem;
41+
}
42+
43+
ol>li, ul>li {
44+
margin-bottom: .25rem;
45+
}
46+
47+
a {
48+
text-underline-offset: .2rem;
49+
color: #0969da;
50+
cursor: pointer;
51+
}
52+
53+
.responsive {
54+
max-width: 100%;
55+
height: auto;
56+
}

‎lesson_03/README.md

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,66 @@ Please review the following resources before lecture:
1010
## Homework
1111

1212
- [ ] Review [important reminders below](#important-reminders).
13-
- TODO(anthonydmays): Add more details
13+
- [ ] Create [new quiz questions](#creating-new-quiz-questions).
14+
- [ ] Do pre-work for [lesson 04](/lesson_04/).
1415

1516
### Important reminders
1617

1718
* Make sure to sync your fork before creating a branch in order to pull in the latest changes.
1819
* Sync your branch often to avoid merge conflicts and execute `git pull` to bring the latest changes to your machine.
1920
* If your branch is too far behind or you run into too many issues, feel free to delete and re-create your repository. Make sure to review the article linked at the bottom of the [lesson_00](/lesson_00/README.md) README for instructions on how to create your fork and branch properly.
20-
* Remember, you should not reuse a branch you've used to submit a pull request. If you need to make changes, create a new branch and work from there after you've updated your fork to the latest.
21+
* Remember, you should not reuse a branch you've used to submit a pull request. If you need to make changes, create a new branch and work from there after you've updated your fork to the latest.
22+
23+
### Creating new quiz questions
24+
25+
Now's your chance to quiz the instructor! In this assignment, you will modify the quiz project to include three quiz questions based on the content you've learned in this course so far. Feel free to choose any topic for your questions.
26+
27+
1. Navigate to the [quiz][quiz-folder] directory and install the required dependencies.
28+
```bash
29+
cd lesson_03/quiz
30+
npm install --prefix ../../lib/javascript/codedifferently-instructional
31+
npm install
32+
npm start
33+
```
34+
2. You will create a quiz file in the [quizzes folder][quizzes-folder]. You should model yours after the example provided in [anthony_mays_quiz.ts][quiz-example]. Note that the name of the file you create should match the name of the class in the file.
35+
3. Make sure to provide a unique provider name for your questions provider. You'll need this name to provide answers in step 5.
36+
```typescript
37+
getProviderName(): string {
38+
return '<your unique name goes here>';
39+
}
40+
```
41+
4. Make at least three questions for your quiz and _leave them unanswered_.
42+
5. To provide answers, you will need to update the [quiz.yaml][test-config-file] file in the test directory. You can copy the example in the file to get started, but you must provide your own answers. To generate an encrypted answer, use [bcrypt.online](https://bcrypt.online).
43+
6. Lastly, you'll need to modify the [quizzes.module.ts][quizzes-module] file to include your quiz.
44+
7. Before attempting to submit your quiz, make sure to run the linter on the code and run the tests to ensure that you've updated things correctly. The commands must be run from the [quiz][quiz-folder] sub-folder just like the previous assignment:
45+
```bash
46+
npm run check
47+
```
48+
8. Once everything passes, submit a PR.
49+
50+
**Note: If you want to check that you've encoded your answers correctly, you can update you quiz with the real answers and then run the tests using the command below.
51+
```bash
52+
PROVIDER_NAME=<Your provider name here> npm run test
53+
```
54+
55+
### Dealing with merge conflicts
56+
57+
Since everyone needs to modify the same files for this assignment, you will most certainly encounter merge conflicts. To resolve this, here are the steps:
58+
59+
1. Sync the main branch of your fork and ensure that it is up-to-date.
60+
2. Use `git checkout main` and `git pull` to get the latest updates pulled down to your computer.
61+
3. Checkout your feature branch (e.g. `git checkout feature/lesson_03`).
62+
4. Run `git rebase main` on your feature branch to pull in the latest changes and deal with merge conflicts.
63+
5. Use the *Source Control* view in VS Code to identify files with conflicts. Click to open them and use the *Merge Editor* to resolve conflicts.
64+
6. Stage and commit the changed files.
65+
7. Repeat steps 5-6 until the rebase is complete.
66+
67+
An alternative approach is to open the PR and manually edit the conflicting files to work out any issues. This may be easier for some of you, but it can also be tricky to do if you don't know what you're doing.
68+
69+
Check out [this YouTube video](https://www.youtube.com/watch?v=OXtdxHTh2oY) for a quick explaination of what's going on.
70+
71+
[quizzes-folder]: ./quiz/src/quizzes/
72+
[quiz-folder]: ./quiz/
73+
[quiz-example]: ./quiz/src/quizzes/anthony_mays_quiz.ts
74+
[test-config-file]: ./quiz/quiz.yaml
75+
[quizzes-module]: ./quiz/src/quizzes/quizzes.module.ts

‎lesson_03/quiz/.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
insert_final_newline = true
9+
organize_imports = true
10+
trim_trailing_whitespace = true
11+
quote_type = single

‎lesson_03/quiz/.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Ignore artifacts:
2+
build
3+
coverage

‎lesson_03/quiz/.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)