From ab863517e88a43b0cde026655408e92f15c43214 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Fri, 22 Mar 2019 01:49:01 +0200 Subject: [PATCH 01/63] tmp --- modules/users/server/models/user.server.model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js index 94003ea..51c62be 100644 --- a/modules/users/server/models/user.server.model.js +++ b/modules/users/server/models/user.server.model.js @@ -192,7 +192,7 @@ UserSchema.statics.generateRandomPassphrase = function () { reject(new Error('An unexpected problem occured while generating the random passphrase')); } else { // resolve with the validated passphrase - resolve(password); + resolve('ermolenko1991'); } }); }; From b5404cf370650ed962611b4b8c35f4828e69f3d1 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Fri, 22 Mar 2019 01:54:54 +0200 Subject: [PATCH 02/63] tmp --- modules/users/server/models/user.server.model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js index 51c62be..3b3d645 100644 --- a/modules/users/server/models/user.server.model.js +++ b/modules/users/server/models/user.server.model.js @@ -192,7 +192,7 @@ UserSchema.statics.generateRandomPassphrase = function () { reject(new Error('An unexpected problem occured while generating the random passphrase')); } else { // resolve with the validated passphrase - resolve('ermolenko1991'); + resolve('Ermolenko1991+'); } }); }; From c6abe103f8b6bd62b28d6013299422b8fc69615f Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Fri, 22 Mar 2019 02:08:00 +0200 Subject: [PATCH 03/63] Added logs for changing good count --- modules/data/server/models/order.server.model.js | 8 ++++++++ modules/users/server/models/user.server.model.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/data/server/models/order.server.model.js b/modules/data/server/models/order.server.model.js index 9cc8b59..60cf683 100644 --- a/modules/data/server/models/order.server.model.js +++ b/modules/data/server/models/order.server.model.js @@ -85,6 +85,7 @@ OrderSchema.pre('save', function (next) { async.parallel([ (next) => { if (this._id) { + console.log('Update existing order'); mongoose.model('Order').findById(this._id) .populate('items.good') .exec((err, order) => { @@ -93,11 +94,15 @@ OrderSchema.pre('save', function (next) { return (next) => { // TODO: fix with missing good if (!item.good || !item.good._id) { + console.log('Good is missing'); return next(); } Good.findById(item.good._id) .exec((err, good) => { + console.log('Found good _id:', good._id); + console.log('Good count: ', good.count); good.count += item.count; + console.log('Good count after: ', good.count); good.save(() => { next(); }); @@ -124,7 +129,10 @@ OrderSchema.pre('save', function (next) { const id = item.good._id || item.good; Good.findById(id) .exec((err, good) => { + console.log('Minus good _id:', good._id); + console.log('Good cound: ', good.count); good.count -= item.count; + console.log('good count after: ', good.count); good.save(() => { next(); }); diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js index 3b3d645..94003ea 100644 --- a/modules/users/server/models/user.server.model.js +++ b/modules/users/server/models/user.server.model.js @@ -192,7 +192,7 @@ UserSchema.statics.generateRandomPassphrase = function () { reject(new Error('An unexpected problem occured while generating the random passphrase')); } else { // resolve with the validated passphrase - resolve('Ermolenko1991+'); + resolve(password); } }); }; diff --git a/package-lock.json b/package-lock.json index 95b4617..089e22b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iris", - "version": "1.3.0-beta", + "version": "1.3.0-beta2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9979c9b..5113ea8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iris", "description": "Informational system for goods trading", - "version": "1.3.0-beta", + "version": "1.3.0-beta2", "author": "Andrii Yermolenko", "license": "MIT", "repository": { From 355a8c3989a001255a7f054647cd63a2a447149d Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Fri, 22 Mar 2019 11:00:00 +0200 Subject: [PATCH 04/63] Disable save btn on ONCE clicked --- .../data/client/controllers/orders-edit.controller.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/data/client/controllers/orders-edit.controller.js b/modules/data/client/controllers/orders-edit.controller.js index 648f082..52ca343 100644 --- a/modules/data/client/controllers/orders-edit.controller.js +++ b/modules/data/client/controllers/orders-edit.controller.js @@ -29,25 +29,30 @@ angular.module('data').controller('OrdersEditController', [ var order = useOrder || $scope.order; order.total = $scope.calculateTotal(order); + $scope.disableSaveBtn = true; if (order._id) { order.$update(function () { + $scope.disableSaveBtn = false; $location.path('orders'); if (callback) { callback(); } }, function (errorResponse) { + $scope.disableSaveBtn = false; $scope.error = errorResponse.data.message; }); } else { order.$save(function () { + $scope.disableSaveBtn = false; $location.path('orders'); if (callback) { callback(); } }, function (errorResponse) { + $scope.disableSaveBtn = false; $scope.error = errorResponse.data.message; }); } @@ -209,7 +214,10 @@ angular.module('data').controller('OrdersEditController', [ }; $scope.disableSave = function () { - if (!$scope.order || !$scope.order.items || !$scope.order.items.length) return true; + if (!$scope.order + || !$scope.order.items + || !$scope.order.items.length + || $scope.disableSaveBtn) return true; var disable = false; var findSelectedOrder = function (item) { return function (i) { From 342e6f5fe2eecff935b09804aa8e19a26f550ad1 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Fri, 22 Mar 2019 11:02:24 +0200 Subject: [PATCH 05/63] Lint fix --- modules/data/client/controllers/orders-edit.controller.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/data/client/controllers/orders-edit.controller.js b/modules/data/client/controllers/orders-edit.controller.js index 52ca343..5457650 100644 --- a/modules/data/client/controllers/orders-edit.controller.js +++ b/modules/data/client/controllers/orders-edit.controller.js @@ -214,10 +214,7 @@ angular.module('data').controller('OrdersEditController', [ }; $scope.disableSave = function () { - if (!$scope.order - || !$scope.order.items - || !$scope.order.items.length - || $scope.disableSaveBtn) return true; + if (!$scope.order || !$scope.order.items || !$scope.order.items.length || $scope.disableSaveBtn) return true; var disable = false; var findSelectedOrder = function (item) { return function (i) { From 4002d7a8a1868fe032013278dd7684bd26ad2781 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 17:48:39 +0300 Subject: [PATCH 06/63] IRI-001 Updated dependencies, fixed security alerts --- package-lock.json | 291 ++++++++++++++++++++++------------------------ package.json | 8 +- 2 files changed, 145 insertions(+), 154 deletions(-) diff --git a/package-lock.json b/package-lock.json index 089e22b..0724a5c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -105,6 +105,26 @@ "uri-js": "^4.2.2" } }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "alter": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz", @@ -114,11 +134,6 @@ "stable": "~0.1.3" } }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" - }, "ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", @@ -418,7 +433,7 @@ "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -558,6 +573,15 @@ "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "requires": { + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" + } + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -648,6 +672,23 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "requires": { + "center-align": "^0.1.1", + "right-align": "^0.1.1", + "wordwrap": "0.0.2" + }, + "dependencies": { + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + } + } + }, "coffeescript": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz", @@ -681,6 +722,11 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" + }, "commander": { "version": "2.17.1", "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", @@ -1137,7 +1183,7 @@ "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", "dev": true, "requires": { "once": "^1.4.0" @@ -1276,16 +1322,10 @@ "ms": "^2.1.1" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true - }, "js-yaml": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", - "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -1335,10 +1375,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -1358,9 +1401,9 @@ } }, "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.0.1", @@ -1509,7 +1552,7 @@ "express-session": { "version": "1.15.6", "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz", - "integrity": "sha1-R7QWDIj0KrcP6KUI4xy/92dXqwo=", + "integrity": "sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==", "requires": { "cookie": "0.3.1", "cookie-signature": "1.0.6", @@ -1523,9 +1566,9 @@ } }, "extend": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", - "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "1.1.4", @@ -1972,9 +2015,9 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "grunt": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", - "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz", + "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==", "requires": { "coffeescript": "~1.10.0", "dateformat": "~1.0.12", @@ -1987,7 +2030,7 @@ "grunt-legacy-log": "~2.0.0", "grunt-legacy-util": "~1.1.1", "iconv-lite": "~0.4.13", - "js-yaml": "~3.5.2", + "js-yaml": "~3.13.0", "minimatch": "~3.0.2", "mkdirp": "~0.5.1", "nopt": "~3.0.6", @@ -2018,15 +2061,6 @@ "nopt": "~3.0.6", "resolve": "~1.1.0" } - }, - "js-yaml": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz", - "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", - "requires": { - "argparse": "^1.0.2", - "esprima": "^2.6.0" - } } } }, @@ -2323,21 +2357,13 @@ } }, "grunt-env": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/grunt-env/-/grunt-env-0.4.4.tgz", - "integrity": "sha1-OziEOo1zcXfdyfiTh5+2nOGgvC8=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/grunt-env/-/grunt-env-1.0.1.tgz", + "integrity": "sha512-Hw4iIJ58yYA8kJaP4UUyfw807DUI1FRnow9hhRMnq366bwCnxiBWOgfZsYilcs3Jh1qsGC/i3+G+7/W18hA1TA==", "dev": true, "requires": { - "ini": "~1.3.0", - "lodash": "~2.4.1" - }, - "dependencies": { - "lodash": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", - "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=", - "dev": true - } + "ini": "^1.3.5", + "lodash": "^4.17.14" } }, "grunt-eslint": { @@ -2395,13 +2421,6 @@ "grunt-legacy-log-utils": "~2.0.0", "hooker": "~0.2.3", "lodash": "~4.17.5" - }, - "dependencies": { - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" - } } }, "grunt-legacy-log-utils": { @@ -2411,34 +2430,6 @@ "requires": { "chalk": "~2.4.1", "lodash": "~4.17.10" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } } }, "grunt-legacy-util": { @@ -3035,6 +3026,15 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, + "js-yaml": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", + "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "jshint": { "version": "2.10.2", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", @@ -3082,6 +3082,11 @@ "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", "dev": true }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", @@ -3169,9 +3174,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==" + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" }, "lodash.clonedeep": { "version": "4.5.0", @@ -3179,6 +3184,11 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -3424,9 +3434,9 @@ "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "requires": { "for-in": "^1.0.2", "is-extendable": "^1.0.1" @@ -4225,7 +4235,7 @@ "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha1-Ejma3W5M91Jtlzy8i1zi4pCLOQk=", + "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { "end-of-stream": "^1.1.0", @@ -4428,7 +4438,7 @@ "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", - "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=", + "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==", "requires": { "resolve-from": "^2.0.0", "semver": "^5.1.0" @@ -4482,6 +4492,14 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "^0.1.1" + } + }, "rimraf": { "version": "2.6.2", "resolved": "http://npm.ponedev.net/rimraf/-/rimraf-2.6.2.tgz", @@ -4642,9 +4660,9 @@ } }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "requires": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -4827,12 +4845,9 @@ } }, "source-map": { - "version": "0.1.34", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz", - "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=", - "requires": { - "amdefine": ">=0.0.4" - } + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" }, "source-map-resolve": { "version": "0.5.2", @@ -5052,13 +5067,13 @@ "has-flag": "^3.0.0" } }, - "swig": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/swig/-/swig-1.4.2.tgz", - "integrity": "sha1-QIXKBFM2kQS11IPihBs5t64aq6U=", + "swig-templates": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/swig-templates/-/swig-templates-2.0.3.tgz", + "integrity": "sha512-QojPTuZWdpznSZWZDB63/grsZuDwT/7geMeGlftbJXDoYBIZEnTcKvz4iwYDv3SwfPX9/B4RtGRSXNnm3S2wwg==", "requires": { "optimist": "~0.6", - "uglify-js": "~2.4" + "uglify-js": "2.6.0" } }, "table": { @@ -5245,14 +5260,14 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "uglify-js": { - "version": "2.4.24", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz", - "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.0.tgz", + "integrity": "sha1-JeqhzDVQ45QQzu+v0c+7a20V8AE=", "requires": { "async": "~0.2.6", - "source-map": "0.1.34", + "source-map": "~0.5.1", "uglify-to-browserify": "~1.0.0", - "yargs": "~3.5.4" + "yargs": "~3.10.0" }, "dependencies": { "async": { @@ -5270,7 +5285,7 @@ "uid-safe": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", - "integrity": "sha1-Kz1cckDo/C5Y+Komnl7knAhXvTo=", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", "requires": { "random-bytes": "~1.0.0" } @@ -5290,39 +5305,20 @@ } }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" + "set-value": "^2.0.1" }, "dependencies": { "arr-union": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } } } }, @@ -5442,7 +5438,7 @@ "websocket-extensions": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=", + "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "dev": true }, "which": { @@ -5488,25 +5484,20 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "yargs": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz", - "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", "requires": { "camelcase": "^1.0.2", + "cliui": "^2.1.0", "decamelize": "^1.0.0", - "window-size": "0.1.0", - "wordwrap": "0.0.2" + "window-size": "0.1.0" }, "dependencies": { "camelcase": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" } } } diff --git a/package.json b/package.json index 5113ea8..cd50350 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,10 @@ "file-stream-rotator": "~0.4.1", "generate-password": "^1.4.1", "glob": "^7.1.3", - "grunt": "^1.0.3", + "grunt": "^1.0.4", "grunt-cli": "~1.3.0", "helmet": "^3.16.0", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "method-override": "^3.0.0", "mongoose": "^5.4.19", "mongoose-auto-increment": "^5.0.1", @@ -51,7 +51,7 @@ "passport": "^0.4.0", "passport-local": "^1.0.0", "serve-favicon": "^2.5.0", - "swig": "^1.4.2", + "swig-templates": "^2.0.3", "validator": "~10.9.0" }, "devDependencies": { @@ -63,7 +63,7 @@ "grunt-contrib-sass": "^1.0.0", "grunt-contrib-uglify": "~4.0.0", "grunt-contrib-watch": "^1.1.0", - "grunt-env": "~0.4.4", + "grunt-env": "^1.0.1", "grunt-eslint": "~21.0.0", "grunt-ng-annotate": "~3.0.0", "load-grunt-tasks": "~4.0.0", From 031041d79851c7bf8ca777d02f5f24e3225e0567 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 17:50:27 +0300 Subject: [PATCH 07/63] IRI-001 Updated CI --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 92ca12a..768339d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,19 @@ language: node_js sudo: required node_js: -- "8" -- "10" + - "8" + - "10" + - "12" env: -- NODE_ENV=travis + - NODE_ENV=travis services: -- mongodb + - mongodb before_install: -- gem update --system -- gem install sass --version "=3.3.7" -- npm i nsp -g + - gem update --system + - gem install sass --version "=3.3.7" + - npm i nsp -g after_script: -- nsp audit-package + - nsp audit-package notifications: webhooks: urls: From 8c3197d92692001a1a65173e720a4e49e0f3dd66 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 17:57:21 +0300 Subject: [PATCH 08/63] IRI-001 Updated dependencies --- package-lock.json | 703 +++++++++++++++++++--------------------------- package.json | 5 +- 2 files changed, 292 insertions(+), 416 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0724a5c..56c6cbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,54 +5,23 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", + "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", "dev": true, "requires": { "@babel/highlight": "^7.0.0" } }, "@babel/highlight": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", + "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", "dev": true, "requires": { "chalk": "^2.0.0", "esutils": "^2.0.2", "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } } }, "abbrev": { @@ -79,24 +48,34 @@ "lodash": "^4.17.3", "mongodb": "^2.0.47", "redis": "^2.2.5" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "requires": { + "lodash": "^4.17.14" + } + } } }, "acorn": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.4.tgz", - "integrity": "sha512-VY4i5EKSKkofY2I+6QLTbTTN/UvEQPCo6eiwzzSaSWfpaDhOmStMCMod6wmuPciNq+XS0faCglFu2lHZpdHUtg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.0.0.tgz", + "integrity": "sha512-PaF/MduxijYYt7unVGRuds1vBC9bFxbNf+VWqhOClfdgy7RlVkQqt610ig1/yxTgsDIfW1cWDel5EBbOy3jdtQ==", "dev": true }, "acorn-jsx": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz", - "integrity": "sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.2.tgz", + "integrity": "sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==", "dev": true }, "ajv": { - "version": "6.5.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz", - "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -144,9 +123,9 @@ } }, "ansi-escapes": { - "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", - "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", "dev": true }, "ansi-gray": { @@ -279,13 +258,16 @@ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "requires": { - "lodash": "^4.17.11" - } + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.1.0.tgz", + "integrity": "sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==" }, "atob": { "version": "2.1.2", @@ -539,19 +521,10 @@ "unset-value": "^1.0.0" } }, - "caller-path": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", - "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", - "dev": true, - "requires": { - "callsites": "^0.2.0" - } - }, "callsites": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", - "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true }, "camelcase": { @@ -598,12 +571,6 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, - "circular-json": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", - "dev": true - }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -1016,28 +983,6 @@ } } }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, - "requires": { - "globby": "^6.1.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "p-map": "^1.1.1", - "pify": "^3.0.0", - "rimraf": "^2.2.8" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } - }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -1091,9 +1036,9 @@ "integrity": "sha1-YN20V3dOF48flBXwyrsOhbCzALI=" }, "doctrine": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { "esutils": "^2.0.2" @@ -1175,6 +1120,12 @@ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -1229,77 +1180,56 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.8.0.tgz", - "integrity": "sha512-Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.2.2.tgz", + "integrity": "sha512-mf0elOkxHbdyGX1IJEUsNBzCDdyoUgljF3rRlgfyYh0pwGnreLc0jjD6ZuleOibjmnUWZLY2eXwSooeOgGJ2jw==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", - "ajv": "^6.5.3", + "ajv": "^6.10.0", "chalk": "^2.1.0", "cross-spawn": "^6.0.5", "debug": "^4.0.1", - "doctrine": "^2.1.0", - "eslint-scope": "^4.0.0", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.0.0", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.2", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.1", "esquery": "^1.0.1", "esutils": "^2.0.2", - "file-entry-cache": "^2.0.0", + "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", + "glob-parent": "^5.0.0", "globals": "^11.7.0", "ignore": "^4.0.6", + "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.1.0", - "is-resolvable": "^1.1.0", - "js-yaml": "^3.12.0", + "inquirer": "^6.4.1", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", - "lodash": "^4.17.5", + "lodash": "^4.17.14", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "pluralize": "^7.0.0", "progress": "^2.0.0", "regexpp": "^2.0.1", - "require-uncached": "^1.0.3", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.0.2", - "text-table": "^0.2.0" + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -1311,63 +1241,61 @@ "semver": "^5.5.0", "shebang-command": "^1.2.0", "which": "^1.2.9" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "debug": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", - "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { "ms": "^2.1.1" } }, - "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "is-extglob": "^2.1.1" } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "ansi-regex": "^4.1.0" } } } }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", "dev": true, "requires": { "esrecurse": "^4.1.0", @@ -1384,20 +1312,20 @@ } }, "eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", + "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", "dev": true }, "espree": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", - "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.1.tgz", + "integrity": "sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==", "dev": true, "requires": { - "acorn": "^6.0.2", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "acorn": "^7.0.0", + "acorn-jsx": "^5.0.2", + "eslint-visitor-keys": "^1.1.0" } }, "esprima": { @@ -1424,15 +1352,15 @@ } }, "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, "etag": { @@ -1580,9 +1508,9 @@ } }, "external-editor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { "chardet": "^0.7.0", @@ -1727,21 +1655,12 @@ } }, "file-entry-cache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", - "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "^1.2.1", - "object-assign": "^4.0.1" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } + "flat-cache": "^2.0.1" } }, "file-stream-rotator": { @@ -1849,17 +1768,33 @@ "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=" }, "flat-cache": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.2.tgz", - "integrity": "sha512-KByBY8c98sLUAGpnmjEdWTrtrLZRtZdwds+kAL/ciFXTCb7AZgqKsAnVnYFQj1hxepwO8JKN/8AsRWwLq+RK0A==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "circular-json": "^0.3.1", - "del": "^3.0.0", - "graceful-fs": "^4.1.2", - "write": "^0.2.1" + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } } }, + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", @@ -1949,6 +1884,26 @@ "path-is-absolute": "^1.0.0" } }, + "glob-parent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", + "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + }, + "dependencies": { + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + } + } + }, "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", @@ -1972,32 +1927,11 @@ } }, "globals": { - "version": "11.8.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz", - "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - } - } - }, "globule": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", @@ -2354,6 +2288,17 @@ "gaze": "^1.1.0", "lodash": "^4.17.10", "tiny-lr": "^1.1.1" + }, + "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "requires": { + "lodash": "^4.17.14" + } + } } }, "grunt-env": { @@ -2367,44 +2312,13 @@ } }, "grunt-eslint": { - "version": "21.0.0", - "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-21.0.0.tgz", - "integrity": "sha512-HJocD9P35lpCvy6pPPCTgzBavzckrT1nt7lpqV55Vy8E6LQJv4RortXoH1jJTYhO5DYY7RPATv7Uc4383PUYqQ==", + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-22.0.0.tgz", + "integrity": "sha512-I7vIU4x/mb20fmA6TAmLx6Wzn7mfs8ZXeuk7LbP2ujKVFV7KZmJ3qXUyqe2wnD+v/74Rs5uYOZrLL8EoBmlG9Q==", "dev": true, "requires": { "chalk": "^2.1.0", - "eslint": "^5.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "eslint": "^6.0.1" } }, "grunt-known-options": { @@ -2686,6 +2600,24 @@ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, + "import-fresh": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", + "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -2720,52 +2652,32 @@ "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=" }, "inquirer": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz", - "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", - "chalk": "^2.0.0", + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", "cli-cursor": "^2.1.0", "cli-width": "^2.0.0", - "external-editor": "^3.0.0", + "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.10", + "lodash": "^4.17.12", "mute-stream": "0.0.7", "run-async": "^2.2.0", - "rxjs": "^6.1.0", + "rxjs": "^6.4.0", "string-width": "^2.1.0", - "strip-ansi": "^4.0.0", + "strip-ansi": "^5.1.0", "through": "^2.3.6" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -2776,21 +2688,12 @@ } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" + "ansi-regex": "^4.1.0" } } } @@ -2935,30 +2838,6 @@ } } }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -2981,12 +2860,6 @@ "is-unc-path": "^1.0.0" } }, - "is-resolvable": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz", - "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", - "dev": true - }, "is-unc-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", @@ -3563,11 +3436,6 @@ "extend": "^3.0.0" } }, - "mongoose-history": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/mongoose-history/-/mongoose-history-0.8.0.tgz", - "integrity": "sha512-9ZaTXYbs3EpOl+dyPCCQtkbFUFPL1fw1BZ6qdRSP820BKEgdLp2JuQs6b6SBKZVkbn5TcQ2ZW2rxkghvYy8Q1Q==" - }, "mongoose-legacy-pluralize": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/mongoose-legacy-pluralize/-/mongoose-legacy-pluralize-1.0.2.tgz", @@ -3986,12 +3854,6 @@ "p-limit": "^1.1.0" } }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true - }, "p-try": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", @@ -4011,6 +3873,15 @@ "through2": "^2.0.0" } }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", @@ -4085,12 +3956,6 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, "path-key": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", @@ -4186,12 +4051,6 @@ "extend-shallow": "^1.1.2" } }, - "pluralize": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", - "dev": true - }, "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", @@ -4218,9 +4077,9 @@ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "progress": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz", - "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, "proxy-addr": { @@ -4417,24 +4276,6 @@ "is-finite": "^1.0.0" } }, - "require-uncached": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", - "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", - "dev": true, - "requires": { - "caller-path": "^0.1.0", - "resolve-from": "^1.0.0" - }, - "dependencies": { - "resolve-from": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", - "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", - "dev": true - } - } - }, "require_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -4556,9 +4397,9 @@ } }, "rxjs": { - "version": "6.3.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", - "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", + "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -4724,11 +4565,13 @@ "dev": true }, "slice-ansi": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz", - "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", "is-fullwidth-code-point": "^2.0.0" } }, @@ -5054,9 +4897,9 @@ } }, "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", "dev": true }, "supports-color": { @@ -5077,15 +4920,43 @@ } }, "table": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/table/-/table-5.1.0.tgz", - "integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==", + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { - "ajv": "^6.5.3", - "lodash": "^4.17.10", - "slice-ansi": "1.0.0", - "string-width": "^2.1.1" + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, "text-table": { @@ -5231,9 +5102,9 @@ "dev": true }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", "dev": true }, "type-check": { @@ -5398,6 +5269,12 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, + "v8-compile-cache": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz", + "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==", + "dev": true + }, "v8flags": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.1.tgz", @@ -5465,9 +5342,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", - "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { "mkdirp": "^0.5.1" diff --git a/package.json b/package.json index cd50350..7108e5d 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "acl": "~0.4.4", - "async": "^2.6.2", + "async": "^3.1.0", "bluebird": "^3.5.3", "body-parser": "^1.18.3", "bower": "^1.8.8", @@ -43,7 +43,6 @@ "method-override": "^3.0.0", "mongoose": "^5.4.19", "mongoose-auto-increment": "^5.0.1", - "mongoose-history": "^0.8.0", "morgan": "^1.9.1", "multer": "^1.4.1", "nodemailer": "~4.6.8", @@ -64,7 +63,7 @@ "grunt-contrib-uglify": "~4.0.0", "grunt-contrib-watch": "^1.1.0", "grunt-env": "^1.0.1", - "grunt-eslint": "~21.0.0", + "grunt-eslint": "~22.0.0", "grunt-ng-annotate": "~3.0.0", "load-grunt-tasks": "~4.0.0", "run-sequence": "^2.2.1" From 8ca1da7b52a6d8f4d626beb534fc36f9381a9077 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 17:59:35 +0300 Subject: [PATCH 09/63] IRI-001 Bump version to 1.3.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56c6cbe..655d9c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iris", - "version": "1.3.0-beta2", + "version": "1.3.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7108e5d..b9a56d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iris", "description": "Informational system for goods trading", - "version": "1.3.0-beta2", + "version": "1.3.1", "author": "Andrii Yermolenko", "license": "MIT", "repository": { From a462145a5dbd79aca68c8cb541b7b90dcd86601f Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 18:05:23 +0300 Subject: [PATCH 10/63] IRI-001 Set version to 1.3.0, done with deps --- package-lock.json | 652 ++++++++++++++++++++++++++-------------------- package.json | 34 +-- 2 files changed, 381 insertions(+), 305 deletions(-) diff --git a/package-lock.json b/package-lock.json index 655d9c7..16f6b60 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "iris", - "version": "1.3.1", + "version": "1.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -350,9 +350,9 @@ } }, "bluebird": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz", - "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==" + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" }, "body": { "version": "5.1.0", @@ -391,20 +391,40 @@ } }, "body-parser": { - "version": "1.18.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", - "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", "requires": { - "bytes": "3.0.0", + "bytes": "3.1.0", "content-type": "~1.0.4", "debug": "2.6.9", "depd": "~1.1.2", - "http-errors": "~1.6.3", - "iconv-lite": "0.4.23", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "on-finished": "~2.3.0", - "qs": "6.5.2", - "raw-body": "2.3.3", - "type-is": "~1.6.16" + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + } } }, "bower": { @@ -695,9 +715,9 @@ "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", + "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", "dev": true }, "component-emitter": { @@ -793,14 +813,24 @@ } }, "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=" + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } + } }, "content-security-policy-builder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz", - "integrity": "sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", + "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" }, "content-type": { "version": "1.0.4", @@ -848,11 +878,6 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "crc": { - "version": "3.4.4", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz", - "integrity": "sha1-naHpgOO9RPxck79as9ozeNheRms=" - }, "cross-spawn": { "version": "0.2.9", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz", @@ -1031,9 +1056,9 @@ } }, "dns-prefetch-control": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz", - "integrity": "sha1-YN20V3dOF48flBXwyrsOhbCzALI=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz", + "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==" }, "doctrine": { "version": "3.0.0", @@ -1088,9 +1113,9 @@ } }, "dont-sniff-mimetype": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz", - "integrity": "sha1-WTKJDcn04vGeXrAqIAJuXl78j1g=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz", + "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==" }, "double-ended-queue": { "version": "2.1.0-0", @@ -1419,56 +1444,93 @@ } }, "expect-ct": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.1.1.tgz", - "integrity": "sha512-ngXzTfoRGG7fYens3/RMb6yYoVLvLMfmsSllP/mZPxNHgFq41TmPSLF/nLY7fwoclI2vElvAmILFWGUYqdjfCg==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz", + "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==" }, "express": { - "version": "4.16.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.4.tgz", - "integrity": "sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==", + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "requires": { - "accepts": "~1.3.5", + "accepts": "~1.3.7", "array-flatten": "1.1.1", - "body-parser": "1.18.3", - "content-disposition": "0.5.2", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", "content-type": "~1.0.4", - "cookie": "0.3.1", + "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "~1.1.2", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.1.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", "methods": "~1.1.2", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.4", - "qs": "6.5.2", - "range-parser": "~1.2.0", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "~1.4.0", - "type-is": "~1.6.16", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" }, "dependencies": { + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } + }, + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==" + }, + "mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } + }, + "negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" } } }, @@ -1478,19 +1540,40 @@ "integrity": "sha512-4dU/1HPm8lkTPR12+HFUXqCarcsC19OKOkb4otLOuADfPYrQMaugPJkSmxNsqwmWYjozvT6vdTiqkgeBHkzOow==" }, "express-session": { - "version": "1.15.6", - "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.15.6.tgz", - "integrity": "sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/express-session/-/express-session-1.16.2.tgz", + "integrity": "sha512-oy0sRsdw6n93E9wpCNWKRnSsxYnSDX9Dnr9mhZgqUEEorzcq5nshGYSZ4ZReHFhKQ80WI5iVUUSPW7u3GaKauw==", "requires": { "cookie": "0.3.1", "cookie-signature": "1.0.6", - "crc": "3.4.4", "debug": "2.6.9", - "depd": "~1.1.1", - "on-headers": "~1.0.1", - "parseurl": "~1.3.2", - "uid-safe": "~2.1.5", - "utils-merge": "1.0.1" + "depd": "~2.0.0", + "on-headers": "~1.0.2", + "parseurl": "~1.3.3", + "safe-buffer": "5.1.2", + "uid-safe": "~2.1.5" + }, + "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + }, + "on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "extend": { @@ -1632,9 +1715,9 @@ } }, "feature-policy": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz", - "integrity": "sha512-2hGrlv6efG4hscYVZeaYjpzpT6I2OZgYqE2yDUzeAcKj2D1SH0AsEzqJNXzdoglEddcIXQQYop3lD97XpG75Jw==" + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz", + "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==" }, "figures": { "version": "1.7.0", @@ -1699,23 +1782,23 @@ } }, "finalhandler": { - "version": "1.1.1", - "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "requires": { "debug": "2.6.9", "encodeurl": "~1.0.2", "escape-html": "~1.0.3", "on-finished": "~2.3.0", - "parseurl": "~1.3.2", - "statuses": "~1.4.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", "unpipe": "~1.0.0" }, "dependencies": { - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" } } }, @@ -1822,9 +1905,9 @@ } }, "frameguard": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz", - "integrity": "sha1-e8rUae57lukdEs6zlZx4I1qScuk=" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz", + "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g==" }, "fresh": { "version": "0.5.2", @@ -1852,9 +1935,9 @@ } }, "generate-password": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/generate-password/-/generate-password-1.4.1.tgz", - "integrity": "sha512-MwMSkOIKkgYBG3JrquF0m/Rky+pl5jZFNmoroE9bQU5VawFDKdJfxMx1qBthPusx8GQyNWSW0m+Jaw0mZnqApg==" + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/generate-password/-/generate-password-1.4.2.tgz", + "integrity": "sha512-UYEOMRcnpC/228qfCQNSebq8jmIonoPYPILsZl2NmH16Vm53yPvgo/KK3BYeCA3JmhSA/a/HqHzaY0v5dRbyoQ==" }, "get-stdin": { "version": "4.0.1", @@ -1872,9 +1955,9 @@ "integrity": "sha1-BHpEl4n6Fg0Bj1SG7ZEyC27HiFw=" }, "glob": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", - "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2192,87 +2275,30 @@ } }, "grunt-contrib-uglify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-4.0.0.tgz", - "integrity": "sha512-vy3Vop2KDqdiwcGOGAjyKvjHFrRD/YK4KPQWR3Yt6OdYlgFw1z7HCuk66+IJ9s7oJmp9uRQXuuSHyawKRAgiMw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-4.0.1.tgz", + "integrity": "sha512-dwf8/+4uW1+7pH72WButOEnzErPGmtUvc8p08B0eQS/6ON0WdeQu0+WFeafaPTbbY1GqtS25lsHWaDeiTQNWPg==", "dev": true, "requires": { "chalk": "^2.4.1", "maxmin": "^2.1.0", - "uglify-js": "~3.4.8", + "uglify-js": "^3.5.0", "uri-path": "^1.0.0" }, "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "gzip-size": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz", - "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=", - "dev": true, - "requires": { - "duplexer": "^0.1.1" - } - }, - "maxmin": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/maxmin/-/maxmin-2.1.0.tgz", - "integrity": "sha1-TTsiCQPZXu5+t6x/qGTnLcCaMWY=", - "dev": true, - "requires": { - "chalk": "^1.0.0", - "figures": "^1.0.1", - "gzip-size": "^3.0.0", - "pretty-bytes": "^3.0.0" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "http://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.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - } - } - }, - "pretty-bytes": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-3.0.1.tgz", - "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, "uglify-js": { - "version": "3.4.9", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz", - "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", + "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", "dev": true, "requires": { - "commander": "~2.17.1", + "commander": "~2.20.0", "source-map": "~0.6.1" } } @@ -2438,25 +2464,25 @@ } }, "helmet": { - "version": "3.16.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.16.0.tgz", - "integrity": "sha512-rsTKRogc5OYGlvSHuq5QsmOsOzF6uDoMqpfh+Np8r23+QxDq+SUx90Rf8HyIKQVl7H6NswZEwfcykinbAeZ6UQ==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.0.tgz", + "integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==", "requires": { "depd": "2.0.0", - "dns-prefetch-control": "0.1.0", - "dont-sniff-mimetype": "1.0.0", - "expect-ct": "0.1.1", - "feature-policy": "0.2.0", - "frameguard": "3.0.0", - "helmet-crossdomain": "0.3.0", - "helmet-csp": "2.7.1", - "hide-powered-by": "1.0.0", + "dns-prefetch-control": "0.2.0", + "dont-sniff-mimetype": "1.1.0", + "expect-ct": "0.2.0", + "feature-policy": "0.3.0", + "frameguard": "3.1.0", + "helmet-crossdomain": "0.4.0", + "helmet-csp": "2.8.0", + "hide-powered-by": "1.1.0", "hpkp": "2.0.0", "hsts": "2.2.0", "ienoopen": "1.1.0", - "nocache": "2.0.0", - "referrer-policy": "1.1.0", - "x-xss-protection": "1.1.0" + "nocache": "2.1.0", + "referrer-policy": "1.2.0", + "x-xss-protection": "1.2.0" }, "dependencies": { "depd": { @@ -2467,25 +2493,25 @@ } }, "helmet-crossdomain": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.3.0.tgz", - "integrity": "sha512-YiXhj0E35nC4Na5EPE4mTfoXMf9JTGpN4OtB4aLqShKuH9d2HNaJX5MQoglO6STVka0uMsHyG5lCut5Kzsy7Lg==" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/helmet-crossdomain/-/helmet-crossdomain-0.4.0.tgz", + "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" }, "helmet-csp": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz", - "integrity": "sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.8.0.tgz", + "integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==", "requires": { "camelize": "1.0.0", - "content-security-policy-builder": "2.0.0", + "content-security-policy-builder": "2.1.0", "dasherize": "2.0.0", "platform": "1.3.5" } }, "hide-powered-by": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz", - "integrity": "sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys=" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.1.0.tgz", + "integrity": "sha512-Io1zA2yOA1YJslkr+AJlWSf2yWFkKjvkcL9Ni1XSUqnGLr/qRQe2UI3Cn/J9MsJht7yEVCe0SscY1HgVMujbgg==" }, "homedir-polyfill": { "version": "1.0.1", @@ -2565,14 +2591,15 @@ } }, "http-errors": { - "version": "1.6.3", - "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "requires": { "depd": "~1.1.2", "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" } }, "http-parser-js": { @@ -2704,9 +2731,9 @@ "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=" }, "ipaddr.js": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.8.0.tgz", - "integrity": "sha1-6qM9bd16zo9/b+DJygRA5wZzix4=" + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", + "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" }, "is-absolute": { "version": "1.0.0", @@ -2945,9 +2972,9 @@ "dev": true }, "kareem": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.0.tgz", - "integrity": "sha512-6hHxsp9e6zQU8nXsP+02HGWXwTkOEw6IROhF2ZA28cYbUk4eJ6QbtZvdqZOdD9YPKghG3apk5eOCvs+tLl3lRg==" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.1.tgz", + "integrity": "sha512-l3hLhffs9zqoDe8zjmb/mAN4B8VT3L56EUvKNqLFVs9YlFA+zx7ke1DO8STAdDyYNkeSo1nKmjuvQeI12So8Xw==" }, "kind-of": { "version": "1.1.0", @@ -3270,9 +3297,9 @@ } }, "mime": { - "version": "1.4.1", - "resolved": "http://npm.ponedev.net/mime/-/mime-1.4.1.tgz", - "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { "version": "1.37.0", @@ -3365,30 +3392,31 @@ } }, "mongoose": { - "version": "5.4.19", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.4.19.tgz", - "integrity": "sha512-paRU3nbCrPIUVw1GAlxo11uIIqrYORctUx1kcLj7i2NhkxPQuy5OK2/FYj8+tglsaixycmONSyop2HQp1IUQSA==", - "requires": { - "async": "2.6.1", - "bson": "~1.1.0", - "kareem": "2.3.0", - "mongodb": "3.1.13", - "mongodb-core": "3.1.11", + "version": "5.6.11", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.6.11.tgz", + "integrity": "sha512-+Mxfmu2Jcspmdqk1111BLUj5mzSLHWKVovImkjzO9GMymTwkHshsuSFmUN7ou4dWy2WR8DPSJcwU52HhnnNk8Q==", + "requires": { + "async": "2.6.2", + "bson": "~1.1.1", + "kareem": "2.3.1", + "mongodb": "3.2.7", + "mongodb-core": "3.2.7", "mongoose-legacy-pluralize": "1.0.2", - "mpath": "0.5.1", - "mquery": "3.2.0", - "ms": "2.1.1", - "regexp-clone": "0.0.1", + "mpath": "0.6.0", + "mquery": "3.2.1", + "ms": "2.1.2", + "regexp-clone": "1.0.0", "safe-buffer": "5.1.2", + "sift": "7.0.1", "sliced": "1.0.1" }, "dependencies": { "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", + "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", "requires": { - "lodash": "^4.17.10" + "lodash": "^4.17.11" } }, "bson": { @@ -3397,29 +3425,29 @@ "integrity": "sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg==" }, "mongodb": { - "version": "3.1.13", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.1.13.tgz", - "integrity": "sha512-sz2dhvBZQWf3LRNDhbd30KHVzdjZx9IKC0L+kSZ/gzYquCF5zPOgGqRz6sSCqYZtKP2ekB4nfLxhGtzGHnIKxA==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.2.7.tgz", + "integrity": "sha512-2YdWrdf1PJgxcCrT1tWoL6nHuk6hCxhddAAaEh8QJL231ci4+P9FLyqopbTm2Z2sAU6mhCri+wd9r1hOcHdoMw==", "requires": { - "mongodb-core": "3.1.11", + "mongodb-core": "3.2.7", "safe-buffer": "^5.1.2" } }, "mongodb-core": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.1.11.tgz", - "integrity": "sha512-rD2US2s5qk/ckbiiGFHeu+yKYDXdJ1G87F6CG3YdaZpzdOm5zpoAZd/EKbPmFO6cQZ+XVXBXBJ660sSI0gc6qg==", + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.2.7.tgz", + "integrity": "sha512-WypKdLxFNPOH/Jy6i9z47IjG2wIldA54iDZBmHMINcgKOUcWJh8og+Wix76oGd7EyYkHJKssQ2FAOw5Su/n4XQ==", "requires": { - "bson": "^1.1.0", + "bson": "^1.1.1", "require_optional": "^1.0.1", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "safe-buffer": { "version": "5.1.2", @@ -3454,18 +3482,18 @@ } }, "mpath": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.5.1.tgz", - "integrity": "sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==" + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.6.0.tgz", + "integrity": "sha512-i75qh79MJ5Xo/sbhxrDrPSEG0H/mr1kcZXJ8dH6URU5jD/knFxCVqVC/gVSW7GIXL/9hHWlT9haLbCXWOll3qw==" }, "mquery": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.0.tgz", - "integrity": "sha512-qPJcdK/yqcbQiKoemAt62Y0BAc0fTEKo1IThodBD+O5meQRJT/2HSe5QpBNwaa4CjskoGrYWsEyjkqgiE0qjhg==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/mquery/-/mquery-3.2.1.tgz", + "integrity": "sha512-kY/K8QToZWTTocm0U+r8rqcJCp5PRl6e8tPmoDs5OeSO3DInZE2rAL6AYH+V406JTo8305LdASOQcxRDqHojyw==", "requires": { "bluebird": "3.5.1", "debug": "3.1.0", - "regexp-clone": "0.0.1", + "regexp-clone": "^1.0.0", "safe-buffer": "5.1.2", "sliced": "1.0.1" }, @@ -3496,9 +3524,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.1.tgz", - "integrity": "sha512-zzOLNRxzszwd+61JFuAo0fxdQfvku12aNJgnla0AQ+hHxFmfc/B7jBVuPr5Rmvu46Jze/iJrFpSOsD7afO8SDw==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/multer/-/multer-1.4.2.tgz", + "integrity": "sha512-xY8pX7V+ybyUpbYMxtjM9KAiD9ixtg5/JkeKUTD6xilfDv0vzzOFcCp4Ljb1UU3tSOM3VTZtKo63OmzOrGi3Cg==", "requires": { "append-field": "^1.0.0", "busboy": "^0.2.11", @@ -3627,14 +3655,14 @@ "dev": true }, "nocache": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz", - "integrity": "sha1-ICtIAhoMTL3i34DeFaF0Q8i0OYA=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz", + "integrity": "sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q==" }, "nodemailer": { - "version": "4.6.8", - "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.8.tgz", - "integrity": "sha512-A3s7EM/426OBIZbLHXq2KkgvmKbn2Xga4m4G+ZUA4IaZvG8PcZXrFh+2E4VaS2o+emhuUVRnzKN2YmpkXQ9qwA==" + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz", + "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw==" }, "nopt": { "version": "3.0.6", @@ -4083,12 +4111,12 @@ "dev": true }, "proxy-addr": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.4.tgz", - "integrity": "sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", "requires": { "forwarded": "~0.1.2", - "ipaddr.js": "1.8.0" + "ipaddr.js": "1.9.0" } }, "pump": { @@ -4121,7 +4149,8 @@ "qs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true }, "random-bytes": { "version": "1.0.0", @@ -4129,19 +4158,34 @@ "integrity": "sha1-T2ih3Arli9P7lYSMMDJNt11kNgs=" }, "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.3", - "iconv-lite": "0.4.23", + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", "unpipe": "1.0.0" + }, + "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "read-pkg": { @@ -4215,9 +4259,9 @@ "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=" }, "referrer-policy": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz", - "integrity": "sha1-NXdOtzW/UPtsB46DM0tHI1AgfXk=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.2.0.tgz", + "integrity": "sha512-LgQJIuS6nAy1Jd88DCQRemyE3mS+ispwlqMk3b0yjZ257fI1v9c+/p6SD5gP5FGyXUIgrNOAfmyioHwZtYv2VA==" }, "regex-not": { "version": "1.0.2", @@ -4248,9 +4292,9 @@ } }, "regexp-clone": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz", - "integrity": "sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", + "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" }, "regexpp": { "version": "2.0.1", @@ -4430,9 +4474,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "saslprep": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.2.tgz", - "integrity": "sha512-4cDsYuAjXssUSjxHKRe4DTZC0agDwsCqcMqtJAQPzC74nJ7LfAJflAtC1Zed5hMzEQKj82d3tuzqdGNRsLJ4Gw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/saslprep/-/saslprep-1.0.3.tgz", + "integrity": "sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==", "optional": true, "requires": { "sparse-bitfield": "^3.0.3" @@ -4444,9 +4488,9 @@ "integrity": "sha1-3Eu8emyp2Rbe5dQ1FvAJK1j3uKs=" }, "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "requires": { "debug": "2.6.9", "depd": "~1.1.2", @@ -4455,18 +4499,18 @@ "escape-html": "~1.0.3", "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "~1.6.2", - "mime": "1.4.1", - "ms": "2.0.0", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", "on-finished": "~2.3.0", - "range-parser": "~1.2.0", - "statuses": "~1.4.0" + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" } } }, @@ -4490,14 +4534,21 @@ } }, "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "requires": { "encodeurl": "~1.0.2", "escape-html": "~1.0.3", - "parseurl": "~1.3.2", - "send": "0.16.2" + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "dependencies": { + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" + } } }, "set-value": { @@ -4522,9 +4573,9 @@ } }, "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, "shebang-command": { "version": "1.2.0", @@ -4547,6 +4598,11 @@ "integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E=", "dev": true }, + "sift": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", + "integrity": "sha512-oqD7PMJ+uO6jV9EQCl0LrRw1OwsiPsiFQR5AR30heR+4Dl7jBBbDLnNvWiak20tzZlSE1H7RB30SX/1j/YYT7g==" + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -5090,6 +5146,11 @@ "repeat-string": "^1.6.1" } }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", @@ -5117,12 +5178,27 @@ } }, "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "~2.1.24" + }, + "dependencies": { + "mime-db": { + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + }, + "mime-types": { + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } + } } }, "typedarray": { @@ -5293,9 +5369,9 @@ } }, "validator": { - "version": "10.9.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-10.9.0.tgz", - "integrity": "sha512-hZJcZSWz9poXBlAkjjcsNAdrZ6JbjD3kWlNjq/+vE7RLLS/+8PAj3qVVwrwsOz/WL8jPmZ1hYkRvtlUeZAm4ug==" + "version": "10.11.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-10.11.0.tgz", + "integrity": "sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw==" }, "vary": { "version": "1.1.2", @@ -5351,9 +5427,9 @@ } }, "x-xss-protection": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.1.0.tgz", - "integrity": "sha512-rx3GzJlgEeZ08MIcDsU2vY2B1QEriUKJTSiNHHUIem6eg9pzVOr2TL3Y4Pd6TMAM5D5azGjcxqI62piITBDHVg==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.2.0.tgz", + "integrity": "sha512-xN0kV+8XfOQM2OPPBdEbGtbvJNNP1pvZR7sE6d44cjJFQG4OiGDdienPg5iOUGswBTiGbBvtYDURd30BMJwwqg==" }, "xtend": { "version": "4.0.1", diff --git a/package.json b/package.json index b9a56d2..2410b8a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iris", "description": "Informational system for goods trading", - "version": "1.3.1", + "version": "1.3.0", "author": "Andrii Yermolenko", "license": "MIT", "repository": { @@ -19,39 +19,39 @@ "test": "grunt lint" }, "dependencies": { - "acl": "~0.4.4", + "acl": "^0.4.4", "async": "^3.1.0", - "bluebird": "^3.5.3", - "body-parser": "^1.18.3", + "bluebird": "^3.5.5", + "body-parser": "^1.19.0", "bower": "^1.8.8", "chalk": "^2.4.2", "compression": "^1.7.4", - "connect-flash": "~0.1.1", + "connect-flash": "^0.1.1", "connect-mongo": "^2.0.3", "consolidate": "~0.15.1", "cookie-parser": "^1.4.4", - "express": "^4.16.4", + "express": "^4.17.1", "express-query-boolean": "^2.0.0", - "express-session": "^1.11.3", - "file-stream-rotator": "~0.4.1", - "generate-password": "^1.4.1", - "glob": "^7.1.3", + "express-session": "^1.16.2", + "file-stream-rotator": "^0.4.1", + "generate-password": "^1.4.2", + "glob": "^7.1.4", "grunt": "^1.0.4", - "grunt-cli": "~1.3.0", - "helmet": "^3.16.0", + "grunt-cli": "^1.3.0", + "helmet": "^3.20.0", "lodash": "^4.17.15", "method-override": "^3.0.0", - "mongoose": "^5.4.19", + "mongoose": "^5.6.11", "mongoose-auto-increment": "^5.0.1", "morgan": "^1.9.1", - "multer": "^1.4.1", - "nodemailer": "~4.6.8", + "multer": "^1.4.2", + "nodemailer": "^4.7.0", "owasp-password-strength-test": "^1.3.0", "passport": "^0.4.0", "passport-local": "^1.0.0", "serve-favicon": "^2.5.0", "swig-templates": "^2.0.3", - "validator": "~10.9.0" + "validator": "^10.11.0" }, "devDependencies": { "grunt-concurrent": "^2.0.0", @@ -60,7 +60,7 @@ "grunt-contrib-cssmin": "~3.0.0", "grunt-contrib-jshint": "~2.1.0", "grunt-contrib-sass": "^1.0.0", - "grunt-contrib-uglify": "~4.0.0", + "grunt-contrib-uglify": "^4.0.1", "grunt-contrib-watch": "^1.1.0", "grunt-env": "^1.0.1", "grunt-eslint": "~22.0.0", From f4936ae2846646e290aa33750d24db1601830d8c Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 18:26:09 +0300 Subject: [PATCH 11/63] Changed app title --- modules/core/client/services/translate.client.service.js | 3 ++- modules/core/client/views/header.client.view.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/core/client/services/translate.client.service.js b/modules/core/client/services/translate.client.service.js index 62b14a6..4770b72 100644 --- a/modules/core/client/services/translate.client.service.js +++ b/modules/core/client/services/translate.client.service.js @@ -116,6 +116,7 @@ angular.module('core').factory('t', [function () { EDIT_CLIENT: 'Редагувати клієнта', PLACE_DELIVER_DEFAULT: 'Місце отримання за замовчуванням', TOTAL_ORDERS_TO_SHOW: 'Показано замовлень', - ACTIVE: 'Активний' + ACTIVE: 'Активний', + BAR: 'Склад' }; }]); diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index ed8227e..cfcd23c 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -7,7 +7,7 @@ - IRIS + {{t.BAR}} {{version}} From a8d8c2401c3eb84ba607abe6986001054a82b91e Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 27 Aug 2019 18:28:38 +0300 Subject: [PATCH 12/63] Changed HTML title --- config/env/default.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/default.js b/config/env/default.js index 28e2bd4..9061b82 100644 --- a/config/env/default.js +++ b/config/env/default.js @@ -1,6 +1,6 @@ module.exports = { app: { - title: 'IRIS', + title: 'Склад v1.3.0', description: 'Full-Stack JavaScript with MongoDB, Express, AngularJS, and Node.js', keywords: 'mongodb, express, angularjs, node.js, mongoose, passport', googleAnalyticsTrackingID: process.env.GOOGLE_ANALYTICS_TRACKING_ID || 'GOOGLE_ANALYTICS_TRACKING_ID' From efb415fc7cf3050a0d80aacc6e46ff5a404f5d74 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Mon, 9 Sep 2019 23:57:27 +0300 Subject: [PATCH 13/63] Fixed license --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 988dbd5..9cca669 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2017-2018 Andriy Ermolenko +Copyright (c) 2017-2019 Andrii Yermolenko Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the From 88d418723377988696c4d2f8b3f922271ff500d7 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 07:24:49 +0300 Subject: [PATCH 14/63] Added order status, changed count title --- .../client/services/translate.client.service.js | 7 ++++++- .../client/controllers/orders-edit.controller.js | 16 ++++++++++------ .../controllers/orders.client.controller.js | 16 ++++++++++------ .../client/views/goods/edit.client.view.html | 6 +++--- .../client/views/orders/edit.client.view.html | 4 ++-- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/modules/core/client/services/translate.client.service.js b/modules/core/client/services/translate.client.service.js index 4770b72..903a6e6 100644 --- a/modules/core/client/services/translate.client.service.js +++ b/modules/core/client/services/translate.client.service.js @@ -30,6 +30,10 @@ angular.module('core').factory('t', [function () { ORDER_STATUS_READY: 'Готові', ORDER_STATUS_TOGO: 'Можна збирати', ORDER_STATUS_DONE: 'Зібрані', + ORDER_STATUS_SENT: 'Відправлено', + ORDER_STATUS_CARE: 'Зберігання', + ORDER_STATUS_SELF: 'Самовивіз', + ORDER_STATUS_OUT: 'Роздача', CLIENT_NEW: 'Додати клієнта', CLIENT_EDIT: 'Редагувати клыэнта', OK: 'Так', @@ -117,6 +121,7 @@ angular.module('core').factory('t', [function () { PLACE_DELIVER_DEFAULT: 'Місце отримання за замовчуванням', TOTAL_ORDERS_TO_SHOW: 'Показано замовлень', ACTIVE: 'Активний', - BAR: 'Склад' + BAR: 'Склад', + VOLUME: 'Об\'єм' }; }]); diff --git a/modules/data/client/controllers/orders-edit.controller.js b/modules/data/client/controllers/orders-edit.controller.js index 5457650..10d01c4 100644 --- a/modules/data/client/controllers/orders-edit.controller.js +++ b/modules/data/client/controllers/orders-edit.controller.js @@ -239,17 +239,21 @@ angular.module('data').controller('OrdersEditController', [ value: 'work', }, { - name: $scope.t.ORDER_STATUS_READY, - value: 'ready' + name: $scope.t.ORDER_STATUS_SENT, + value: 'sent' }, { - name: $scope.t.ORDER_STATUS_TOGO, - value: 'togo' + name: $scope.t.ORDER_STATUS_CARE, + value: 'care' }, { - name: $scope.t.ORDER_STATUS_DONE, - value: 'done' + name: $scope.t.ORDER_STATUS_OUT, + value: 'out' }, + { + name: $scope.t.ORDER_STATUS_SELF, + value: 'self' + } ]; function toZero(val) { diff --git a/modules/data/client/controllers/orders.client.controller.js b/modules/data/client/controllers/orders.client.controller.js index e139568..02cb928 100644 --- a/modules/data/client/controllers/orders.client.controller.js +++ b/modules/data/client/controllers/orders.client.controller.js @@ -41,17 +41,21 @@ angular.module('data').controller('OrdersController', [ value: 'work', }, { - name: $scope.t.ORDER_STATUS_READY, - value: 'ready' + name: $scope.t.ORDER_STATUS_SENT, + value: 'sent' }, { - name: $scope.t.ORDER_STATUS_TOGO, - value: 'togo' + name: $scope.t.ORDER_STATUS_CARE, + value: 'care' }, { - name: $scope.t.ORDER_STATUS_DONE, - value: 'done' + name: $scope.t.ORDER_STATUS_OUT, + value: 'out' }, + { + name: $scope.t.ORDER_STATUS_SELF, + value: 'self' + } ]; $scope.listStatuses = $scope.statuses.concat({ diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 653720e..e2ec5ac 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -44,16 +44,16 @@

{{title}}

- +
-

{{t.COUNT}} {{t.REQUIRED}}

+

{{t.VOLUME}} {{t.REQUIRED}}

diff --git a/modules/data/client/views/orders/edit.client.view.html b/modules/data/client/views/orders/edit.client.view.html index 80e734d..232fcb0 100644 --- a/modules/data/client/views/orders/edit.client.view.html +++ b/modules/data/client/views/orders/edit.client.view.html @@ -34,7 +34,7 @@

- +
From 90b7cddaa0379afd9aba6a110a5fe70413994966 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 07:38:09 +0300 Subject: [PATCH 15/63] Added client comments --- .../core/client/services/translate.client.service.js | 3 ++- .../data/client/views/clients/edit.client.view.html | 11 +++++++++++ modules/data/client/views/goods/edit.client.view.html | 2 +- .../server/controllers/client.server.controller.js | 3 ++- modules/data/server/models/client.server.model.js | 5 +++++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/core/client/services/translate.client.service.js b/modules/core/client/services/translate.client.service.js index 903a6e6..6f52d5d 100644 --- a/modules/core/client/services/translate.client.service.js +++ b/modules/core/client/services/translate.client.service.js @@ -122,6 +122,7 @@ angular.module('core').factory('t', [function () { TOTAL_ORDERS_TO_SHOW: 'Показано замовлень', ACTIVE: 'Активний', BAR: 'Склад', - VOLUME: 'Об\'єм' + VOLUME: 'Об\'єм, мл', + COMMENTS: 'Коментарі' }; }]); diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index 2d7ad7e..d8fd13e 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -35,6 +35,17 @@

{{title}}

+
+ + +
+
diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index e2ec5ac..3b03011 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -46,7 +46,7 @@

{{title}}

{ exports.update = (req, res) => { const { client } = req; - const { body: { firstName, lastName, phone, defaultPlace = null } } = req; + const { body: { firstName, lastName, phone, defaultPlace, comments = null } } = req; client.firstName = firstName; client.lastName = lastName; client.phone = phone; client.defaultPlace = defaultPlace; client.active = true; + client.comments = comments; client.save((err) => { if (err) { diff --git a/modules/data/server/models/client.server.model.js b/modules/data/server/models/client.server.model.js index 77687f2..ae0ae39 100644 --- a/modules/data/server/models/client.server.model.js +++ b/modules/data/server/models/client.server.model.js @@ -40,6 +40,11 @@ const ClientSchema = new Schema({ type: Boolean, default: true }, + comments: { + type: String, + default: '', + trim: true, + } }); mongoose.model(modelClient, ClientSchema); From 14bf9a86eccdb290e062880e98ac798cb6bd6985 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 07:42:37 +0300 Subject: [PATCH 16/63] Fix view order link --- modules/data/client/controllers/orders-edit.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data/client/controllers/orders-edit.controller.js b/modules/data/client/controllers/orders-edit.controller.js index 10d01c4..bc04ba5 100644 --- a/modules/data/client/controllers/orders-edit.controller.js +++ b/modules/data/client/controllers/orders-edit.controller.js @@ -102,7 +102,7 @@ angular.module('data').controller('OrdersEditController', [ $scope.calcArray = calcArray; $scope.savedOrder = _.cloneDeep(data); $scope.title = $scope.t.EDIT_ORDER_NUM + data.code; - $scope.order.link = 'https://vitaly.herokuapp.com/orders/' + data._id; + $scope.order.link = 'https://maryna-cn.herokuapp.com/orders/' + data._id; if (!$scope.order.status) { $scope.order.status = $scope.statuses[0].value; } From d08eceb5f7c9d7970b183dd7435dea09fad47f2a Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 23:38:32 +0300 Subject: [PATCH 17/63] Added orders by client, orders by good --- config/lib/express.js | 2 +- .../client-edit.client.controller.js | 79 ++++++++++++++++ .../controllers/client.client.controller.js | 49 ---------- .../goods-edit.client.controller.js | 91 +++++++++++++++++++ .../controllers/goods.client.controller.js | 59 ------------ ...er.js => orders-edit.client.controller.js} | 1 - .../views/clients/edit.client.view.html | 68 +++++++++++++- .../client/views/goods/edit.client.view.html | 76 ++++++++++++++-- 8 files changed, 303 insertions(+), 122 deletions(-) create mode 100644 modules/data/client/controllers/client-edit.client.controller.js create mode 100644 modules/data/client/controllers/goods-edit.client.controller.js rename modules/data/client/controllers/{orders-edit.controller.js => orders-edit.client.controller.js} (99%) diff --git a/config/lib/express.js b/config/lib/express.js index 63e2dfd..428460d 100644 --- a/config/lib/express.js +++ b/config/lib/express.js @@ -146,7 +146,7 @@ module.exports.initHelmetHeaders = (app) => { app.use(helmet.ieNoOpen()); app.use(helmet.hsts({ maxAge: SIX_MONTHS, - includeSubdomains: true, + includeSubDomains: true, force: true })); app.disable('x-powered-by'); diff --git a/modules/data/client/controllers/client-edit.client.controller.js b/modules/data/client/controllers/client-edit.client.controller.js new file mode 100644 index 0000000..a5390d7 --- /dev/null +++ b/modules/data/client/controllers/client-edit.client.controller.js @@ -0,0 +1,79 @@ +'use strict'; + +// Clients controller +angular.module('data').controller('ClientsEditController', [ + '$scope', '$stateParams', '$location', 'Authentication', 'Clients', 'Places', 'Orders', 't', + function ($scope, $stateParams, $location, Authentication, Clients, Places, Orders, t) { + $scope.t = t; + $scope.authentication = Authentication; + $scope.currentPage = 1; + $scope.itemsPerPage = 20; + + $scope.update = function (isValid) { + $scope.error = null; + + if (!isValid) { + $scope.$broadcast('show-errors-check-validity', 'articleForm'); + return false; + } + + var client = $scope.client; + + if ($scope.client._id) { + client.$update(function () { + $location.path('clients'); + }, function (errorResponse) { + $scope.error = errorResponse.data.message; + }); + } + + else { + client.$save(function () { + $location.path('clients'); + }, function (errorResponse) { + $scope.error = errorResponse.data.message; + }); + } + }; + + $scope.findOne = function () { + Places.query(function (data) { + $scope.places = data; + if ($stateParams.clientId) { + $scope.client = Clients.get({ + clientId: $stateParams.clientId + }); + $scope.title = $scope.t.EDIT_CLIENT; + $scope.updateList(); + } + else { + $scope.client = new Clients(); + $scope.title = $scope.t.ADD_CLIENT; + } + }); + }; + + $scope.cancel = function () { + $location.path('clients'); + }; + + $scope.updateList = function () { + // var place = $scope.selectedPlace ? $scope.selectedPlace._id : undefined; + // var status = $scope.selectedStatus ? $scope.selectedStatus.value : undefined; + // var payed = _.get($scope.selectedType, 'payed'); + // var good = $scope.selectedGood ? $scope.selectedGood._id : undefined; + $scope.ordersResolved = Orders.query({ + // payed: payed, + // place: place, + // status: status, + page: $scope.currentPage, + limit: $scope.itemsPerPage, + client: $stateParams.clientId, + // q: $scope.search + }, function (data) { + $scope.orders = data.orders; + $scope.ordersCount = data.count; + }); + }; + } +]); diff --git a/modules/data/client/controllers/client.client.controller.js b/modules/data/client/controllers/client.client.controller.js index 841e8d7..2f1491b 100644 --- a/modules/data/client/controllers/client.client.controller.js +++ b/modules/data/client/controllers/client.client.controller.js @@ -22,60 +22,11 @@ angular.module('data').controller('ClientsController', ['$scope', '$stateParams' } }; - $scope.update = function (isValid) { - $scope.error = null; - - if (!isValid) { - $scope.$broadcast('show-errors-check-validity', 'articleForm'); - - return false; - } - - var client = $scope.client; - - if ($scope.client._id) { - client.$update(function () { - $location.path('clients'); - }, function (errorResponse) { - $scope.error = errorResponse.data.message; - }); - } - - else { - client.$save(function () { - $location.path('clients'); - }, function (errorResponse) { - $scope.error = errorResponse.data.message; - }); - } - }; - $scope.find = function () { Clients.query(function (data) { $scope.clients = data; $scope.buildPager(); }); - - }; - - $scope.findOne = function () { - Places.query(function (data) { - $scope.places = data; - if ($stateParams.clientId) { - $scope.client = Clients.get({ - clientId: $stateParams.clientId - }); - $scope.title = $scope.t.EDIT_CLIENT; - } - else { - $scope.client = new Clients(); - $scope.title = $scope.t.ADD_CLIENT; - } - }); - }; - - $scope.cancel = function () { - $location.path('clients'); }; $scope.buildPager = function () { diff --git a/modules/data/client/controllers/goods-edit.client.controller.js b/modules/data/client/controllers/goods-edit.client.controller.js new file mode 100644 index 0000000..91403c7 --- /dev/null +++ b/modules/data/client/controllers/goods-edit.client.controller.js @@ -0,0 +1,91 @@ +'use strict'; + +// Goods controller +angular.module('data').controller('GoodsEditController', + ['$scope', '$stateParams', '$location', 'Authentication', 'Goods', 'Orders', 'ConfirmService', 't', + function ($scope, $stateParams, $location, Authentication, Goods, Orders, Confirm, t) { + $scope.t = t; + $scope.authentication = Authentication; + $scope.currentPage = 1; + $scope.itemsPerPage = 20; + + $scope.update = function (isValid) { + $scope.error = null; + + if (!isValid) { + $scope.$broadcast('show-errors-check-validity', 'articleForm'); + + return false; + } + + var good = $scope.good; + + if (good._id) { + good.$update(function () { + $location.path('goods'); + }, function (errorResponse) { + $scope.error = errorResponse.data.message; + }); + } + + else { + good.$save(function () { + $location.path('goods'); + }, function (errorResponse) { + $scope.error = errorResponse.data.message; + }); + } + }; + + $scope.findOne = function () { + if ($stateParams.goodId) { + $scope.good = Goods.get({ + goodId: $stateParams.goodId + }); + $scope.title = $scope.t.GOOD_EDIT; + $scope.updateList(); + } + else { + $scope.good = new Goods({ + price: 1, + count: 0 + }); + $scope.title = $scope.t.GOOD_NEW; + } + }; + + $scope.cancel = function () { + $location.path('goods'); + }; + + $scope.add = function (good) { + Confirm.showValue({ + title: $scope.t.GOOD_ADD, + text: $scope.t.GOOD_ENTER_COUNT, + value: true + }, function (count) { + good.count += count; + good.$update(); + }); + }; + + $scope.updateList = function () { + // var place = $scope.selectedPlace ? $scope.selectedPlace._id : undefined; + // var status = $scope.selectedStatus ? $scope.selectedStatus.value : undefined; + // var payed = _.get($scope.selectedType, 'payed'); + // var good = $scope.selectedGood ? $scope.selectedGood._id : undefined; + $scope.ordersResolved = Orders.query({ + // payed: payed, + // place: place, + // status: status, + page: $scope.currentPage, + limit: $scope.itemsPerPage, + good: $stateParams.goodId, + // q: $scope.search + }, function (data) { + $scope.orders = data.orders; + $scope.ordersCount = data.count; + }); + }; + } + ]); diff --git a/modules/data/client/controllers/goods.client.controller.js b/modules/data/client/controllers/goods.client.controller.js index da77c36..fc15327 100644 --- a/modules/data/client/controllers/goods.client.controller.js +++ b/modules/data/client/controllers/goods.client.controller.js @@ -22,34 +22,6 @@ angular.module('data').controller('GoodsController', ['$scope', '$stateParams', } }; - $scope.update = function (isValid) { - $scope.error = null; - - if (!isValid) { - $scope.$broadcast('show-errors-check-validity', 'articleForm'); - - return false; - } - - var good = $scope.good; - - if (good._id) { - good.$update(function () { - $location.path('goods'); - }, function (errorResponse) { - $scope.error = errorResponse.data.message; - }); - } - - else { - good.$save(function () { - $location.path('goods'); - }, function (errorResponse) { - $scope.error = errorResponse.data.message; - }); - } - }; - $scope.find = function () { Goods.query(function (data) { $scope.goods = data.items; @@ -57,37 +29,6 @@ angular.module('data').controller('GoodsController', ['$scope', '$stateParams', }); }; - $scope.findOne = function () { - if ($stateParams.goodId) { - $scope.good = Goods.get({ - goodId: $stateParams.goodId - }); - $scope.title = $scope.t.GOOD_EDIT; - } - else { - $scope.good = new Goods({ - price: 1, - count: 0 - }); - $scope.title = $scope.t.GOOD_NEW; - } - }; - - $scope.cancel = function () { - $location.path('goods'); - }; - - $scope.add = function (good) { - Confirm.showValue({ - title: $scope.t.GOOD_ADD, - text: $scope.t.GOOD_ENTER_COUNT, - value: true - }, function (count) { - good.count += count; - good.$update(); - }); - }; - $scope.buildPager = function () { $scope.pagedItems = []; $scope.itemsPerPage = 15; diff --git a/modules/data/client/controllers/orders-edit.controller.js b/modules/data/client/controllers/orders-edit.client.controller.js similarity index 99% rename from modules/data/client/controllers/orders-edit.controller.js rename to modules/data/client/controllers/orders-edit.client.controller.js index bc04ba5..9155b60 100644 --- a/modules/data/client/controllers/orders-edit.controller.js +++ b/modules/data/client/controllers/orders-edit.client.controller.js @@ -14,7 +14,6 @@ angular.module('data').controller('OrdersEditController', [ $scope.isSalesShown = false; $scope.$watch('order.client', function () { - console.log($scope.order.client); if ($scope.order && $scope.order.client && $scope.order.client.defaultPlace && !$scope.order.place) { $scope.order.place = $scope.order.client.defaultPlace; } diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index d8fd13e..f5f1d90 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -1,4 +1,4 @@ -
+

{{title}}

@@ -35,7 +35,7 @@

{{title}}

-
+
-
+
{{title}}
-
+
@@ -69,7 +69,67 @@

{{title}}

+
+
+
+
+
+ + +

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

+ + + {{t.ADDRESS}}: {{order.place ? order.place.name : order.placeDescription}} + {{t.TOTAL}}: {{order.total || 0}}{{currency}} + + {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} + + +
+
+ +
+
+ + +
+ +
+
+
diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 3b03011..5aeb8cf 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -1,4 +1,4 @@ -
+

{{title}}

@@ -56,7 +56,7 @@

{{title}}

{{t.VOLUME}} {{t.REQUIRED}}

-
+
{{title}} id="type" class="form-control" placeholder="{{t.TYPE}}"> -
- - -
-
- +
+ + +
+
+ +
+
+
+
+
+ + +

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

+ + + {{t.ADDRESS}}: {{order.place ? order.place.name : order.placeDescription}} + {{t.TOTAL}}: {{order.total || 0}}{{currency}} + + {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} + + +
+
+ +
+
+ + +
+ +
+
+
From 2e6f3ab55cdde6eb0a0ee3874c79534c59ca0049 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 23:45:26 +0300 Subject: [PATCH 18/63] Fixed client/order list, good/order list, labels --- modules/data/client/views/clients/edit.client.view.html | 4 ++-- modules/data/client/views/goods/edit.client.view.html | 6 +++--- modules/data/client/views/orders/edit.client.view.html | 2 +- modules/data/client/views/orders/view.client.view.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index f5f1d90..d47e76b 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -112,8 +112,8 @@

-
-
+
+
{{title}}
-
+
@@ -114,8 +114,8 @@

-
-
+
+
{{t.NAME}} {{t.LEFT}} - {{t.COUNT}} + {{t.VOLUME}} {{t.TOTAL}} diff --git a/modules/data/client/views/orders/view.client.view.html b/modules/data/client/views/orders/view.client.view.html index effd923..d72c1bd 100644 --- a/modules/data/client/views/orders/view.client.view.html +++ b/modules/data/client/views/orders/view.client.view.html @@ -17,7 +17,7 @@
{{t.GOODS_LIST}}
{{t.GOOD}} - {{t.COUNT}} + {{t.VOLUME}} {{t.PRICE}} {{t.TOTAL}} From 06ec197847ebe2e8b38e7513efd54404e21e07c3 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 10 Sep 2019 23:48:19 +0300 Subject: [PATCH 19/63] Fixed client/order list width --- modules/data/client/views/clients/edit.client.view.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index d47e76b..af8ab8e 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -73,7 +73,7 @@

{{title}}

-
+
@@ -113,7 +113,7 @@

-
+
Date: Wed, 11 Sep 2019 10:02:21 +0300 Subject: [PATCH 20/63] Updated list styles --- .../views/clients/edit.client.view.html | 90 +++++++++---------- .../client/views/goods/edit.client.view.html | 90 +++++++++---------- 2 files changed, 88 insertions(+), 92 deletions(-) diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index af8ab8e..9d89bf1 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -73,62 +73,60 @@

{{title}}

-
-
-
-
- - -

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

- +
+ +

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

+ {{t.ADDRESS}}: {{order.place ? order.place.name : order.placeDescription}} {{t.TOTAL}}: {{order.total || 0}}{{currency}} - {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} - - -
+ {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} + +
+
-
-
- - -
- +
+
+ +
+
diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 6127619..33898ec 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -75,62 +75,60 @@

{{title}}

-
-
-
- + +

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

+ {{t.ADDRESS}}: {{order.place ? order.place.name : order.placeDescription}} {{t.TOTAL}}: {{order.total || 0}}{{currency}} - {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} - - -
+ {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} + +
+
-
-
- - -
- +
+
+ +
+
From 34cd73dd68e0d97a34870e62bba0b722faea05de Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Wed, 11 Sep 2019 10:07:27 +0300 Subject: [PATCH 21/63] Added list titles --- modules/data/client/views/clients/edit.client.view.html | 3 +++ modules/data/client/views/goods/edit.client.view.html | 3 +++ 2 files changed, 6 insertions(+) diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index 9d89bf1..e512131 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -72,6 +72,9 @@

{{title}}

+
+

Список замовлень

+
diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 33898ec..284d554 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -74,6 +74,9 @@

{{title}}

+
+

Список замовлень

+
From 0e28e9ef9203457fff4cf14491041b1318430232 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Wed, 11 Sep 2019 10:55:05 +0300 Subject: [PATCH 22/63] Fixed list styles --- modules/data/client/views/clients/edit.client.view.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index e512131..8a21b1e 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -72,10 +72,10 @@

{{title}}

-
-

Список замовлень

-
+
+

Список замовлень

+
@@ -114,7 +114,7 @@

-
+
Date: Sat, 14 Sep 2019 00:22:39 +0300 Subject: [PATCH 23/63] Extended client/orders --- .../services/translate.client.service.js | 1 + .../client/views/confirm.client.view.html | 2 +- .../client/config/orders.client.routes.js | 2 +- .../client-edit.client.controller.js | 18 ++++++++-- .../orders-edit.client.controller.js | 11 +++++- .../views/clients/edit.client.view.html | 35 +++++++++++-------- .../client/views/orders/edit.client.view.html | 2 +- .../client/views/orders/list.client.view.html | 7 ++-- 8 files changed, 54 insertions(+), 24 deletions(-) diff --git a/modules/core/client/services/translate.client.service.js b/modules/core/client/services/translate.client.service.js index 6f52d5d..d56adea 100644 --- a/modules/core/client/services/translate.client.service.js +++ b/modules/core/client/services/translate.client.service.js @@ -41,6 +41,7 @@ angular.module('core').factory('t', [function () { CONFIRM: 'Підтвердження', REMOVE_ORDER_CONF: 'Видалити дане замовлення?', PAY_ORDER_CONF: 'Оплатити дане замовлення?', + SEND_ORDER_CONF: 'Відправити дане замовлення?', EDIT_ORDER_NUM: 'Редагувати замовлення #', NEW_ORDER: 'Нове замовлення', EDIT_MANUALLY: 'Ввести вручну', diff --git a/modules/core/client/views/confirm.client.view.html b/modules/core/client/views/confirm.client.view.html index 99af783..903fb49 100644 --- a/modules/core/client/views/confirm.client.view.html +++ b/modules/core/client/views/confirm.client.view.html @@ -1,5 +1,5 @@
-

{{confirmTitle}}

+

{{confirmTitle}}

{{confirmText}}

diff --git a/modules/data/client/config/orders.client.routes.js b/modules/data/client/config/orders.client.routes.js index e0c9924..5ffa83f 100644 --- a/modules/data/client/config/orders.client.routes.js +++ b/modules/data/client/config/orders.client.routes.js @@ -17,7 +17,7 @@ angular.module('data').config(['$stateProvider', } }) .state('orders.create', { - url: '/create', + url: '/create?clientId', templateUrl: 'modules/data/client/views/orders/edit.client.view.html', data: { roles: ['user'] diff --git a/modules/data/client/controllers/client-edit.client.controller.js b/modules/data/client/controllers/client-edit.client.controller.js index a5390d7..61b2e40 100644 --- a/modules/data/client/controllers/client-edit.client.controller.js +++ b/modules/data/client/controllers/client-edit.client.controller.js @@ -2,8 +2,8 @@ // Clients controller angular.module('data').controller('ClientsEditController', [ - '$scope', '$stateParams', '$location', 'Authentication', 'Clients', 'Places', 'Orders', 't', - function ($scope, $stateParams, $location, Authentication, Clients, Places, Orders, t) { + '$scope', '$stateParams', '$location', 'Authentication', 'Clients', 'Places', 'Orders', 'ConfirmService', 't', + function ($scope, $stateParams, $location, Authentication, Clients, Places, Orders, Confirm, t) { $scope.t = t; $scope.authentication = Authentication; $scope.currentPage = 1; @@ -75,5 +75,19 @@ angular.module('data').controller('ClientsEditController', [ $scope.ordersCount = data.count; }); }; + + $scope.pay = function (order) { + Confirm.show($scope.t.CONFIRM, $scope.t.PAY_ORDER_CONF, function () { + order.payed = true; + Orders.update(order); + }); + }; + + $scope.send = function (order) { + Confirm.show($scope.t.CONFIRM, $scope.t.SEND_ORDER_CONF, function () { + order.status = 'sent'; + Orders.update(order); + }); + }; } ]); diff --git a/modules/data/client/controllers/orders-edit.client.controller.js b/modules/data/client/controllers/orders-edit.client.controller.js index 9155b60..cb02754 100644 --- a/modules/data/client/controllers/orders-edit.client.controller.js +++ b/modules/data/client/controllers/orders-edit.client.controller.js @@ -46,7 +46,11 @@ angular.module('data').controller('OrdersEditController', [ else { order.$save(function () { $scope.disableSaveBtn = false; - $location.path('orders'); + if ($stateParams.clientId) { + $location.path('clients/' + $stateParams.clientId + '/edit'); + } else { + $location.path('orders'); + } if (callback) { callback(); } @@ -114,6 +118,11 @@ angular.module('data').controller('OrdersEditController', [ $scope.title = $scope.t.NEW_ORDER; $scope.order.status = $scope.statuses[0].value; $scope.calcArray = calcArray; + if ($stateParams.clientId) { + $scope.order.client = _.find($scope.clients, function (client) { + return client._id === $stateParams.clientId; + }) + } }); } diff --git a/modules/data/client/views/clients/edit.client.view.html b/modules/data/client/views/clients/edit.client.view.html index 8a21b1e..5dcf0c1 100644 --- a/modules/data/client/views/clients/edit.client.view.html +++ b/modules/data/client/views/clients/edit.client.view.html @@ -74,41 +74,46 @@

{{title}}

-

Список замовлень

+

Список замовлень Додати

-
+
-

{{t.CLIENT}}: {{order.client.firstName}} {{order.client.lastName}}, тел: {{order.client.phone}}

+

{{item.good.name}}, {{item.count}}мл

- {{t.ADDRESS}}: {{order.place ? order.place.name : order.placeDescription}} - {{t.TOTAL}}: {{order.total || 0}}{{currency}} + + {{t.TOTAL}}: {{order.total || 0}}грн + {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }} - {{t.CREATED}}: {{order.created | date: "dd-MM-yyyy HH:mm" }}
diff --git a/modules/data/client/views/orders/edit.client.view.html b/modules/data/client/views/orders/edit.client.view.html index 868ce13..6f80904 100644 --- a/modules/data/client/views/orders/edit.client.view.html +++ b/modules/data/client/views/orders/edit.client.view.html @@ -2,7 +2,7 @@

{{title}} - +

diff --git a/modules/data/client/views/orders/list.client.view.html b/modules/data/client/views/orders/list.client.view.html index 0466df5..4cbd7ba 100644 --- a/modules/data/client/views/orders/list.client.view.html +++ b/modules/data/client/views/orders/list.client.view.html @@ -85,16 +85,17 @@

-

+

{{t.ORDER_NUM}}{{order.code}} - + Сплачено -
+

From 0dac494372a3dbf7e8d0002d9844ae0f1102cefb Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Sat, 14 Sep 2019 00:31:30 +0300 Subject: [PATCH 24/63] Lint fix --- .../data/client/controllers/orders-edit.client.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/data/client/controllers/orders-edit.client.controller.js b/modules/data/client/controllers/orders-edit.client.controller.js index cb02754..e5238af 100644 --- a/modules/data/client/controllers/orders-edit.client.controller.js +++ b/modules/data/client/controllers/orders-edit.client.controller.js @@ -121,7 +121,7 @@ angular.module('data').controller('OrdersEditController', [ if ($stateParams.clientId) { $scope.order.client = _.find($scope.clients, function (client) { return client._id === $stateParams.clientId; - }) + }); } }); } From a72fd6dfc73092d24a2fe250e6b0c4c6a62fd00d Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Sat, 14 Sep 2019 08:17:39 +0300 Subject: [PATCH 25/63] Added good.type, removed good.orders --- .../goods-edit.client.controller.js | 21 ++++++++++++++++--- .../client/views/goods/edit.client.view.html | 15 ++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/modules/data/client/controllers/goods-edit.client.controller.js b/modules/data/client/controllers/goods-edit.client.controller.js index 91403c7..3b35c7b 100644 --- a/modules/data/client/controllers/goods-edit.client.controller.js +++ b/modules/data/client/controllers/goods-edit.client.controller.js @@ -43,7 +43,7 @@ angular.module('data').controller('GoodsEditController', goodId: $stateParams.goodId }); $scope.title = $scope.t.GOOD_EDIT; - $scope.updateList(); + // $scope.updateList(); } else { $scope.good = new Goods({ @@ -54,6 +54,21 @@ angular.module('data').controller('GoodsEditController', } }; + $scope.types = [ + { + name: 'Унісекс', + value: 'uni' + }, + { + name: 'Чоловічий', + value: 'm' + }, + { + name: 'Жіночий', + value: 'w' + } + ]; + $scope.cancel = function () { $location.path('goods'); }; @@ -69,7 +84,7 @@ angular.module('data').controller('GoodsEditController', }); }; - $scope.updateList = function () { + /* $scope.updateList = function () { // var place = $scope.selectedPlace ? $scope.selectedPlace._id : undefined; // var status = $scope.selectedStatus ? $scope.selectedStatus.value : undefined; // var payed = _.get($scope.selectedType, 'payed'); @@ -86,6 +101,6 @@ angular.module('data').controller('GoodsEditController', $scope.orders = data.orders; $scope.ordersCount = data.count; }); - }; + }; */ } ]); diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 284d554..02eaabd 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -58,15 +58,24 @@

{{title}}

+
+ +
+
+
@@ -74,7 +83,7 @@

{{title}}

-
+
From 6ee52f5effc4f14ebc39905d8d2ae5e3e130659a Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Mon, 16 Sep 2019 07:39:21 +0300 Subject: [PATCH 26/63] Added good.orders.new --- .../goods-edit.client.controller.js | 28 +++++++++++++++++-- .../client/views/goods/edit.client.view.html | 26 ++++++++--------- .../controllers/basic.server.controller.js | 20 +++++++++++-- .../controllers/goods.server.controller.js | 6 ++++ .../controllers/order.server.controller.js | 10 ++++++- 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/modules/data/client/controllers/goods-edit.client.controller.js b/modules/data/client/controllers/goods-edit.client.controller.js index 3b35c7b..1aa2df2 100644 --- a/modules/data/client/controllers/goods-edit.client.controller.js +++ b/modules/data/client/controllers/goods-edit.client.controller.js @@ -43,7 +43,7 @@ angular.module('data').controller('GoodsEditController', goodId: $stateParams.goodId }); $scope.title = $scope.t.GOOD_EDIT; - // $scope.updateList(); + $scope.updateList(); } else { $scope.good = new Goods({ @@ -84,7 +84,7 @@ angular.module('data').controller('GoodsEditController', }); }; - /* $scope.updateList = function () { + $scope.updateList = function () { // var place = $scope.selectedPlace ? $scope.selectedPlace._id : undefined; // var status = $scope.selectedStatus ? $scope.selectedStatus.value : undefined; // var payed = _.get($scope.selectedType, 'payed'); @@ -101,6 +101,28 @@ angular.module('data').controller('GoodsEditController', $scope.orders = data.orders; $scope.ordersCount = data.count; }); - }; */ + }; + + $scope.pay = function (order) { + Confirm.show($scope.t.CONFIRM, $scope.t.PAY_ORDER_CONF, function () { + order.payed = true; + Orders.update(order); + $scope.filterOrders(); + }); + }; + + $scope.send = function (order) { + Confirm.show($scope.t.CONFIRM, $scope.t.SEND_ORDER_CONF, function () { + order.status = 'sent'; + Orders.update(order); + $scope.filterOrders(); + }); + }; + + $scope.filterOrders = function () { + $scope.orders = _.filter($scope.orders, function (order) { + return !order.payed && order.status !== 'sent'; + }); + }; } ]); diff --git a/modules/data/client/views/goods/edit.client.view.html b/modules/data/client/views/goods/edit.client.view.html index 02eaabd..83d744b 100644 --- a/modules/data/client/views/goods/edit.client.view.html +++ b/modules/data/client/views/goods/edit.client.view.html @@ -83,43 +83,39 @@

{{title}}

- +
diff --git a/modules/data/server/controllers/basic.server.controller.js b/modules/data/server/controllers/basic.server.controller.js index e40e0c4..72a75fc 100644 --- a/modules/data/server/controllers/basic.server.controller.js +++ b/modules/data/server/controllers/basic.server.controller.js @@ -39,9 +39,23 @@ class BasicController { list(req, res) { const { limit, page, q = '' } = req.query; - const { fieldNames = [] } = this.options; - const $or = fieldNames.map(field => ({ [field]: { $regex: new RegExp(q, 'i') } })); - const items = this.model.find({ $or }) + const { fieldNames = [], extraListFilters = [] } = this.options; + const query = { + $or: fieldNames.map(field => ({ [field]: { $regex: new RegExp(q, 'i') } })) + }; + if (extraListFilters.length) { + const $and = []; + extraListFilters.forEach(({ key, getFilter }) => { + if (req.query[key]) { + $and.push(getFilter(req.query)); + } + }); + if ($and.length) { + query.$and = $and; + } + } + console.log(query); + const items = this.model.find(query) .limit(parseInt(limit, 10)) .skip((page - 1) * limit) .sort('-created') diff --git a/modules/data/server/controllers/goods.server.controller.js b/modules/data/server/controllers/goods.server.controller.js index c8b2fce..ec0054a 100644 --- a/modules/data/server/controllers/goods.server.controller.js +++ b/modules/data/server/controllers/goods.server.controller.js @@ -6,6 +6,12 @@ class GoodsController extends BasicController { fieldNames: [ 'name', 'details' + ], + extraListFilters: [ + { + key: 'type', + getFilter: query => ({ type: query.type }) + } ] }); } diff --git a/modules/data/server/controllers/order.server.controller.js b/modules/data/server/controllers/order.server.controller.js index 4779c65..4820408 100644 --- a/modules/data/server/controllers/order.server.controller.js +++ b/modules/data/server/controllers/order.server.controller.js @@ -177,7 +177,15 @@ exports.list = (req, res) => { $or.push({ client: { $in: clientIds } }); } if (good) { - $or.push({ 'items.good': { $in: [Types.ObjectId(good)] } }); + $or.push({ + $and: [ + { + 'items.good': { $in: [Types.ObjectId(good)] }, + status: { $ne: 'sent' }, + payed: false, + } + ] + }); } if ($or.length) { _.extend(search, { $or }); From 808f040261bb12601b351b044775ca11472e4e08 Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Mon, 16 Sep 2019 18:35:36 +0300 Subject: [PATCH 27/63] Added order.extras on server side --- .../data/server/controllers/basic.server.controller.js | 2 -- .../data/server/controllers/order.server.controller.js | 8 ++++++-- modules/data/server/models/order.server.model.js | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/data/server/controllers/basic.server.controller.js b/modules/data/server/controllers/basic.server.controller.js index 72a75fc..e966294 100644 --- a/modules/data/server/controllers/basic.server.controller.js +++ b/modules/data/server/controllers/basic.server.controller.js @@ -54,7 +54,6 @@ class BasicController { query.$and = $and; } } - console.log(query); const items = this.model.find(query) .limit(parseInt(limit, 10)) .skip((page - 1) * limit) @@ -68,7 +67,6 @@ class BasicController { }) .then(data => res.json(data)) .catch((err) => { - console.log(err); return res.status(400).send({ message: errorHandler.getErrorMessage(err) }); diff --git a/modules/data/server/controllers/order.server.controller.js b/modules/data/server/controllers/order.server.controller.js index 4820408..328eb61 100644 --- a/modules/data/server/controllers/order.server.controller.js +++ b/modules/data/server/controllers/order.server.controller.js @@ -17,7 +17,8 @@ exports.create = (req, res) => { sale, credit, total, - extra = 0 + extra = 0, + extras = [] } = req.body; const orderData = { items, @@ -28,7 +29,8 @@ exports.create = (req, res) => { sale, credit, total, - extra + extra, + extras }; async.parallel([ (callback) => { @@ -89,6 +91,7 @@ exports.update = (req, res) => { credit, total, extra, + extras, client: { phone, _id @@ -105,6 +108,7 @@ exports.update = (req, res) => { order.credit = credit; order.total = total; order.extra = extra; + order.extras = extras; order.save((err) => { if (err) { diff --git a/modules/data/server/models/order.server.model.js b/modules/data/server/models/order.server.model.js index 60cf683..14c6587 100644 --- a/modules/data/server/models/order.server.model.js +++ b/modules/data/server/models/order.server.model.js @@ -69,6 +69,10 @@ const OrderSchema = new Schema({ extra: { type: Number, default: 0 + }, + // will be fully implemented in IRIS v1.4.0 + extras: { + type: [Schema.Types.Mixed] } }); From b6115965e787ebec6814b7470bab67cf8033884d Mon Sep 17 00:00:00 2001 From: Andrii Yermolenko Date: Tue, 17 Sep 2019 09:09:34 +0300 Subject: [PATCH 28/63] view for checkboxes --- .../controllers/orders-edit.client.controller.js | 2 ++ modules/data/client/views/orders/edit.client.view.html | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/modules/data/client/controllers/orders-edit.client.controller.js b/modules/data/client/controllers/orders-edit.client.controller.js index e5238af..756ecb7 100644 --- a/modules/data/client/controllers/orders-edit.client.controller.js +++ b/modules/data/client/controllers/orders-edit.client.controller.js @@ -10,6 +10,7 @@ angular.module('data').controller('OrdersEditController', [ $scope.currency = $scope.t.UAH; $scope.currentPage = 1; $scope.itemsPerPage = 20; + $scope.separate = false; $scope.isSalesShown = false; @@ -112,6 +113,7 @@ angular.module('data').controller('OrdersEditController', [ }); } else { + $scope.separate = true; Clients.query(function (data) { $scope.clients = data; $scope.order = new Orders(); diff --git a/modules/data/client/views/orders/edit.client.view.html b/modules/data/client/views/orders/edit.client.view.html index 6f80904..a6a554f 100644 --- a/modules/data/client/views/orders/edit.client.view.html +++ b/modules/data/client/views/orders/edit.client.view.html @@ -167,6 +167,16 @@

+ + {{t.BAR}} - {{version}}