Merge pull request #45 from HackYourFuture-CPH/for-example

Use "e.g." for examples, not "fx"

Author: adamblanchard

legacy/databases/lesson3/README.md

@@ -69,45 +69,45 @@ Create these queries
 
 #### Meal
 
-| Queries to write                                                                          |
-| ----------------------------------------------------------------------------------------- |
-| Get all meals                                                                             |
-| Add a new meal                                                                            |
-| Get a meal with any id, fx 1                                                              |
-| Update a meal with any id, fx 1. Update any attribute fx the title or multiple attributes |
-| Delete a meal with any id, fx 1                                                           |
+| Queries to write                                                                              |
+| --------------------------------------------------------------------------------------------- |
+| Get all meals                                                                                 |
+| Add a new meal                                                                                |
+| Get a meal with any id, e.g. 1                                                                |
+| Update a meal with any id, e.g. 1. Update any attribute e.g. the title or multiple attributes |
+| Delete a meal with any id, e.g. 1                                                             |
 
 #### Reservation
 
-| Queries to write                                                                                 |
-| ------------------------------------------------------------------------------------------------ |
-| Get all reservations                                                                             |
-| Add a new reservation                                                                            |
-| Get a reservation with any id, fx 1                                                              |
-| Update a reservation with any id, fx 1. Update any attribute fx the title or multiple attributes |
-| Delete a reservation with any id, fx 1                                                           |
+| Queries to write                                                                                     |
+| ---------------------------------------------------------------------------------------------------- |
+| Get all reservations                                                                                 |
+| Add a new reservation                                                                                |
+| Get a reservation with any id, e.g. 1                                                                |
+| Update a reservation with any id, e.g. 1. Update any attribute e.g. the title or multiple attributes |
+| Delete a reservation with any id, e.g. 1                                                             |
 
 #### Review
 
-| Queries to write                                                                            |
-| ------------------------------------------------------------------------------------------- |
-| Get all reviews                                                                             |
-| Add a new review                                                                            |
-| Get a review with any id, fx 1                                                              |
-| Update a review with any id, fx 1. Update any attribute fx the title or multiple attributes |
-| Delete a review with any id, fx 1                                                           |
+| Queries to write                                                                                |
+| ----------------------------------------------------------------------------------------------- |
+| Get all reviews                                                                                 |
+| Add a new review                                                                                |
+| Get a review with any id, e.g. 1                                                                |
+| Update a review with any id, e.g. 1. Update any attribute e.g. the title or multiple attributes |
+| Delete a review with any id, e.g. 1                                                             |
 
 #### Additional queries
 
 Now add a couple of different meals, reservations and reviews with different attributes. With those meals create the following queries
 
 | Functionality                                                                                                  |
 | -------------------------------------------------------------------------------------------------------------- |
-| Get meals that has a price smaller than a specific price fx 90                                                 |
+| Get meals that has a price smaller than a specific price e.g. 90                                               |
 | Get meals that still has available reservations                                                                |
 | Get meals that partially match a title. `Rød grød med` will match the meal with the title `Rød grød med fløde` |
 | Get meals that has been created between two dates                                                              |
-| Get only specific number of meals fx return only 5 meals                                                       |
+| Get only specific number of meals e.g. return only 5 meals                                                     |
 | Get the meals that have good reviews                                                                           |
 | Get reservations for a specific meal sorted by created_date                                                    |
 | Sort all meals by average number of stars in the reviews                                                       |

legacy/databases/lesson3/social_media_exercise.md

@@ -55,4 +55,4 @@ It should however **not** be possible for a user to react to something with the
 
 ### Friendship
 
-Fx: User 1 is friends with user 2
+e.g. User 1 is friends with user 2

legacy/javascript/homework-projects/guides/making-your-API-guide.md

@@ -24,7 +24,7 @@ If you already have such a repository, just go on to the next step.
 
 1. Once the repository has been made, head over to your terminal and clone that repository into a directory of your choosing.
 2. Once the repository been cloned to your computer, open the project folder in VS Code.
-3. Create a folder for your APIs or just create a file in the root of the repository. You might want to organize it into a folder (fx. “data”) if you plan to create more APIs in the future and/or if you plan to also host your site on Github Pages. In the case of your JS project, you would just copy and paste the array of objects that you have been using so far and perhaps add more objects to it, if needed.
+3. Create a folder for your APIs or just create a file in the root of the repository. You might want to organize it into a folder (e.g. “data”) if you plan to create more APIs in the future and/or if you plan to also host your site on Github Pages. In the case of your JS project, you would just copy and paste the array of objects that you have been using so far and perhaps add more objects to it, if needed.
 4. Once you are ready with your JSON file, add, commit and push the changes to `main` so that you have the file on your repository.
 5. Head over to the repo on GitHub and verify that your file is there and that all is good.
 

legacy/javascript/javascript1/week1/lesson-plan.md

@@ -7,7 +7,7 @@
 
 Remember to add the code you wrote in the class to the relevant class branch's class work folder. If the branch has not been created just create and push it :) If you don't have access, write to one from the core team. You can see an example below!
 
-To find examples of what teachers have taught before go to the class branches in the classwork folder, Fx [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
+To find examples of what teachers have taught before go to the class branches in the classwork folder, e.g. [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
 
 If you find anything that could be improved then please create a pull request! We welcome changes, so please get involved if you have any ideas!!!
 

legacy/javascript/javascript1/week2/README.md

@@ -7,7 +7,7 @@
 - [ ] Global vs local scope
 - [ ] For loop
 
-Teaching note. Start off explaining functions with how to use a function fx explain why the Math.random function is smart, or Math.max.
+Teaching note. Start off explaining functions with how to use a function e.g. explain why the Math.random function is smart, or Math.max.
 
 ## Relevant links
 
@@ -78,7 +78,7 @@ console.log(randomNumber); // logs out some number between 0 and 1
 
 Here `Math.random` is a function. To activate the function we call it using parentheses `()`. When calling it we get a randomNumber! We now don't need to think about all the code it takes to create a random number in javascript, we simply call the function and get a random number. Code has been abstracted away for us!
 
-Some functions is called with arguments fx:
+Some functions is called with arguments, for example:
 
 ```js
 const maxNumber = Math.max(3, 5); // 3 and 5 are arguments
@@ -142,7 +142,7 @@ multiply(10 * 4);
 
 ##### Return value
 
-Sometimes we want to get a value back when calling a function. Fx in the sum example. We want to call the function and get the sum back!
+Sometimes we want to get a value back when calling a function. e.g. in the sum example. We want to call the function and get the sum back!
 
 ```js
 function sum(a, b) {

legacy/javascript/javascript1/week2/lesson-plan.md

@@ -7,7 +7,7 @@
 
 Remember to add the code you wrote in the class to the relevant class branch's class work folder. If the branch has not been created just create and push it :) If you don't have access, write to one from the core team. You can see an example below!
 
-To find examples of what teachers have taught before go to the class branches in the classwork folder, Fx [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
+To find examples of what teachers have taught before go to the class branches in the classwork folder, e.g. [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
 
 If you find anything that could be improved then please create a pull request! We welcome changes, so please get involved if you have any ideas!!!
 
@@ -38,7 +38,7 @@ If you find anything that could be improved then please create a pull request! W
   - [Exercise string logger](#for-loop-1)
   - [Exercise send emails](#send-emails)
 
-The students really struggle with the **return** value. What it means, how it is captured. What happens when nothing is returned etc. Try really hammering in this concept with lots of simple examples and exercises! Fx if a function is called get something. That means that something is returned from that function.
+The students really struggle with the **return** value. What it means, how it is captured. What happens when nothing is returned etc. Try really hammering in this concept with lots of simple examples and exercises! e.g. if a function is called get something. That means that something is returned from that function.
 
 Zoey Zou made a nice Notion lesson plan here: <https://www.notion.so/JS1-Week2-8f2d4b7e7ba0425ea4a9e97816e9ceb7>
 

legacy/javascript/javascript1/week3/homework.md

@@ -4,7 +4,7 @@
 
 Array's has lots of helper functions, that is used all the time when developing js applications. It is super helpful to be able to **manipulate an array** like **removing elements** or **adding elements** at specific indexes. Another helpful function of arrays is to know **where a specific item is** in the array.
 
-Objects can be used for **representing data** and it can **help structure your code**. An object can fx represent a user that has a firstname, surname, profile picture and a list of friends. It is constantly used in javascript and **essential to learning the language**.
+Objects can be used for **representing data** and it can **help structure your code**. An object can e.g. represent a user that has a firstname, surname, profile picture and a list of friends. It is constantly used in javascript and **essential to learning the language**.
 
 If you struggle to do this weeks homework there are a couple of things to do:
 

legacy/javascript/javascript1/week3/lesson-plan.md

@@ -7,7 +7,7 @@
 
 Remember to add the code you wrote in the class to the relevant class branch's class work folder. If the branch has not been created just create and push it :) If you don't have access, write to one from the core team. You can see an example below!
 
-To find examples of what teachers have taught before go to the class branches in the classwork folder, Fx [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
+To find examples of what teachers have taught before go to the class branches in the classwork folder, e.g. [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
 
 If you find anything that could be improved then please create a pull request! We welcome changes, so please get involved if you have any ideas!!!
 

legacy/javascript/javascript1/week4/homework.md

@@ -36,9 +36,9 @@ These are the commands you should be able to give the voice assistant:
 - `Add fishing to my todo` - Should respond with "fishing added to your todo". Should add fishing to a list of todos
 - `Add singing in the shower to my todo` - Should add singing in the shower to a list of todos
 - `Remove fishing from my todo` - Should respond with "Removed fishing from your todo"
-- `What is on my todo?` - should respond with the todos. Fx you have 2 todos - fishing and singing in the shower
+- `What is on my todo?` - should respond with the todos. e.g. you have 2 todos - fishing and singing in the shower
 - `What day is it today?` - Should respond with the date in a human readable format. E.g. if today is 30/8/2019 then it should respond with 30. of August 2019
-- Should be able to do simple math. fx `what is 3 + 3` should respond with 6. Or `what is 4 * 12` should respond with 48
+- Should be able to do simple math. e.g. `what is 3 + 3` should respond with 6. Or `what is 4 * 12` should respond with 48
 - `Set a timer for 4 minutes` - Should respond with "Timer set for 4 minutes". When 4 minutes is up: "Timer done". How do we set a timer in js? Google is your friend here!
 - Add one or more command to your voice assistant
 

legacy/javascript/javascript1/week4/lesson-plan.md

@@ -7,7 +7,7 @@
 
 Remember to add the code you wrote in the class to the relevant class branch's class work folder. If the branch has not been created just create and push it :) If you don't have access, write to one from the core team. You can see an example below!
 
-To find examples of what teachers have taught before go to the class branches in the classwork folder, Fx [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
+To find examples of what teachers have taught before go to the class branches in the classwork folder, e.g. [class 07](https://github.com/HackYourFuture-CPH/JavaScript/tree/class07/JavaScript1/Week1/classwork)
 
 If you find anything that could be improved then please create a pull request! We welcome changes, so please get involved if you have any ideas!!!
 
@@ -74,7 +74,7 @@ When that works. Make the two number for multiples into parameters. So it can be
 
 A sentiment analyzer is some functionality that figures out how positive/negative a sentence is.
 
-Fx the sentence `I am mega super awesome happy" Should have a high score
+For example, the sentence `I am mega super awesome happy" Should have a high score
 The sentence "I hate doing boring stuff" should have a low score.
 
 Create a function that takes a string as a parameter. calling the function will return an object with `score`, `positiveWords` and `negativeWords`. You decide how the score should be implemented and what words are negative and positive.
@@ -96,7 +96,9 @@ console.log(sentimentScoreObject);
 
 ### Credit card number formatter
 
-This is a very real world example of a problem i got at my previous work. I was tasked to implement one of the smart credit card input fields, where the credit card numbers are separated with a space. Fx inputting 123456789 would show 1234 5678 9.
+This is a very real world example of a problem i got at my previous work. I
+was tasked to implement one of the smart credit card input fields, where the
+credit card numbers are separated with a space. e.g. inputting 123456789 would show 1234 5678 9.
 
 ![Credit card formatter](assets/credit-card-formatter.gif)