Skip to content
This repository was archived by the owner on May 14, 2024. It is now read-only.

Commit 2a362f8

Browse files
mkruijtmkruijt
authored
Merge pull request #14 from remarcmij/master
Resubmission of PR to remove block by Maartje
2 parents 783adc3 + 936bff1 commit 2a362f8

18 files changed

Lines changed: 648 additions & 208 deletions

File tree

‎.gitignore‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
8+
# Runtime data
9+
pids
10+
*.pid
11+
*.seed
12+
*.pid.lock
13+
14+
# Directory for instrumented libs generated by jscoverage/JSCover
15+
lib-cov
16+
17+
# Coverage directory used by tools like istanbul
18+
coverage
19+
20+
# nyc test coverage
21+
.nyc_output
22+
23+
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
24+
.grunt
25+
26+
# Bower dependency directory (https://bower.io/)
27+
bower_components
28+
29+
# node-waf configuration
30+
.lock-wscript
31+
32+
# Compiled binary addons (http://nodejs.org/api/addons.html)
33+
build/Release
34+
35+
# Dependency directories
36+
node_modules/
37+
jspm_packages/
38+
39+
# Typescript v1 declaration files
40+
typings/
41+
42+
# Optional npm cache directory
43+
.npm
44+
45+
# Optional eslint cache
46+
.eslintcache
47+
48+
# Optional REPL history
49+
.node_repl_history
50+
51+
# Output of 'npm pack'
52+
*.tgz
53+
54+
# Yarn Integrity file
55+
.yarn-integrity
56+
57+
# dotenv environment variables file
58+
.env
59+
60+
.netlify
61+
dist/

‎.vscode/settings.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
2+
"editor.formatOnSave": true,
3+
"editor.formatOnType": true,
4+
"editor.formatOnPaste": true,
5+
"editor.detectIndentation": false,
6+
"editor.tabSize": 2,
27
"cSpell.words": [
3-
"orgs",
4-
"repos"
8+
"tabindex"
59
]
610
}

‎LICENSE‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This work is licensed under the Creative Commons Attribution 4.0 International License.
2+
To view a copy of this license, visit http://creativecommons.org/licenses/by/4.0/
3+
or send a letter to Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Here you can find course content and homework for the JavaScript3 modules
99
|----|-----|----|--------|
1010
|1.|• Structure for a basic SPA (Single Page Application) <br>• [XMLHttpRequests](../../../fundamentals/blob/master/fundamentals/XMLHttpRequest.md) <br>• API calls|[Reading Week 1](/Week1/README.md)|[Homework Week 1](/Week1/MAKEME.md)|
1111
|2.|• [Event Loop (order of execution)](../../../fundamentals/blob/master/fundamentals/event_loop.md)<br>• [Promises](../../../fundamentals/blob/master/fundamentals/promises.md)|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
12-
|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind |[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
12+
|3.|• [try...catch](../../../fundamentals/blob/master/fundamentals/try_catch.md)<br>• [async/await](../../../fundamentals/blob/master/fundamentals/async_await.md)<br>• [The `this` keyword](../../../fundamentals/blob/master/fundamentals/this.md)<br>• call, apply, bind<br>• [Object Oriented Programming and ES6 Classes](../../../fundamentals/blob/master/fundamentals/oop_classes.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
1313

1414
__Kind note:__
1515

@@ -19,3 +19,5 @@ We expect you to __always__ come prepared to the class on Sunday.
1919
A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](../../../fundamentals/blob/master/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear.
2020

2121
*The HackYourFuture curriculum is subject to CC BY copyright. This means you can freely use our materials, but just make sure to give us credit for it :)*
22+
23+
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

‎Week1/MAKEME.md‎

Lines changed: 165 additions & 54 deletions
Large diffs are not rendered by default.

‎Week1/assets/hyf-github-error.png‎

10.5 KB
Loading

‎Week2/MAKEME.md‎

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,51 @@ Topics discussed this week:
2020
- YouTube: [promises](https://www.youtube.com/watch?v=WBupia9oidU)
2121

2222

23-
## Step 2: Feedback
23+
## Step 2: Implement requested PR changes
2424

25-
- Create at least 2 issues (bug / feature / code improvement) on another student's GitHub repository.
26-
- Solve the issue(s) proposed by another students in your GitHub repository. More info [here](https://hackyourfuture.slack.com/files/michahell/F31BX1XT6/Merging_a_local_branch_into_master).
25+
- Fix Requested Changes (if any) on the Pull Request.
2726

28-
## Step 3: Promises
27+
## Step 3: Convert callbacks to promises
2928

30-
_Deadline Saturday_
29+
**_Deadline Thursday_**
3130

32-
The assignment for this week is:
31+
### 3.1 Preparation
32+
33+
The homework for week 2 will build on the work you did in week 1. You will create a new branch based on the `week1` branch.
34+
35+
1. Make sure that you committed all changes in the week 1 version of your homework.
36+
2. Create a new `week2` branch:
37+
38+
```
39+
git checkout -b week2
40+
```
41+
42+
### 3.2 Assignment
43+
44+
You will continue to work on the files `index.js` and (possibly) `style.css`.
3345
3446
- Complete your GitHub app code from the previous week, if needed, to meet the requirements from that week's assignment.
3547
- Replace all asynchronous callbacks (e.g. as used with XMLHttpRequest) by ES6 promises.
3648
- Beautify your app's styling.
49+
- If not yet completed in week 1, make your app responsive (use CSS media queries and [Flexbox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/)).
50+
51+
### 3.3 Handing in your homework
52+
53+
- Have you removed all commented out code (should never be present in a PR)?
54+
- Have you used `const` and `let` and avoided `var`?
55+
- Do the variable, function and argument names you created follow the [Naming Conventions](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md)?
56+
- Is your code well-formatted (see [Code Formatting](../../../../fundamentals/blob/master/fundamentals/naming_conventions.md))?
57+
- Have you resolved all issues flagged by ESLint and the spell checker (no wavy red and green underlines in VSCode)?
58+
59+
If the answer is 'yes' to all preceding questions you are ready to follow these instructions:
60+
61+
1. Push your `week2` branch to GitHub:
3762
38-
Bonus assignments:
63+
```
64+
git push -u origin week2
65+
```
3966
40-
- Make your app responsive (using media queries)
41-
- Make your app ARIA-compliant
67+
2. Create a pull request for your `week2` branch.
4268
4369
Note:
4470

0 commit comments

Comments
 (0)