diff --git a/README.md b/README.md
index 53bcaabde..127f72333 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,16 @@
> 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).
-# HackYourFuture - JavaScript 1
+# Social Hackers Academy - JavaScript 1
Here you can find course content and homework for the JavaScript 1 module
|Week|Topic|Read|Homework|
|----|-----|----|--------|
-|1.|Git Session with Unmesh|[Reading Week 1](/Week1/README.md) | [Homework Week 1](/Week1/MAKEME.md)|
+|1.|Git Session |[Reading Week 1](/Week1/README.md) | [Homework Week 1](/Week1/MAKEME.md)|
|2.|• Intro JavaScript (What is it, where can you use it for)
• [Variables (var, let, const)](../../../fundamentals/blob/master/fundamentals/variables.md)
• [Basic Data types (Strings, Numbers, Arrays, Booleans)](../../../fundamentals/blob/master/fundamentals/values.md)
• [Operators](../../../fundamentals/blob/master/fundamentals/operators.md)
• [Naming conventions](../../../fundamentals/blob/master/fundamentals/naming_conventions.md)|[Reading Week 2](/Week2/README.md)|[Homework Week 2](/Week2/MAKEME.md)|
-|3.|• Git work flow :smiling_imp:
• [Advanced data types (objects)](../../../fundamentals/blob/master/fundamentals/objects.md)
• [Conditional execution](../../../fundamentals/blob/master/fundamentals/conditional_execution.md)
• [Statements vs Expressions](../../../fundamentals/blob/master/fundamentals/statements_expressions.md)
• [Loops (for/while)](../../../fundamentals/blob/master/fundamentals/loops.md)
• [Functions](../../../fundamentals/blob/master/fundamentals/functions.md)
• [Scope](../../../fundamentals/blob/master/fundamentals/scope.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
+|3.|• [Advanced data types (objects)](../../../fundamentals/blob/master/fundamentals/objects.md)
• [Conditional execution](../../../fundamentals/blob/master/fundamentals/conditional_execution.md)
• [Statements vs Expressions](../../../fundamentals/blob/master/fundamentals/statements_expressions.md)
• [Loops (for/while)](../../../fundamentals/blob/master/fundamentals/loops.md)
• [Functions](../../../fundamentals/blob/master/fundamentals/functions.md)
• [Scope](../../../fundamentals/blob/master/fundamentals/scope.md)|[Reading Week 3](/Week3/README.md)|[Homework Week 3](/Week3/MAKEME.md)|
-__Kind note:__
-
-We expect you to __always__ come prepared to the class on Sunday.
### Overall
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.
diff --git a/Week1/README.md b/Week1/README.md
index a4bea4c62..c6131a0ee 100644
--- a/Week1/README.md
+++ b/Week1/README.md
@@ -7,7 +7,7 @@ In week one we will discuss the following topics:
### Here are resources that we like you to read as a preparation for the coming lecture.
-- In you next lecture **Unmesh** will give you your first Git session, please look through the [GIT](https://github.com/HackYourFuture/Git) repository and read the learning goals.
+- In you next lecture we will give you your first Git session, please look through the [GIT](https://github.com/SocialHackersCodeSchool/Git) repository and read the learning goals.
- Please watch [Up Running with Bash Scripting](https://www.lynda.com/Bash-tutorials/Up-Running-Bash-Scripting/142989-2.html)
as a recap on the cli classes you have had (1 hour and 25 min). Please ask Gijs or Maartje for access to Lynda.com
- Please watch the first 5 chapters of the [Git essential training](https://www.lynda.com/Git-tutorials/Git-Essential-Training/100222-2.html)
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
index 7eaad7cee..ae13dcf05 100644
--- a/Week2/MAKEME.md
+++ b/Week2/MAKEME.md
@@ -23,16 +23,16 @@ Topics discussed in class this week:
## Step 2: Feedback
-_Deadline Wednesday_
-
Provide feedback on the Git assignments (week 1) of one of your fellow students. You will be assigned to one of the assignments by the class lead of this week.
-## Step 3: JavaScript
+## Step 3: **Some freeCodeCamp challenges (10 hours):**
-_Deadline Thursday_
+On freeCodeCamp.com please do the [Basic JavaScript](https://www.freecodecamp.com/challenges/learn-how-free-code-camp-works) exercises up and until the __"Shopping List"__ exercise (there are some topics we did not cover but you can do it).
-> For all the following exercises create a new .js file. Try to find a proper name for each file or make a small comment about what it does inside for future reference.
+## Step 4: JavaScript
+> For all the following exercises create a new .js file. Try to find a proper name for each file or make a small comment about what it does inside for future reference.
+- - -
1\. Write a `console.log` statement saying "Hello World!" for each language that you know.
For example:
@@ -41,7 +41,7 @@ Halo, dunia! // Indonesian
Ciao, mondo! // Italian
Hola, mundo! // Spanish
```
-
+- - -
2\. Consider the following code:
```
@@ -49,7 +49,7 @@ console.log('I'm awesome');
```
Copy the code in your `.js` file and run it. You will see that you will get a SyntaxError. Find a solution for this error. Hint: read the error message carefully, it also gives an indication of where the problem is.
-
+- - -
3\. Declare a variable `x` and initialize it with an integer, using these exact steps:
3\.1 First, _declare_ your variable `x` (do not initialize it yet).
3\.2 Add a console.log statement that explains that explains in words what _you think_ the value of `x` is, like in this example:
@@ -71,7 +71,7 @@ Copy the code in your `.js` file and run it. You will see that you will get a Sy
console.log('the value of x will be: whateverYouThinkItWillLog');
// TODO -> log value of x again
```
-
+- - -
4\. Declare a variable `y` and assign a string to it.
4\.1 Write a console.log statement in which you explain in words what _you think_ the value of the string is.
4\.2 Now console.log the variable `y`.
@@ -86,7 +86,7 @@ Copy the code in your `.js` file and run it. You will see that you will get a Sy
console.log('the value of my string will be: whateverYouThinkItWillLog');
// TODO -> log the actual value of the string to the console
```
-
+- - -
5\. How do you round the number 7.25, to the nearest integer (i.e., whole number)?
5\.1 Declare a variable `z` and assign the number 7.25 to it.
5\.2 Console.log `z`.
@@ -94,7 +94,7 @@ Copy the code in your `.js` file and run it. You will see that you will get a Sy
5\.4 Console.log `a`.
5\.5 So now we have `z` and `a` find a way to compare the two values and store the highest of the two in a new variable.
5\.6 Console.log the highest value.
-
+- - -
6\. *Arrays!*
6\.1 Declare an empty array. Make sure that the name you choose indicates 'plurality', because an array is capable of containing more than one element. (See [Naming conventions](../fundamentals/naming_conventions.md).)
6\.2 Write a console.log statement that explains in words what you think the value of the array is.
@@ -103,13 +103,13 @@ Copy the code in your `.js` file and run it. You will see that you will get a Sy
6\.5 Log your array.
6\.6 Add a statement that adds Daan's favorite animal ('baby pig') to the *existing array*.
6\.7 Log your new array!
-
+- - -
7\. *More strings*
7\.1 Let's consider the following string: `let myString = "this is a test"`.
7\.2 Add the string to your file and console.log it.
7\.3 Find a way to get the length of `myString`.
7\.4 Console.log the length of `myString`.
-
+- - -
8\. Write a program that checks the types of two variables and prints out `SAME TYPE` if they are the same type.
8\.1 First declare at least four variables and assign them different data types.
8\.2 For each variable write a `console.log` statement that logs the value
@@ -136,7 +136,7 @@ if (...) {
}
// TODO -> add a way of giving feedback if your variables don't have the same type
```
-
+- - -
9\. If `x` equals 7, and the only other statement is `x = x % 3`, what would be the new value of `x`?
9\.1 Add at least 3 `console.log` statements in which you show that you understand what `%` does.
@@ -145,16 +145,8 @@ if (...) {
10\.2 Can you compare infinities? (Not in Eyad's world) - does 6/0 === 10/0? How can you test this?
10\.3 Add console.log statements to the above program's in which you show that you understand the concepts (just like you've done in the above assignments).
-## Step 4: **Some freeCodeCamp challenges (10 hours):**
-
-_Deadline Saturday_
-
-On freeCodeCamp.com please do the [Basic JavaScript](https://www.freecodecamp.com/challenges/learn-how-free-code-camp-works) exercises up and until the __"Shopping List"__ exercise (there are some topics we did not cover but you can do it).
-
## Step 5: Read before next lecture
-_Deadline Sunday morning_
-
Go trough the reading material in the [README.md](/Week3/README.md) to prepare for your next class
### How to hand in Homework:
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
index 1c593fba0..0188d1906 100644
--- a/Week3/MAKEME.md
+++ b/Week3/MAKEME.md
@@ -2,7 +2,6 @@
```
Topics discussed in class this week:
-• Git work flow
• Advanced data types [Objects]
• Conditions
• Statements vs Expressions
@@ -29,7 +28,6 @@ Provide feedback to the homework of last week to one of your fellow students. Yo
- [Naming conventions](./../../../../fundamentals/blob/master/fundamentals/naming_conventions.md)
- Go through the topics of this week:
- - Git work flow
- [Advanced data types (Objects)](./../../../../fundamentals/blob/master/fundamentals/objects.md)
- [Conditional execution](./../../../../fundamentals/blob/master/fundamentals/conditional_execution.md)
- [Statements vs Expressions](./../../../../fundamentals/blob/master/fundamentals/statements_expressions.md)
@@ -72,8 +70,11 @@ let myString = "hello,this,is,a,difficult,to,read,sentence";
```
1\.1 Add the string to your file and log it.
+
1\.2 Log the length of `myString`.
+
1\.3 The commas make that the sentence is quite hard to read. Find a way to remove the commas from the string and replace them with spaces.
+
1\.4 Log `myString` to see if you succeeded.
2\. **Arrays!**
@@ -85,14 +86,23 @@ let favoriteAnimals = ['blowfish', 'capricorn', 'giraffe'];
```
2\.1 Add a statement that adds Mauro's favorite animal *'turtle'* to the existing array.
+
2\.2 Log your new array!
+
2\.3 Now add Jim's favorite animal to the array, it's *'meerkat'*, but make sure it will be placed after *'blowfish'* and before *'capricorn'*.
+
2\.4 Write a console.log statement that explains in words _you think_ the new value of the array is.
+
2\.5 Log your new array!
+
2\.6 Log the length of the array, add a message: *'The array has a length of: '* (here you should show the length of the array).
+
2\.7 Jason does not like *'giraffe'*, delete this animal from the array.
+
2\.8 Again log your new array.
+
2\.9 Now if unlike Jim, you don't like *'meerkat'* and you want to delete it from the array, but you don't know the position or the `index` of the item in the array, how can you find it?
+
2\.10 Log the index of *'meerkat'*. Add a message so it says: *'The item you are looking for is at index: '* (here you should show the index of the item).
## More JavaScript :tada:
diff --git a/Week3/README.md b/Week3/README.md
index 71df5c72c..96345eafe 100644
--- a/Week3/README.md
+++ b/Week3/README.md
@@ -2,7 +2,6 @@
```
In week three we will discuss the following topics:
-• Git work flow
• Advanced data types [Objects]
• Conditions
• Statements vs Expressions
diff --git a/index.js b/index.js
new file mode 100644
index 000000000..f31cc53b4
--- /dev/null
+++ b/index.js
@@ -0,0 +1,98 @@
+
+//my homework
+
+let salute = {english:'Hello', Amaric:'Salam', arabic: 'Marhabaan', turkish:'Marhaba', greek:'Yia-sas'};
+console.log(salute);
+
+
+
+
+console.log("I'm awesome");
+
+
+
+
+let x;
+console.log('variable x will be: undifined');
+console.log(x);
+x = 200;
+console.log('variable x will be: 200');
+console.log(x);
+
+
+
+let y = "winny";
+console.log('the string will be: winny');
+console.log(y);
+
+
+
+let z = 7.25;
+console.log(z);
+
+let a = z.toFixed(0);
+console.log(a)
+let h = az){
+console.log(a)
+}
+else {
+console.log(z)
+}
+
+
+
+let makeup = [];
+console.log('squre brackets')
+console.log(makeup)
+let animals = ['monkey', 'giraffe', 'lion', 'peacock']
+console.log(animals)
+animals.push('big pig')
+console.log(animals)
+
+
+
+var string = "this is a test";
+console.log(string)
+console.log(string.length);
+
+
+let num1 = 45;
+let fruit = "love";
+const num2 = null;
+let ask = false;
+console.log(num1);
+console.log(fruit);
+console.log(num2);
+console.log(ask);
+console.log("types = Number String Null Boolean");
+console.log(typeof num1);
+console.log(typeof fruit);
+console.log(typeof num2);
+console.log(typeof ask);
+if (num1 === fruit) {
+ console.log('Same Type')
+}
+else{
+ console.log('not same type')
+}
+
+
+var d = 7 % 3;
+console.log(d);
+console.log('% is reminder')
+console.log('% = 1')
+
+
+
+let mixed = ["solomon", "winslet", 45, "Ethiopia", 444 ];
+console.log(mixed);
+
+const number1 = 6/0;
+const number2 = 10/0;
+if (number1 === number2){
+ console.log("same number")
+}
+else{
+ console.log("Not the same number")
+}
\ No newline at end of file