Merge branch 'master' of github.com:HackYourFuture/HTML-CSS

robvk · robvk · commit f97103cba3f8 · 2022-06-29T11:36:12.000+02:00
diff --git a/Week2/MAKEME.md b/Week2/MAKEME.md
@@ -59,6 +59,7 @@ In this project you're going to rebuild `the homepage` of an existing responsive
 
 You don't have to build everything, but include the following requirements:
 
+- Design-wise it should be similar so the fonts, icons, text, etc. should look the same as the original
 - Only rebuild the homepage (which should include a navigation bar, footer, the landing section and at least 2 other sections)
 - Write your CSS in an external stylesheet
 - You are **allowed** to use a CSS framework, but you do not have to. It is up to you!
@@ -79,7 +80,7 @@ If you like learning in a fun way there are quite a few games on the internet th
 
 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 exercise #1 (the URL of the remote `git_practice` repository)
+1. GIT exercise (the URL of the remote `favorite-cmd-commands` repository)
 2. The responsive 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
@@ -31,7 +31,7 @@ GIT is software that allows you to save your work at any given moment in time. I
 
 You can think of it like a video game. You get to a certain point in the game, after hours of struggle. You're really proud of how far you've come, and don't want to do it over again in case you die. So you decide to _save your game_. If something bad happens after that point you can always reload your game and start from that point on.
 
-This is exactly what happens with GIT: however, instead of calling it _saving your game_ we call it **committing your changes**. A "change" is a code modification you made within a working day.
+This is exactly what happens with GIT: however, instead of calling it _saving your game_ we call it **committing your changes**. A "change" is a code modification you made in one or more files. It's recommended to commit multiple times a day, every time you make something that is worth saving. Making commits often also makes it easier to reset your work to the last working state. Discarding changes with GIT is better than to trust on CTRL-Z to undo failed attempts.
 
 If you ever would want to go back to a previous _game save_ you can make GIT help you do so by **checking out to that commit**. You will learn more about that in the next sections.
 
@@ -55,7 +55,14 @@ git --version
 
 It should say that the version is **2.21** (or up if you've installed a new version).
 
-Now that you have GIT installed, it's important to make a basic configuration. Inside your CLI, type in the following (Replace "Your name" and "your.email@youremailserver.com" with your own name and email address, respectively):
+You can work with GIT using only the CLI but you can also use a GUI (graphical user interface).
+Two free cross-platform examples are [SourceTree](https://www.sourcetreeapp.com/) and [Gitkraken](https://www.gitkraken.com/).
+It's up to personal preference what works the best, both CLI and GUI will use the same underlying system.
+You can even use both in the same project, e.g. commands on the CLI will reflect instantly in the GUI.
+The main advantage of a GUI is that it has a visual overview of all commits and branches, local and remote.
+
+Now that you have GIT installed, it's important to make a basic configuration. Inside your CLI, type in the following (Replace "Your name" and "your.email@youremailserver.com" with your own name and email address, respectively).
+In case you are using a GUI, it will probably ask the same data the first time you open the application, and it will do these commands for you.
 
 ```bash
 git config --global user.name "Your name"
@@ -86,12 +93,13 @@ What it does is creating a brand new **local** repository in your project folder
 Now we can continue with the actual procedure itself. This happens in 3 stages:
 
 1. **Untracked**. In this stage GIT is not aware of the changes in your workspace.
-2. **Staged**. In this stage the changes will be tracked by GIT.
+2. **Staged**. In this stage the changes are selected for the next commit.
 3. **Committed** In this stage your changes have been saved into the local repository. If you need to refer to a previous version of your workspace you can safely do that now.
 
 This might sound very abstract, and it is. So to make it more comprehensible, you can watch the following videos and/or try stuff in the Git playground:
 
-- [GIT Tutorial for beginners](https://www.youtube.com/watch?v=HVsySz-h9r4)
+- [GIT command line basics](https://www.youtube.com/watch?v=HVsySz-h9r4)
+- [Learn Git - using CLI & GitKraken](https://www.youtube.com/playlist?list=PLe6EXFvnTV7-_41SpakZoTIYCgX4aMTdU)
 - [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)
 - [Git Playground](https://git-school.github.io/visualizing-git/)
diff --git a/Week3/MAKEME.md b/Week3/MAKEME.md
@@ -51,7 +51,7 @@ In this section you're going to get familiar with [MaterializeCSS](https://mater
 
 ### 5. Optional: Side project ideas
 
-> A part of the HackYourFuture curriculum is to work on as many side projects as you can throughout the time you have. This is a nice way to add extra knowledge to your arsenal and show in your CV that you are motivated to learn new technologies. This is also a great time to learn new things as there are plenty of mentors available to help you out in the `#projects` channel on Slack! You will not get this amount of time and support once you start working. Have a look at the [hyf_projects repo](https://github.com/HackYourFuture/hyf_projects/blob/main/README.md#project-2-a-try-out-application) for more details.
+> A part of the HackYourFuture curriculum is to work on as many side projects as you can throughout the time you have. This is a nice way to add extra knowledge to your arsenal and show in your CV that you are motivated to learn new technologies. There are plenty of people available to help you out in the `#get-help` channel on Slack so definitely make use of that! Have a look at the [hyf_projects repo](https://github.com/HackYourFuture/hyf_projects/blob/main/README.md#project-2-a-try-out-application) for more details.
 
 #### 5.1 CSS preprocessor
 
diff --git a/Week3/prep-exercises/01-animals-repo/README.md b/Week3/prep-exercises/01-animals-repo/README.md
@@ -1,7 +1,5 @@
 # Animals repo
 
-> Tip: you can either use the CLI to make your git commands or use a GUI. The most used is [Git Kraken](https://www.gitkraken.com/) and it visualises what happens. VSCode also has an integrated Git activity tab that you can use. Try them out and see what you prefer!
-
 In this homework you'll be working with GIT and GitHub. Follow the steps to learn how to create a remote repository and work with it from your local machine:
 
 1. Create a repository on GitHub, called `animals`
