finished week 2, halfway week 3

NoerGitKat · NoerGitKat · commit 19c7fe9b069f · 2019-06-11T01:25:20.000+02:00
diff --git a/Week2/LESSONPLAN.md b/Week2/LESSONPLAN.md
@@ -5,15 +5,22 @@
 The purpose of this class is to introduce to the student (1) the basics of using GIT, and (2) the basics of grid-based thinking and using flexbox:
 
 -   Basic GIT commands
+-   Introducing GitHub
 -   Setting up an SSH key pair
 
+-   Introducing grid-based thinking
+-   The problem Flexbox solves
+-   Basic flexbox commands
+
 ## Core Concepts
 
 FIRST HALF (12.00 - 13.30)
 
 1. **Introduction to GIT**
 
--  SSH key pair, create repo, commit and push
+-   GIT is software that allows us to keep track of the changes within our files
+-   Imagine having written complex code that messed everything up, GIT allow us to return to a previous state where everything was still working
+-   It can be used through the command line interface (CLI) or using a graphical user interface (also known as GUI): SourceTree
 
 SECOND HALF (14.00 - 16.00)
 
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
@@ -11,6 +11,14 @@
 
 ### 1. GIT exercises
 
+The first exercise is to create a local repository using GIT and link it to a remote GitHub repository. Go through the following instructions:
+
+-   [Getting Started with Git and GitHub](https://www.codecademy.com/articles/f1-u3-git-setup)
+
+The next exercise is a short interactive course, that will take you through the basics of GIT usage:
+
+-   [Learn GIT](https://www.codecademy.com/learn/learn-git)
+
 ### 2. Responsive design challenges
 
 Making websites that are `responsive` to a variety of device sizes (in other words, that still "look good" on any device), has become the standard way of building. You have to learn how to do this to. However, fear not because it's not as intimating as it might seem; you're not going to build a separete page for literally every device size out there.
@@ -52,9 +60,9 @@ https://www.html5webtemplates.co.uk/templates/simplestyle_purple/index.html
 
 ## SUBMIT YOUR HOMEWORK!
 
-After you've finished your todo list it's time to show us what you got! The homework you have to this week is the following:
+After you've finished your todo list it's time to show us what you got! The homework you have to submit this week is the following:
 
-1. GIT exercises
+1. GIT exercise #1 (the URL of the remote `git_practice` repository)
 2. The Drones website
 
 Go through the [guide](../hand-in-homework-guide.md) to learn how to submit your homework.
diff --git a/Week2/README.md b/Week2/README.md
@@ -8,6 +8,8 @@ These are the topics for week 2:
     - What is GIT?
     - Installing GIT
     - Basic GIT commands
+    - What is GitHub?
+    - Working with SSH
 2. More advanced CSS
     - Flexible organizing with flexbox
     - Pseudo class selectors
@@ -79,6 +81,34 @@ This might sound very abstract, and it is. So to illustrate this watch the follo
 -   [Introduction to GIT - Core Concepts](https://www.youtube.com/watch?v=uR6G2v_WsRA)
 -   [GIT & GitHub Crash Course](https://www.youtube.com/watch?v=SWYqp7iY_Tc)
 
+## What is GitHub?
+
+GitHub is **NOT the same** as GIT. While GIT is software that allows you to keep track of your files, GitHub is a development platform that allows you to store a copy of your code online. Check the following video to learn more:
+
+-   [What is GitHub?](https://www.youtube.com/watch?v=w3jLJU7DT5E)
+
+We use GitHub because of its main benefit: it allows us to freely store our code online (or "remote", as we developers also call it). This is useful in case our computer, for some reason, crashes and our projects are lost.
+
+The second benefit is that it allows us to work together with other developers, using one central (and remote) repository. This is done using branches, which you will learn about [next week](../Week3/README.me).
+
+### Working with SSH
+
+SSH stands for Secure Shell and is a way of providing users a secure way of accessing (the content of) a computer over an unsecure network. Simply put, it makes the connection much more difficult to hack or intercept.
+
+When working with online (or what you'll hear more often: remote) code repositories, you might be dealing with unsecure connections. In order to make the connection more secure, you have to use an **SSH key**. Similar to a real key, this digital key allows your computer to be identified by the network you're trying to access. If the connection has been made you can access and modify the contents of network.
+
+> The concept of secure networking through use of identifiers (like an SSH key) is also known as "authentication": are you who you say you are? Authentication is a central idea within programming and you should keep it in mind. You'll also be seeing more of it during later modules!
+
+Check the following resources for more information:
+
+-   [Beginners Guide To SSH](https://www.youtube.com/watch?v=qWKK_PNHnnA)
+-   [How SSH works](https://www.youtube.com/watch?v=zlv9dI-9g1U)
+
+When working with GitHub we want to ensure the same level of security. Thus, we will have to make an SSH key and link it to GitHub!
+
+-   [How to generate an SSH key](https://help.github.com/en/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent)
+-   [Adding SSH Key to GitHub](https://www.youtube.com/watch?v=H5qNpRGB7Qw)
+
 ## 2. More advanced CSS
 
 By now you've gotten some practice with CSS. In the following sections you'll learn about some more essentials concepts in order to write modern stylesheets for the web!
diff --git a/Week3/LESSONPLAN.md b/Week3/LESSONPLAN.md
@@ -1 +1,24 @@
 # Lesson Plan Week 3
+
+## Agenda
+
+The purpose of this class is to introduce to the student
+
+-   GIT branching
+-
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
+
+## Core Concepts
+
+FIRST HALF (12.00 - 13.30)
+
+1.
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
+
+SECOND HALF (14.00 - 16.00)
+
+2.
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
@@ -4,45 +4,60 @@
 
 ## Todo list
 
-1. GIT exercises
+1. GIT exercise: `animals` repository
 2. CSS framework challenges
 3. Code along
 4. PROJECT: Responsive website
 
-### 1. GIT exercises
+### 1. GIT exercise: `animals` repository
 
-Using GIT together with a remote 
+In this homework you'll be working with GIT and GitHub. Follow the steps to learn how a 
+
+1. Create a repository on GitHub, called `animals`
+2. admin adds a file called “zoo.txt” with some animals generally found in a zoo.
+3. admin commits and pushes the changes (in master branch).
+4. user forks the repository created by admin and bring it to their machine (covered during classwork).
+5. user makes a new branch called user-dev.
+6. user adds another file called “pets.txt” with some animals generally found in a home.
+7. user commits and pushes his branch to remote.
+8. user creates a pull request(PR) to merge changes from user's user-dev branch to admin's master branch.
+9. admin reviews the pull request and approves it.
 
 ### 2. Framework tutorial: MaterializeCSS
 
-Using a popular CSS framework called [MaterializeCSS](https://materializecss.com/), you'
+Using a popular CSS framework called [MaterializeCSS](https://materializecss.com/), you're going to follow the tutorial
 
 ### 3. Code along
 
-You'll continue practicing your skill using MaterializeCSS. In the following video you'll learn how to build responsive website, .
+You'll continue practicing your skill using MaterializeCSS. In the following video you'll learn how to build responsive .
 
 -   [Build A Travel Agency Theme With Materialize CSS](https://www.youtube.com/watch?v=MaP3vO-vEsg)
 
 ### 4. PROJECT: Responsive website
 
-These are the requirements you need to fulfill:
+In this project you're going to rebuild `the homepage` of an existing responsive website. Choose one of the following:
+
+-   https://www.rijksoverheid.nl
+-   https://www.bostonglobe.com
+-   https://www.thinkwithgoogle.com
+-   http://muumilaakso.tampere.fi/en/
+-   http://incredibletypes.com
+-   http://thenextweb.com
+
+In order to pass you need to fulfill the following criteria:
 
--   Remake an existing responsive website: choose one of the following
-    -   https://www.rijksoverheid.nl
-    -   https://www.bostonglobe.com
-    -   https://www.thinkwithgoogle.com
-    -   http://muumilaakso.tampere.fi/en/
-    -   http://incredibletypes.com
-    -   http://thenextweb.com
--   It should have an external CSS file
+-   Write your CSS in an external stylesheet
+-   Make use of Flexbox
+-   Use media queries for both tablet and mobile (This might be same for the website you're making)
+- 
 
 _Deadline Saturday 23.59 CET_
 
 ## SUBMIT YOUR HOMEWORK!
 
 After you've finished your todo list it's time to show us what you got! The homework to be submitted this week is the following:
 
-1. GIT exercises
+1. GIT exercise: `animals` repository
 2. Responsive website
 
 Go through the [guide](../hand-in-homework-guide.md) to learn how to submit your homework.
diff --git a/Week3/README.md b/Week3/README.md
@@ -19,32 +19,50 @@ These are the topics for week 3:
 
 `Branches` are a core benefit of using GIT. It allows you to work on different versions of your project in parallel. Imagine
 
-Working with branches is especially important when working with other developers.
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
 
--
+Working with branches is especially important when working with other developers. This only applies when working with a **remote** repository, which we'll talk about in the next section.
 
 -   [Introduction to GIT - Branching and Merging](https://www.youtube.com/watch?v=FyAAIHHClqI)
 
+### Working with branches on GitHub
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
+
+-   [GitHub 'Hello World' Project](https://guides.github.com/activities/hello-world/)
+
 ### Working with a remote repository: GitHub
 
 In practice, having a copy of your code is essential. What if your local files get corrupt, your computer crashes or it's almost impossible to rewrite complex code that just doesn't work? We already learned that GIT can help us with this.
 
--   [What is GitHub?](https://www.youtube.com/watch?v=w3jLJU7DT5E)
+However, we can go a step further: we can have a copy of our code online. For this we use a Git repository hosting service, called **GitHub**.
+
+-   [GIT Good: A Practical Introduction to GIT and GitHub](https://codeburst.io/git-good-part-a-e0d826286a2a)
 
 ### Making pull requests
 
-A pull request is a term GitHub uses to refer to merge requests.
+A **pull request** is a term GitHub uses to refer to merge requests; a request to incorporate code changes made by a developer (whether it's you or another developer) into the code stored in a branch of a repository.
 
-### Basic GIT workflow
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
 
 ## 2. CSS Frameworks
 
-Let's suppose you want to make a special tea on daily basis. You do this with several ingredients: water, special tea leaves and sugar. Doing so on a daily basis most of the time you will find it is really difficult to put all ingredients in right ratio all time, u can forget some times u have to open several boxes one by one , one morning u come up with idea of mixing all ingredients in one jar in one ratio , such that every spoon will serve the right ratio mix to the tea.
+In order to explain CSS frameworks, we first must understand what a framework is. Let's explain using an analogy.
+
+Let's suppose you want to make a ginger tea on daily basis. You do this with several ingredients: water, pieces of ginger and sugar. Doing so you will find it is really difficult to put all ingredients in the right proportions all the time.
 
-This jar is your framework. When we want to do lots of things on regular basis it just consumes time and a framework will not only save time it will also provide right components in ur applications. Fast and easy.
+One morning you come up with idea of mixing all the ingredients in one jar in the correct proportion, such that every spoon will serve the right amount to make the tea.
 
-### Why use a framework?
+This jar is your framework. By using it you never have to think about When we want to do lots of things on regular basis it just consumes time and a framework will not only save time it will also provide right components in ur applications. Fast and easy.
 
-A common theme in development you'll learn is: **Don't Repeat Yourself** (DRY).
+### Why use a CSS framework?
+
+A CSS framework allows you to style your HTML reliably, by making use of carefully written CSS rules.
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
 
 ### Most popular frameworks
+
+The most popular CSS frameworks
+
+[[[[[TO BE CONTINUED!!!!!!!!!]]]]]
diff --git a/hand-in-homework-guide.md b/hand-in-homework-guide.md
@@ -26,6 +26,6 @@ Follow these steps to upload the link to your homework:
 
 1. Go to the `Feedback Assignments` board
 2. In the right week, create a card with your name and week number (like, `Noer Paanakker Week 1 homework`)
-3. Click on the card, and attach the URL of your GitHub repository
+3. Click on the card, and attach the URL of your GitHub repository and/or other links
 
 If you have any questions or if something is not entirely clear ¯\\\_(ツ)\_/¯, please ask/comment on Slack!
