Skip to content

Commit 2bb2ec6

Browse files
authored
Merge pull request Ada-Developers-Academy#804 from Ada-Developers-Academy/sdr/dee-to-simon
replaces instances of 'dee' to 'simon'
2 parents 7833cd2 + 9dbd2ef commit 2bb2ec6

File tree

13 files changed

+46
-46
lines changed

13 files changed

+46
-46
lines changed

00-programming-fundamentals/exercises/git-pull-requests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ As a group, assign each person as role A, B, C, or D. If there aren't four peopl
3131
1. Person A should add all members (B, C, and D) as collaborators to this repo, and ensure they have push permissions
3232
1. Person A should share their repo URL with B, C, and D
3333
1. All people (A, B, C, and D) should clone this repo to their computers
34-
1. All people (A, B, C, and D) should create a branch on their local machine, and name this branch by their initials and then `/feature-branch-example` ( For example, if Dee's initials were "ddr", then `$ git checkout -b ddr/feature-branch-example`)
34+
1. All people (A, B, C, and D) should create a branch on their local machine, and name this branch by their initials and then `/feature-branch-example` ( For example, if Simon's initials were "sdr", then `$ git checkout -b ddr/feature-branch-example`)
3535
1. All people should spend less than 2 minutes making some changes and git commits on their own branch:
3636
- Make at least one `.txt` file, with some text in it, such as `$ touch favorite-color.txt` or `$ touch my-secrets.txt`
3737
- add and commit here

00-programming-fundamentals/intro-to-regex.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Character | Meaning | Example
7777
### Practice
7878

7979
Write a regular expression to match a valid email of form `[email protected]`
80-
- Matches `dee@adadev.org`, `[email protected]`, `[email protected]`
80+
- Matches `simon@adadev.org`, `[email protected]`, `[email protected]`
8181
- Rejects `dan@adadev.`, `charles.com`, `@adadev.org`, `[email protected]`
8282
- Use `\.` for a literal period (more on this later)
8383

00-programming-fundamentals/more-regular-expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Your other option is to use the special variables named `$1`, `$2`, etc. We'll s
7171
Now that we've got access to the captured data, we can make use of it. Here is a slightly more complex version of the same program:
7272

7373
```ruby
74-
emails = ['[email protected]', 'dee@adadev.org', '[email protected]']
74+
emails = ['[email protected]', 'simon@adadev.org', '[email protected]']
7575
email_regex = /.*@(.*\..*)/
7676

7777
# Create a new hash where missing values are initialized to 0

00-programming-fundamentals/project-submissions-without-git.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Almost there -- to actually finish project submission, you'll need to open and c
8282
1. Finish opening the pull Request by clicking the green "Create Pull Request" button
8383

8484
1. The next page should give you details about the PR that you need to fill out. As part of project submission, you will need to fill out the following things:
85-
1. The title of this PR should be "`<YOUR CLASSROOM NAME> - <YOUR NAME>`", such as "Ports - Dee"
85+
1. The title of this PR should be "`<YOUR CLASSROOM NAME> - <YOUR NAME>`", such as "Ports - Simon"
8686
1. There should be a bunch of text already filled in as the detail for the PR! This is our way of giving each person project reflection questions to answer. It is in the format of a table created in `markdown` formatting. Please spend a few minutes filling out an answer for each question, about 1-2 sentences for each answer.
8787
![PR Details](./images/project-submissions-without-git/open-pr.png)
8888

01-ruby-fundamentals/exercises/oo-library.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ sorcers_stone = Book.new(
5555
puts sorcers_stone.title
5656
# will output "Harry Potter and the Sorcer's Stone" in terminal
5757

58-
sorcers_stone.checkout("Dee")
58+
sorcers_stone.checkout("Simon")
5959
sorcers_stone.checkout("Cedrick")
6060

6161
puts sorcers_stone.checked_out_by
62-
# will output "Dee" and "Cedrick" to the terminal
62+
# will output "Simon" and "Cedrick" to the terminal
6363

6464
puts sorcers_stone.copies_available
6565
# will output "1" to the terminal
@@ -70,7 +70,7 @@ puts sorcers_stone.copies_available
7070

7171
sorcers_stone.checkin("Cedrick")
7272
puts sorcers_stone.checked_out_by
73-
# will output "Dee"
73+
# will output "Simon"
7474

7575
puts sorcers_stone.copies_available
7676
# will output "5"

04-cs-fundamentals/classroom/examples/symetric_pairs.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ def symetric_pairs(array_of_pairs)
1919

2020
puts "#{symetric_pairs([[11, 20], [30, 40], [5, 10], [40, 30], [10, 5]])}"
2121

22-
puts "#{symetric_pairs([["Dan", "Dee"], ["Lisa", "Val"], ["Kaida", "Chris"], ["Devin", "Susan"], ["Christine", "Jane"]])}"
23-
puts "#{symetric_pairs([["Dan", "Dee"], ["Dee", "Dan"], ["Kaida", "Chris"], ["Devin", "Susan"], ["Devin", "Jane"]])}"
22+
puts "#{symetric_pairs([["Dan", "Simon"], ["Lisa", "Val"], ["Kaida", "Chris"], ["Devin", "Susan"], ["Christine", "Jane"]])}"
23+
puts "#{symetric_pairs([["Dan", "Simon"], ["Simon", "Dan"], ["Kaida", "Chris"], ["Devin", "Susan"], ["Devin", "Jane"]])}"

04-cs-fundamentals/classroom/hash-tables.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ If I attempted the following:
6868
my_hash = MyHash.new
6969
my_hash["Dan"] = "Lead Instructor"
7070
my_hash["Chris"] = "CS Fun Instructor"
71-
my_hash["Dee"] = "Instructor Extraordinaire"
71+
my_hash["Simon"] = "Instructor Extraordinaire"
7272
my_hash[356] = "A big number"
7373
```
7474

@@ -142,12 +142,12 @@ Output: Following pairs have symmetric pairs
142142
(30, 40)
143143
(5, 10)
144144
145-
Input: arr[] = {{"Dan", "Dee"}, {"Lisa", "Val"}, {"Kaida", "Chris"}, {"Devin", "Susan"}, {"Christine", "Jane"}}
145+
Input: arr[] = {{"Dan", "Simon"}, {"Lisa", "Val"}, {"Kaida", "Chris"}, {"Devin", "Susan"}, {"Christine", "Jane"}}
146146
Output: No symmetric pairs
147147
148-
Input: arr[] = {{"Dan", "Dee"}, {"Kaida", "Val"}, {"Kaida", "Chris"}, {"Devin", "Susan"}, {"Dee", "Dan"}, {"Devin", "Susan"}}
148+
Input: arr[] = {{"Dan", "Simon"}, {"Kaida", "Val"}, {"Kaida", "Chris"}, {"Devin", "Susan"}, {"Simon", "Dan"}, {"Devin", "Susan"}}
149149
Output: Following pairs have symmetric pairs
150-
(Dan, Dee)
150+
(Dan, Simon)
151151
```
152152

153153
When you are finished you can see [our solution](examples/symetric_pairs.rb)

05-html-css/cascade-inheritance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ What happens when more than one CSS rule-set applies to an element? Observe the
1111

1212
```html
1313
<article>
14-
<h2><em>Why My Cats are the Most Charming</em> <span id="article-author" class="featured-author">by Dee Del Rosario</span></h2>
14+
<h2><em>Why My Cats are the Most Charming</em> <span id="article-author" class="featured-author">by Simon Del Rosario</span></h2>
1515
</article>
1616
```
1717

@@ -39,7 +39,7 @@ span {
3939
}
4040
```
4141

42-
What will the text `by Dee Del Rosario` look like?
42+
What will the text `by Simon Del Rosario` look like?
4343

4444
How does this get determined? Do styles override one another? Do styles get ignored? Which ones? When?
4545

09-intermediate-rails/intro-to-oauth.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Authentication is a process in web apps which verifies that a user is who truly
1919

2020
We've already learned about creating user login functionality in Rails using Rails' `session` hash. This "login functionality" was really just a person declaring they were a certain user by filling out a name in a form.
2121

22-
However, that person could have been lying. Chris could have gone to a website and filled out the name "Dee," even though Dee is not his name. Currently, we don't have a great way to authenticate, or verify, this fake "Dee" user in Rails, because we don't have an authentication process.
22+
However, that person could have been lying. Chris could have gone to a website and filled out the name "Simon," even though Simon is not his name. Currently, we don't have a great way to authenticate, or verify, this fake "Simon" user in Rails, because we don't have an authentication process.
2323

2424
In the web, we'll want to augment our login systems so that they can confirm the identity of a user, whether through some evidence or using some system that knows how to authenticate.
2525

@@ -48,16 +48,16 @@ If you've ever followed a link to "log in with Facebook" (or Google, Twitter, Gi
4848

4949
The process of the end user coming across OAuth is usually like this:
5050

51-
1. The user, Dee, is on the website [Glitch.com](https://glitch.com/)
52-
1. Dee needs to sign-in in order to save their project, and clicks the "sign in" button
51+
1. The user, Simon, is on the website [Glitch.com](https://glitch.com/)
52+
1. Simon needs to sign-in in order to save their project, and clicks the "sign in" button
5353
![Glitch before logging in](images/intro-to-oauth/before.png)
54-
1. Dee doesn't have an account on Glitch, but sees the "Sign in with GitHub" option
54+
1. Simon doesn't have an account on Glitch, but sees the "Sign in with GitHub" option
5555
![Glitch's options for logging in](images/intro-to-oauth/login.png)
56-
1. Dee clicks on it, and is redirected to a page in GitHub styling and branding that asks them to log in to GitHub
57-
1. Then, after successful login, GitHub automatically goes to another GitHub page that asks Dee to give GitHub permission to authorize Glitch. By agreeing, Dee says "Yes, GitHub, I trust Glitch, and Glitch may use my GitHub user information"
56+
1. Simon clicks on it, and is redirected to a page in GitHub styling and branding that asks them to log in to GitHub
57+
1. Then, after successful login, GitHub automatically goes to another GitHub page that asks Simon to give GitHub permission to authorize Glitch. By agreeing, Simon says "Yes, GitHub, I trust Glitch, and Glitch may use my GitHub user information"
5858
![GitHub asking the user to authorize Glitch](images/intro-to-oauth/authorize.png)
59-
1. After Dee clicks on the big green button, Dee is redirected back to Glitch
60-
1. Dee sees that on Glitch, they are fully logged in, and all of the Glitch UI reflects their user icon and user name
59+
1. After Simon clicks on the big green button, Simon is redirected back to Glitch
60+
1. Simon sees that on Glitch, they are fully logged in, and all of the Glitch UI reflects their user icon and user name
6161
![Glitch after logging in](images/intro-to-oauth/after.png)
6262

6363
## The Authentication Process Details

09-intermediate-rails/oauth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Each provider requires you to provide some credentials for your application, so
110110
1. On the left-hand vertical side bar, choose the option named "OAuth Apps" within these Settings / Developer Settings. From here, click he button that says [Register a new application](https://github.com/settings/applications/new)
111111
1. On this form to register a new OAuth app, use the following pieces of information in this form:
112112
113-
- Application name: whatever you feel like, like "OmniAuth in Books App Test" or "Dee's Books App"
113+
- Application name: whatever you feel like, like "OmniAuth in Books App Test" or "Simon's Books App"
114114
- Homepage URL: `http://localhost:3000`
115115
- Application description: Leave blank, or fill in whatever you feel like
116116
- Authorization callback URL: `http://localhost:3000/auth/github/callback`

10-JavaScript/axios-post.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ The `post()` function takes in the same two parameters: URL first, and an option
6060
const axios = require('axios');
6161

6262
const tripData = {
63-
name: 'Dee\'s Chill Trip to Chicago',
63+
name: 'Simon\'s Chill Trip to Chicago',
6464
continent: 'North America',
6565
about: 'A tour around good architecture and hot dogs.',
6666
category: 'casual',
@@ -124,7 +124,7 @@ Confirm your understanding of the code by answering these questions (use the [ax
124124
// ...
125125

126126
axios.post('https://trektravel.herokuapp.com/trips', {
127-
name: 'Dee\'s Chill Trip to Chicago',
127+
name: 'Simon\'s Chill Trip to Chicago',
128128
continent: 'North America',
129129
about: 'A tour around good architecture and hot dogs.',
130130
category: 'casual',
@@ -156,7 +156,7 @@ When we run this code together and it responds with success:
156156
```js
157157
{
158158
id: 136,
159-
name: "Dee's Chill Trip to Chicago",
159+
name: "Simon's Chill Trip to Chicago",
160160
continent: 'North America',
161161
about: 'A tour around good architecture and hot dogs.',
162162
category: 'casual',
@@ -239,8 +239,8 @@ Utilizing the [Ada Trip Reserving Service™ Trip API™™™](https://github.c
239239
const tripId = 136;
240240

241241
const tripReservationData = {
242-
name: 'dee',
243-
email: 'dee@deemail.dev',
242+
name: 'Simon',
243+
email: 'Simon@tildeemail.dev',
244244
};
245245

246246
axios.post(`https://trektravel.herokuapp.com/trips/${tripId}/reservations`, tripReservationData)

10-JavaScript/first-class-functions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ We will be applying this idea of an object to much more realistic use-cases of o
2727
const task = {
2828
name: 'practice iteration in JavaScript',
2929
dueDate: 'end of the week',
30-
owner: 'dee',
30+
owner: 'simon',
3131
isComplete: false
3232
}
3333
```
@@ -45,7 +45,7 @@ We can attach _behavior_ to an object by making it a member, using this syntax:
4545
const task = {
4646
name: 'practice iteration in JavaScript',
4747
dueDate: 'end of the week',
48-
owner: 'dee',
48+
owner: 'simon',
4949
isComplete: false,
5050
markComplete() {
5151
console.log('Wow...');
@@ -78,7 +78,7 @@ Within an object itself, other members (such as properties) can be accessed thro
7878
const task = {
7979
name: 'practice iteration in JavaScript',
8080
dueDate: 'end of the week',
81-
owner: 'dee',
81+
owner: 'simon',
8282
isComplete: false,
8383
markComplete() {
8484
console.log('Wow...');
@@ -114,7 +114,7 @@ Given this base code for an object named `task`, make another method on it:
114114
const task = {
115115
name: 'practice iteration in JavaScript',
116116
dueDate: 'end of the week',
117-
owner: 'dee',
117+
owner: 'simon',
118118
isComplete: false,
119119
markComplete() {
120120
console.log('Wow...');

10-JavaScript/variables-conditionals-iteration.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ There are three keywords to use to declare a variable, all specifying different
6767
Observe variable declaration and assignment below:
6868

6969
```javascript
70-
var deesFavoriteColor = 'green';
71-
let deesFavoriteNumber = 72;
72-
const deesFavoriteGame = 'night in the woods';
70+
var simonsFavColor = 'green';
71+
let simonsFavNum = 72;
72+
const simonsFavGame = 'night in the woods';
7373
```
7474

7575
### We Prefer `let` for Reassignable Variables
@@ -84,15 +84,15 @@ Constants cannot change their value through reassignment. **We will always use `
8484

8585
In your Node REPL, input these lines. Do you get what you expect?
8686

87-
1. `var deesFavoriteColor = 'green';`
88-
1. `deesFavoriteColor;`
89-
1. `let deesFavoriteNumber = 72;`
90-
1. `deesFavoriteNumber;`
91-
1. `const deesFavoriteGame = 'night in the woods';`
92-
1. `deesFavoriteGame;`
93-
1. `deesFavoriteNumber = 16;`
94-
1. `let deesFavoriteNumber;`
95-
1. `deesFavoriteGame = 'butterfly soup';`
87+
1. `var simonsFavColor = 'green';`
88+
1. `simonsFavColor;`
89+
1. `let simonsFavNum = 72;`
90+
1. `simonsFavNum;`
91+
1. `const simonsFavGame = 'night in the woods';`
92+
1. `simonsFavGame;`
93+
1. `simonsFavNum = 16;`
94+
1. `let simonsFavNum;`
95+
1. `simonsFavGame = 'butterfly soup';`
9696

9797
<details>
9898

@@ -107,7 +107,7 @@ In your Node REPL, input these lines. Do you get what you expect?
107107
1. `undefined`
108108
1. `'night in the woods'`
109109
1. `16`
110-
1. `Thrown: SyntaxError: Identifier 'deesFavoriteNumber' has already been declared` You only need to do the variable declaration (using `let` or `const`) once. You can just re-assign a `let` variable without the keyword `let`.
110+
1. `Thrown: SyntaxError: Identifier 'simonsFavNum' has already been declared` You only need to do the variable declaration (using `let` or `const`) once. You can just re-assign a `let` variable without the keyword `let`.
111111
1. `Thrown: TypeError: Assignment to constant variable.` You can't re-assign a `const` variable.
112112

113113
</details>

0 commit comments

Comments
 (0)