Brought branch up-to-date with template manually to avoid merge issues

.eslintrc.json

@@ -15,17 +15,18 @@
     "arrow-spacing": ["warn", {"before": true, "after": true}],
     "brace-style": 2,
     "camelcase": [2, {"properties": "never"}],
-    "complexity": ["warn", 5],
+    "complexity": ["error", 5],
     "eol-last": "warn",
     "eqeqeq": "error",
     "func-call-spacing": ["error", "never"],
     "global-require": "error",
     "handle-callback-err": "warn",
     "indent": [1, "tab", {"SwitchCase": 1}],
     "key-spacing": ["error", {"beforeColon": false, "afterColon": true}],
+    "linebreak-style": ["warn", "unix"],
     "max-depth": ["error", 3],
     "max-len": ["warn", { "code": 120, "tabWidth": 4 }],
-    "max-lines": ["error", 100],
+    "max-lines": ["warn", 150],
     "max-lines-per-function": ["error", 20],
     "max-nested-callbacks": ["error", 4],
     "max-params": ["error", 5],
@@ -52,6 +53,7 @@
     "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" }],

.githooks/post-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "running the 'post-commit' script"
+./node_modules/.bin/markdownlint  --ignore node_modules .

.githooks/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "running the 'pre-commit' script"
+./node_modules/.bin/eslint .

.markdownlint.json

@@ -0,0 +1,33 @@
+
+{
+  "line-length": false,
+  "no-inline-html": {
+    "allowed_elements": [
+      "a", "br"
+    ]
+  },
+  "header-increment": true,
+  "ul-style": {
+    "style": "dash"
+  },
+  "ul-start-left": true,
+  "no-trailing-spaces": {
+    "br_spaces": 0
+  },
+  "no-hard-tabs": true,
+  "no-reversed-links": true,
+  "no-multiple-blanks": true,
+  "no-missing-space-atx": true,
+  "no-multiple-space-atx": true,
+  "blanks-around-headers": true,
+  "header-start-left": true,
+  "no-duplicate-header": true,
+  "single-h1": true,
+  "blanks-around-fences": true,
+  "blanks-around-lists": true,
+  "no-bare-urls": true,
+  "no-space-in-emphasis": true,
+  "no-space-in-code": true,
+  "no-space-in-links": true,
+  "fenced-code-language": true
+}

modules/user.js

@@ -2,7 +2,7 @@
 'use strict'
 
 const bcrypt = require('bcrypt-promise')
-const fs = require('fs-extra')
+// const fs = require('fs-extra')
 const mime = require('mime-types')
 const sqlite = require('sqlite-async')
 const saltRounds = 10