diff --git a/database/db.sql b/database/db.sql
index 2596dc0..5ea049f 100644
--- a/database/db.sql
+++ b/database/db.sql
@@ -4,9 +4,9 @@ DROP TABLE IF EXISTS users, posts, comments cascade ;
CREATE TABLE users (
id SERIAL PRIMARY KEY NOT NULL,
- name VARCHAR(100) NOT NULL,
+ name VARCHAR(100) UNIQUE NOT NULL,
email VARCHAR(100) NOT NULL,
- password VARCHAR(30) NOT NULL
+ password VARCHAR(300) NOT NULL
);
CREATE TABLE posts (
diff --git a/package-lock.json b/package-lock.json
index 7a850de..0349828 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,7 +2,6 @@
"name": "blog",
"version": "1.0.0",
"lockfileVersion": 1,
- "requires": true,
"dependencies": {
"abbrev": {
"version": "1.1.0",
@@ -26,20 +25,13 @@
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
- "dev": true,
- "requires": {
- "micromatch": "2.3.11",
- "normalize-path": "2.1.1"
- }
+ "dev": true
},
"arr-diff": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
- "dev": true,
- "requires": {
- "arr-flatten": "1.1.0"
- }
+ "dev": true
},
"arr-flatten": {
"version": "1.1.0",
@@ -70,6 +62,11 @@
"resolved": "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz",
"integrity": "sha1-6sFuA+oUOO/5Qj1puqNiYu0fcLs="
},
+ "bcryptjs": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.4.3.tgz",
+ "integrity": "sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms="
+ },
"binary-extensions": {
"version": "1.10.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz",
@@ -80,22 +77,13 @@
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
- "dev": true,
- "requires": {
- "balanced-match": "1.0.0",
- "concat-map": "0.0.1"
- }
+ "dev": true
},
"braces": {
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
- "dev": true,
- "requires": {
- "expand-range": "1.8.2",
- "preserve": "0.2.0",
- "repeat-element": "1.1.2"
- }
+ "dev": true
},
"buffer-equal-constant-time": {
"version": "1.0.1",
@@ -111,30 +99,13 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
- "dev": true,
- "requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
- }
+ "dev": true
},
"chokidar": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
"integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
- "dev": true,
- "requires": {
- "anymatch": "1.3.2",
- "async-each": "1.0.1",
- "glob-parent": "2.0.0",
- "inherits": "2.0.3",
- "is-binary-path": "1.0.1",
- "is-glob": "2.0.1",
- "path-is-absolute": "1.0.1",
- "readdirp": "2.1.0"
- }
+ "dev": true
},
"concat-map": {
"version": "0.0.1",
@@ -157,17 +128,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz",
"integrity": "sha1-w1eB0FAdJowlxUuLF/YkDopPsCE=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "mkdirp": "0.5.1",
- "object-assign": "4.1.1",
- "os-tmpdir": "1.0.2",
- "osenv": "0.1.4",
- "uuid": "2.0.3",
- "write-file-atomic": "1.3.4",
- "xdg-basedir": "2.0.0"
- }
+ "dev": true
},
"cookie": {
"version": "0.3.1",
@@ -195,10 +156,7 @@
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
- "dev": true,
- "requires": {
- "ms": "2.0.0"
- }
+ "dev": true
},
"deep-equal": {
"version": "1.0.1",
@@ -216,11 +174,7 @@
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
- "dev": true,
- "requires": {
- "foreach": "2.0.5",
- "object-keys": "1.0.11"
- }
+ "dev": true
},
"defined": {
"version": "1.0.0",
@@ -238,31 +192,18 @@
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
"integrity": "sha512-j5goxHTwVED1Fpe5hh3q9R93Kip0Bg2KVAt4f8CEYM3UEwYcPSvWbXaUQOzdX/HtiNomipv+gU7ASQPDbV7pGQ==",
- "dev": true,
- "requires": {
- "end-of-stream": "1.4.0",
- "inherits": "2.0.3",
- "readable-stream": "2.3.3",
- "stream-shift": "1.0.0"
- }
+ "dev": true
},
"ecdsa-sig-formatter": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz",
- "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE=",
- "requires": {
- "base64url": "2.0.0",
- "safe-buffer": "5.1.1"
- }
+ "integrity": "sha1-S8kmJ07Dtau1AW5+HWCSGsJisqE="
},
"end-of-stream": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
"integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=",
- "dev": true,
- "requires": {
- "once": "1.4.0"
- }
+ "dev": true
},
"env2": {
"version": "2.2.0",
@@ -273,25 +214,13 @@
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.8.0.tgz",
"integrity": "sha512-Cf9/h5MrXtExM20gSS55YFrGKCyPrRBjIVBtVyy8vmlsDfe0NPKMWj65tPLgzyfPuapWxh5whpXCtW4+AW5mRg==",
- "dev": true,
- "requires": {
- "es-to-primitive": "1.1.1",
- "function-bind": "1.1.0",
- "has": "1.0.1",
- "is-callable": "1.1.3",
- "is-regex": "1.0.4"
- }
+ "dev": true
},
"es-to-primitive": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
"integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
- "dev": true,
- "requires": {
- "is-callable": "1.1.3",
- "is-date-object": "1.0.1",
- "is-symbol": "1.0.1"
- }
+ "dev": true
},
"es6-promise": {
"version": "3.3.1",
@@ -309,53 +238,31 @@
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
- "dev": true,
- "requires": {
- "duplexer": "0.1.1",
- "from": "0.1.7",
- "map-stream": "0.1.0",
- "pause-stream": "0.0.11",
- "split": "0.3.3",
- "stream-combiner": "0.0.4",
- "through": "2.3.8"
- }
+ "dev": true
},
"expand-brackets": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
- "dev": true,
- "requires": {
- "is-posix-bracket": "0.1.1"
- }
+ "dev": true
},
"expand-range": {
"version": "1.8.2",
"resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
- "dev": true,
- "requires": {
- "fill-range": "2.2.3"
- }
+ "dev": true
},
"extglob": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
- "dev": true,
- "requires": {
- "is-extglob": "1.0.0"
- }
+ "dev": true
},
"figures": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
- "dev": true,
- "requires": {
- "escape-string-regexp": "1.0.5",
- "object-assign": "4.1.1"
- }
+ "dev": true
},
"filename-regex": {
"version": "2.0.1",
@@ -367,23 +274,13 @@
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz",
"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
- "dev": true,
- "requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
- }
+ "dev": true
},
"for-each": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz",
"integrity": "sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ=",
- "dev": true,
- "requires": {
- "is-function": "1.0.1"
- }
+ "dev": true
},
"for-in": {
"version": "1.0.2",
@@ -395,10 +292,7 @@
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
- "dev": true,
- "requires": {
- "for-in": "1.0.2"
- }
+ "dev": true
},
"foreach": {
"version": "2.0.5",
@@ -428,52 +322,25 @@
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
- "dev": true,
- "requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
- }
+ "dev": true
},
"glob-base": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
- "dev": true,
- "requires": {
- "glob-parent": "2.0.0",
- "is-glob": "2.0.1"
- }
+ "dev": true
},
"glob-parent": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
- "dev": true,
- "requires": {
- "is-glob": "2.0.1"
- }
+ "dev": true
},
"got": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz",
"integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=",
"dev": true,
- "requires": {
- "duplexify": "3.5.1",
- "infinity-agent": "2.0.3",
- "is-redirect": "1.0.0",
- "is-stream": "1.1.0",
- "lowercase-keys": "1.0.0",
- "nested-error-stacks": "1.0.2",
- "object-assign": "3.0.0",
- "prepend-http": "1.0.4",
- "read-all-stream": "3.1.0",
- "timed-out": "2.0.0"
- },
"dependencies": {
"object-assign": {
"version": "3.0.0",
@@ -493,19 +360,13 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
- "dev": true,
- "requires": {
- "function-bind": "1.1.0"
- }
+ "dev": true
},
"has-ansi": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
- "dev": true,
- "requires": {
- "ansi-regex": "2.1.1"
- }
+ "dev": true
},
"hoek": {
"version": "2.16.3",
@@ -534,11 +395,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
- "dev": true,
- "requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
- }
+ "dev": true
},
"inherits": {
"version": "2.0.3",
@@ -556,10 +413,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
- "dev": true,
- "requires": {
- "binary-extensions": "1.10.0"
- }
+ "dev": true
},
"is-buffer": {
"version": "1.1.5",
@@ -589,10 +443,7 @@
"version": "0.1.3",
"resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
- "dev": true,
- "requires": {
- "is-primitive": "2.0.0"
- }
+ "dev": true
},
"is-extendable": {
"version": "0.1.1",
@@ -610,10 +461,7 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
- "dev": true,
- "requires": {
- "number-is-nan": "1.0.1"
- }
+ "dev": true
},
"is-function": {
"version": "1.0.1",
@@ -625,10 +473,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
- "dev": true,
- "requires": {
- "is-extglob": "1.0.0"
- }
+ "dev": true
},
"is-npm": {
"version": "1.0.0",
@@ -640,10 +485,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
- "dev": true,
- "requires": {
- "kind-of": "3.2.2"
- }
+ "dev": true
},
"is-posix-bracket": {
"version": "0.1.1",
@@ -667,10 +509,7 @@
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
"integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
- "dev": true,
- "requires": {
- "has": "1.0.1"
- }
+ "dev": true
},
"is-stream": {
"version": "1.1.0",
@@ -705,10 +544,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
"integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
- "dev": true,
- "requires": {
- "isarray": "1.0.0"
- }
+ "dev": true
},
"items": {
"version": "2.1.1",
@@ -719,13 +555,7 @@
"joi": {
"version": "6.10.1",
"resolved": "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz",
- "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY=",
- "requires": {
- "hoek": "2.16.3",
- "isemail": "1.2.0",
- "moment": "2.18.1",
- "topo": "1.1.0"
- }
+ "integrity": "sha1-TVDDGAeRIgAP5fFq8f+OGRe3fgY="
},
"js-string-escape": {
"version": "1.0.1",
@@ -735,53 +565,29 @@
"jsonwebtoken": {
"version": "7.4.3",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.3.tgz",
- "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg=",
- "requires": {
- "joi": "6.10.1",
- "jws": "3.1.4",
- "lodash.once": "4.1.1",
- "ms": "2.0.0",
- "xtend": "4.0.1"
- }
+ "integrity": "sha1-d/UCHeBYtgWheD+hKD6ZgS5kVjg="
},
"jwa": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz",
- "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU=",
- "requires": {
- "base64url": "2.0.0",
- "buffer-equal-constant-time": "1.0.1",
- "ecdsa-sig-formatter": "1.0.9",
- "safe-buffer": "5.1.1"
- }
+ "integrity": "sha1-oFUs4CIHQs1S4VN3SjKQXDDnVuU="
},
"jws": {
"version": "3.1.4",
"resolved": "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz",
- "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI=",
- "requires": {
- "base64url": "2.0.0",
- "jwa": "1.1.5",
- "safe-buffer": "5.1.1"
- }
+ "integrity": "sha1-+ei5M46KhHJ31kRLFGT2GIDgUKI="
},
"kind-of": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "1.1.5"
- }
+ "dev": true
},
"latest-version": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz",
"integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs=",
- "dev": true,
- "requires": {
- "package-json": "1.2.0"
- }
+ "dev": true
},
"lodash": {
"version": "3.10.1",
@@ -793,11 +599,7 @@
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
"integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=",
- "dev": true,
- "requires": {
- "lodash._basecopy": "3.0.1",
- "lodash.keys": "3.1.2"
- }
+ "dev": true
},
"lodash._basecopy": {
"version": "3.0.1",
@@ -815,12 +617,7 @@
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
"integrity": "sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=",
- "dev": true,
- "requires": {
- "lodash._bindcallback": "3.0.1",
- "lodash._isiterateecall": "3.0.9",
- "lodash.restparam": "3.6.1"
- }
+ "dev": true
},
"lodash._getnative": {
"version": "3.9.1",
@@ -838,22 +635,13 @@
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
- "dev": true,
- "requires": {
- "lodash._baseassign": "3.2.0",
- "lodash._createassigner": "3.1.1",
- "lodash.keys": "3.1.2"
- }
+ "dev": true
},
"lodash.defaults": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
- "dev": true,
- "requires": {
- "lodash.assign": "3.2.0",
- "lodash.restparam": "3.6.1"
- }
+ "dev": true
},
"lodash.isarguments": {
"version": "3.1.0",
@@ -871,12 +659,7 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
- "dev": true,
- "requires": {
- "lodash._getnative": "3.9.1",
- "lodash.isarguments": "3.1.0",
- "lodash.isarray": "3.0.4"
- }
+ "dev": true
},
"lodash.once": {
"version": "4.1.1",
@@ -915,31 +698,13 @@
"version": "2.3.11",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
- "dev": true,
- "requires": {
- "arr-diff": "2.0.0",
- "array-unique": "0.2.1",
- "braces": "1.8.5",
- "expand-brackets": "0.1.5",
- "extglob": "0.3.2",
- "filename-regex": "2.0.1",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1",
- "kind-of": "3.2.2",
- "normalize-path": "2.1.1",
- "object.omit": "2.0.1",
- "parse-glob": "3.0.4",
- "regex-cache": "0.4.3"
- }
+ "dev": true
},
"minimatch": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
- "requires": {
- "brace-expansion": "1.1.8"
- }
+ "dev": true
},
"minimist": {
"version": "0.0.8",
@@ -951,10 +716,7 @@
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- }
+ "dev": true
},
"moment": {
"version": "2.18.1",
@@ -970,46 +732,25 @@
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz",
"integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=",
- "dev": true,
- "requires": {
- "inherits": "2.0.3"
- }
+ "dev": true
},
"nodemon": {
"version": "1.11.0",
"resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.11.0.tgz",
"integrity": "sha1-ImxWK9KnsT09dRi0mtSCijYj0Gw=",
- "dev": true,
- "requires": {
- "chokidar": "1.7.0",
- "debug": "2.6.8",
- "es6-promise": "3.3.1",
- "ignore-by-default": "1.0.1",
- "lodash.defaults": "3.1.2",
- "minimatch": "3.0.4",
- "ps-tree": "1.1.0",
- "touch": "1.0.0",
- "undefsafe": "0.0.3",
- "update-notifier": "0.5.0"
- }
+ "dev": true
},
"nopt": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
- "dev": true,
- "requires": {
- "abbrev": "1.1.0"
- }
+ "dev": true
},
"normalize-path": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
- "dev": true,
- "requires": {
- "remove-trailing-separator": "1.1.0"
- }
+ "dev": true
},
"number-is-nan": {
"version": "1.0.1",
@@ -1039,20 +780,13 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
- "dev": true,
- "requires": {
- "for-own": "0.1.5",
- "is-extendable": "0.1.1"
- }
+ "dev": true
},
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "dev": true,
- "requires": {
- "wrappy": "1.0.2"
- }
+ "dev": true
},
"os-homedir": {
"version": "1.0.2",
@@ -1076,21 +810,13 @@
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz",
"integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=",
- "dev": true,
- "requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
- }
+ "dev": true
},
"package-json": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz",
"integrity": "sha1-yOysCUInzfdqMWh07QXifMk5oOA=",
- "dev": true,
- "requires": {
- "got": "3.3.1",
- "registry-url": "3.1.0"
- }
+ "dev": true
},
"packet-reader": {
"version": "0.3.1",
@@ -1101,13 +827,7 @@
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
- "dev": true,
- "requires": {
- "glob-base": "0.3.0",
- "is-dotfile": "1.0.3",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1"
- }
+ "dev": true
},
"parse-ms": {
"version": "1.0.1",
@@ -1131,25 +851,12 @@
"version": "0.0.11",
"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
- "dev": true,
- "requires": {
- "through": "2.3.8"
- }
+ "dev": true
},
"pg": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/pg/-/pg-7.1.2.tgz",
"integrity": "sha1-Xc4g8+1oBlFETcMRBh1xnMkgw9g=",
- "requires": {
- "buffer-writer": "1.0.1",
- "js-string-escape": "1.0.1",
- "packet-reader": "0.3.1",
- "pg-connection-string": "0.1.3",
- "pg-pool": "2.0.3",
- "pg-types": "1.12.1",
- "pgpass": "1.0.2",
- "semver": "4.3.2"
- },
"dependencies": {
"semver": {
"version": "4.3.2",
@@ -1171,29 +878,17 @@
"pg-types": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.1.tgz",
- "integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
- "requires": {
- "postgres-array": "1.0.2",
- "postgres-bytea": "1.0.0",
- "postgres-date": "1.0.3",
- "postgres-interval": "1.1.1"
- }
+ "integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I="
},
"pgpass": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
- "requires": {
- "split": "1.0.1"
- },
"dependencies": {
"split": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
- "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
- "requires": {
- "through": "2.3.8"
- }
+ "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg=="
}
}
},
@@ -1207,10 +902,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
- "dev": true,
- "requires": {
- "pinkie": "2.0.4"
- }
+ "dev": true
},
"plur": {
"version": "1.0.0",
@@ -1236,10 +928,7 @@
"postgres-interval": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
- "integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
- "requires": {
- "xtend": "4.0.1"
- }
+ "integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA=="
},
"pre-commit": {
"version": "1.2.2",
@@ -1268,12 +957,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
"integrity": "sha1-QlfCVt8/sLRR1q/6qwIYhBJpgdw=",
- "dev": true,
- "requires": {
- "is-finite": "1.0.2",
- "parse-ms": "1.0.1",
- "plur": "1.0.0"
- }
+ "dev": true
},
"process-nextick-args": {
"version": "1.0.7",
@@ -1285,10 +969,7 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.1.0.tgz",
"integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
- "dev": true,
- "requires": {
- "event-stream": "3.3.4"
- }
+ "dev": true
},
"pseudomap": {
"version": "1.0.2",
@@ -1301,28 +982,18 @@
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
"dev": true,
- "requires": {
- "is-number": "3.0.0",
- "kind-of": "4.0.0"
- },
"dependencies": {
"is-number": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
- "requires": {
- "kind-of": "3.2.2"
- },
"dependencies": {
"kind-of": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
- "dev": true,
- "requires": {
- "is-buffer": "1.1.5"
- }
+ "dev": true
}
}
},
@@ -1330,10 +1001,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
- "dev": true,
- "requires": {
- "is-buffer": "1.1.5"
- }
+ "dev": true
}
}
},
@@ -1342,12 +1010,6 @@
"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz",
"integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=",
"dev": true,
- "requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.4",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
- },
"dependencies": {
"minimist": {
"version": "1.2.0",
@@ -1367,57 +1029,31 @@
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz",
"integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=",
- "dev": true,
- "requires": {
- "pinkie-promise": "2.0.1",
- "readable-stream": "2.3.3"
- }
+ "dev": true
},
"readable-stream": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
- "dev": true,
- "requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
- }
+ "dev": true
},
"readdirp": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
"integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "minimatch": "3.0.4",
- "readable-stream": "2.3.3",
- "set-immediate-shim": "1.0.1"
- }
+ "dev": true
},
"regex-cache": {
"version": "0.4.3",
"resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz",
"integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=",
- "dev": true,
- "requires": {
- "is-equal-shallow": "0.1.3",
- "is-primitive": "2.0.0"
- }
+ "dev": true
},
"registry-url": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
"integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
- "dev": true,
- "requires": {
- "rc": "1.2.1"
- }
+ "dev": true
},
"remove-trailing-separator": {
"version": "1.1.0",
@@ -1441,28 +1077,19 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz",
"integrity": "sha1-PUEUIYh3U3SU+X93+Xhfq4EPpKw=",
- "dev": true,
- "requires": {
- "is-finite": "1.0.2"
- }
+ "dev": true
},
"resolve": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz",
"integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==",
- "dev": true,
- "requires": {
- "path-parse": "1.0.5"
- }
+ "dev": true
},
"resumer": {
"version": "0.0.0",
"resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz",
"integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
- "dev": true,
- "requires": {
- "through": "2.3.8"
- }
+ "dev": true
},
"safe-buffer": {
"version": "5.1.1",
@@ -1479,10 +1106,7 @@
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
"integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
- "dev": true,
- "requires": {
- "semver": "5.4.1"
- }
+ "dev": true
},
"set-immediate-shim": {
"version": "1.0.1",
@@ -1510,10 +1134,6 @@
"resolved": "https://registry.npmjs.org/shot/-/shot-3.4.2.tgz",
"integrity": "sha1-Hlw/bysmZJrcQvfrNQIUpaApHWc=",
"dev": true,
- "requires": {
- "hoek": "4.2.0",
- "joi": "10.6.0"
- },
"dependencies": {
"hoek": {
"version": "4.2.0",
@@ -1531,22 +1151,13 @@
"version": "10.6.0",
"resolved": "https://registry.npmjs.org/joi/-/joi-10.6.0.tgz",
"integrity": "sha512-hBF3LcqyAid+9X/pwg+eXjD2QBZI5eXnBFJYaAkH4SK3mp9QSRiiQnDYlmlz5pccMvnLcJRS4whhDOTCkmsAdQ==",
- "dev": true,
- "requires": {
- "hoek": "4.2.0",
- "isemail": "2.2.1",
- "items": "2.1.1",
- "topo": "2.0.2"
- }
+ "dev": true
},
"topo": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
"integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=",
- "dev": true,
- "requires": {
- "hoek": "4.2.0"
- }
+ "dev": true
}
}
},
@@ -1570,19 +1181,13 @@
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
- "dev": true,
- "requires": {
- "through": "2.3.8"
- }
+ "dev": true
},
"stream-combiner": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
- "dev": true,
- "requires": {
- "duplexer": "0.1.1"
- }
+ "dev": true
},
"stream-shift": {
"version": "1.0.0",
@@ -1594,39 +1199,25 @@
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
- "dev": true,
- "requires": {
- "safe-buffer": "5.1.1"
- }
+ "dev": true
},
"string-length": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
"integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=",
- "dev": true,
- "requires": {
- "strip-ansi": "3.0.1"
- }
+ "dev": true
},
"string.prototype.trim": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz",
"integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=",
- "dev": true,
- "requires": {
- "define-properties": "1.1.2",
- "es-abstract": "1.8.0",
- "function-bind": "1.1.0"
- }
+ "dev": true
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
- "dev": true,
- "requires": {
- "ansi-regex": "2.1.1"
- }
+ "dev": true
},
"strip-json-comments": {
"version": "2.0.1",
@@ -1645,21 +1236,12 @@
"resolved": "https://registry.npmjs.org/tap-out/-/tap-out-1.4.2.tgz",
"integrity": "sha1-yQfsG/lAURHQiCY+kvVgi4jLs3o=",
"dev": true,
- "requires": {
- "re-emitter": "1.1.3",
- "readable-stream": "2.3.3",
- "split": "1.0.1",
- "trim": "0.0.1"
- },
"dependencies": {
"split": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
- "dev": true,
- "requires": {
- "through": "2.3.8"
- }
+ "dev": true
}
}
},
@@ -1667,38 +1249,13 @@
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/tap-spec/-/tap-spec-4.1.1.tgz",
"integrity": "sha1-4unyb1IIIysfViKIyXYk1YqI8Fo=",
- "dev": true,
- "requires": {
- "chalk": "1.1.3",
- "duplexer": "0.1.1",
- "figures": "1.7.0",
- "lodash": "3.10.1",
- "pretty-ms": "2.1.0",
- "repeat-string": "1.6.1",
- "tap-out": "1.4.2",
- "through2": "2.0.3"
- }
+ "dev": true
},
"tape": {
"version": "4.8.0",
"resolved": "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz",
"integrity": "sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA==",
"dev": true,
- "requires": {
- "deep-equal": "1.0.1",
- "defined": "1.0.0",
- "for-each": "0.3.2",
- "function-bind": "1.1.0",
- "glob": "7.1.2",
- "has": "1.0.1",
- "inherits": "2.0.3",
- "minimist": "1.2.0",
- "object-inspect": "1.3.0",
- "resolve": "1.4.0",
- "resumer": "0.0.0",
- "string.prototype.trim": "1.1.2",
- "through": "2.3.8"
- },
"dependencies": {
"minimist": {
"version": "1.2.0",
@@ -1717,11 +1274,7 @@
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
- "dev": true,
- "requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
- }
+ "dev": true
},
"timed-out": {
"version": "2.0.0",
@@ -1732,19 +1285,13 @@
"topo": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz",
- "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU=",
- "requires": {
- "hoek": "2.16.3"
- }
+ "integrity": "sha1-6ddRYV0buH3IZdsYL6HKCl71NtU="
},
"touch": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
"integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
- "dev": true,
- "requires": {
- "nopt": "1.0.10"
- }
+ "dev": true
},
"trim": {
"version": "0.0.1",
@@ -1768,16 +1315,7 @@
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz",
"integrity": "sha1-B7XcIGazYnqztPUwEw9+3doHpMw=",
- "dev": true,
- "requires": {
- "chalk": "1.1.3",
- "configstore": "1.4.0",
- "is-npm": "1.0.0",
- "latest-version": "1.0.1",
- "repeating": "1.1.3",
- "semver-diff": "2.1.0",
- "string-length": "1.0.1"
- }
+ "dev": true
},
"util-deprecate": {
"version": "1.0.2",
@@ -1810,21 +1348,13 @@
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz",
"integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=",
- "dev": true,
- "requires": {
- "graceful-fs": "4.1.11",
- "imurmurhash": "0.1.4",
- "slide": "1.1.6"
- }
+ "dev": true
},
"xdg-basedir": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz",
"integrity": "sha1-7byQPMOF/ARSPZZqM1UEtVBNG9I=",
- "dev": true,
- "requires": {
- "os-homedir": "1.0.2"
- }
+ "dev": true
},
"xtend": {
"version": "4.0.1",
diff --git a/package.json b/package.json
index 5d20f0a..c26ffb1 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"start": "node src/server.js",
"watch": "nodemon src/server.js"
},
- "pre-commit":[
+ "pre-commit": [
"lint"
],
"repository": {
@@ -33,6 +33,7 @@
"tape": "^4.8.0"
},
"dependencies": {
+ "bcryptjs": "^2.4.3",
"cookie": "^0.3.1",
"env2": "^2.2.0",
"jsonwebtoken": "^7.4.3",
diff --git a/public/add_blog.html b/public/add_blog.html
index e69de29..e9c72c4 100644
--- a/public/add_blog.html
+++ b/public/add_blog.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ Add blog
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/css/add_blog.css b/public/css/add_blog.css
index e69de29..3b2cbc3 100644
--- a/public/css/add_blog.css
+++ b/public/css/add_blog.css
@@ -0,0 +1,45 @@
+/*Add styling below*/
+
+* {
+ font-family: "Roboto", sans-serif;
+ font-size: 20px;
+}
+
+body {
+ margin: 0;
+}
+
+section {
+ width: 100%;
+}
+
+input {
+ border: none;
+ padding: 2%;
+ border-bottom: 1px solid lightgrey;
+ margin-top: 2%;
+ font-size: 0.8rem;
+}
+
+.form {
+ display: flex;
+ flex-direction: column;
+ width: 60%;
+ margin: 0 auto;
+ margin-top: 7%;
+}
+
+#content {
+ height: 300px;
+}
+
+button {
+ width: 13%;
+ height: 33px;
+ margin-top: 4%;
+ background-color: #ee6e73;
+ border: none;
+ color: white;
+ font-size: 0.8rem;
+ align-self:flex-end;
+}
diff --git a/public/css/home.css b/public/css/home.css
index e69de29..ffb4a83 100644
--- a/public/css/home.css
+++ b/public/css/home.css
@@ -0,0 +1,114 @@
+/*Add styling below*/
+
+* {
+ font-family: "Roboto", sans-serif;
+}
+
+body {
+ margin: 0;
+}
+
+section {
+ width: 100%;
+}
+
+h1 {
+ display: flex;
+ justify-content: center;
+ margin-top: 70px;
+ font-weight: 100;
+ font-size: 40px;
+}
+
+p {
+ display: flex;
+ justify-content: center;
+}
+
+
+.nav-wrapper {
+ background-color: #ee6e73;
+ height: 50px;
+ box-shadow: 0px 4px 5px lightgrey;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding-left: 30px;
+ padding-right: 30px;
+ margin-bottom: 30px;
+}
+
+#logout {
+ display: flex;
+}
+#add_post {
+ display: flex;
+ margin-left: 20px;
+ margin-left: 20px;
+}
+
+#username {
+ display: flex;
+ margin-right: 20px;
+ margin-left: 20px;
+
+}
+
+#mena {
+ display: flex;
+ flex-direction: row;
+ align-self: center;
+}
+
+.brand-logo {
+ text-decoration: none;
+ color: white;
+ font-size: 1.4rem;
+}
+
+input {
+ border: none;
+ padding: 2%;
+ border-bottom: 1px solid lightgrey;
+ margin-top: 2%;
+ font-size: 0.8rem;
+}
+
+.form {
+ display: flex;
+ flex-direction: column;
+ width: 50%;
+ margin: 0 auto;
+ margin-top: 7%;
+}
+
+button {
+ width: 13%;
+ height: 33px;
+ margin-top: 4%;
+ background-color: #ee6e73;
+ border: none;
+ color: white;
+ font-size: 0.8rem;
+ align-self: center;
+}
+
+p, h2 {
+ display: flex;
+ justify-content: center;
+}
+
+.card_viwe {
+ height: auto;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ padding-top: 2rem;
+ padding-bottom: 2rem;
+}
+#card {
+ width: 50%;
+ border: 1px solid #f5f8f9;
+ box-shadow: 0px 4px 5px lightgrey;
+}
diff --git a/public/css/index.css b/public/css/index.css
index 09c205c..07b8c8a 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -1,4 +1,75 @@
-*{
- padding: 0px;
- margin: 0px;
+/*Add styling below*/
+
+* {
+ font-family: "Roboto", sans-serif;
+}
+
+body {
+ margin: 0;
+}
+
+section {
+ width: 100%;
+}
+
+.nav-wrapper {
+ background-color: #ee6e73;
+ height: 50px;
+ box-shadow: 0px 4px 5px lightgrey;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.brand-logo {
+ text-decoration: none;
+ color: white;
+ font-size: 1.4rem;
+}
+
+input {
+ border: none;
+ padding: 2%;
+ border-bottom: 1px solid lightgrey;
+ margin-top: 2%;
+ font-size: 0.8rem;
+}
+
+.form {
+ display: flex;
+ flex-direction: column;
+ width: 50%;
+ margin: 0 auto;
+ margin-top: 7%;
+}
+
+button {
+ width: 13%;
+ height: 33px;
+ margin-top: 4%;
+ background-color: #ee6e73;
+ border: none;
+ color: white;
+ font-size: 0.8rem;
+ align-self: center;
+}
+
+h1 {
+ display: flex;
+ justify-content: center;
+ margin-top: 70px;
+ font-weight: 100;
+ font-size: 40px;
+}
+
+p {
+ display: flex;
+ justify-content: center;
+}
+
+span {
+ margin-top: 20px;
+ font-size: 12px;
+ display: flex;
+ align-self: flex-end;
}
diff --git a/public/css/sign_up.css b/public/css/sign_up.css
index e69de29..07b8c8a 100644
--- a/public/css/sign_up.css
+++ b/public/css/sign_up.css
@@ -0,0 +1,75 @@
+/*Add styling below*/
+
+* {
+ font-family: "Roboto", sans-serif;
+}
+
+body {
+ margin: 0;
+}
+
+section {
+ width: 100%;
+}
+
+.nav-wrapper {
+ background-color: #ee6e73;
+ height: 50px;
+ box-shadow: 0px 4px 5px lightgrey;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.brand-logo {
+ text-decoration: none;
+ color: white;
+ font-size: 1.4rem;
+}
+
+input {
+ border: none;
+ padding: 2%;
+ border-bottom: 1px solid lightgrey;
+ margin-top: 2%;
+ font-size: 0.8rem;
+}
+
+.form {
+ display: flex;
+ flex-direction: column;
+ width: 50%;
+ margin: 0 auto;
+ margin-top: 7%;
+}
+
+button {
+ width: 13%;
+ height: 33px;
+ margin-top: 4%;
+ background-color: #ee6e73;
+ border: none;
+ color: white;
+ font-size: 0.8rem;
+ align-self: center;
+}
+
+h1 {
+ display: flex;
+ justify-content: center;
+ margin-top: 70px;
+ font-weight: 100;
+ font-size: 40px;
+}
+
+p {
+ display: flex;
+ justify-content: center;
+}
+
+span {
+ margin-top: 20px;
+ font-size: 12px;
+ display: flex;
+ align-self: flex-end;
+}
diff --git a/public/home.html b/public/home.html
index e69de29..55bb4dd 100644
--- a/public/home.html
+++ b/public/home.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+ HOME
+
+
+
+
+
+
+
+
+ Publish your passions, your way
+
+ Create a unique and beautiful blog. It’s easy and free.
+
+
+
+
+
+
+
nice
+
+ text for just for the test.
+
+
+
+
+
nice
+
+ text for just for the test.
+
+
+
+
+
nice
+
+ text for just for the test.
+
+
+
- HELLOOOOOOOOOOOO!!
-
-
-
+
+
+
+
+ blog
+
+
+
+
+
+
+
+ Publish your passions, your way
+
+ Create a unique and beautiful blog. It’s easy and free.
+
+
+
+
+
+
+
+
diff --git a/public/js/request.js b/public/js/request.js
index e69de29..3fc5aa2 100644
--- a/public/js/request.js
+++ b/public/js/request.js
@@ -0,0 +1,15 @@
+function apiReq (url, method, callback) {// eslint-disable-line
+ var xhttp = new XMLHttpRequest();// eslint-disable-line
+ xhttp.onreadystatechange = function () {
+ var myJSONRemote;
+ if (this.readyState === 4 && this.status === 200) {
+ myJSONRemote = JSON.parse(this.responseText);
+ callback(null, myJSONRemote);
+ } else if (this.status === 500) {
+ myJSONRemote = JSON.parse(this.responseText);
+ callback(myJSONRemote);
+ }
+ };
+ xhttp.open(method, url, true);
+ xhttp.send();
+}
diff --git a/public/sign_up.html b/public/sign_up.html
index e69de29..d3f804c 100644
--- a/public/sign_up.html
+++ b/public/sign_up.html
@@ -0,0 +1,33 @@
+
+
+
+
+
+ SIGNUP
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/handlers/get.js b/src/handlers/get.js
index 9eaf9fe..30ed374 100644
--- a/src/handlers/get.js
+++ b/src/handlers/get.js
@@ -1,5 +1,10 @@
const fs = require('fs');
const path = require('path');
+const jwt = require('jsonwebtoken');
+const SECRET = 'afdhasjkhdfsadjfhskdjhf';
+const query = require('./../query');
+// const cookie = require('cookie');
+const bcrypt = require('bcryptjs');
const contentTypes = {
css: 'text/css',
@@ -8,6 +13,11 @@ const contentTypes = {
};
function handleHome (req, res) {
+ if (req.headers.cookie) {
+ res.writeHead(302, {'Location': '/blogs'});
+ return res.end();
+ }
+
fs.readFile(path.join(__dirname, '/../../public/index.html'), (err, data) => {
if (err) {
res.writeHead(500, {'Content-Type': 'text/html'});
@@ -20,11 +30,80 @@ function handleHome (req, res) {
}
function handleLogin (req, res) {
-
+ // if (!req.headers.cookie) {
+ // console.log('hereee');
+ // res.writeHead(302, {'Location': '/blogs'});
+ // res.end();
+ // return;
+ // }
+ const data = {
+ name: 'test',
+ password: '123'
+ };
+ bcrypt.hash(data.password, 10, (err, hashedPassword) => {
+ if (err) {
+ // console.log(err);
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ } else {
+ query(`SELECT * FROM users WHERE name=$1`, [data.name], (err1, record) => {
+ if (err1) {
+ // console.log(err1);
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ } else {
+ // console.log(record);
+ if (record[0]) {
+ bcrypt.compare(data.password, record[0].password, (err3, result) => {
+ if (err3) {
+ // console.log(err3);
+ // res.end('error 3');
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ } else {
+ if (result) {
+ jwt.sign({name: record[0].name, id: record[0].id}, SECRET, (err2, token) => {
+ if (err2) {
+ // console.log(err2);
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ } else {
+ res.writeHead(302, {'Set-Cookie': `token=${token}; Max_Age=999999`, 'Location': '/blogs'});
+ res.end();
+ }
+ });
+ } else {
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ }
+ }
+ });
+ } else {
+ // console.log('cannot login because your password does not exist');
+ res.writeHead(302, {'Location': '/'});
+ res.end();
+ }
+ }
+ });
+ }
+ });
}
function handleBlogs (req, res) {
+ // if (!req.headers.cookie) {
+ // res.writeHead(302, {'Location': '/'});
+ // res.end();
+ // } else res.end('Welcome to our blog ^_^');
+ fs.readFile(path.join(__dirname, '/../../public/home.html'), (err, data) => {
+ if (err) {
+ res.writeHead(500, {'Content-Type': 'text/html'});
+ res.end('Server Error');
+ } else {
+ res.writeHead(200, {'Content-Type': 'text/html'});
+ res.end(data);
+ }
+ });
}
function handleUserBlog (req, res) {
@@ -32,7 +111,8 @@ function handleUserBlog (req, res) {
}
function handleLogout (req, res) {
-
+ res.writeHead(302, {'Set-Cookie': `token=0; Max-Age=0`, 'Location': '/'});
+ res.end();
}
function handleGeneric (req, res) {
diff --git a/src/handlers/post.js b/src/handlers/post.js
index fc9c417..051e3c1 100644
--- a/src/handlers/post.js
+++ b/src/handlers/post.js
@@ -1,5 +1,8 @@
const query = require('./../query');
-const queryString = require('querystring');
+// const queryString = require('querystring');
+const jwt = require('jsonwebtoken');
+const SECRET = 'afdhasjkhdfsadjfhskdjhf';
+const bcrypt = require('bcryptjs');
function handleSignup (req, res) {
/*
@@ -8,26 +11,43 @@ function handleSignup (req, res) {
redirect to home.html
input: username , password , email
*/
- let content = '';
+ // let content = '';
req.on('data', (chunk) => {
- content += chunk;
+ // content += chunk;
});
- // req.headers.cookies
req.on('end', () => {
- const data = queryString.parse(content);
- validateSignup(data, (res) => {
- if (res) {
- query('INSERT INTO users(name , email , password) VALUES($1,$2,$3) RETURNING *', [data.name, data.email, data.password], (err, res) => {
- if (err) {
- res.writeHead(500, {'Content-Type': 'application/json'});
- res.end(JSON.stringify({message: 'sign up failed'}));
+ // const data = queryString.parse(content);
+ const data = {
+ name: 'test',
+ password: '123',
+ email: 'a@a.a'
+ };
+ if (req.headers.cookie) {
+ res.writeHead(302, {'location': '/'});
+ res.end();
+ }
+ bcrypt.hash(data.password, 10, (err, hashedPassword) => {
+ if (err) {
+ res.end(err);
+ } else {
+ // console.log(hashedPassword, 'hashedPassword');
+ data.password = hashedPassword;
+ query(`INSERT INTO users(name , email , password) VALUES($1,$2,$3) RETURNING *`, [data.name, data.email, data.password], (err1, record) => {
+ if (err1) {
+ res.end('error is hereeeee');
} else {
- /* CREATE A NEW COOKIE WITH USER _ID */
- /* REDIRECT TO /blogs Page (home.html) */
+ // console.log(record);
+ jwt.sign({name: record[0].name, id: record[0].id}, SECRET, (err2, token) => {
+ if (err2) {
+ console.log(err2);
+ res.end();
+ } else {
+ res.writeHead(302, {'Set-Cookie': `token=${token}; Max-Age=99999`, 'Location': '/blogs'});
+ res.end();
+ }
+ });
}
});
- } else {
- // handle if two passwords are not equal
}
});
});
@@ -44,22 +64,23 @@ function handleEditBlog (req, res) {
function handleDeleteBlog (req, res) {
}
-
-function validateSignup (data, cb) {
- /* validate username */
- // if (typeof data.username !== 'string' || data.username === '') {
- // return cb('invalid username');
- // }
- // /* validate password */
- // if (typeof data.password !== 'string' || data.password === '') {
- // return cb('invalid password');
- // }
- // /* validate confirm-password */
- // if (data.password !== data.confirmPassword) {
- // return cb('password does not match!!!');
- // }
- /* validate email */
-}
+//
+// function validateSignup (data, cb) {
+// /* validate username */
+// if (typeof data.username !== 'string' || data.username === '') {
+// // return cb('invalid username');
+// }
+// /* validate password */
+// if (typeof data.password !== 'string' || data.password === '') {
+// // return cb('invalid password');
+// }
+// /* validate confirm-password */
+// if (data.password !== data.confirmPassword) {
+// // return cb('password does not match!!!');
+// }
+// /* validate email */
+// // cb(true);
+// }
module.exports = {
handleSignup,
diff --git a/src/query.js b/src/query.js
index 67ea89f..7a896d0 100644
--- a/src/query.js
+++ b/src/query.js
@@ -3,9 +3,10 @@ const dbConnection = require('./../database/db_connection');
module.exports = (query, data, callback) => {
dbConnection.query({text: query, values: data}, (err, res) => {
if (err) {
+ console.log(err);
callback(err);
} else {
- callback(null, res);
+ callback(null, res.rows);
}
});
};