Merge pull request #1 from web/master

.eslintrc.json

@@ -15,7 +15,7 @@
     "arrow-spacing": ["warn", {"before": true, "after": true}],
     "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
     "camelcase": [2, {"properties": "never"}],
-    "complexity": ["error", 4],
+    "complexity": ["error", 5],
     "eol-last": "warn",
     "eqeqeq": "error",
     "func-call-spacing": ["error", "never"],
@@ -27,10 +27,14 @@
     "max-depth": ["error", 3],
     "max-len": ["warn", { "code": 120, "tabWidth": 4 }],
     "max-lines": ["error", 100],
+<<<<<<< HEAD
     "max-lines-per-function": ["error", 25],
+=======
+    "max-lines-per-function": ["error", 20],
+>>>>>>> upstream/master
     "max-nested-callbacks": ["error", 4],
     "max-params": ["error", 5],
-    "max-statements": ["error", 10],
+    "max-statements": ["error", 20],
     "no-cond-assign": 2,
     "no-dupe-args": "error",
     "no-dupe-keys": "error",
@@ -53,11 +57,11 @@
     "no-var": 2,
     "prefer-arrow-callback": 1,
     "prefer-const": 2,
+    "prefer-template": "error",
     "quotes": [1, "single"],
     "semi": [1, "never"],
     "space-before-blocks": ["error", { "functions": "always", "keywords": "always", "classes": "always" }],
     "space-before-function-paren": [2, "never"],
-    "strict": [2, "global"],
     "yoda": 2
 	},
 	"overrides": [{

.gitignore

@@ -7,10 +7,15 @@ data/
 coverage/
 docs/
 sessions/
+<<<<<<< HEAD
 screenshots/
 __image_snapshots_/
 __diff_output__/
 trace/
+=======
+screenshots/*
+out/
+>>>>>>> upstream/master
 
 # sqlite databases
 # *.db
@@ -32,3 +37,6 @@ website.db
 # IDE setting files
 *.codio
 *.c9
+
+messages.txt
+todo.db

.vscode/launch.json

@@ -1,14 +1,42 @@
+
 {
 	"version": "0.2.0",
 	"configurations": [
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Jest Tests",
-			"program": "${workspaceFolder}/exercises/12_spa/books/node_modules/.bin/jest",
+			"name": "Launch Current Opened File",
+			"program": "${file}"
+	},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Jest All",
+			"program": "${workspaceFolder}/exercises/07_unit_testing/todo/node_modules/jest/bin/jest",
+			"args": ["--runInBand"],
+			"console": "integratedTerminal",
+			"internalConsoleOptions": "neverOpen",
+			"disableOptimisticBPs": true,
+			"windows": {
+				"program": "${workspaceFolder}/exercises/07_unit_testing/todo/node_modules/jest/bin/jest",
+			}
+		},
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Jest Current File",
+			"program": "${workspaceFolder}/exercises/07_unit_testing/todo/node_modules/jest/bin/jest",
 			"args": [
-				"-i"
-			]
+				"${fileBasenameNoExtension}",
+				"--config",
+				"jest.config.js"
+			],
+			"console": "integratedTerminal",
+			"internalConsoleOptions": "neverOpen",
+			"disableOptimisticBPs": true,
+			"windows": {
+				"program": "${workspaceFolder}/exercises/07_unit_testing/todo/node_modules/jest/bin/jest",
+			}
 		}
 	]
-}
+}

01 Setup Win10.md

@@ -0,0 +1,60 @@
+
+# Setup for Windows 10 Users
+
+The tools used in this module are designed to be used in a Unix or Linux environment. Whilst this will create challenges for Windows 10 user there are some steps you will need to take. Please read and follow the steps below carefully:
+
+Install the Windows Subsystem for Linux (WSL). Open PowerShell as Administrator and run:
+
+``` shell
+Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux
+```
+
+Restart your computer when prompted.
+
+Now install Visual Studio Code and once launched install the [remote-wsl](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-wsl) component by Microsoft. You should also install the [browser-preview](https://marketplace.visualstudio.com/items?itemName=auchenberg.vscode-browser-preview) component which will allow you to open html web pages.
+
+![remote-wsl](exercises/.images/remote-wsl.png)
+
+Now you need to install Ubuntu. This can be found by searching for `run linux on windows` in the Microsoft Store. You will be presented with the following screen.
+
+![Microsoft Store](exercises/.images/store.png)
+
+Choose the Ubuntu operating system (v18.04 LTS) and install. Once installed, click on the **Launch** button, this will open a console window and you will need to wait for a few minutes for the installation to complete.
+
+## Cloning the Forked Repository
+
+You will now need to fork the foundation lab by clicking on the Fork button. This will create a copy of the repository. See the standard setup instructions for more details.
+
+Now you can clone your forked repository by running the following command in the Ubuntu console, replacing xxx with the URL of your repository.
+
+```shell
+git clone xxx
+```
+
+This will create a directory called `foundation` in the Ubuntu console. The final step is to launch VS Code from within the WSL environment by running the following command:
+
+```shell
+code foundation
+```
+
+This will launch VS Code from within the WSL with the contents of the `foundation/` directory. If you open the integrated terminal (using the **Terminal** menu) you will see that you have the full ubuntu bash shell. You can now run all the remaining steps from this integrated terminal, just as you would for a standard Linux install.
+
+## Installing NodeJS
+
+These steps are identical to those used on a full Ubuntu installation. Start by installing the Node Version Manager (NVM) tool:
+
+```shell
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.0/install.sh | bash
+nvm --version
+nvm install node
+```
+
+If the `nvm` command is not found you will need to reload the shell:
+
+```shell
+source ~/.profile
+```
+
+Now try to install again.
+
+Now you can go directly to step 4 in the standard setup instructions.

01 Setup.md

@@ -0,0 +1,197 @@
+
+# Setup
+
+In this worksheet you will learn how to configure your work environment using VS Code. You should start by installing **Visual Studio Code** (NOT VISUAL STUDIO!) from the [website](https://code.visualstudio.com), note that it might already be installed. If you are using a Coventry University computer and the software is not installed you can do this using AppsAnywhere.
+
+If you are using Windows 10 you will also need to install [Git](https://git-scm.com/download/win), this may already be installed on a Coventry University computer. If you are on MacOS you may already have it installed as it comes with the XCode IDE but if you have recently updated your OS you may need to run the `xcode-select --install` command to update the **Xcode Command-line Tools** but if you don't want to install XCode you can install git using [HomeBrew](http://brew.sh/) using the `brew install git` command. If you are running Ubuntu you can install it using the `sudo apt install git` command.
+
+DO NOT INSTALL THE GIT GUI TOOLS!
+
+Visual Studio Code comes with an integrated **Terminal** that can be used instead of the standard _Command Prompt_ or _Terminal_. If you are using Linux or MacOS this will give you a Bash prompt however on Windows 10 it defaults to the _Command Prompt_ and will need to be changed to the _Bash Shell_.
+
+Press CTRL-SHIFT-P and a selection box should appear at the top of the editor. Type in `default shell` and click on the `Terminal: Select Default Shell` option.
+
+![Changing the Default Shell in Windows 10](exercises/.images/windows_shell.png)
+
+Now the integrated terminal uses the _Bash Shell_ meaning you can use the standard *nix bash commands!
+
+# If _Bash Shell_ is _not_ listed on your Windows 10 machine
+
+On some versions of Windows 10, some extra configuration is required before Bash Shell is able to be selected within VS Code. If this is the case on your machine, follow the below troubleshooting steps before reattempting to change your shell as above.
+
+To start, we need to make sure Developer Mode is enabled in the Update and Security section of Windows 10. Press **WIN+R** (Windows Key and R simultaneosly) to open a Run dialog. In the dialog enter **ms-settings:developers** followed by the enter key. The window shown below should appear on screen.
+
+![Enabling Windows 10 Developer Mode](exercises/.images/developerMode.PNG)
+
+Select the **Developer mode** radio button and **yes** on any succeeding dialog boxes. Wait for any neccessary installations to complete.
+
+Once that has completed, we need to enable the WSL (Windows Subsystem for Linux). Press **WIN+R**, in the dialog enter **powershell** followed by the enter key. In the powershell window copy and paste the following:
+
+```
+Start-Process powershell -Verb runAs
+exit
+```
+
+Press the enter key and accept the UAC (User Account Control) dialog. A new powershell window will launch with Administrator rights. 
+
+Copy and paste the following:
+
+```
+Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Windows-Subsystem-Linux
+```
+
+Press the enter key and wait for the process to complete. Once complete, restart your computer before continuing. 
+
+Finally, we need to install [Ubuntu from the Microsoft Store](https://www.microsoft.com/en-gb/p/ubuntu/9nblggh4msv6?activetab=pivot:overviewtab). Click the blue **Get** button and accept any dialogs to launch the Microsoft Store and begin the installation. Once Ubuntu for WSL (Windows Subsystem for Linux) has installed, restart Windows. 
+
+Once restarted, reattempt to enable Bash Shell in VS Code as per the section above. 
+
+## 1 Forking the Foundation Materials
+
+You should start by logging in to the University GitHub server using your university username and password. Make sure you don't log into GitHub.com!
+
+Next you should open the [web page](https://github.coventry.ac.uk/web/foundation) containing the foundation materials and click on the small Fork button in the top-right corner of the page
+
+![The Clone Button](exercises/.images/fork01.png)
+
+You will be asked to select where you want to place the forked repository, make sure you choose your own personal space (the one that is named using your username).
+
+![The Clone Button](exercises/.images/fork02.png)
+
+This will create an exact copy (clone) of the repository in your personal workspace. It should indicate where the original version was (see below).
+
+![The Clone Button](exercises/.images/fork03.png)
+
+## 2 Cloning the Lab Exercises
+
+Locate the green **Clone or Download** button and click this. You will see the option to clone with HTTPS. Click on the copy icon as shown to copy the URL to the clipboard.
+
+![The Clone Button](exercises/.images/clone01.png)
+
+Make sure the url begins with `https://`, if it begins with `git` you need to click in the small **Use HTTPS** link!
+
+Launch the **terminal** app (Mac and Linux users) or Bash Shell (Windows 10 users). Now use this to navigate to the directory where you want to store the lab materials. You should use the following bash commands:
+
+1. `ls` is used to see the contents of the current directory.
+2. `pwd` prints the path to the current directory.
+3. `cd` changes to the directory you specify, `cd ..` takes you to the parent directory.
+
+When you are in the chosen location you need to clone the repository using the URL we copied earlier:
+
+```shell
+git clone xxx
+```
+
+Replacing xxx with the content of the clipboard.
+
+This will create a directory called `foundation` which contains all the content from the repository.
+
+Now you can launch Visual Studio Code and use the **File** menu to open this `foundation/` directory.
+
+### 2.1 Additional Steps for Windows 10 Users
+
+If you are using Windows 10 you will need to carry out some additional steps before starting the lab exercises:
+
+2. Open the integrated terminal using the **Terminal** menu.
+3. Type - Select Default Shell
+4. Select Git Bash from the options
+5. Click on the + icon in the terminal window.
+
+This will open a new Git Bash shell in the project directory.
+
+## 3 Installing NodeJS
+
+Next we need to install and configure NodeJS. If you are using MacOS or Linux the first task is to install the Node Version Manager tool. You can find detailed [instructions](https://nodesource.com/blog/installing-node-js-tutorial-using-nvm-on-mac-os-x-and-ubuntu/).
+
+Once installed you may need to restart your computer. Now check it was installed correctly:
+
+```bash
+$ command -v nvm
+  nvm
+```
+
+Now we can install the latest version of NodeJS:
+
+```bash
+nvm install node
+node -v
+```
+
+If you are running Windows 10 you need to [download the installer](https://nodejs.org/en/) for the **Current** version of NodeJS (12.10 at the time of writing).
+
+## 4 Running a Web Server
+
+Use the terminal to navigate to the `exercises/01_setup/` directory and try running the `index.js` script:
+
+```shell
+$ cd exercises/01_setup/
+$ node index.js
+  Error: Cannot find module 'koa'
+```
+
+If you are using Windows 10 you will need to use the command prompt instead and navigate to the `01_setup/` directory.
+
+Notice you get an error, we need to install the missing module using the _Node Package Manager_ tool. We can then try to run the script again:
+
+```shell
+$ npm install koa
+$ node index.js
+  app listening on port 8080
+```
+
+Now we have the server up and running so the final task is to view the web page using the web browser. Simply open the Chrome browser and navigate to localhost:8080 where you should see a message. If this works you are ready to start the lab exercises.
+
+## 5 Pushing the Changes to GitHub
+
+As you work through the lab activities two things are likely to happen:
+
+1. You make changes to the code that you want to push to the forked copy of your repository.
+2. You will need to pull any bug fixes from the original repository.
+
+### 5.1 Configuring the Repository
+
+Before you start interacting with the GitHub server you need to configure the local repository. Open the Bash Shell and run the following commands:
+
+```shell
+git config user.name 'John Doe'
+git config user.email 'doej@coventry.ac.uk'
+```
+
+remember to replace the values with you own name and your university email (but without the uni part).
+
+### 5.2 Pushing Changes
+
+**NOTE: You only need to carry out this step when you have make changes to the code! This will normally need to take place each time you complete a "Test Your Understanding" section.**
+
+As you save your changes you will see a blue circle against the **Source Control** tab that indicates how many files have been changed, we need to get these changed files up to GitHub. Start by opening the tab, you will see a list of all the files you have changed.
+
+1. Click on the + button to stage these changes.
+2. Type in a commit message to explain what changes you have made.
+3. Click in the tick button to commit the changes.
+
+![Committing Changes](exercises/.images/push01.png)
+
+Now you should click on the **Sync** icon (shown below) to push the new commit up to your GitHub repository, this will also pull doen any commits that are on the GitHub server but that you don't have on your local computer. The first number is the number of commits it will pull from GitHub (down arrow) and the second the number of commits it will push from your local computer to GitHub (up arrow).
+
+![Pushing Commits](exercises/.images/push-pull.png)
+
+At this point you should be able to refresh your GitHub repository page to see the changes.
+
+### 5.3 Pulling from Upstream
+
+As new materials and resources are added to the original repository (and bugs fixed) you will want to merge these into your forked repository. Before you can do this you will need to add a link to the upstream repository. Open a bash shell:
+
+```bash
+git remote add upstream https://github.coventry.ac.uk/web/foundation.git
+git remote -v
+```
+
+Now, every time you have committed and pushed you changes you can pull the changes from the master repository:
+
+```shell
+git fetch upstream
+git checkout master
+git merge upstream/master
+```
+
+Don't worry if you don't understand what is happening, this will be explained in a future lab.