Skip to content

Commit 28a8e21

Browse files
committed
first commit
2 parents d2998ed + f6d1acc commit 28a8e21

File tree

7 files changed

+14
-154
lines changed

7 files changed

+14
-154
lines changed

.eslintrc

Lines changed: 0 additions & 47 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 61 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

LICENSE

Lines changed: 0 additions & 3 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
> Please help us improve and share your feedback! If you find better tutorials
2-
or links, please share them by [opening a pull request](https://github.com/HackYourFuture/JavaScript2/pulls).
3-
4-
# HackYourFuture - JavaScript 2
5-
6-
Here you can find course content and homework for the JavaScript2 module
7-
8-
|Week|Topic|Read|Homework|
9-
|----|-----|----|--------|
10-
|1.|• Capturing user input <br>• [Events](http://javascript.info/introduction-browser-events)<br>• [Basic DOM manipulations](../../../fundamentals/blob/master/fundamentals/DOM_manipulation.md)<br>• [Code debugging using the browser](http://javascript.info/debugging-chrome) <br>• [Code commenting](../../../fundamentals/blob/master/fundamentals/code_commenting.md)<br>• Structuring code files<br>• [Code formatting](../../../fundamentals/blob/master/fundamentals/code_formatting.md)<br>• [Handing in homework via PR](../../..//fundamentals/blob/master/fundamentals/homework_pr.md) |[Reading Week 1](/Week1/README.md)|[Homework Week 1](/Week1/MAKEME.md)|
11-
|2.|• Functions + JSON/Arrays<br>• [Array Manipulations](../../../fundamentals/blob/master/fundamentals/array_manipulation.md)<br>• JSON<br>• [Map and filter](../../../fundamentals/blob/master/fundamentals/map_filter.md)<br>• Arrow functions |[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
12-
|3.|[Closures](../../../fundamentals/blob/master/fundamentals/scope_closures_this.md) <br>• Callbacks|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
13-
14-
__Kind note:__
15-
16-
We expect you to __always__ come prepared to the class on Sunday.
17-
18-
### Overall
19-
A good understanding of all the above mentioned topics. Want to check your Knowledge? Go through the [JavaScript Fundamentals README](../../../fundamentals/blob/master/fundamentals/README.md) and research/ ask for help (Slack!) with the concepts that are not entirely clear.
20-
21-
*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>.
241
#hyfjavascript2

Week2/homework/maartjes_work.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,20 @@ const tasks = monday.concat(tuesday);
5050
// Add your code here
5151
//console.log(tasks);
5252

53+
<<<<<<< HEAD
5354
// convert Maarje working mins into hours then into salary for Mon-Tuesday
55+
=======
56+
// convert Maarje's working mins into hours then into salary for Mon-Tuesday
57+
>>>>>>> f6d1acc7b0ab9c3a3f3c27687df766257317bf60
5458
const salary = tasks.map(lengths => { return lengths.duration })
5559
.map(hours => hours / 60)
5660
.filter(long => long >= 2)
5761
.map(rate => rate * 25)
5862
.map(euro => { return euro.toFixed(2) })
5963
.reduce((accumulator, wage) => { return accumulator + wage; 0 });
6064

61-
console.log('Maartje\'s salary for Monday and Tuesday is ' + '€' + salary);
65+
<<<<<<< HEAD
66+
console.log('Maartje\'s salary for Monday and Tuesday is ' + '€' + salary);
67+
=======
68+
console.log('Maartje\'s salary for Monday and Tuesday is ' + '€' + salary);
69+
>>>>>>> f6d1acc7b0ab9c3a3f3c27687df766257317bf60

Week2/homework/map_filter.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ const oddNumbers = numbers.filter(x => x % 2 !== 0);
77
const doubleNumbers = oddNumbers.map(x => { if (x % 2 !== 0) return x * 2 });
88

99
console.log(oddNumbers); //==>[1, 3]
10-
console.log(doubleNumbers);//==> [2,6]
10+
<<<<<<< HEAD
11+
console.log(doubleNumbers);//==> [2,6]
12+
=======
13+
console.log(doubleNumbers);//==> [2,6]
14+
>>>>>>> f6d1acc7b0ab9c3a3f3c27687df766257317bf60

0 commit comments

Comments
 (0)