Skip to content

Commit 051c111

Browse files
Merge branch 'code-differently:main' into feature/thomas
2 parents bf71801 + 70acc3d commit 051c111

24 files changed

+6831
-1
lines changed

lesson_01/joybrown/index.html

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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" />
6+
<link rel="stylesheet" href="styles.css" />
7+
<title>How to Work with Joy Brown</title>
8+
</head>
9+
<body>
10+
<h1>How to Work with Joy Brown</h1>
11+
<hr/>
12+
<h2>🕘 Availability &amp; Work Style</h2>
13+
<hr/>
14+
<ul>
15+
<li>I typically work from <strong>9 AM to 5 PM</strong>, but I’m generally available until <strong>7 PM</strong> if something urgent comes up.<br /></li>
16+
<li>I’m a <strong>morning person</strong>—I like to knock out my most important tasks early in the day.<br /></li>
17+
<li>I prefer <strong>in-person meetings</strong> over chat when possible.</li>
18+
<li>Feel free to <strong>interrupt me</strong>, just give me a <strong>heads-up first</strong>.</li>
19+
<li>If I can't assist you right away, please try another team member first. If no one’s available, feel free to <strong>reach out to me on my personal number</strong>.</li>
20+
</ul>
21+
22+
<h2>💬 Communication Style</h2>
23+
<hr/>
24+
<ul>
25+
<li>I prefer to give and receive <strong>feedback via email</strong>—it helps me process and respond more thoughtfully.<br /></li>
26+
<li>I'm generally responsive during work hours, but I appreciate some heads-up for anything time-sensitive.</li>
27+
<li>For non-urgent matters, email is the best way to ensure I don’t miss anything.</li>
28+
</ul>
29+
30+
<h2>📌 Priorities</h2>
31+
<hr/>
32+
<ul>
33+
<li>I focus on <strong>clarity, consistency, and quality</strong> in customer service.</li>
34+
<li>I value <strong>transparency and ownership</strong>—I’m happy to collaborate, but I appreciate when people take initiative.</li>
35+
</ul>
36+
37+
<h2>🧘‍♀️ Personal Preferences</h2>
38+
<hr/>
39+
<ul>
40+
<li>I get <strong>migraines</strong> occasionally, and they hit hard. If I seem off, that might be why.</li>
41+
<li>I work best with a bit of quiet time to focus. I don’t mind background noise, but I like having blocks of time without distractions.</li>
42+
<li>A quick <strong>coffee and a playlist</strong> go a long way for my productivity.</li>
43+
<li>I appreciate people who are <strong>direct but kind</strong>.</li>
44+
</ul>
45+
46+
<h2>🆘 When Things Go Wrong</h2>
47+
<hr/>
48+
<ul>
49+
<li>If something urgent happens and I’m unavailable, don’t hesitate to escalate or involve someone else.</li>
50+
<li>If there's ever a miscommunication, I'm open to a quick, honest conversation—no drama needed.</li>
51+
</ul>
52+
53+
<h2>💡 Fun Facts</h2>
54+
<hr/>
55+
<ul>
56+
<li>I love <strong>Lo-fi music</strong>—it helps me focus and unwind.</li>
57+
<li>I’m always down for a good <strong>YouTube Music playlist recommendation</strong>.</li>
58+
<li>I enjoy reading, organizing things, and drinking Starbucks Refreshers no matter the season.</li>
59+
<li>Favorite quote: <em>“Everything is gonna be okay in the end, and if it's not okay, then it's not the end.”</em></li>
60+
</ul>
61+
</body>
62+
</html>

lesson_01/joybrown/styles.css

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
body {
2+
font-family: Arial, sans-serif;
3+
max-width: 800px;
4+
margin: 0 auto;
5+
padding: 40px;
6+
line-height: 1.6;
7+
background-color: #fff;
8+
color: #333;
9+
}
10+
11+
h2 {
12+
font-size: 28px;
13+
color: #222;
14+
margin-top: 40px;
15+
}
16+
17+
h3 {
18+
font-size: 22px;
19+
color: #444;
20+
margin-top: 30px;
21+
}
22+
23+
ul {
24+
list-style-type: disc;
25+
padding-left: 20px;
26+
}
27+
28+
li {
29+
margin-bottom: 10px;
30+
}
31+
32+
img {
33+
margin: 10px;
34+
border-radius: 8px;
35+
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
36+
}
37+
38+
.section-divider {
39+
border: none;
40+
height: 1px;
41+
background-color: #ccc;
42+
margin-top:-20px;
43+
margin-bottom: 20px;
44+
45+
}
5.13 MB
Loading
413 KB
Loading

lesson_01/nicolejackson/index.html

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="UTF-8">
5+
<title>Nicole Jackson README</title>
6+
<link rel="stylesheet" href="03_styles.css">
7+
</head>
8+
<body>
9+
<div class="container">
10+
<header>
11+
<h1 class="line-break" >Nicole Jackson README</h1>
12+
</header>
13+
14+
<main>
15+
16+
17+
18+
19+
<section>
20+
<h2 class="line-break">Introduction</h2>
21+
22+
23+
<p>
24+
I am embarking on the journey of becoming a software engineer with a unique set of experiences
25+
and circumstances that have somehow led me back to this path after almost 30 years to finish the
26+
thing that I started but did not complete. And I am excited!
27+
</p>
28+
</section>
29+
30+
31+
32+
<section>
33+
<h2 class="line-break">Work Hours &amp; Best Way To Communicate With Me</h2>
34+
35+
<p>
36+
I intend to get my work done between 9am and 5pm, although I expect to work outside of these
37+
hours to complete homework and conduct research. For the purposes of this cohort, I will make
38+
myself available during the week until 7:30pm if anyone needs to contact me. After 7:30, I hope
39+
to give my undivided attention to my family and hopefully have a few minutes to myself by the end
40+
of the day.
41+
</p>
42+
<p>The best ways to communicate with me are:</p>
43+
<ul>
44+
<li><strong>Email</strong>: as a means to share detailed information with me.</li>
45+
<li><strong>Google Chat</strong>: great for quick updates.</li>
46+
<li><strong>Google Meets</strong>: an excellent option for scheduling meetings when a face-to-face is not possible.</li>
47+
<li><strong>Phone call</strong>: for a direct, real-time response.</li>
48+
</ul>
49+
<p>
50+
I check my email often and will reach back out to you shortly after. I have no problem with quick
51+
in-person chats related to work and/or projects.
52+
</p>
53+
</section>
54+
55+
<section>
56+
<h2 class="line-break">What I'd Love To Help You With</h2>
57+
58+
<p>
59+
It would be my pleasure to help you with any of the concepts we are tackling as I grasp them
60+
myself. I am not sure which aspects of this work will come with ease for me, but I love to share
61+
as I learn and grow. As I know from experience, helping others with ideas or concepts that I have
62+
obtained strengthens my understanding of those very same ideas.
63+
So as I am able to help you in whatever capacity I can, in that interaction, you are also helping me.
64+
</p>
65+
</section>
66+
67+
68+
69+
<section>
70+
<h2 class="line-break">One Of My Goals For The Coming Year</h2>
71+
72+
<p>
73+
My biggest goal for 2025 is to reach the end of the Code Differently 25.2 cohort with all of the
74+
skills outlined in the course syllabus. Over the last 2 months, I have rearranged things in my
75+
life to make room for this endeavor, and I will be extremely proud of myself to see this goal to fruition.
76+
</p>
77+
</section>
78+
79+
<section>
80+
<h2 class="line-break">A Topic I Am Always Happy to Talk About</h2>
81+
82+
<p>
83+
<strong>Reading.</strong> I love to read books. I am old school, so my preference is to have a physical
84+
book in hand as opposed to online reading from a screen or having my books read to me in audiobooks.
85+
I co-founded a book club during the pandemic and since its inception we have read over 30 books.
86+
In addition to book club books, I also have a running list of titles that I tackle independently.
87+
For a long time, I gravitated to biographies, autobiographies, and self-help books. My book club
88+
interactions have exposed me to different genres that I now enjoy. It is amazing just how much a
89+
good writer can convey between the front and back ends of a book.
90+
</p>
91+
</section>
92+
93+
94+
<section>
95+
<h2 class="line-break">Photo Gallery</h2>
96+
97+
<img src="images/20241229_132543 2.jpg" alt="Pink Roses" height="300" width="320" />
98+
<img src="images/picture2.jpg" alt="Nicole" height="300" />
99+
</section>
100+
</main>
101+
</div>
102+
</body>
103+
</html>

lesson_01/nicolejackson/style.css

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
.container {
2+
box-sizing: border-box;
3+
color: rgb (31, 35, 40);
4+
font-family: apple-system, "system-ui", "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
5+
font-size: 16px;
6+
font-weight: 400;
7+
height:72px;
8+
line-height:24px;
9+
margin-block-end: 16px;
10+
margin-block-start: 0px;
11+
margin-bottom : 6px;
12+
margin-inline-end:0px;
13+
margin-inline-start:0px;
14+
margin-top:0px;
15+
overscroll-behavior-block: auto;
16+
unicode-bidi: isolate;
17+
width : 1012px;
18+
line-height: 1.5;
19+
20+
21+
}
22+
23+
/* Dont need Container */
24+
/* .body {
25+
font-family: apple-system, "system-ui", "Segoe UI", "Noto Sans", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
26+
font-size: 16px;
27+
background-color: white;
28+
color: #333;
29+
padding:20px;
30+
word-wrap: break-word;
31+
32+
}*/
33+
34+
.line-break{
35+
border-bottom: 1px solid #d1d9e0b3;
36+
line-height: 1.25;
37+
}
38+
39+
40+

lesson_03/README.md

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,67 @@ Please review the following resources before lecture:
99

1010
## Homework
1111

12-
- TODO(anthonydmays): Add homework details.
12+
- [ ] Review [important reminders below](#important-reminders).
13+
- [ ] Create [new quiz questions](#creating-new-quiz-questions).
14+
- [ ] Do pre-work for [lesson 04](/lesson_04/).
15+
16+
### Important reminders
17+
18+
* Make sure to sync your fork before creating a branch in order to pull in the latest changes.
19+
* Sync your branch often to avoid merge conflicts and execute `git pull` to bring the latest changes to your machine.
20+
* 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.
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)