robzi18
diff --git a/‎Week1/MAKEME.md‎
Lines changed: 25 additions & 17 deletions b/‎Week1/MAKEME.md‎
Lines changed: 25 additions & 17 deletions
diff --git a/‎Week1/QA.md‎
Lines changed: 1 addition & 1 deletion b/‎Week1/QA.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Week1/README.md‎
Lines changed: 30 additions & 27 deletions b/‎Week1/README.md‎
Lines changed: 30 additions & 27 deletions
diff --git a/‎Week1/practice-exercises/1-hello-world.js‎
Lines changed: 0 additions & 12 deletions b/‎Week1/practice-exercises/1-hello-world.js‎
Lines changed: 0 additions & 12 deletions
diff --git a/‎…practice-exercises/1-remove-the-comma.js‎ ‎…practice-exercises/1-remove-the-comma.js‎Week2/practice-exercises/1-remove-the-comma.js renamed to Week1/practice-exercises/1-remove-the-comma.js b/‎…practice-exercises/1-remove-the-comma.js‎ ‎…practice-exercises/1-remove-the-comma.js‎Week2/practice-exercises/1-remove-the-comma.js renamed to Week1/practice-exercises/1-remove-the-comma.js
diff --git a/‎…ractice-exercises/2-even-odd-reporter.js‎ ‎…ractice-exercises/2-even-odd-reporter.js‎Week2/practice-exercises/2-even-odd-reporter.js renamed to Week1/practice-exercises/2-even-odd-reporter.js b/‎…ractice-exercises/2-even-odd-reporter.js‎ ‎…ractice-exercises/2-even-odd-reporter.js‎Week2/practice-exercises/2-even-odd-reporter.js renamed to Week1/practice-exercises/2-even-odd-reporter.js
diff --git a/‎Week1/practice-exercises/2-syntax-error.js‎
Lines changed: 0 additions & 6 deletions b/‎Week1/practice-exercises/2-syntax-error.js‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎Week1/practice-exercises/3-log-number.js‎
Lines changed: 0 additions & 23 deletions b/‎Week1/practice-exercises/3-log-number.js‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎Week2/practice-exercises/3-recipe-card.js‎ ‎Week1/practice-exercises/3-recipe-card.js‎Week2/practice-exercises/3-recipe-card.js renamed to Week1/practice-exercises/3-recipe-card.js b/‎Week2/practice-exercises/3-recipe-card.js‎ ‎Week1/practice-exercises/3-recipe-card.js‎Week2/practice-exercises/3-recipe-card.js renamed to Week1/practice-exercises/3-recipe-card.js
diff --git a/‎Week1/practice-exercises/4-log-string.js‎
Lines changed: 0 additions & 23 deletions b/‎Week1/practice-exercises/4-log-string.js‎
Lines changed: 0 additions & 23 deletions
@@ -3,38 +3,46 @@
 ## **Todo list**
 
 1. JS Tutor
-2. Prep exercises
-3. Practice the concepts
+1. Practice the concepts
+1. Prep exercises
+1. Practice practice practice
 
 ## **1. JS Tutor**
 
 Practice, practice, practice. This week you are not handing in any homework, but are going to practice as much javascript as you can. Play around with the exercises mentioned below, remember that you can copy the code into [JS Tutor](http://pythontutor.com/javascript.html#mode=edit) to step through the code. Or look at it in the debugger in the browser/vscode.
 
-## **2. Prep exercises**
+## **2. Practice the concepts**
 
-> Prep exercises are exercises that you should work on _before_ the session on Sunday. These are a little more difficult or show an important concept and as such are a great exercise to talk about with your class and your Q&A mentor. Have a solution ready by Sunday as you may be asked to show what you did.
+In this section you will be doing interactive exercises, that will allow you to practice with the concepts you've learned about this week! We provide a lot of possible exercises here and you probably can't do everything, but do as many as you need to feel comfortable with the concepts. Also feel free to come back to them later.
+
+- Do all parts of [Codecademy: Arrays](https://www.codecademy.com/courses/introduction-to-javascript/lessons/arrays) (Signup required!)
+- Do 5 exercises of [FreeCodeCamp: Basic data structures](https://learn.freecodecamp.org/javascript-algorithms-and-data-structures/basic-data-structures)
+- [Codecademy: Functions ](https://www.codecademy.com/courses/introduction-to-javascript/lessons/functions)
+- [JSchallenger](https://www.jschallenger.com/) - Do all of the Javascript Basics section except for `scope` and `asynchronous javascript`.
+- There is a practice-exercises folder in this week's repository that is filled with exercises to try out. The solutions are in a separate folder so you can check if you did it correctly. Clone this repository to your computer and have a go!
 
-Inside your `JavaScript` fork, go to the folder `Week1`. Inside of that folder, navigate to `/prep-exercises`. For each exercise, you will find a separate folder. The `README` explains what needs to be done. There will also be some questions at the bottom to think about. Go through them _before_ the session on Sunday as it will be covered then.
+## **3. Prep exercises**
 
-## **3. Practice the concepts**
+> Prep exercises are exercises that you should work on _before_ the session on Sunday. These are a little more difficult or show an important concept and as such are a great exercise to talk about with your class and your Q&A mentor. Have a solution ready by Sunday as you may be asked to show what you did.
 
-Before we learn how to build actual applications, we first need to gain experience using JavaScript in a computational way. This teaches us how to think like a programmer, and gives us more experience with the language itself.
+Inside your `JavaScript` fork, go to the folder `Week2`. Inside of that folder, navigate to `/prep-exercises`. For each exercise, you will find a separate folder. The `README` explains what needs to be done. There will also be some questions at the bottom to think about. Go through them _before_ the session on Sunday as it will be covered then.
 
-In the following exercises you'll learn how to use different JavaScript concepts to solve common computational problems.
+## **4. Practice practice practice**
 
-- [Learn-js](https://www.learn-js.org/). Do all the `Learn the basics` exercises.
-- [Codecademy: Introduction to JavaScript](https://www.codecademy.com/learn/introduction-to-javascript/modules/learn-javascript-introduction). Do all the exercises (#1 to #10).
-- [jshero.net](https://www.jshero.net/en/success.html). Do the first 5 exercises.
+Done with the above? Then it is time to practice practice practice! Below you will find huge lists of practice exercises to keep practicing. The better you get at JavaScript, the easier the rest of the curriculum is so try to do as much as you can. Some of these solutions use some of the concepts of next week so if something looks weird, have a quick look at next week's topics to see what it means:
 
-The above should give you a nice basis. If you have extra time and are still a little unsure, have a look at the following:
+- [W3Resource Basic exercises](https://www.w3resource.com/javascript-exercises/javascript-basic-exercises.php) _(Note that the given solutions to these exercises use old JS syntax, we will learn more about this later. Most important now is that we don't use `var` anymore, so make sure you use `let` or `const`!)_
 
-- [FreeCodeCamp: Introduction to JavaScript](https://learn.freecodecamp.org/javascript-algorithms-and-data-structures/basic-javascript). Do at least 20 exercises, you can choose whichever ones you feel are challenging enough.
-- There is a practice-exercises folder in this week's repository that is filled with exercises to try out. The solutions are in a separate folder so you can check if you did it correctly. Clone this repository to your computer and have a go!
+There are also multiple websites that provide constant challenges to practice your skills. These go from beginner to advanced and you should bookmark them and return every once in awhile. In some interview processes these kinds of exercises are given nowadays. We suggest to start with Edabit as they are more geared to beginners, the others start at a higher level:
+
+- [Edabit](https://edabit.com/challenges) - You can choose JavaScript as a language and then try solving as many challenges as you can. If you find the level too easy then you can choose a higher difficulty.
+- [leetcode](https://leetcode.com/) - Sign up and start solving!
+- [Code Wars](https://www.codewars.com/) - Once you feel comfortable with the JavaScript syntax sign up for code wars to practice. It is a website where you can solve exercises and rank up! When signing up, only choose JavaScript to really focus the problems on learning to solve problems in it. You can later change it to other technologies when you get more familiar.
 
-## No homework to hand in
+## No homework to hand in (for now)
 
-For the first 2 weeks of JavaScript there is no homework to hand in as the exercises already give you all the feedback you need. Go through the first 3 weeks at your own pace, and feel free to ask questions about any of the 3 weeks for the Q&A sessions.
+For the first week of JavaScript there is no homework to hand in as the exercises already give you all the feedback you need.
 
 ## Done early?
 
-Try to do more exercises in the links above. The first weeks of the JavaScript modules are very important as understanding the basics will make the rest of the curriculum that much easier to follow. So keep reading and writing code! If you are done early, go on to week 2!
+Try to do more exercises in the links above. The first weeks of the JavaScript modules are very important as understanding the basics will make the rest of the curriculum that much easier to follow. So keep reading and writing code!
@@ -1,6 +1,6 @@
 # Q & A Session
 
-The first 2 weeks of JavaScript we do not have homework and we encourage students to follow all the material at their own pace. So students can ask questions about any week. Expect questions about:
+The first week of JavaScript we do not have homework and we encourage students to follow all the material at their own pace. So students can ask questions about any week. Expect questions about:
 
 - Basic JavaScript blocks (let/const, operators, loops, if/else, functions)
 - The Debugger (both browser/vscode) and how to debug
 
@@ -1,41 +1,44 @@
-# Reading Material JavaScript Week 1
+# Reading Material JavaScript1 Week 1
 
 ## Agenda
 
-These are the topics for week 1.
-
-1. [What is programming?](https://study.hackyourfuture.net/#/programming/README)
-   - Software
-   - What is a programming language?
-2. [What is web development?](https://study.hackyourfuture.net/#/the-internet/web-development)
-   - Web development vs. software development
-   - Web development vs. web design
-   - Website vs. web application
-3. [What is JavaScript?](https://study.hackyourfuture.net/#/javascript/README)
-4. [What are variables?](https://study.hackyourfuture.net/#/javascript/variables)
-   - The keywords: let, const, var
-5. [What are values?](https://study.hackyourfuture.net/#/javascript/values)
-6. [Statements vs. Expressions](https://study.hackyourfuture.net/#/javascript/statements-vs-expressions)
-7. [Operators](https://study.hackyourfuture.net/#/javascript/operators)
-8. [Debuggers](https://study.hackyourfuture.net/#/tools/debuggers)
-9. Testing code
+These are the topics for week 1:
+
+1. [Refresher on JavaScript building blocks](https://github.com/HackYourFuture/explore/tree/main/Week3)
+   - Variables
+   - Values
+   - Statements / Expressions
+   - Operators
+   - Conditional Statements
+   - [Functions](https://study.hackyourfuture.net/#/javascript/functions)
+1. [Refresher on debuggers](https://study.hackyourfuture.net/#/tools/debuggers)
+1. [Loops](https://study.hackyourfuture.net/#/javascript/loops)
+1. [Naming conventions](https://study.hackyourfuture.net/#/programming/naming-conventions)
+1. [Testing code](https://www.ministryoftesting.com/articles/e463d4ba?s_id=14519957)
    - [Assertion](https://study.hackyourfuture.net/#/testing/assertion)
-10. [Career training I (Your Personal Brand)](https://github.com/HackYourFuture/yourpersonalbrand)
 
 ## Week goals
-All of the detailed information about every concept is in your study book. The following goal explanation will link you to the correct place to get studying. Read through the goal description once to get an idea of what you will be learning, then go through the different links (either from the agenda or this goal list).
 
-This week is all about getting you started in the world of JavaScript. For that we have to go a little broad and first explain the difference between what you have been doing until now (very visual, one line does one thing coding) to actually programming. Start by opening your study book to the [What is programming](https://study.hackyourfuture.net/#/programming/README) section and reading through it to get a feel for the world you are going to embark into. Once you know what programming is it is time to learn about the programmer niche this curriculum is built for which is [Web development](https://study.hackyourfuture.net/#/the-internet/web-development). Now let's talk about JavaScript, which is the programming language the whole rest of the curriculum will be done in. First read up on what JavaScript is in your studybook [here](https://study.hackyourfuture.net/#/javascript/README).
+All of the detailed information about every concept is in your study book. The following goal explanation will link you to the correct place to get studying. Read through the goal description once to get an idea of what you will be learning, then go through the different links and look at them in detail.
 
-Time to start learning the language with the first building blocks: variables! Have a look at what variables are [here](https://study.hackyourfuture.net/#/javascript/variables) and what values are [here](https://study.hackyourfuture.net/#/javascript/values). Then let's go over some syntax with the difference between statements and expressions [here](https://study.hackyourfuture.net/#/javascript/statements-vs-expressions). And finally let's look at what we can do with variables and values by using what's called operators. Read about them [here](https://study.hackyourfuture.net/#/javascript/operators).
+Welcome to week 1 of JavaScript! Time to get coding, let's start with refreshing the things we learned during the explore module. Have a look at [week 3](https://github.com/HackYourFuture/explore/tree/main/Week3) there again to remind yourself what the following concepts mean again:
 
-To help learn the language we also want to introduce you to some tools that you can use to look under the hood of your code in the section about [debuggers](https://study.hackyourfuture.net/#/tools/debuggers). You won't understand everything of what's there yet, but debugging is so important we want you to look at it early. Read through it once and play around a bit in the debugger. We will be telling you to revisit the debugging section over the next few weeks as you start learning more and more about what is possible. 
+- Variables
+- Values
+- Statements / Expressions
+- Operators
+- Conditional Statements
 
-Lastly we want to introduce the first steps to testing code with some code you will find in your exercises. Have a look at what assertion is [here](https://study.hackyourfuture.net/#/testing/assertion), the `console.assert` lines in your practice exercises uses this to check that your code does the right thing.
+Then have a look at functions again over [here](https://study.hackyourfuture.net/#/javascript/functions).
 
-## Career training I (Your personal brand)
-During this module, you will also learn about the different components that make your personal brand (CV, GitHub, LinkedIn, etc). We have compiled all important info for you in [this repo](https://github.com/HackYourFuture/yourpersonalbrand). Be sure to read the full repo for the Career Training session that will happen in Week 2 of this module and start working on your personal brand which you will have to hand in at the end of JS week 4!
+This week we are going to go a little deeper and get some extra building blocks to work with. Another cool thing we can do in JavaScript is repeat actions, we can do that using a concept called loops, read more about that [here](https://study.hackyourfuture.net/#/javascript/loops).
+
+You now have all of the basic building blocks that form the basis of all code! You will undoubtedly already have encountered the difficulty of reading code, and combining everything this week will make it even more difficult to follow. It is a good idea to revisit the debugger section with this new knowledge [here](https://study.hackyourfuture.net/#/tools/debuggers). Although it is called debugging, a lot of the process of finding 'bugs' in your code is trying to understand what is happening in the code. So keep using the debugger to understand pieces of code that you are not 100% comfortable with yet!
+
+This is also the week we are going to start learning about best practices surrounding programming. These are general rules programmers follow so that code remains readable for others. The first will be about naming conventions, read more about that [here](https://study.hackyourfuture.net/#/programming/naming-conventions) and try to make it a habit to follow them.
+
+Lastly we want to introduce the first steps to testing code. Let's first have a look at what software testing is and why we do it [here](https://www.ministryoftesting.com/articles/e463d4ba?s_id=14519957). The simplest form of testing is using assertions, have a look what that is [here](https://study.hackyourfuture.net/#/testing/assertion), we will introduce this more in your homework so you will see how it works.
 
 ## Finished?
 
-Are you finished with going through the materials? You're doing great! If you feel ready to get practical, click [here](./MAKEME.md). If you have finished the exercises, then start working on week 2! The first 3 weeks of this module cover all the basic building blocks of JavaScript and getting familiar with them is of the utmost importance!
+Are you finished with going through the materials? You're doing great! If you feel ready to get practical, click [here](./MAKEME.md).