merge conflict resolved

.eslintrc.json

@@ -12,11 +12,10 @@
   },
   "rules": {
     "arrow-body-style": 2,
-    "arrow-parens": ["error", "as-needed"],
     "arrow-spacing": ["warn", {"before": true, "after": true}],
     "brace-style": 2,
     "camelcase": [2, {"properties": "never"}],
-    "complexity": ["warn", 4],
+    "complexity": ["error", 5],
     "eol-last": "warn",
     "eqeqeq": "error",
     "func-call-spacing": ["error", "never"],
@@ -25,13 +24,13 @@
     "indent": [1, "tab", {"SwitchCase": 1}],
     "key-spacing": ["error", {"beforeColon": false, "afterColon": true}],
     "linebreak-style": ["warn", "unix"],
-    "max-depth": ["warn", 3],
+    "max-depth": ["error", 3],
     "max-len": ["warn", { "code": 120, "tabWidth": 4 }],
-    "max-lines": ["warn", 100],
-    "max-lines-per-function": ["warn", 15],
-    "max-nested-callbacks": ["warn", 4],
-    "max-params": ["warn", 5],
-    "max-statements": ["warn", 10],
+    "max-lines": ["error", 100],
+    "max-lines-per-function": ["error", 20],
+    "max-nested-callbacks": ["error", 4],
+    "max-params": ["error", 5],
+    "max-statements": ["error", 20],
     "no-cond-assign": 2,
     "no-dupe-args": "error",
     "no-dupe-keys": "error",
@@ -54,10 +53,9 @@
     "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": "never" }],
+    "space-before-blocks": ["error", { "functions": "always", "keywords": "always", "classes": "always" }],
     "space-before-function-paren": [2, "never"],
     "strict": [2, "global"],
     "yoda": 2
@@ -72,4 +70,4 @@
 			"no-magic-numbers": "off"
 		}
 	}]
-}
+}

.gitignore

@@ -1,6 +1,7 @@
 
 .DS_Store
 node_modules/
+coverage/
 *.db
 screenshots/*
 docs/

.vscode/launch.json

@@ -0,0 +1,27 @@
+
+{
+  "version": "0.2.0",
+  "configurations": [
+
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach by Process ID",
+      "processId": "${command:PickProcess}"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": ["--runInBand"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "protocol": "inspector",
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+      }
+    }
+  ]
+}

README.md

@@ -1,8 +1,25 @@
 # Assignment Template
 
-This repository contains the base files for the assignment. To make use of this carry out the following steps:
+This repository contains the base files for the assignment. You will need to create a _private duplicate_ in your module organisation. Carry out the following steps, taken from the [GitHub documentation](https://help.github.com/en/enterprise/2.16/user/articles/duplicating-a-repository):
 
-1. Fork this repository but change its name (replace `xxx` with your university username):
-    1. If this is your original assignment, `xxx-coursework`.
-    2. If this is your resit assignment code, `xxx-resit`.
-2. Replace the contents of this file with the details of the topic you have been assigned.
+Temporarily clone this repository to your development computer. This will create a directory on your computer called `temp` which contains the repository files:
+
+`git clone https://github.coventry.ac.uk/web/template-dynamic-websites.git temp`
+
+Create a new **private** repository in the module organisation on the GitHub server and copy the _clone url_ to the clipboard (the one that begins with `https://` and ends in `.git`. The repository name should be your username (the one you use to log into the University computers).
+
+Mirror Push to this new repository, replacing xxx with the url from the clipboard making sure you are _in_ the `temp/` directory:
+
+`cd temp/ && git push --mirror xxx`
+
+Once you are sure the code is in your new repository, delete the temporary local repository.
+
+`cd .. && rm -rf temp/`
+
+Your private repository on GitHub will now contain a complete copy of this template including the commits that were already made. You can now start your assignment by carrying out the following steps:
+
+Clone your private repository
+
+Change your **local config settings**. This is a vital step otherwise your commits won't show on the GitHub _graph_ and your grade will be affected.
+
+Start working on the assignment.