From 6a1735e1d452524d5bc27d22bc93c96f1c008d76 Mon Sep 17 00:00:00 2001 From: AbdalRhman Date: Thu, 2 Jan 2020 18:22:07 +0200 Subject: [PATCH 1/3] Socail Hackers Academy Stamped --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7e90c241d..62c934b31 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -> If you are following the HackYourFuture curriculum we recommend you to start with module 1: [HTML/CSS/GIT](https://github.com/HackYourFuture/HTML-CSS). To get a complete overview of the HackYourFuture curriculum first, click [here](https://github.com/HackYourFuture/curriculum). +> If you are following the curriculum we recommend you to start with module 1: [HTML/CSS/GIT](https://github.com/SocialHackersCodeSchool/HTML-CSS). To get a complete overview of the HackYourFuture curriculum first, click [here](https://github.com/SocialHackersCodeSchool/curriculum). -> Please help us improve and share your feedback! If you find better tutorials or links, please share them by [opening a pull request](https://github.com/HackYourFuture/JavaScript2/pulls). +> Please help us improve and share your feedback! If you find better tutorials or links, please share them by [opening a pull request](https://github.com/SocialHackersCodeSchool/JavaScript2/pulls). # Module #3 - JavaScript 2: DOM Manipulation (Frontend) @@ -47,6 +47,8 @@ Did you finish the module? Good job! You're doing great! If you feel ready for the next challenge, click [here](https://www.github.com/HackYourFuture/JavaScript3) to go to JavaScript3! -_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 :)_ +## Credit: +This curriculum is developed by HackYourFuture, modifications, and changes can be found in this Fork. (edited) + Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. From 5f9e431437a58dca07112464ed2e92550f6b08c0 Mon Sep 17 00:00:00 2001 From: Abed Date: Fri, 3 Jan 2020 22:22:35 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 62c934b31..9fc255af5 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ If you have any questions or if something is not entirely clear ¯\\\_(ツ)\_/¯ | Week | Topic | Reading Materials | Homework | Lesson Plan | | ---- | -------------------------------------------------------------------- | ------------------------------ | ------------------------------- | -------------------------------------- | | 1. | Document-Object Model (DOM), DOM manipulation | [Reading W1](/Week1/README.md) | [Homework W1](/Week1/MAKEME.md) | [Lesson Plan W1](/Week1/LESSONPLAN.md) | -| 2. | Synchronous vs. asynchronous, Event Loop, Callbacks, Array Functions | [Reading W2](/Week2/README.md) | [Homework W2](/Week2/MAKEME.md) | [Lesson Plan W2](/Week1/LESSONPLAN.md) | -| 3. | Scope, Hoisting, Closures, Thinking like a programmer II | [Reading W3](/Week3/README.md) | [Homework W3](/Week3/MAKEME.md) | [Lesson Plan W3](/Week1/LESSONPLAN.md) | +| 2. | Synchronous vs. asynchronous, Event Loop, Callbacks, Array Functions | [Reading W2](/Week2/README.md) | [Homework W2](/Week2/MAKEME.md) | [Lesson Plan W2](/Week2/LESSONPLAN.md) | +| 3. | Scope, Hoisting, Closures, Thinking like a programmer II | [Reading W3](/Week3/README.md) | [Homework W3](/Week3/MAKEME.md) | [Lesson Plan W3](/Week3/LESSONPLAN.md) | | 4. | Test | [Details](/test/README.md) | - | - | ## Finished? From 6642b05b55accb6f05d59ad3a36f73bb86b86574 Mon Sep 17 00:00:00 2001 From: hsnckkgl <56938448+hsnckkgl@users.noreply.github.com> Date: Fri, 17 Jan 2020 18:59:44 +0200 Subject: [PATCH 3/3] 17.01.2020 1-3-4 --- Week1/js-exercises/aboutMe/2aboutMe.html | 0 Week1/js-exercises/aboutMe/2aboutMe.js | 0 Week1/js-exercises/bookList/1bookList.html | 13 ++++ Week1/js-exercises/bookList/1booksList.js | 55 ++++++++++++++++ .../js-exercises/logoHijack/3logoHijack.html | 13 ++++ Week1/js-exercises/logoHijack/3logoHijack.js | 5 ++ .../js-exercises/theCatWalk/5theCatWalk.html | 0 Week1/js-exercises/theCatWalk/5theCatWalk.js | 0 .../whatistheTime/4whatistheTime.html | 12 ++++ .../whatistheTime/4whatistheTime.js | 17 +++++ Week2/week2HomeworkHasan/theOddOnesOut.js | 15 +++++ .../whatIsYourMondayWorth.js | 65 +++++++++++++++++++ 12 files changed, 195 insertions(+) create mode 100644 Week1/js-exercises/aboutMe/2aboutMe.html create mode 100644 Week1/js-exercises/aboutMe/2aboutMe.js create mode 100644 Week1/js-exercises/bookList/1bookList.html create mode 100644 Week1/js-exercises/bookList/1booksList.js create mode 100644 Week1/js-exercises/logoHijack/3logoHijack.html create mode 100644 Week1/js-exercises/logoHijack/3logoHijack.js create mode 100644 Week1/js-exercises/theCatWalk/5theCatWalk.html create mode 100644 Week1/js-exercises/theCatWalk/5theCatWalk.js create mode 100644 Week1/js-exercises/whatistheTime/4whatistheTime.html create mode 100644 Week1/js-exercises/whatistheTime/4whatistheTime.js create mode 100644 Week2/week2HomeworkHasan/theOddOnesOut.js create mode 100644 Week2/week2HomeworkHasan/whatIsYourMondayWorth.js diff --git a/Week1/js-exercises/aboutMe/2aboutMe.html b/Week1/js-exercises/aboutMe/2aboutMe.html new file mode 100644 index 000000000..e69de29bb diff --git a/Week1/js-exercises/aboutMe/2aboutMe.js b/Week1/js-exercises/aboutMe/2aboutMe.js new file mode 100644 index 000000000..e69de29bb diff --git a/Week1/js-exercises/bookList/1bookList.html b/Week1/js-exercises/bookList/1bookList.html new file mode 100644 index 000000000..07240ea7b --- /dev/null +++ b/Week1/js-exercises/bookList/1bookList.html @@ -0,0 +1,13 @@ + + + + + + + Document + + + + + + \ No newline at end of file diff --git a/Week1/js-exercises/bookList/1booksList.js b/Week1/js-exercises/bookList/1booksList.js new file mode 100644 index 000000000..a8ad7b79f --- /dev/null +++ b/Week1/js-exercises/bookList/1booksList.js @@ -0,0 +1,55 @@ +function bookList(){ +const books = [ + { + title: 'The Design of Everyday Things', + author: 'Don Norman', + alreadyRead: false, + src: "https://productdork.com/uploads/default/original/1X/ddbda1150301e89cdf0119d84f2a7fb8930beffb.png" + }, + { + title: 'The Most Human Human', + author: 'Brian Christian', + alreadyRead: false, + src: "https://i.gr-assets.com/images/S/compressed.photo.goodreads.com/books/1295465264l/8884400.jpg" + }, + { + title: 'Angels & Demons', + author: 'Dan Brown', + alreadyRead: true, + src: "https://covers.openlibrary.org/w/id/8398165-L.jpg" + } + ]; + var paragraf = document.createElement("p"); + + for (let i=0; i + + + + + + Document + + + + + + \ No newline at end of file diff --git a/Week1/js-exercises/logoHijack/3logoHijack.js b/Week1/js-exercises/logoHijack/3logoHijack.js new file mode 100644 index 000000000..ddd02a133 --- /dev/null +++ b/Week1/js-exercises/logoHijack/3logoHijack.js @@ -0,0 +1,5 @@ +function hijackGoogleLogo(){ +var logo = document.getElementById('googlelogo'); +logo.src = 'https://www.hackyourfuture.dk/static/logo-dark.svg'; +} +hijackGoogleLogo(); \ No newline at end of file diff --git a/Week1/js-exercises/theCatWalk/5theCatWalk.html b/Week1/js-exercises/theCatWalk/5theCatWalk.html new file mode 100644 index 000000000..e69de29bb diff --git a/Week1/js-exercises/theCatWalk/5theCatWalk.js b/Week1/js-exercises/theCatWalk/5theCatWalk.js new file mode 100644 index 000000000..e69de29bb diff --git a/Week1/js-exercises/whatistheTime/4whatistheTime.html b/Week1/js-exercises/whatistheTime/4whatistheTime.html new file mode 100644 index 000000000..68fa4e4ad --- /dev/null +++ b/Week1/js-exercises/whatistheTime/4whatistheTime.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + + + \ No newline at end of file diff --git a/Week1/js-exercises/whatistheTime/4whatistheTime.js b/Week1/js-exercises/whatistheTime/4whatistheTime.js new file mode 100644 index 000000000..10a25c774 --- /dev/null +++ b/Week1/js-exercises/whatistheTime/4whatistheTime.js @@ -0,0 +1,17 @@ +function showCurrentTime() { + var today = new Date(); + var h = today.getHours(); + var m = today.getMinutes(); + var s = today.getSeconds(); + m = checkTime(m); + s = checkTime(s); + document.body.innerHTML = + h + ":" + m + ":" + s; + var t = setTimeout(showCurrentTime, 1000); +} +function checkTime(i) { + if (i < 10) {i = "0" + i}; + return i; + } + +showCurrentTime(); \ No newline at end of file diff --git a/Week2/week2HomeworkHasan/theOddOnesOut.js b/Week2/week2HomeworkHasan/theOddOnesOut.js new file mode 100644 index 000000000..c8e8a88c1 --- /dev/null +++ b/Week2/week2HomeworkHasan/theOddOnesOut.js @@ -0,0 +1,15 @@ +'use strict'; + +function doubleOddNumbers(numbers) { + // Replace this comment and the next line with your code + console.log(numbers); +} + +const myNumbers = [1, 2, 3, 4]; +console.log(doubleOddNumbers(myNumbers)); + +// Do not change or remove anything below this line +module.exports = { + myNumbers, + doubleOddNumbers, +}; diff --git a/Week2/week2HomeworkHasan/whatIsYourMondayWorth.js b/Week2/week2HomeworkHasan/whatIsYourMondayWorth.js new file mode 100644 index 000000000..49772eb44 --- /dev/null +++ b/Week2/week2HomeworkHasan/whatIsYourMondayWorth.js @@ -0,0 +1,65 @@ +'use strict'; + +const monday = [ + { + name: 'Write a summary HTML/CSS', + duration: 180, + }, + { + name: 'Some web development', + duration: 120, + }, + { + name: 'Fix homework for class10', + duration: 20, + }, + { + name: 'Talk to a lot of people', + duration: 200, + }, +]; + +const tuesday = [ + { + name: 'Keep writing summary', + duration: 240, + }, + { + name: 'Some more web development', + duration: 180, + }, + { + name: 'Staring out the window', + duration: 10, + }, + { + name: 'Talk to a lot of people', + duration: 200, + }, + { + name: 'Look at application assignments new students', + duration: 40, + }, +]; + +const maartjesTasks = monday.concat(tuesday); +const maartjesHourlyRate = 20; + +function computeEarnings(tasks, hourlyRate) { + // Replace this comment and the next line with your code + console.log(tasks, hourlyRate); +} + +// eslint-disable-next-line no-unused-vars +const earnings = computeEarnings(maartjesTasks, maartjesHourlyRate); + +// add code to convert `earnings` to a string rounded to two decimals (euro cents) + +console.log(`Maartje has earned €${'replace this string with the earnings rounded to euro cents'}`); + +// Do not change or remove anything below this line +module.exports = { + maartjesTasks, + maartjesHourlyRate, + computeEarnings, +};