From 3702612b93a7fd6c186e428232c961ab4968775d Mon Sep 17 00:00:00 2001 From: Abed Date: Thu, 26 Dec 2019 19:57:34 +0200 Subject: [PATCH 1/6] SHA's modification --- README.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index dbf980860..b103d2a06 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -> 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, 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/JavaScript1/pulls). +> or links, please share them by [opening a pull request](https://github.com/SocialHackersCodeSchool/JavaScript1/pulls). # Module #2 - JavaScript 1: Programming Basics (Frontend) @@ -71,8 +71,11 @@ If you have any questions or if something is not entirely clear ¯\\\_(ツ)\_/¯ 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/JavaScript2) to go to JavaScript2! +If you feel ready for the next challenge, click [here](https://www.github.com/SocialHackersCodeSchool/JavaScript2) to go to JavaScript2! + +## Credit: +This curriculum is developed by [HackYourFuture](https://github.com/HackYourFuture), modifications, and +changes can be found in this Fork. -_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 :)_ Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. From 23530916f87cc40ef494abeae51e7ff979aff4a5 Mon Sep 17 00:00:00 2001 From: Abed Date: Thu, 26 Dec 2019 20:09:16 +0200 Subject: [PATCH 2/6] SHA modification. --- Week1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week1/README.md b/Week1/README.md index ecfaf004b..ea3ed54a9 100644 --- a/Week1/README.md +++ b/Week1/README.md @@ -56,7 +56,7 @@ There are various languages, each made to fulfill a certain need. For example, M ## 1. What is web development? -In HackYourFuture we focus on `web` programmming (also known as `web development`): writing code that creates websites and web applications. Look at the following video to learn about what you'll be doing: +In this course we focus on `web` programmming (also known as `web development`): writing code that creates websites and web applications. Look at the following video to learn about what you'll be doing: - [What does a web developer do?](https://www.youtube.com/watch?v=GEfuOMzRgXo) From a4460245f0f09ae088bbad9bc99fba9ba41ed172 Mon Sep 17 00:00:00 2001 From: miketsikis Date: Tue, 7 Jan 2020 16:52:35 +0200 Subject: [PATCH 3/6] Week 1 exercises Folder Creation in Git and exercise creation --- .../js-exercises/Exercise 1 Hello world.js | 11 +++++++++++ .../js-exercises/Exercise 2 Error debugging.js | 2 ++ .../js-exercises/Exercise 3 Log the number.js | 7 +++++++ .../js-exercises/Exercise 4 Log the string.js | 7 +++++++ .../Exercise 5 Round a number and log it.js | 15 +++++++++++++++ .../Exercise 6 Log an array of animals.js | 8 ++++++++ .../Exercise 7 Log the length of a string.js | 4 ++++ 7 files changed, 54 insertions(+) create mode 100644 Week1/homework/js-exercises/Exercise 1 Hello world.js create mode 100644 Week1/homework/js-exercises/Exercise 2 Error debugging.js create mode 100644 Week1/homework/js-exercises/Exercise 3 Log the number.js create mode 100644 Week1/homework/js-exercises/Exercise 4 Log the string.js create mode 100644 Week1/homework/js-exercises/Exercise 5 Round a number and log it.js create mode 100644 Week1/homework/js-exercises/Exercise 6 Log an array of animals.js create mode 100644 Week1/homework/js-exercises/Exercise 7 Log the length of a string.js diff --git a/Week1/homework/js-exercises/Exercise 1 Hello world.js b/Week1/homework/js-exercises/Exercise 1 Hello world.js new file mode 100644 index 000000000..6f4160db2 --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 1 Hello world.js @@ -0,0 +1,11 @@ +"use strict"; +console.log ("Hello world! in English"); +console.log ("Hello Wêreld! in Afrikaans"); +console.log ("مرحبا بالعالم! in Arabic"); +console.log ("Sawubona Mhlaba! in Zulu"); +console.log ("Selam Dünya! in Turkish"); +console.log ("こんにちは世界！ in Japanese"); +console.log ("שלום עולם! in Hebrew"); +console.log ("Olá Mundo! in Portuguese"); +console.log ("Salom Dunyo! in Uzbek"); +console.log ("Hej världen! in Swedish"); \ No newline at end of file diff --git a/Week1/homework/js-exercises/Exercise 2 Error debugging.js b/Week1/homework/js-exercises/Exercise 2 Error debugging.js new file mode 100644 index 000000000..51e845a7c --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 2 Error debugging.js @@ -0,0 +1,2 @@ +"use strict"; +console.log("'I'm awesome"); \ No newline at end of file diff --git a/Week1/homework/js-exercises/Exercise 3 Log the number.js b/Week1/homework/js-exercises/Exercise 3 Log the number.js new file mode 100644 index 000000000..17d2fd6e6 --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 3 Log the number.js @@ -0,0 +1,7 @@ +"use strict"; +let numberX; +console.log ("Hello world! in English"); +console.log ("Hello Wêreld! in Afrikaans"); +numberX = 2020; +console.log ("Hello world! in English"); +console.log ("Hello Wêreld! in Afrikaans"); \ No newline at end of file diff --git a/Week1/homework/js-exercises/Exercise 4 Log the string.js b/Week1/homework/js-exercises/Exercise 4 Log the string.js new file mode 100644 index 000000000..4e7dfeda9 --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 4 Log the string.js @@ -0,0 +1,7 @@ +"use strict"; +let myString = "Tsimplostefanakis Michalis"; +console.log ("The variable myString is about fullname"); +console.log (myString); +myString = "Papadakis Manolis"; +console.log ("The variable myString is about fullname"); +console.log (myString); diff --git a/Week1/homework/js-exercises/Exercise 5 Round a number and log it.js b/Week1/homework/js-exercises/Exercise 5 Round a number and log it.js new file mode 100644 index 000000000..ee8854e76 --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 5 Round a number and log it.js @@ -0,0 +1,15 @@ +"use strict"; +let z = 7.25; +console.log(z); +let a = Math.round (z); +console.log(a); +let comp; +if (z==a){ +console.log("The z is equal to a"); +} +else if (z>a){ +console.log("The z is larger than a"); +} +else { + Console.log("The a is larger than z"); +} diff --git a/Week1/homework/js-exercises/Exercise 6 Log an array of animals.js b/Week1/homework/js-exercises/Exercise 6 Log an array of animals.js new file mode 100644 index 000000000..f46eae660 --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 6 Log an array of animals.js @@ -0,0 +1,8 @@ +"use strict"; +let books = []; +console.log("The content of the Array is about animals"); +console.log(books); +let animals=["Dog","Cat","Horse"] +console.log(animals); +animals.push("Piglet"); +console.log(animals); \ No newline at end of file diff --git a/Week1/homework/js-exercises/Exercise 7 Log the length of a string.js b/Week1/homework/js-exercises/Exercise 7 Log the length of a string.js new file mode 100644 index 000000000..8be4a424d --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 7 Log the length of a string.js @@ -0,0 +1,4 @@ +"use strict"; +let mySentence="Programming is so interesting!" +let strlength= mySentence.length; +console.log("The string length is "+strlength); \ No newline at end of file From a91a763836f68a5281096f1ad211ccde7538438a Mon Sep 17 00:00:00 2001 From: miketsikis Date: Tue, 7 Jan 2020 18:36:43 +0200 Subject: [PATCH 4/6] Create Exercise 1 Remove the comma.js --- Week1/homework/js-exercises/Exercise 1 Remove the comma.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Week1/homework/js-exercises/Exercise 1 Remove the comma.js diff --git a/Week1/homework/js-exercises/Exercise 1 Remove the comma.js b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js new file mode 100644 index 000000000..2c1c1f6cb --- /dev/null +++ b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js @@ -0,0 +1,5 @@ +"use strict"; +let myString = "hello,this,is,a,difficult,to,read,sentence"; +console.log("The length of the string is "+myString.length); +let repl=myString.replace(","," "); +console.log(repl); \ No newline at end of file From 97643d257aef4de4896a8d798de6d2adabc2ca10 Mon Sep 17 00:00:00 2001 From: miketsikis Date: Tue, 7 Jan 2020 18:42:17 +0200 Subject: [PATCH 5/6] Update Exercise 1 Remove the comma.js --- Week1/homework/js-exercises/Exercise 1 Remove the comma.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week1/homework/js-exercises/Exercise 1 Remove the comma.js b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js index 2c1c1f6cb..4cf835117 100644 --- a/Week1/homework/js-exercises/Exercise 1 Remove the comma.js +++ b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js @@ -2,4 +2,4 @@ let myString = "hello,this,is,a,difficult,to,read,sentence"; console.log("The length of the string is "+myString.length); let repl=myString.replace(","," "); -console.log(repl); \ No newline at end of file +console.log(repl.split(",").join(" ")); \ No newline at end of file From 669918f023593ceb5d08b37b8ee996283a2003b7 Mon Sep 17 00:00:00 2001 From: miketsikis Date: Tue, 7 Jan 2020 18:48:19 +0200 Subject: [PATCH 6/6] Update Exercise 1 Remove the comma.js --- Week1/homework/js-exercises/Exercise 1 Remove the comma.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week1/homework/js-exercises/Exercise 1 Remove the comma.js b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js index 4cf835117..43fd8179d 100644 --- a/Week1/homework/js-exercises/Exercise 1 Remove the comma.js +++ b/Week1/homework/js-exercises/Exercise 1 Remove the comma.js @@ -1,5 +1,5 @@ "use strict"; let myString = "hello,this,is,a,difficult,to,read,sentence"; console.log("The length of the string is "+myString.length); -let repl=myString.replace(","," "); +let repl=myString.replace(/,/g," "); console.log(repl.split(",").join(" ")); \ No newline at end of file