From 2ac046c155301bb6dc9ae125aeefb5b5221d7607 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 7 Feb 2018 17:54:15 +0300 Subject: [PATCH 01/48] CLIENT-472: change package lock --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0994019e41..96a6a999ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.0.0-beta.10", + "version": "1.0.0-beta.11", "lockfileVersion": 1, "requires": true, "dependencies": { From c51a80f2aadc716799ee66554c3288635946fa88 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 08:18:35 +0300 Subject: [PATCH 02/48] CLIENT-472: fix current change 24h --- src/modules/app/services/waves/WavesUtils.js | 20 ++++++++++++++----- .../modules/assets/controllers/AssetsCtrl.js | 15 +++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/modules/app/services/waves/WavesUtils.js b/src/modules/app/services/waves/WavesUtils.js index a8a49ed1b9..4e9b8167a5 100644 --- a/src/modules/app/services/waves/WavesUtils.js +++ b/src/modules/app/services/waves/WavesUtils.js @@ -177,15 +177,24 @@ _getChange(from, to) { return Waves.AssetPair.get(from, to) .then((pair) => { - return fetch(`${WavesApp.network.datafeed}/api/candles/${pair.toString()}/1440/1`) + return fetch(`${WavesApp.network.datafeed}/api/candles/${pair.toString()}/15/97`) .then(utils.onFetch) .then((data) => { - if (!data || !data.length) { + if (!data) { return 0; } + + data = data.filter(({ open, close }) => Number(open) !== 0 && Number(close) !== 0) + .sort(utils.comparators.process(({ timestamp }) => timestamp).asc); + + if (!data.length) { + return 0; + } + const open = Number(data[0].open); - const close = Number(data[0].close); - const percent = open ? (close - open) * 100 / open : 0; + const close = Number(data[data.length - 1].close); + + const percent = open ? ((close - open) / open * 100) : 0; if (pair.amountAsset.id === from) { return percent; @@ -258,7 +267,8 @@ }); } - return result.filter((item) => item.timestamp > from && item.timestamp < to); + return result.filter((item) => item.timestamp > from && item.timestamp < to) + .sort(utils.comparators.process(({ timestamp }) => timestamp).asc); }, []); }); }); diff --git a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js b/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js index 5a66abb0dd..ec46d5204d 100644 --- a/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js +++ b/src/modules/wallet/modules/assets/controllers/AssetsCtrl.js @@ -199,13 +199,14 @@ const from = this.activeChartAssetId; const to = this.mirrorId; - return utils.whenAll([ - waves.utils.getRateHistory(from, to, this._startDate), - waves.utils.getRate(from, to) - ]) - .then(([values, rate]) => { - this.change = (values[0].rate - values[values.length - 1].rate).toFixed(2); - this.changePercent = (this.change * 100 / Number(rate.toString())).toFixed(2); + return utils.when(waves.utils.getRateHistory(from, to, this._startDate)) + .then((values) => { + const first = values[0].rate; + const last = values[values.length - 1].rate; + + this.change = (last - first).toFixed(2); + this.changePercent = ((last - first) / first * 100).toFixed(2); + return { values }; }); } From 507579e4209d23940d0e47a8405bb85d7b3fca0e Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 08:44:36 +0300 Subject: [PATCH 03/48] CLIENT-472: fix get interval for rate request --- src/modules/app/services/waves/WavesUtils.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/app/services/waves/WavesUtils.js b/src/modules/app/services/waves/WavesUtils.js index 4e9b8167a5..ff4d3b16d1 100644 --- a/src/modules/app/services/waves/WavesUtils.js +++ b/src/modules/app/services/waves/WavesUtils.js @@ -142,17 +142,17 @@ * @param {Moment} from * @private */ + @decorators.cachable() _getChangeByInterval(from) { - const MINUTE_TIME = 1000 * 60; - const INTERVALS = [5, 30, 240, 1440]; + const INTERVALS = [5, 15, 30, 60, 240, 1440]; const MAX_COUNTS = 100; const intervalMinutes = (Date.now() - from.getDate()) / MINUTE_TIME; let interval, i = 0; do { - if (intervalMinutes / INTERVALS[i] < MAX_COUNTS) { + if ((intervalMinutes / INTERVALS[i]) < MAX_COUNTS) { interval = INTERVALS[i]; } else { i++; @@ -177,7 +177,8 @@ _getChange(from, to) { return Waves.AssetPair.get(from, to) .then((pair) => { - return fetch(`${WavesApp.network.datafeed}/api/candles/${pair.toString()}/15/97`) + const interval = this._getChangeByInterval(utils.moment().add().day(-1)); + return fetch(`${WavesApp.network.datafeed}/api/candles/${pair.toString()}/${interval}`) .then(utils.onFetch) .then((data) => { if (!data) { From 3a1579575bea4bc0867da2508d12db9ff417880e Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 09:27:42 +0300 Subject: [PATCH 04/48] CLIENT-443: change package lock --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0994019e41..96a6a999ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.0.0-beta.10", + "version": "1.0.0-beta.11", "lockfileVersion": 1, "requires": true, "dependencies": { From a81fb2aa0eb83f438ade240dc356e556e6d87528 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 09:28:07 +0300 Subject: [PATCH 05/48] CLIENT-443: add electron menu --- electron/main.ts | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/electron/main.ts b/electron/main.ts index af02e6ef16..458e4b398b 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1,10 +1,11 @@ -import { app, BrowserWindow, screen, protocol } from 'electron'; +import { app, BrowserWindow, screen, protocol, Menu } from 'electron'; import { ISize, IMetaJSON } from './package'; import { format } from 'url'; import { readFile, stat, writeFile } from 'fs'; import { join } from 'path'; import BrowserWindowConstructorOptions = Electron.BrowserWindowConstructorOptions; +import MenuItemConstructorOptions = Electron.MenuItemConstructorOptions; const CONFIG = { META_PATH: join(app.getPath('userData'), 'meta.json'), @@ -25,6 +26,28 @@ const CONFIG = { } }; +const MENU_LIST: MenuItemConstructorOptions[] = [ + { + label: 'Application', + submenu: [ + { label: 'About Application', selector: 'orderFrontStandardAboutPanel:' }, + { type: 'separator' }, + { label: 'Quit', accelerator: 'Command+Q', click: () => app.quit() } + ] + } as MenuItemConstructorOptions, { + label: 'Edit', + submenu: [ + { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' }, + { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' }, + { type: 'separator' }, + { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' }, + { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' }, + { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' }, + { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' } + ] + } as MenuItemConstructorOptions +]; + class Main { @@ -34,6 +57,8 @@ class Main { this.mainWindow = null; this.setHandlers(); + + Menu.setApplicationMenu(Menu.buildFromTemplate(MENU_LIST)); } private createWindow() { From 3d041ae2d12c4e278b805f85138001d14c45dd87 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 09:29:38 +0300 Subject: [PATCH 06/48] CLIENT-354: change package lock --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 0994019e41..96a6a999ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.0.0-beta.10", + "version": "1.0.0-beta.11", "lockfileVersion": 1, "requires": true, "dependencies": { From 5819ab0f2ca1fcf5a8bed862a66071921d386fd1 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 09:59:07 +0300 Subject: [PATCH 07/48] CLIENT-354: change package lock --- package-lock.json | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 96a6a999ca..41b279595e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2428,6 +2428,16 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "clipboard": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz", + "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs=", + "requires": { + "good-listener": "1.2.2", + "select": "1.1.2", + "tiny-emitter": "2.0.2" + } + }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -3007,6 +3017,11 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -5103,7 +5118,8 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "json-schema": { "version": "0.2.3", @@ -5855,6 +5871,14 @@ "sparkles": "1.0.0" } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "requires": { + "delegate": "3.2.0" + } + }, "got": { "version": "6.7.1", "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", @@ -10498,6 +10522,11 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=" + }, "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", @@ -11374,6 +11403,11 @@ "process": "0.11.10" } }, + "tiny-emitter": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz", + "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==" + }, "tmp": { "version": "0.0.28", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", From f813c199e273aa2547d1976f3736add96b423ff7 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 09:59:38 +0300 Subject: [PATCH 08/48] CLIENT-354: add clipboard.js for deps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 718201f492..0ff95b8118 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "angular-material": "^1.1.5", "angular-ui-router": "^1.0.3", "bignumber.js": "^4.1.0", + "clipboard": "^1.7.1", "csv-gen": "^0.0.6", "d3": "^3.5.17", "html-minifier": "^3.5.7", From 08a6803b1da7ab94fb69536eeed360049b8dc7a3 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 11:06:55 +0300 Subject: [PATCH 09/48] CLIENT-477: change package lock --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From ec9481b0d007eccac1b06c31d40375f0c3b3b50a Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 11:07:07 +0300 Subject: [PATCH 10/48] CLIENT-477: fix asset validator parser --- src/modules/utils/directives/validators/Validate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/utils/directives/validators/Validate.js b/src/modules/utils/directives/validators/Validate.js index 8a40667d5c..854a0feba0 100644 --- a/src/modules/utils/directives/validators/Validate.js +++ b/src/modules/utils/directives/validators/Validate.js @@ -397,7 +397,7 @@ return (viewValue && !!modelValue) || !viewValue; }, parser: (value) => { - if (precisionValidator.handler($ngModel.$modelValue, value)) { + if (value && precisionValidator.handler($ngModel.$modelValue, value)) { return Validate._toMoney(value, validator.money); } else { return null; From 4e8c51754213e1cb618c1ce2369f9336bc3218fa Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 9 Feb 2018 12:55:58 +0300 Subject: [PATCH 11/48] CLIENT-478: change package lock --- electron/main.ts | 9 ++- package-lock.json | 169 +++++++++++++++++++++++----------------------- 2 files changed, 92 insertions(+), 86 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index af02e6ef16..8bedc4ef34 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -49,6 +49,10 @@ class Main { this.mainWindow = null; }); + this.mainWindow.webContents.on('will-navigate', function (event) { + event.preventDefault(); + }); + const onChangeWindow = Main.asyncHandler(() => { const [x, y] = this.mainWindow.getPosition(); const [width, height] = this.mainWindow.getSize(); @@ -139,7 +143,10 @@ class Main { minWidth: CONFIG.MIN_SIZE.width, minHeight: CONFIG.MIN_SIZE.height, icon: join(__dirname, 'img/icon.png'), - fullscreen, width, height, x, y + fullscreen, width, height, x, y, + webPreferences: { + contextIsolation: true + } }; } diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From 775af6a6615feb687eec89683c9c8378e8f9817e Mon Sep 17 00:00:00 2001 From: Phil Filippak Date: Mon, 12 Feb 2018 12:37:04 +0300 Subject: [PATCH 12/48] Removed unneeded caching decorator --- src/modules/app/services/waves/WavesUtils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/app/services/waves/WavesUtils.js b/src/modules/app/services/waves/WavesUtils.js index ff4d3b16d1..cae98cd7c0 100644 --- a/src/modules/app/services/waves/WavesUtils.js +++ b/src/modules/app/services/waves/WavesUtils.js @@ -142,7 +142,6 @@ * @param {Moment} from * @private */ - @decorators.cachable() _getChangeByInterval(from) { const MINUTE_TIME = 1000 * 60; const INTERVALS = [5, 15, 30, 60, 240, 1440]; From 271afabfd81fb0afa7a6d5d7d9f48178e844ecf8 Mon Sep 17 00:00:00 2001 From: Phil Filippak Date: Mon, 12 Feb 2018 15:50:46 +0300 Subject: [PATCH 13/48] Disabled isolated context --- electron/main.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 8bedc4ef34..93b416be36 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -143,10 +143,7 @@ class Main { minWidth: CONFIG.MIN_SIZE.width, minHeight: CONFIG.MIN_SIZE.height, icon: join(__dirname, 'img/icon.png'), - fullscreen, width, height, x, y, - webPreferences: { - contextIsolation: true - } + fullscreen, width, height, x, y }; } From c68d36c04520a95330271727d624f502772333a0 Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 12 Feb 2018 19:29:08 +0300 Subject: [PATCH 14/48] CLIENT-372: change package lock --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From aceb31639d80227224a3234da8eb8b9262b0e117 Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 12 Feb 2018 19:29:40 +0300 Subject: [PATCH 15/48] CLIENT-372: fix ff select text when drag and drop create order --- src/modules/ui/directives/draggable/Draggable.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/ui/directives/draggable/Draggable.js b/src/modules/ui/directives/draggable/Draggable.js index f0718b58e8..0aa9570ae1 100644 --- a/src/modules/ui/directives/draggable/Draggable.js +++ b/src/modules/ui/directives/draggable/Draggable.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - const directive = (Base) => { + const directive = () => { return { scope: false, @@ -16,6 +16,7 @@ const $document = $(document); $element.on('mousedown', (e) => { + e.preventDefault(); const startX = e.pageX; const startY = e.pageY; const x = parseInt($element.css('left'), 10); @@ -45,7 +46,7 @@ }; }; - directive.$inject = ['Base']; + directive.$inject = []; angular.module('app.ui').directive('wDraggable', directive); From 05ecb2d89e3779df4f33debf706bbef48335a27b Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 12 Feb 2018 19:32:18 +0300 Subject: [PATCH 16/48] CLIENT-441: change package lock --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From 0c53bd33bdf3ccba109e18e1f195fde2be6618f8 Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 12 Feb 2018 19:42:10 +0300 Subject: [PATCH 17/48] CLIENT-441: fix round filled order --- src/modules/app/services/waves/matcher/Matcher.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/app/services/waves/matcher/Matcher.js b/src/modules/app/services/waves/matcher/Matcher.js index 8c16ac5b1b..c7d947d73f 100644 --- a/src/modules/app/services/waves/matcher/Matcher.js +++ b/src/modules/app/services/waves/matcher/Matcher.js @@ -184,7 +184,8 @@ Promise.resolve(`${assetPair.priceAsset.displayName} / ${assetPair.amountAsset.displayName}`) ])) .then(([price, amount, filled, pair]) => { - const percent = filled.getTokens().div(amount.getTokens()).mul(100); + const percent = filled.getTokens().div(amount.getTokens()).mul(100).round(2); // TODO + // TODO Move to component myOrders (dex refactor); const STATUS_MAP = { 'Cancelled': 'matcher.orders.statuses.canceled', 'Accepted': 'matcher.orders.statuses.opened', From 6bbc5de82385884232cf19afd847bffc05477f09 Mon Sep 17 00:00:00 2001 From: daniil Date: Tue, 13 Feb 2018 13:01:43 +0300 Subject: [PATCH 18/48] CLIENT-443: fix electron menu for mac --- electron/main.ts | 5 +- package-lock.json | 462 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 464 insertions(+), 4 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 458e4b398b..500193b1a8 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -30,8 +30,6 @@ const MENU_LIST: MenuItemConstructorOptions[] = [ { label: 'Application', submenu: [ - { label: 'About Application', selector: 'orderFrontStandardAboutPanel:' }, - { type: 'separator' }, { label: 'Quit', accelerator: 'Command+Q', click: () => app.quit() } ] } as MenuItemConstructorOptions, { @@ -57,8 +55,6 @@ class Main { this.mainWindow = null; this.setHandlers(); - - Menu.setApplicationMenu(Menu.buildFromTemplate(MENU_LIST)); } private createWindow() { @@ -110,6 +106,7 @@ class Main { private onAppReady() { this.replaceProtocol(); this.createWindow(); + Menu.setApplicationMenu(Menu.buildFromTemplate(MENU_LIST)); } private onActivate() { diff --git a/package-lock.json b/package-lock.json index a20df19155..685051e8c1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -557,6 +557,12 @@ "color-convert": "1.9.0" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -677,6 +683,37 @@ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, + "asar": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz", + "integrity": "sha512-eKo4ywQDq9dC/0Pu6UJsX4PxNi5ZlC4/NQ1JORUW4xkMRrEWpoLPpkngmQ6K7ZkioVjE2ZafLMmHPAQKMO0BdA==", + "dev": true, + "requires": { + "chromium-pickle-js": "0.2.0", + "commander": "2.11.0", + "cuint": "0.2.2", + "glob": "6.0.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.0", + "mksnapshot": "0.3.1", + "tmp": "0.0.28" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, "asar-integrity": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asar-integrity/-/asar-integrity-0.2.4.tgz", @@ -768,6 +805,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "author-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", + "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", + "dev": true + }, "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", @@ -1597,6 +1640,16 @@ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" }, + "binary": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", + "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", + "dev": true, + "requires": { + "buffers": "0.1.1", + "chainsaw": "0.1.0" + } + }, "binary-extensions": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", @@ -2093,6 +2146,12 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, + "buffers": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", + "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", + "dev": true + }, "bufferstreams": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz", @@ -2337,6 +2396,15 @@ "lazy-cache": "1.0.4" } }, + "chainsaw": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", + "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", + "dev": true, + "requires": { + "traverse": "0.3.9" + } + }, "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", @@ -2897,6 +2965,12 @@ "resolved": "https://registry.npmjs.org/csv-gen/-/csv-gen-0.0.6.tgz", "integrity": "sha512-5b5Yzeo5wpdPi+PCl4OMxexbMpL7tprmhSUIpQf9W0QLI+ulwM1SZvlymknluPc+6kFHkngoXindDixgpn4Zaw==" }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", + "dev": true + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2960,6 +3034,21 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decompress-zip": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz", + "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=", + "dev": true, + "requires": { + "binary": "0.3.0", + "graceful-fs": "4.1.11", + "mkpath": "0.1.0", + "nopt": "3.0.6", + "q": "1.5.0", + "readable-stream": "1.1.14", + "touch": "0.0.3" + } + }, "deep-extend": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", @@ -3696,6 +3785,164 @@ } } }, + "electron-osx-sign": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz", + "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "compare-version": "0.1.2", + "debug": "2.6.8", + "isbinaryfile": "3.0.2", + "minimist": "1.2.0", + "plist": "2.1.0" + } + }, + "electron-packager": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.1.tgz", + "integrity": "sha1-wtH/nsqBEL6evIGCbiqSHATRIA4=", + "dev": true, + "requires": { + "asar": "0.14.2", + "debug": "3.1.0", + "electron-download": "4.1.0", + "electron-osx-sign": "0.4.8", + "extract-zip": "1.6.6", + "fs-extra": "5.0.0", + "get-package-info": "1.0.0", + "mz": "2.7.0", + "nodeify": "1.0.1", + "parse-author": "2.0.0", + "pify": "3.0.0", + "plist": "2.1.0", + "pruner": "0.0.7", + "rcedit": "1.0.0", + "resolve": "1.4.0", + "sanitize-filename": "1.6.1", + "semver": "5.4.1", + "yargs-parser": "9.0.2" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "electron-download": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz", + "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=", + "dev": true, + "requires": { + "debug": "2.6.9", + "env-paths": "1.0.0", + "fs-extra": "2.1.2", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "3.0.0", + "rc": "1.2.5", + "semver": "5.4.1", + "sumchecker": "2.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0" + } + } + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + }, + "dependencies": { + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "sumchecker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", + "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=", + "dev": true, + "requires": { + "debug": "2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, "electron-publish": { "version": "19.55.2", "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.55.2.tgz", @@ -5593,6 +5840,77 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" }, + "get-package-info": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", + "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "debug": "2.6.8", + "lodash.get": "4.4.2", + "read-pkg-up": "2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -8390,6 +8708,12 @@ "lodash._root": "3.0.1" } }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -8807,6 +9131,38 @@ } } }, + "mkpath": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz", + "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=", + "dev": true + }, + "mksnapshot": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz", + "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=", + "dev": true, + "requires": { + "decompress-zip": "0.3.0", + "fs-extra": "0.26.7", + "request": "2.81.0" + }, + "dependencies": { + "fs-extra": { + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", + "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.1" + } + } + } + }, "module-deps": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz", @@ -8943,6 +9299,17 @@ "integrity": "sha1-N1hVVaT/GYUwntrHwqBFpGa+bDI=", "dev": true }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "object-assign": "4.1.1", + "thenify-all": "1.6.0" + } + }, "n3-charts": { "version": "2.0.28", "resolved": "https://registry.npmjs.org/n3-charts/-/n3-charts-2.0.28.tgz", @@ -9009,6 +9376,33 @@ "is-stream": "1.1.0" } }, + "nodeify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz", + "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=", + "dev": true, + "requires": { + "is-promise": "1.0.1", + "promise": "1.3.0" + }, + "dependencies": { + "is-promise": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", + "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=", + "dev": true + }, + "promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", + "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", + "dev": true, + "requires": { + "is-promise": "1.0.1" + } + } + } + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -9381,6 +9775,15 @@ "pbkdf2": "3.0.14" } }, + "parse-author": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", + "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", + "dev": true, + "requires": { + "author-regex": "1.0.0" + } + }, "parse-color": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz", @@ -9812,6 +10215,15 @@ "dev": true, "optional": true }, + "pruner": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz", + "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=", + "dev": true, + "requires": { + "fs-extra": "4.0.2" + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -9959,6 +10371,12 @@ "strip-json-comments": "2.0.1" } }, + "rcedit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.0.0.tgz", + "integrity": "sha512-W7DNa34x/3OgWyDHsI172AG/Lr/lZ+PkavFkHj0QhhkBRcV9QTmRJE1tDKrWkx8XHPSBsmZkNv9OKue6pncLFQ==", + "dev": true + }, "react": { "version": "0.14.9", "resolved": "https://registry.npmjs.org/react/-/react-0.14.9.tgz", @@ -11324,6 +11742,24 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "thenify": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", + "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", + "dev": true, + "requires": { + "any-promise": "1.3.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", + "dev": true, + "requires": { + "thenify": "3.3.0" + } + }, "throttleit": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", @@ -11402,6 +11838,26 @@ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, + "touch": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", + "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=", + "dev": true, + "requires": { + "nopt": "1.0.10" + }, + "dependencies": { + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", + "dev": true, + "requires": { + "abbrev": "1.1.0" + } + } + } + }, "tough-cookie": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", @@ -11411,6 +11867,12 @@ "punycode": "1.4.1" } }, + "traverse": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", + "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", + "dev": true + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", diff --git a/package.json b/package.json index 94cc3a58be..8fd56529fc 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "connect": "^3.6.5", "electron": "^1.8.2-beta.5", "electron-builder": "^19.55.3", + "electron-packager": "^11.0.1", "eslint": "^4.9.0", "fs-extra": "^4.0.2", "gulp": "^3.9.1", From fae77698ca4f0166b7e016d3448f3420bdb27de3 Mon Sep 17 00:00:00 2001 From: xenohunter Date: Tue, 13 Feb 2018 16:41:16 +0300 Subject: [PATCH 19/48] CLIENT-450: fixed invalid price-to-string transformation --- src/modules/app/services/waves/matcher/Matcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/app/services/waves/matcher/Matcher.js b/src/modules/app/services/waves/matcher/Matcher.js index 8c16ac5b1b..d3d78af941 100644 --- a/src/modules/app/services/waves/matcher/Matcher.js +++ b/src/modules/app/services/waves/matcher/Matcher.js @@ -213,7 +213,7 @@ amount: lastAsk.price, price: new BigNumber(lastAsk.price).sub(firstBid.price) .abs() - .toFormat(pair.priceAsset.precision), + .toFixed(pair.priceAsset.precision), total: firstBid.price } || { amount: '0', price: '0', total: '0' }; } From bc772c3b9d84105d925a3fe0c48e7f4c600abee8 Mon Sep 17 00:00:00 2001 From: tsigel Date: Tue, 13 Feb 2018 17:09:05 +0300 Subject: [PATCH 20/48] CLIENT-443: fix copy --- src/modules/create/controllers/CreateCtrl.js | 6 +- src/modules/create/templates/backupSeed.html | 2 +- src/modules/ui/directives/copy/copy.js | 40 +++++++++++++ .../{copy/Copy.js => copyWrap/CopyWrap.js} | 17 +++--- .../copy.less => copyWrap/copyWrap.less} | 2 +- .../ui/directives/transaction/Transaction.js | 12 ++-- .../directives/transaction/transaction.html | 4 +- .../modals/accountInfo/account-info.less | 4 +- .../accountInfo/account-info.modal.html | 14 ++--- .../addressQrCode/address-qr-code.modal.html | 4 +- .../depositAsset/deposit-asset.modal.html | 2 +- src/modules/utils/services/CopyService.js | 27 --------- src/modules/utils/services/utils.js | 60 +++++++++++++++++++ ts-scripts/meta.json | 1 + 14 files changed, 132 insertions(+), 63 deletions(-) create mode 100644 src/modules/ui/directives/copy/copy.js rename src/modules/ui/directives/{copy/Copy.js => copyWrap/CopyWrap.js} (53%) rename src/modules/ui/directives/{copy/copy.less => copyWrap/copyWrap.less} (97%) delete mode 100644 src/modules/utils/services/CopyService.js diff --git a/src/modules/create/controllers/CreateCtrl.js b/src/modules/create/controllers/CreateCtrl.js index 0a233fbf25..f0cf43cc44 100644 --- a/src/modules/create/controllers/CreateCtrl.js +++ b/src/modules/create/controllers/CreateCtrl.js @@ -8,12 +8,11 @@ * @param {User} user * @param {ModalManager} modalManager * @param {ISeedService} seedService - * @param {CopyService} copyService * @param {NotificationManager} notificationManager * @return {CreateCtrl} */ const controller = function ($q, $mdDialog, $timeout, user, modalManager, - seedService, copyService, notificationManager) { + seedService, notificationManager) { const PATH = 'modules/create/templates'; const ORDER_LIST = [ @@ -104,7 +103,6 @@ copySeed() { if (this.seed) { analytics.push('Welcome', 'Welcome.CopySeed'); - copyService.copy(this.seed); notificationManager.info({ ns: 'app.create', title: { literal: 'backupSeed.seedCopied' } @@ -156,7 +154,7 @@ }; controller.$inject = [ - '$q', '$mdDialog', '$timeout', 'user', 'modalManager', 'seedService', 'copyService', 'notificationManager' + '$q', '$mdDialog', '$timeout', 'user', 'modalManager', 'seedService', 'notificationManager' ]; angular.module('app.create').controller('CreateCtrl', controller); diff --git a/src/modules/create/templates/backupSeed.html b/src/modules/create/templates/backupSeed.html index d99485c34e..48e78adb85 100644 --- a/src/modules/create/templates/backupSeed.html +++ b/src/modules/create/templates/backupSeed.html @@ -11,7 +11,7 @@
backupSeed.writeSeed -  backupSeed.or  +  backupSeed.or 
diff --git a/src/modules/ui/directives/copy/copy.js b/src/modules/ui/directives/copy/copy.js new file mode 100644 index 0000000000..59ee99ceeb --- /dev/null +++ b/src/modules/ui/directives/copy/copy.js @@ -0,0 +1,40 @@ +(function () { + 'use strict'; + + /** + * @param {app.utils} utils + * @return {*} + */ + const directive = function (utils) { + return { + restrict: 'A', + priority: 100, + scope: false, + compile: function ($element, $attrs) { + return function ($scope, $element) { + + const destroy = new tsUtils.Signal(); + const stop = $scope.$on('$destroy', () => { + destroy.dispatch(); + stop(); + }); + + const param = utils.parseAngularParam($attrs.wCopy, $scope, destroy); + const clipboard = new Clipboard($element.get(0), { + text: () => param.value, + container: $element.get(0) + }); + + destroy.once(() => { + clipboard.destroy(); + }); + + }; + } + }; + }; + + directive.$inject = ['utils']; + + angular.module('app.ui').directive('wCopy', directive); +})(); diff --git a/src/modules/ui/directives/copy/Copy.js b/src/modules/ui/directives/copyWrap/CopyWrap.js similarity index 53% rename from src/modules/ui/directives/copy/Copy.js rename to src/modules/ui/directives/copyWrap/CopyWrap.js index 86e59d8e5a..9d695ecfb0 100644 --- a/src/modules/ui/directives/copy/Copy.js +++ b/src/modules/ui/directives/copyWrap/CopyWrap.js @@ -2,17 +2,14 @@ 'use strict'; /** - * @param Base - * @param copyService * @param {NotificationManager} notificationManager - * @return {Copy} + * @return {CopyWrap} */ - const controller = function (Base, copyService, notificationManager) { + const controller = function (notificationManager) { - class Copy extends Base { + class CopyWrap { copy() { - copyService.copy(this.info); notificationManager.info({ ns: 'app.ui', title: { literal: 'copySuccess' } @@ -21,16 +18,16 @@ } - return new Copy(); + return new CopyWrap(); }; - controller.$inject = ['Base', 'copyService', 'notificationManager']; + controller.$inject = ['notificationManager']; - angular.module('app.ui').component('wCopy', { + angular.module('app.ui').component('wCopyWrap', { bindings: { info: '@' }, - template: '
', + template: '
', transclude: true, controller }); diff --git a/src/modules/ui/directives/copy/copy.less b/src/modules/ui/directives/copyWrap/copyWrap.less similarity index 97% rename from src/modules/ui/directives/copy/copy.less rename to src/modules/ui/directives/copyWrap/copyWrap.less index 4d12791ee5..e92481fbf6 100644 --- a/src/modules/ui/directives/copy/copy.less +++ b/src/modules/ui/directives/copyWrap/copyWrap.less @@ -1,6 +1,6 @@ @import (reference) url('../../../config'); -w-copy { +w-copy-wrap { display: block; position: relative; background-color: @color-basic-50; diff --git a/src/modules/ui/directives/transaction/Transaction.js b/src/modules/ui/directives/transaction/Transaction.js index cb18cc73ca..db3a434f1e 100644 --- a/src/modules/ui/directives/transaction/Transaction.js +++ b/src/modules/ui/directives/transaction/Transaction.js @@ -9,14 +9,13 @@ * @param {ModalManager} modalManager * @param {NotificationManager} notificationManager * @param {Waves} waves - * @param {CopyService} copyService * @param {User} user * @param {BaseAssetService} baseAssetService * @param {DexService} dexService * @return {Transaction} */ const controller = function (Base, $filter, modalManager, notificationManager, - waves, copyService, user, baseAssetService, dexService) { + waves, user, baseAssetService, dexService) { class Transaction extends Base { @@ -64,7 +63,6 @@ * return {string} */ copyId() { - copyService.copy(this.transaction.id); notificationManager.info({ ns: 'app.ui', title: { literal: 'transaction.notifications.txIdCopied' } @@ -74,7 +72,7 @@ /** * return {string} */ - copyAllData() { + getCopyAllData() { const tx = this.transaction; const id = `Transaction ID: ${tx.id}`; @@ -111,7 +109,10 @@ const fee = `Fee: ${tx.fee.toFormat()} ${tx.fee.asset.name} (${tx.fee.asset.id})`; message += `\n${fee}`; - copyService.copy(message); + return message; + } + + copyAllData() { notificationManager.info({ ns: 'app.ui', title: { literal: 'transaction.notifications.txDataCopied' } @@ -129,7 +130,6 @@ 'modalManager', 'notificationManager', 'waves', - 'copyService', 'user', 'baseAssetService', 'dexService' diff --git a/src/modules/ui/directives/transaction/transaction.html b/src/modules/ui/directives/transaction/transaction.html index 1975511f40..864df62d0c 100644 --- a/src/modules/ui/directives/transaction/transaction.html +++ b/src/modules/ui/directives/transaction/transaction.html @@ -7,10 +7,10 @@ transaction.actions.showTx - + transaction.actions.copyTxId - + transaction.actions.copyTxData diff --git a/src/modules/utils/modals/accountInfo/account-info.less b/src/modules/utils/modals/accountInfo/account-info.less index be81510af4..83d245f5de 100644 --- a/src/modules/utils/modals/accountInfo/account-info.less +++ b/src/modules/utils/modals/accountInfo/account-info.less @@ -6,7 +6,7 @@ md-dialog.account-info { margin-right: 10px; } - w-copy { + w-copy-wrap { .container { display: flex; @@ -20,7 +20,7 @@ md-dialog.account-info { .row { margin-top: 20px; - w-copy { + w-copy-wrap { border-bottom: none; border-radius: 0; diff --git a/src/modules/utils/modals/accountInfo/account-info.modal.html b/src/modules/utils/modals/accountInfo/account-info.modal.html index dbc5199840..5d64f20ab8 100644 --- a/src/modules/utils/modals/accountInfo/account-info.modal.html +++ b/src/modules/utils/modals/accountInfo/account-info.modal.html @@ -1,19 +1,19 @@
- +
{{::$ctrl.address}}
- +
- + {{::alias}} - +
diff --git a/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html b/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html index 7d3bd3c915..602fe614da 100644 --- a/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html +++ b/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html @@ -8,9 +8,9 @@
- + {{::$ctrl.address}} - +
modal.qr.or diff --git a/src/modules/utils/modals/depositAsset/deposit-asset.modal.html b/src/modules/utils/modals/depositAsset/deposit-asset.modal.html index 0a1d2b3931..7e8488fdd2 100644 --- a/src/modules/utils/modals/depositAsset/deposit-asset.modal.html +++ b/src/modules/utils/modals/depositAsset/deposit-asset.modal.html @@ -21,7 +21,7 @@
- {{$ctrl.gatewayAddress}} + {{$ctrl.gatewayAddress}}
modal.deposit.or diff --git a/src/modules/utils/services/CopyService.js b/src/modules/utils/services/CopyService.js deleted file mode 100644 index 2289b07a99..0000000000 --- a/src/modules/utils/services/CopyService.js +++ /dev/null @@ -1,27 +0,0 @@ -(function () { - 'use strict'; - - /** - * @return {CopyService} - */ - const factory = function () { - - class CopyService { - - copy(data) { - const handler = function (e) { - e.clipboardData.setData('text/plain', data); - e.preventDefault(); - }; - document.addEventListener('copy', handler); - document.execCommand('copy'); - document.removeEventListener('copy', handler); - } - - } - - return new CopyService(); - }; - - angular.module('app.utils').factory('copyService', factory); -})(); diff --git a/src/modules/utils/services/utils.js b/src/modules/utils/services/utils.js index 921e76e327..e645f80647 100644 --- a/src/modules/utils/services/utils.js +++ b/src/modules/utils/services/utils.js @@ -421,6 +421,51 @@ }); }, + /** + * @name app.utils#parseAngularParam + * @param {string} attribute + * @param $scope + * @param {Signal} destroy + * @return {{attribute: string, exp: string, change: Signal, value: *}} + */ + parseAngularParam(attribute, $scope, destroy) { + const exp = _hasExp(attribute) && attribute; + const change = new tsUtils.Signal(); + + const result = utils.liteObject({ + attribute, exp, change, value: null + }); + + if (exp) { + if (exp.indexOf('::') !== -1) { + result.value = $scope.$eval(exp.replace('::', '').replace(/{{(.*)?(}})/, '$1')); + } else { + const stop = $scope.$watch(exp, (value) => { + result.value = value; + change.dispatch(value); + }); + destroy.once(() => { + stop(); + }); + } + } else { + result.value = attribute; + } + + return result; + }, + + /** + * @name app.utils#liteObject + * @param {T} props + * @return {T} + */ + liteObject(props) { + const result = Object.create(null); + Object.assign(result, props); + return result; + }, + /** * @name app.utils#comparators */ @@ -459,6 +504,21 @@ isNotEqualValue: isNotEqualValue }; + /** + * @param value + * @return {boolean} + * @private + */ + function _hasExp(value) { + if (!value) { + return false; + } + + const openIndex = value.indexOf('{{'); + const closeIndex = value.indexOf('}}'); + return openIndex !== -1 && closeIndex !== -1 && openIndex < closeIndex; + } + function _processDecimal(decimal) { const mute = []; decimal.split('') diff --git a/ts-scripts/meta.json b/ts-scripts/meta.json index 18415e390d..533076c8df 100644 --- a/ts-scripts/meta.json +++ b/ts-scripts/meta.json @@ -1,5 +1,6 @@ { "vendors": [ + "node_modules/clipboard/dist/clipboard.min.js", "node_modules/csv-gen/dist/CSV.min.js", "node_modules/js-cookie/src/js.cookie.js", "vendors/require-modules.js", From 2fb1892a127228228a49dccd9a6370d9d2babbf7 Mon Sep 17 00:00:00 2001 From: xenohunter Date: Wed, 14 Feb 2018 12:58:36 +0300 Subject: [PATCH 21/48] CLIENT-443: refactored notifications on copying --- .eslintrc.json | 1 + src/modules/create/controllers/CreateCtrl.js | 16 ------------ src/modules/create/locales/en.json | 4 +-- src/modules/create/locales/ko.json | 4 +-- src/modules/create/locales/ru.json | 4 +-- src/modules/create/templates/backupSeed.html | 2 +- src/modules/ui/directives/copy/copy.js | 19 ++++++++++++-- .../ui/directives/copyWrap/CopyWrap.js | 25 +------------------ .../ui/directives/transaction/Transaction.js | 17 ------------- .../directives/transaction/transaction.html | 4 +-- src/modules/ui/locales/en.json | 5 ++-- src/modules/ui/locales/ko.json | 4 +-- src/modules/ui/locales/ru.json | 5 ++-- .../addressQrCode/address-qr-code.modal.html | 2 +- 14 files changed, 31 insertions(+), 81 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 9d4407c067..b018e90942 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,6 +12,7 @@ "globals": { "Waves": true, "BigNumber": true, + "Clipboard": true, "identityImg": true, "angular": true, "jQuery": true, diff --git a/src/modules/create/controllers/CreateCtrl.js b/src/modules/create/controllers/CreateCtrl.js index f0cf43cc44..7b83d47cb0 100644 --- a/src/modules/create/controllers/CreateCtrl.js +++ b/src/modules/create/controllers/CreateCtrl.js @@ -100,22 +100,6 @@ } } - copySeed() { - if (this.seed) { - analytics.push('Welcome', 'Welcome.CopySeed'); - notificationManager.info({ - ns: 'app.create', - title: { literal: 'backupSeed.seedCopied' } - }); - } else { - // TODO : is this conditional branch needed? - notificationManager.error({ - ns: 'app.create', - title: { literal: 'backupSeed.noSeedToCopy' } - }); - } - } - resetAddress() { const list = []; for (let i = 0; i < 5; i++) { diff --git a/src/modules/create/locales/en.json b/src/modules/create/locales/en.json index ae00d369b8..3f25937aeb 100755 --- a/src/modules/create/locales/en.json +++ b/src/modules/create/locales/en.json @@ -31,9 +31,7 @@ "or": "or", "copySeed": "copy them", "needConfirm": "You will confirm this phrase on the next screen.", - "ok": "I’ve written it down", - "seedCopied": "The seed is copied", - "noSeedToCopy": "There is no seed in scope" + "ok": "I’ve written it down" }, "confirmBackup": { "confirm": "Confirm backup", diff --git a/src/modules/create/locales/ko.json b/src/modules/create/locales/ko.json index 39e2bd4012..925ff6c262 100644 --- a/src/modules/create/locales/ko.json +++ b/src/modules/create/locales/ko.json @@ -27,9 +27,7 @@ "or": "또는", "copySeed": "복사하기", "needConfirm": "다음 화면에 이 구절을 확인합니다.", - "ok": "작성 완료", - "seedCopied": "시드가 복사되었습니다.", - "noSeedToCopy": "시드를 찾을 수 없습니다." + "ok": "작성 완료" }, "confirmBackup": { "confirm": "백업 확인", diff --git a/src/modules/create/locales/ru.json b/src/modules/create/locales/ru.json index 80516ab290..dbc22dcd1f 100644 --- a/src/modules/create/locales/ru.json +++ b/src/modules/create/locales/ru.json @@ -31,9 +31,7 @@ "or": "или", "copySeed": "скопируйте их", "needConfirm": "Вам нужно будет восстановить эту фразу на следующем шаге.", - "ok": "Я всё записал", - "seedCopied": "Секретная фраза скопирована", - "noSeedToCopy": "Нет секретной фразы" + "ok": "Я всё записал" }, "confirmBackup": { "confirm": "Подтверждение бэкапа", diff --git a/src/modules/create/templates/backupSeed.html b/src/modules/create/templates/backupSeed.html index 48e78adb85..374e8e4e3f 100644 --- a/src/modules/create/templates/backupSeed.html +++ b/src/modules/create/templates/backupSeed.html @@ -11,7 +11,7 @@
backupSeed.writeSeed -  backupSeed.or  +  backupSeed.or 
diff --git a/src/modules/ui/directives/copy/copy.js b/src/modules/ui/directives/copy/copy.js index 59ee99ceeb..c36629ded5 100644 --- a/src/modules/ui/directives/copy/copy.js +++ b/src/modules/ui/directives/copy/copy.js @@ -3,9 +3,10 @@ /** * @param {app.utils} utils + * @param {NotificationManager} notificationManager * @return {*} */ - const directive = function (utils) { + const directive = function (utils, notificationManager) { return { restrict: 'A', priority: 100, @@ -25,6 +26,20 @@ container: $element.get(0) }); + clipboard.on('success', () => { + notificationManager.info({ + ns: 'app.ui', + title: { literal: 'copySuccess' } + }); + }); + + clipboard.on('error', () => { + notificationManager.error({ + ns: 'app.ui', + title: { literal: 'copyError' } + }); + }); + destroy.once(() => { clipboard.destroy(); }); @@ -34,7 +49,7 @@ }; }; - directive.$inject = ['utils']; + directive.$inject = ['utils', 'notificationManager']; angular.module('app.ui').directive('wCopy', directive); })(); diff --git a/src/modules/ui/directives/copyWrap/CopyWrap.js b/src/modules/ui/directives/copyWrap/CopyWrap.js index 9d695ecfb0..0d273c5619 100644 --- a/src/modules/ui/directives/copyWrap/CopyWrap.js +++ b/src/modules/ui/directives/copyWrap/CopyWrap.js @@ -1,34 +1,11 @@ (function () { 'use strict'; - /** - * @param {NotificationManager} notificationManager - * @return {CopyWrap} - */ - const controller = function (notificationManager) { - - class CopyWrap { - - copy() { - notificationManager.info({ - ns: 'app.ui', - title: { literal: 'copySuccess' } - }, 2000); - } - - } - - return new CopyWrap(); - }; - - controller.$inject = ['notificationManager']; - angular.module('app.ui').component('wCopyWrap', { bindings: { info: '@' }, template: '
', - transclude: true, - controller + transclude: true }); })(); diff --git a/src/modules/ui/directives/transaction/Transaction.js b/src/modules/ui/directives/transaction/Transaction.js index db3a434f1e..f2d73fb77f 100644 --- a/src/modules/ui/directives/transaction/Transaction.js +++ b/src/modules/ui/directives/transaction/Transaction.js @@ -59,16 +59,6 @@ modalManager.showTransactionInfo(this.transaction.id); } - /** - * return {string} - */ - copyId() { - notificationManager.info({ - ns: 'app.ui', - title: { literal: 'transaction.notifications.txIdCopied' } - }); - } - /** * return {string} */ @@ -112,13 +102,6 @@ return message; } - copyAllData() { - notificationManager.info({ - ns: 'app.ui', - title: { literal: 'transaction.notifications.txDataCopied' } - }); - } - } return new Transaction(); diff --git a/src/modules/ui/directives/transaction/transaction.html b/src/modules/ui/directives/transaction/transaction.html index 864df62d0c..407f49a745 100644 --- a/src/modules/ui/directives/transaction/transaction.html +++ b/src/modules/ui/directives/transaction/transaction.html @@ -7,10 +7,10 @@ transaction.actions.showTx - + transaction.actions.copyTxId - + transaction.actions.copyTxData diff --git a/src/modules/ui/locales/en.json b/src/modules/ui/locales/en.json index 2e1fce20e5..e57049c339 100755 --- a/src/modules/ui/locales/en.json +++ b/src/modules/ui/locales/en.json @@ -1,4 +1,6 @@ { + "copySuccess": "The data is copied", + "copyError": "Cannot copy! Your browser may be outdated", "balanceInput": { "max": "Max" }, @@ -63,8 +65,6 @@ "copyTxData": "Copy all TX data" }, "notifications": { - "txIdCopied": "Transaction ID is copied", - "txDataCopied": "Transaction data is copied", "closed": "The leasing has been already canceled", "closedSuccess": "The leasing canceled complete" }, @@ -91,7 +91,6 @@ "noTransactionsTitle": "Nothing Here…", "noTransactionsDescription": "You do not have any transactions" }, - "copySuccess": "The data is copied", "confirmTransaction": { "back": "Go Back", "confirm": "Confirm", diff --git a/src/modules/ui/locales/ko.json b/src/modules/ui/locales/ko.json index 7b7031d601..f3758d8881 100644 --- a/src/modules/ui/locales/ko.json +++ b/src/modules/ui/locales/ko.json @@ -1,4 +1,5 @@ { + "copySuccess": "데이터가 복사되었습니다.", "balanceInput": { "max": "최대" }, @@ -63,8 +64,6 @@ "copyTxData": "모든 TX 데이터 복사" }, "notifications": { - "txIdCopied": "거래 ID 복사되었습니다.", - "txDataCopied": "거래 데이터가 복사되었습니다", "closed": "리스가 이미 취소되었습니다", "closedSuccess": "리스 취소가 완료되었습니다" }, @@ -91,7 +90,6 @@ "noTransactionsTitle": "아무것도 없습니다…", "noTransactionsDescription": "거래가 없습니다." }, - "copySuccess": "데이터가 복사되었습니다.", "confirmTransaction": { "back": "Go Back", "confirm": "Confirm", diff --git a/src/modules/ui/locales/ru.json b/src/modules/ui/locales/ru.json index 8cb2cd4613..221e0b04e5 100644 --- a/src/modules/ui/locales/ru.json +++ b/src/modules/ui/locales/ru.json @@ -1,4 +1,6 @@ { + "copySuccess": "Данные скопированы", + "copyError": "Не получается скопировать! Возможно, ваш браузер устарел", "balanceInput": { "max": "Max" }, @@ -63,8 +65,6 @@ "copyTxData": "Скопировать данные транзакции" }, "notifications": { - "txIdCopied": "ID транзакции скопирован", - "txDataCopied": "Данные транзакции скопированы", "closed": "Лизинг уже был отменён ранее", "closedSuccess": "Лизинг отменён" }, @@ -91,7 +91,6 @@ "noTransactionsTitle": "Пока ничего нет…", "noTransactionsDescription": "У вас пока что нет транзакций" }, - "copySuccess": "Данные скопированы", "confirmTransaction": { "back": "Назад", "confirm": "Подтвердить", diff --git a/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html b/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html index 602fe614da..8216f3e37b 100644 --- a/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html +++ b/src/modules/utils/modals/addressQrCode/address-qr-code.modal.html @@ -8,7 +8,7 @@
- + {{::$ctrl.address}} From be945bfc79753566f66c857064a8b4a115cfb9e2 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 16:24:45 +0300 Subject: [PATCH 22/48] CLIENT-372: fix draggable --- .../directives/createOrder/createOrder.less | 3 +- .../ui/directives/draggable/Draggable.js | 49 +++++++++++++------ .../ui/directives/draggable/draggable.less | 8 +++ src/modules/utils/services/utils.js | 22 +++++++++ 4 files changed, 66 insertions(+), 16 deletions(-) create mode 100644 src/modules/ui/directives/draggable/draggable.less diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index 0b27ec4e6f..59cc25d87b 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -6,10 +6,9 @@ w-create-order { display: block; width: 320px; top: 80px; - left: 50%; + left: calc(~'50% - 160px'); overflow: hidden; border-radius: @border-radius; - transform: translateX(-50%); box-shadow: 0 24px 24px 0 rgba(0, 0, 0, 0.15), 0 0 24px 0 rgba(0, 0, 0, 0.15); .split-half { diff --git a/src/modules/ui/directives/draggable/Draggable.js b/src/modules/ui/directives/draggable/Draggable.js index 0aa9570ae1..fe377e828d 100644 --- a/src/modules/ui/directives/draggable/Draggable.js +++ b/src/modules/ui/directives/draggable/Draggable.js @@ -1,37 +1,58 @@ (function () { 'use strict'; - const directive = () => { + /** + * @param {app.utils} utils + * @return {{scope: boolean, link: function(*, *=)}} + */ + const directive = (utils) => { return { scope: false, link: ($scope, $element) => { + const $document = $(document); const position = $element.css('position'); + const $block = $('
'); + if (position === 'static' || position === 'relative') { const offset = $element.offset(); - $element.css('position', 'absolute'); + $element.css({ + position: 'absolute', + transformOrigin: 'left top', + willChange: 'transform' + }); $element.offset(offset); } - const $document = $(document); + + $element.css('zIndex', 10); + + document.body.appendChild($element.get(0)); + const stop = $scope.$on('$destroy', () => { + stop(); + $element.remove(); + $block.remove(); + }); + + let x = 0; + let y = 0; $element.on('mousedown', (e) => { e.preventDefault(); - const startX = e.pageX; - const startY = e.pageY; - const x = parseInt($element.css('left'), 10); - const y = parseInt($element.css('top'), 10); + $block.insertBefore($element); + const startX = e.pageX - x; + const startY = e.pageY - y; - const move = (e) => { + const move = utils.debounceRequestAnimationFrame((e) => { e.preventDefault(); - $element.css({ - left: `${x + (e.pageX - startX)}px`, - top: `${y + (e.pageY - startY)}px` - }); - }; + x = (e.pageX - startX); + y = (e.pageY - startY); + $element.css('transform', `translate(${x}px, ${y}px)`); + }); const up = () => { e.preventDefault(); + $block.detach(); $document.off('mousemove', move); $document.off('mouseup', up); }; @@ -46,7 +67,7 @@ }; }; - directive.$inject = []; + directive.$inject = ['utils']; angular.module('app.ui').directive('wDraggable', directive); diff --git a/src/modules/ui/directives/draggable/draggable.less b/src/modules/ui/directives/draggable/draggable.less new file mode 100644 index 0000000000..59ac3200a4 --- /dev/null +++ b/src/modules/ui/directives/draggable/draggable.less @@ -0,0 +1,8 @@ +.draggable-block { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 9; +} diff --git a/src/modules/utils/services/utils.js b/src/modules/utils/services/utils.js index 921e76e327..780e9b0dba 100644 --- a/src/modules/utils/services/utils.js +++ b/src/modules/utils/services/utils.js @@ -47,6 +47,28 @@ }; }, + /** + * @name app.utils#debounceRequestAnimationFrame + * @param callback + * @return {function(...[*])} + */ + debounceRequestAnimationFrame(callback) { + const control = { + queued: false, + args: null + }; + return (...args) => { + control.args = args; + if (!control.queued) { + requestAnimationFrame(() => { + control.queued = false; + callback(...control.args); + }); + } + control.queued = true; + }; + }, + /** * @name app.utils#animate * @param {JQuery} $element From 13ee75400a057386505be3e8ed83590f0085eba9 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:13:48 +0300 Subject: [PATCH 23/48] CLIENT-372: rename class name for PR --- src/modules/ui/directives/draggable/Draggable.js | 2 +- src/modules/ui/directives/draggable/draggable.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/ui/directives/draggable/Draggable.js b/src/modules/ui/directives/draggable/Draggable.js index fe377e828d..7bbf58131f 100644 --- a/src/modules/ui/directives/draggable/Draggable.js +++ b/src/modules/ui/directives/draggable/Draggable.js @@ -13,7 +13,7 @@ const $document = $(document); const position = $element.css('position'); - const $block = $('
'); + const $block = $('
'); if (position === 'static' || position === 'relative') { const offset = $element.offset(); diff --git a/src/modules/ui/directives/draggable/draggable.less b/src/modules/ui/directives/draggable/draggable.less index 59ac3200a4..ecf70b135d 100644 --- a/src/modules/ui/directives/draggable/draggable.less +++ b/src/modules/ui/directives/draggable/draggable.less @@ -1,4 +1,4 @@ -.draggable-block { +.drag-overlay { position: absolute; left: 0; top: 0; From 0bfa54f9190f4405bad5a675cf6fc659693dfc05 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:16:54 +0300 Subject: [PATCH 24/48] CLIENT-372: rename variable --- src/modules/ui/directives/draggable/Draggable.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/ui/directives/draggable/Draggable.js b/src/modules/ui/directives/draggable/Draggable.js index 7bbf58131f..105a8a0930 100644 --- a/src/modules/ui/directives/draggable/Draggable.js +++ b/src/modules/ui/directives/draggable/Draggable.js @@ -13,7 +13,7 @@ const $document = $(document); const position = $element.css('position'); - const $block = $('
'); + const $overlay = $('
'); if (position === 'static' || position === 'relative') { const offset = $element.offset(); @@ -31,7 +31,7 @@ const stop = $scope.$on('$destroy', () => { stop(); $element.remove(); - $block.remove(); + $overlay.remove(); }); let x = 0; @@ -39,7 +39,7 @@ $element.on('mousedown', (e) => { e.preventDefault(); - $block.insertBefore($element); + $overlay.insertBefore($element); const startX = e.pageX - x; const startY = e.pageY - y; @@ -52,7 +52,7 @@ const up = () => { e.preventDefault(); - $block.detach(); + $overlay.detach(); $document.off('mousemove', move); $document.off('mouseup', up); }; From 1d718e12072529fd8af7562126917d768db71ab4 Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:24:38 +0300 Subject: [PATCH 25/48] CLIENT-443: fix deposit copy --- .../modals/depositAsset/deposit-asset.modal.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/modules/utils/modals/depositAsset/deposit-asset.modal.html b/src/modules/utils/modals/depositAsset/deposit-asset.modal.html index 7e8488fdd2..39b0290227 100644 --- a/src/modules/utils/modals/depositAsset/deposit-asset.modal.html +++ b/src/modules/utils/modals/depositAsset/deposit-asset.modal.html @@ -16,12 +16,18 @@
modal.deposit.{{::$ctrl.assetKeyName}}.helpDescrTitle
-
modal.deposit.{{::$ctrl.assetKeyName}}.helpDescrText
-
modal.deposit.pleaseNote
+
+ modal.deposit.{{::$ctrl.assetKeyName}}.helpDescrText +
+
+ modal.deposit.pleaseNote +
- {{$ctrl.gatewayAddress}} + + {{$ctrl.gatewayAddress}} +
modal.deposit.or From 7c07351da38382b6200c29ad5f91bd2d11e958eb Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:31:38 +0300 Subject: [PATCH 26/48] CLIENT-511: change package lock --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From a3a14590e94e64d813515e5c37b7d47181f8059c Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:38:30 +0300 Subject: [PATCH 27/48] CLIENT-511: fix path separator --- ts-scripts/utils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts-scripts/utils.ts b/ts-scripts/utils.ts index 73dfa9b28b..378ca8a5ae 100644 --- a/ts-scripts/utils.ts +++ b/ts-scripts/utils.ts @@ -2,7 +2,7 @@ import * as gulp from 'gulp'; import { getType } from 'mime'; import { exec, spawn } from 'child_process'; import { readdirSync, statSync } from 'fs'; -import { join, relative } from 'path'; +import { join, relative, sep } from 'path'; import { ITaskFunction } from './interface'; import { readFile, readJSON, readJSONSync, createWriteStream, mkdirpSync } from 'fs-extra'; import { compile } from 'handlebars'; @@ -179,7 +179,7 @@ export function download(url: string, filePath: string): Promise { return new Promise((resolve) => { try { - mkdirpSync(filePath.split('/').slice(0, -1).join('/')); + mkdirpSync(filePath.split(sep).slice(0, -1).join(sep)); } catch (e) { console.log(e); } @@ -230,7 +230,7 @@ export function route(connectionType, buildType) { if (buildType !== 'dev') { if (isPage(req.url)) { - const path = join(__dirname, '../dist/web', connectionType, buildType, 'index.html'); + const path = join(__dirname, `..${sep}dist${sep}web`, connectionType, buildType, 'index.html'); return readFile(path, 'utf8').then((file) => { res.end(file); }); From 7075508c1bc6d151e107fa5f4cfb191744f7496b Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 18:58:47 +0300 Subject: [PATCH 28/48] CLIENT-511: fix gulp --- gulpfile.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 7be41752f2..4bcb93a021 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -3,7 +3,7 @@ import * as concat from 'gulp-concat'; import * as babel from 'gulp-babel'; import { exec, execSync } from 'child_process'; import { download, getFilesFrom, prepareHTML, run, task } from './ts-scripts/utils'; -import { join } from 'path'; +import { join, normalize, sep } from 'path'; import { copy as fsCopy, mkdirp, outputFile, readFile, readJSON, readJSONSync, writeFile } from 'fs-extra'; import { IMetaJSON, IPackageJSON } from './ts-scripts/interface'; import * as templateCache from 'gulp-angular-templatecache'; @@ -97,8 +97,9 @@ task('load-trading-view', (done) => { } task(`copy-${taskPostfix}`, copyDeps, function (done) { + const reg = new RegExp(`(.*?\\${sep}src)`); let forCopy = JSON_LIST.map((path) => { - return fsCopy(path, path.replace(/(.*?\/src)/, `${targetPath}`)); + return fsCopy(path, path.replace(reg, `${targetPath}`)); }).concat(fsCopy(join(__dirname, 'src/fonts'), `${targetPath}/fonts`)); if (buildName === 'desktop') { @@ -113,11 +114,11 @@ task('load-trading-view', (done) => { return fsCopy(join(__dirname, path), `${targetPath}/${path}`); })) as Promise, fsCopy(join(__dirname, 'src/img'), `${targetPath}/img`).then(() => { - const images = IMAGE_LIST.map((path) => path.replace(/(.*?\/src)/, '')); + const images = IMAGE_LIST.map((path) => normalize(path.replace(reg, ''))); return writeFile(`${targetPath}/img/images-list.json`, JSON.stringify(images)); }), fsCopy(cssPath, `${targetPath}/css/${cssName}`), - fsCopy('LICENSE', `${targetPath}/LICENSE`), + fsCopy('LICENSE', join(`${targetPath}`, 'LICENSE')), ].concat(forCopy)).then(() => { done(); }, (e) => { From 054d676d5be659c6554b289f617c98ff536eb94d Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 19:02:20 +0300 Subject: [PATCH 29/48] CLIENT-511: fix concat for windows --- gulpfile.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 4bcb93a021..9c0cba6c40 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -77,14 +77,14 @@ task('load-trading-view', (done) => { task(`concat-${taskPostfix}`, [type === 'min' ? 'uglify' : 'babel'], function (done) { const stream = gulp.src([vendorPath, getName(bundlePath), getName(templatePath)]) .pipe(concat(jsFileName)) - .pipe(gulp.dest(`${targetPath}/js`)); + .pipe(gulp.dest(normalize(`${targetPath}/js`))); stream.on('end', function () { - readFile(`${targetPath}/js/${jsFileName}`, { encoding: 'utf8' }).then((file) => { + readFile(normalize(`${targetPath}/js/${jsFileName}`), { encoding: 'utf8' }).then((file) => { if (buildName === 'desktop') { file = `(function () {\nvar module = undefined;\n${file}})();`; } - outputFile(`${targetPath}/js/${jsFileName}`, file) + outputFile(normalize(`${targetPath}/js/${jsFileName}`), file) .then(() => done()); }); }); From 85ebf5a7573cdef3a3a9c1620c0121a2ed54834c Mon Sep 17 00:00:00 2001 From: tsigel Date: Wed, 14 Feb 2018 19:10:23 +0300 Subject: [PATCH 30/48] CLIENT-511: fix concat --- gulpfile.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 9c0cba6c40..50a5b114b2 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -68,7 +68,7 @@ task('load-trading-view', (done) => { ['normal', 'min'].forEach((type) => { - const targetPath = `./dist/${buildName}/${configName}/${type}`; + const targetPath = `.${sep}dist${sep}${buildName}${sep}${configName}${sep}${type}`; const jsFileName = getName(`${pack.name}-${buildName}-${configName}-${pack.version}.js`); const jsFilePath = join(targetPath, 'js', jsFileName); const taskPostfix = `${buildName}-${configName}-${type}`; @@ -77,14 +77,14 @@ task('load-trading-view', (done) => { task(`concat-${taskPostfix}`, [type === 'min' ? 'uglify' : 'babel'], function (done) { const stream = gulp.src([vendorPath, getName(bundlePath), getName(templatePath)]) .pipe(concat(jsFileName)) - .pipe(gulp.dest(normalize(`${targetPath}/js`))); + .pipe(gulp.dest(normalize(`${targetPath}${sep}js`))); stream.on('end', function () { - readFile(normalize(`${targetPath}/js/${jsFileName}`), { encoding: 'utf8' }).then((file) => { + readFile(normalize(`${targetPath}${sep}js${sep}${jsFileName}`), { encoding: 'utf8' }).then((file) => { if (buildName === 'desktop') { file = `(function () {\nvar module = undefined;\n${file}})();`; } - outputFile(normalize(`${targetPath}/js/${jsFileName}`), file) + outputFile(normalize(`${targetPath}${sep}js${sep}${jsFileName}`), file) .then(() => done()); }); }); From 9d1e1d8882499fd067b3a18d899bbd8767ddff54 Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 09:52:40 +0300 Subject: [PATCH 31/48] CLIENT-511: add cache for download trading-view --- .gitignore | 1 + gulpfile.ts | 44 +++++++++++++++++++++----------------------- ts-scripts/utils.ts | 40 +++++++++++++++++++++++++--------------- 3 files changed, 47 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 1a44ff799e..7091c69216 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ *.pfx **/**/.DS_Store WavesGUI.iml +/.cache-download diff --git a/gulpfile.ts b/gulpfile.ts index 50a5b114b2..0f8587fc2c 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -3,8 +3,8 @@ import * as concat from 'gulp-concat'; import * as babel from 'gulp-babel'; import { exec, execSync } from 'child_process'; import { download, getFilesFrom, prepareHTML, run, task } from './ts-scripts/utils'; -import { join, normalize, sep } from 'path'; -import { copy as fsCopy, mkdirp, outputFile, readFile, readJSON, readJSONSync, writeFile } from 'fs-extra'; +import { join, sep } from 'path'; +import { copy as fsCopy, outputFile, readFile, readJSON, readJSONSync, writeFile } from 'fs-extra'; import { IMetaJSON, IPackageJSON } from './ts-scripts/interface'; import * as templateCache from 'gulp-angular-templatecache'; import * as htmlmin from 'gulp-htmlmin'; @@ -12,8 +12,8 @@ import * as htmlmin from 'gulp-htmlmin'; const zip = require('gulp-zip'); const s3 = require('gulp-s3'); -const meta: IMetaJSON = readJSONSync('ts-scripts/meta.json'); -const pack: IPackageJSON = readJSONSync('package.json'); +const meta: IMetaJSON = readJSONSync(join(__dirname, 'ts-scripts', 'meta.json')); +const pack: IPackageJSON = readJSONSync(join(__dirname, 'package.json')); const configurations = Object.keys(meta.configurations); const AWS = { key: process.env.AWS_ACCESS_KEY_ID, @@ -22,7 +22,7 @@ const AWS = { }; const SOURCE_FILES = getFilesFrom(join(__dirname, 'src'), '.js'); -const IMAGE_LIST = getFilesFrom(join(__dirname, 'src/img'), ['.png', '.svg', '.jpg']); +const IMAGE_LIST = getFilesFrom(join(__dirname, 'src', 'img'), ['.png', '.svg', '.jpg']); const JSON_LIST = getFilesFrom(join(__dirname, 'src'), '.json'); const taskHash = { @@ -32,8 +32,8 @@ const taskHash = { zip: [] }; -const tmpJsPath = './dist/tmp/js'; -const tmpCssPath = './dist/tmp/css'; +const tmpJsPath = join(__dirname, 'dist', 'tmp', 'js'); +const tmpCssPath = join(__dirname, 'dist', 'tmp', 'css'); const vendorName = 'vendors.js'; const bundleName = 'bundle.js'; const templatesName = 'templates.js'; @@ -49,12 +49,12 @@ const getFileName = (name, type) => { }; -const indexPromise = readFile(join(__dirname, 'src/index.html'), { encoding: 'utf8' }); +const indexPromise = readFile(join(__dirname, 'src', 'index.html'), { encoding: 'utf8' }); task('load-trading-view', (done) => { Promise.all(meta.tradingView.files.map((relativePath) => { const url = `${meta.tradingView.domain}/${relativePath}`; - return download(url, join(__dirname, `dist/tmp/trading-view/${relativePath}`)).then(() => { + return download(url, join(__dirname, 'dist', 'tmp', 'trading-view', relativePath)).then(() => { console.log(`Download "${relativePath}" done`); }); })).then(() => done()); @@ -64,11 +64,9 @@ task('load-trading-view', (done) => { configurations.forEach((configName) => { - const config = meta.configurations[configName]; - ['normal', 'min'].forEach((type) => { - const targetPath = `.${sep}dist${sep}${buildName}${sep}${configName}${sep}${type}`; + const targetPath = join(__dirname, 'dist', buildName, configName, type); const jsFileName = getName(`${pack.name}-${buildName}-${configName}-${pack.version}.js`); const jsFilePath = join(targetPath, 'js', jsFileName); const taskPostfix = `${buildName}-${configName}-${type}`; @@ -77,14 +75,14 @@ task('load-trading-view', (done) => { task(`concat-${taskPostfix}`, [type === 'min' ? 'uglify' : 'babel'], function (done) { const stream = gulp.src([vendorPath, getName(bundlePath), getName(templatePath)]) .pipe(concat(jsFileName)) - .pipe(gulp.dest(normalize(`${targetPath}${sep}js`))); + .pipe(gulp.dest(join(targetPath, 'js'))); stream.on('end', function () { - readFile(normalize(`${targetPath}${sep}js${sep}${jsFileName}`), { encoding: 'utf8' }).then((file) => { + readFile(join(targetPath, 'js', jsFileName), { encoding: 'utf8' }).then((file) => { if (buildName === 'desktop') { file = `(function () {\nvar module = undefined;\n${file}})();`; } - outputFile(normalize(`${targetPath}${sep}js${sep}${jsFileName}`), file) + outputFile(join(targetPath, 'js', jsFileName), file) .then(() => done()); }); }); @@ -103,10 +101,10 @@ task('load-trading-view', (done) => { }).concat(fsCopy(join(__dirname, 'src/fonts'), `${targetPath}/fonts`)); if (buildName === 'desktop') { - forCopy.push(fsCopy(join(__dirname, 'electron/main.js'), `${targetPath}/main.js`)); - forCopy.push(fsCopy(join(__dirname, 'electron/package.json'), `${targetPath}/package.json`)); - forCopy.push(fsCopy(join(__dirname, 'electron/icons/icon128x128.png'), `${targetPath}/img/icon.png`)); - forCopy.push(fsCopy(join(__dirname, '/dist/tmp/trading-view'), `${targetPath}/trading-view`)); + forCopy.push(fsCopy(join(__dirname, 'electron', 'main.js'), join(targetPath, 'main.js'))); + forCopy.push(fsCopy(join(__dirname, 'electron', 'package.json'), join(targetPath, 'package.json'))); + forCopy.push(fsCopy(join(__dirname, 'electron', 'icons', 'icon128x128.png'), join(targetPath, 'img', 'icon.png'))); + forCopy.push(fsCopy(join(__dirname, 'dist', 'tmp', 'trading-view'), join(targetPath, 'trading-view'))); } Promise.all([ @@ -114,10 +112,10 @@ task('load-trading-view', (done) => { return fsCopy(join(__dirname, path), `${targetPath}/${path}`); })) as Promise, fsCopy(join(__dirname, 'src/img'), `${targetPath}/img`).then(() => { - const images = IMAGE_LIST.map((path) => normalize(path.replace(reg, ''))); - return writeFile(`${targetPath}/img/images-list.json`, JSON.stringify(images)); + const images = IMAGE_LIST.map((path) => path.replace(reg, '')); + return writeFile(join(targetPath, 'img', 'images-list.json'), JSON.stringify(images)); }), - fsCopy(cssPath, `${targetPath}/css/${cssName}`), + fsCopy(cssPath, join(targetPath, 'css', cssName)), fsCopy('LICENSE', join(`${targetPath}`, 'LICENSE')), ].concat(forCopy)).then(() => { done(); @@ -140,7 +138,7 @@ task('load-trading-view', (done) => { connection: configName, scripts: [jsFilePath], styles: [ - `${targetPath}/css/${pack.name}-styles-${pack.version}.css` + join(targetPath, 'css', `${pack.name}-styles-${pack.version}.css`) ], type: buildName }); diff --git a/ts-scripts/utils.ts b/ts-scripts/utils.ts index 378ca8a5ae..f2ad9a99c1 100644 --- a/ts-scripts/utils.ts +++ b/ts-scripts/utils.ts @@ -1,10 +1,10 @@ import * as gulp from 'gulp'; import { getType } from 'mime'; import { exec, spawn } from 'child_process'; -import { readdirSync, statSync } from 'fs'; -import { join, relative, sep } from 'path'; +import { existsSync, readdirSync, statSync } from 'fs'; +import { join, relative, sep, extname, dirname } from 'path'; import { ITaskFunction } from './interface'; -import { readFile, readJSON, readJSONSync, createWriteStream, mkdirpSync } from 'fs-extra'; +import { readFile, readJSON, readJSONSync, createWriteStream, mkdirpSync, copy } from 'fs-extra'; import { compile } from 'handlebars'; import { transform } from 'babel-core'; import { render } from 'less'; @@ -53,7 +53,7 @@ export function getFilesFrom(dist: string, extension?: string | Array, f } else { if (Array.isArray(extension)) { const isNeedFile = extension.some((ext) => { - return itemName.lastIndexOf(ext) === (itemName.length - ext.length); + return isEqualExtension(itemName, ext); }); if (isNeedFile) { if (!filter || filter(itemName, itemPath)) { @@ -61,7 +61,7 @@ export function getFilesFrom(dist: string, extension?: string | Array, f } } } else if (extension) { - if (itemName.lastIndexOf(extension) === (itemName.length - extension.length)) { + if (isEqualExtension(itemName, extension)) { if (!filter || filter(itemName, itemPath)) { files.push(itemPath); } @@ -82,6 +82,10 @@ export function getFilesFrom(dist: string, extension?: string | Array, f return files; } +export function isEqualExtension(fileName: string, extension: string): boolean { + return extname(fileName).replace('.', '') === extension.replace('.', ''); +} + export function run(command: string, args: Array, noLog?: boolean): Promise<{ code: number; data: string[] }> { return new Promise((resolve) => { const task = spawn(command, args); @@ -178,18 +182,24 @@ export function prepareHTML(param: IPrepareHTMLOptions): Promise { export function download(url: string, filePath: string): Promise { return new Promise((resolve) => { - try { - mkdirpSync(filePath.split(sep).slice(0, -1).join(sep)); - } catch (e) { - console.log(e); - } + const cachePath = join(process.cwd(), '.cache-download', filePath.replace(process.cwd(), '')); + if (existsSync(cachePath)) { + copy(cachePath, filePath).then(resolve); + } else { - const file = createWriteStream(filePath); + try { + mkdirpSync(dirname(filePath)); + } catch (e) { + console.log(e); + } - get(url, (response) => { - response.pipe(file); - response.on('end', resolve); - }); + const file = createWriteStream(filePath); + + get(url, (response) => { + response.pipe(file); + response.on('end', () => copy(filePath, cachePath).then(resolve)); + }); + } }); } From 1ad23efdbb405a4d65e380d395a5c691c2f4390e Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 10:17:53 +0300 Subject: [PATCH 32/48] CLIENT-511: fix uglify path --- gulpfile.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gulpfile.ts b/gulpfile.ts index 0f8587fc2c..35bb910c9d 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -251,9 +251,13 @@ task('babel', ['concat-develop'], function () { }); task('uglify', ['babel', 'templates'], function (done) { + const PATH_HASH = { + bin: join(__dirname, 'node_modules', '.bin', 'uglifyjs'), + out: join(__dirname, 'dist', 'tmp', 'js') + }; const run = function (path, name) { return new Promise((resolve, reject) => { - exec(`./node_modules/.bin/uglifyjs ${path} -o ./dist/tmp/js/${name}`, (err, l1, l2) => { + exec(`${PATH_HASH.bin} ${path} -o ${join(PATH_HASH.out, name)}`, (err, l1, l2) => { if (err) { reject(err); } else { From b24a3f8607e572df52f421339e008aa209906fe7 Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 10:30:40 +0300 Subject: [PATCH 33/48] CLIENT-511: fix style concat path --- gulpfile.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.ts b/gulpfile.ts index 35bb910c9d..2c8b4bafb1 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -207,7 +207,7 @@ task('templates', function () { }); task('concat-style', ['less'], function () { - return gulp.src(meta.stylesheets.concat(join(__dirname, tmpCssPath, 'style.css'))) + return gulp.src(meta.stylesheets.concat(join(tmpCssPath, 'style.css'))) .pipe(concat(cssName)) .pipe(gulp.dest(tmpCssPath)); }); @@ -233,7 +233,7 @@ task('eslint', function (done) { }); task('less', function () { - execSync('sh scripts/less.sh'); + execSync(`sh ${join('scripts', 'less.sh')}`); }); task('babel', ['concat-develop'], function () { From 314debd75ec1323e3c95c909ad4c1695c8381f67 Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 11:32:34 +0300 Subject: [PATCH 34/48] CLIENT-293: change package json --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From 7f12efcfc8f56f08da50a80a7928ad8b5b9e1a44 Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 11:32:51 +0300 Subject: [PATCH 35/48] CLIENT-293: fix orders --- src/modules/dex/directives/createOrder/CreateOrder.js | 9 ++++----- src/modules/dex/directives/createOrder/createOrder.less | 2 ++ src/modules/utils/services/utils.js | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js index d8b7a86407..855477c1e0 100644 --- a/src/modules/dex/directives/createOrder/CreateOrder.js +++ b/src/modules/dex/directives/createOrder/CreateOrder.js @@ -126,10 +126,10 @@ this.maxAmountBalance = CreateOrder._getMaxAmountBalance(this.type, this.amountBalance, this.fee); switch (type) { case 'sell': - this.price = this.priceBalance.cloneWithTokens(this.bid.price); + this.price = this.priceBalance.cloneWithTokens(String(this.bid.price)); break; case 'buy': - this.price = this.priceBalance.cloneWithTokens(this.ask.price); + this.price = this.priceBalance.cloneWithTokens(String(this.ask.price)); break; default: throw new Error('Wrong type'); @@ -271,15 +271,14 @@ * @param spread * @private */ - _setData({ lastAsk, firstBid, spread }) { + _setData({ lastAsk, firstBid }) { this.bid = firstBid || { price: 0 }; this.ask = lastAsk || { price: 0 }; - this.spread = spread; const sell = Number(this.bid.price); const buy = Number(this.ask.price); - this.spreadPercent = ((buy - sell) * 100 / buy).toFixed(2); + this.spreadPercent = (((buy - sell) * 100 / buy) || 0).toFixed(2); } /** diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index 0b27ec4e6f..30d6154157 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -67,6 +67,7 @@ w-create-order { flex-direction: row; .choose { + width: 50%; flex-grow: 1; height: 55px; padding-top: 8px; @@ -96,6 +97,7 @@ w-create-order { flex-direction: row; .area { + width: 50%; height: 110px; flex-grow: 1; padding: 33px 17px 0; diff --git a/src/modules/utils/services/utils.js b/src/modules/utils/services/utils.js index 921e76e327..90dac1430c 100644 --- a/src/modules/utils/services/utils.js +++ b/src/modules/utils/services/utils.js @@ -324,7 +324,7 @@ */ getNiceNumberTemplate(num, precision, shortMode) { const bigNum = this.parseNiceNumber(num); - const formatted = this.getNiceNumber(num, precision); + const formatted = this.getNiceNumber(bigNum, precision); if (shortMode && bigNum.gte(10000)) { /** From 5de0102838a69c0a4851feca22a744d59c01669d Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 11:48:47 +0300 Subject: [PATCH 36/48] CLIENT-530: change package lock --- package-lock.json | 169 +++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index a20df19155..a9549b2a48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,7 @@ "@types/babel-core": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-core/-/babel-core-6.25.2.tgz", - "integrity": "sha512-+Ush/fQHUDIithA5yDJWZiL6KdOiVOs5yuj4qcgvQOCnmJec+RgzkLgxnpgmM6Ear9RXa3aCcwjPiUnStPp1zA==", + "integrity": "sha1-UAt/7yg03Oh7MjEaTWehp1etqsc=", "dev": true, "requires": { "@types/babel-generator": "6.25.0", @@ -52,7 +52,7 @@ "@types/babel-generator": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-generator/-/babel-generator-6.25.0.tgz", - "integrity": "sha512-WbrKGSt8SKOxAivCHB1fsIP59EyCCfMHuCYcA6yenjGxnjh0rK3BOSPHR96RdZD6ukgyDwzMF/biQH4llowTDg==", + "integrity": "sha1-glVGmqFHEvDRYIuZaDyr1bQT2Ws=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -61,7 +61,7 @@ "@types/babel-template": { "version": "6.25.0", "resolved": "https://registry.npmjs.org/@types/babel-template/-/babel-template-6.25.0.tgz", - "integrity": "sha512-TtyfVlrprX92xSuKa8D//7vFz5kBJODBw5IQ1hQXehqO+me26vt1fyNxOZyXhUq2a7jRyT72V8p68IyH4NEZNA==", + "integrity": "sha1-JQXXtVuI+CHZgEi0/fB7OyJWPTA=", "dev": true, "requires": { "@types/babel-types": "6.25.1", @@ -71,7 +71,7 @@ "@types/babel-traverse": { "version": "6.25.2", "resolved": "https://registry.npmjs.org/@types/babel-traverse/-/babel-traverse-6.25.2.tgz", - "integrity": "sha512-SO/YPiHOYApenZJecbw1Psd2lopAQ9Wc9HnFevEvM1mOoNXHglV8mHgVkCQJRIrn6UgWqHE/QfvQ1uG1crNgHA==", + "integrity": "sha1-PPrr4xb+xRWpZK27hBR7PIlxup8=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -80,13 +80,13 @@ "@types/babel-types": { "version": "6.25.1", "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-6.25.1.tgz", - "integrity": "sha512-7Z6r20+HE0viAFhsW0d/UrC1K2tTlpXzGpNlYm8MmCv8z5PbAacFIshrM/MjlGRa5SBqxu2socpy8FHntwZKng==", + "integrity": "sha1-zo8SakQD4R4bADOkJPEWOK+seIk=", "dev": true }, "@types/babylon": { "version": "6.16.2", "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz", - "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==", + "integrity": "sha1-BizmO2k9mvHCRvWu35KLycMFicg=", "dev": true, "requires": { "@types/babel-types": "6.25.1" @@ -109,7 +109,7 @@ "@types/connect": { "version": "3.4.31", "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.31.tgz", - "integrity": "sha512-OPSxsP6XqA3984KWDUXq/u05Hu8VWa/2rUVlw/aDUOx87BptIep6xb3NdCxCpKLfLdjZcCE5jR+gouTul3gjdA==", + "integrity": "sha1-H5LWsRfswFB2xJ7NAk95duUoutk=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -127,7 +127,7 @@ "@types/express-serve-static-core": { "version": "4.0.53", "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.0.53.tgz", - "integrity": "sha512-zaGeOpEYp5G2EhjaUFdVwysDrfEYc6Q6iPhd3Kl4ip30x0tvVv7SuJvY3yzCUSuFlzAG8N5KsyY6BJg93/cn+Q==", + "integrity": "sha1-FyOjXRRH8sVeE8hyHqs0SOQvTYI=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -136,7 +136,7 @@ "@types/fs-extra": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-3.0.3.tgz", - "integrity": "sha512-o2qkg/J2LWK+sr007+KFBBOrxzxpr9kiP0gMFC75gQJXhUn/E3pQA0kSVdxrQ3lf+rOwsRnuH0wnR5MNTotEKg==", + "integrity": "sha1-HWbrZw6/ZX5XwP2gFN80DBnYqgw=", "dev": true, "requires": { "@types/node": "8.0.34" @@ -165,7 +165,7 @@ "@types/gulp": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/gulp/-/gulp-4.0.4.tgz", - "integrity": "sha512-5hGc57snkSvGEkUQ42tcYAQmQrU9E41XQJNglP6FtDg7ou9QGyF1HfPZ5POGnrl7ee7uYq0Om0gh1bAmykxaxA==", + "integrity": "sha1-dT/+Ww3a8MmmAQGzRhQbuA5gLyU=", "dev": true, "requires": { "@types/chokidar": "1.7.1", @@ -222,7 +222,7 @@ "@types/handlebars": { "version": "4.0.36", "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.0.36.tgz", - "integrity": "sha512-LjNiTX7TY7wtuC6y3QwC93hKMuqYhgV9A1uXBKNvZtVC8ZvyWAjZkJ5BvT0K7RKqORRYRLMrqCxpw5RgS+MdrQ==", + "integrity": "sha1-/1fHf6GrZxO7RGU03cTZeXB6Onk=", "dev": true }, "@types/html-minifier": { @@ -244,7 +244,7 @@ "@types/jasmine": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.6.0.tgz", - "integrity": "sha512-1ZZdFvYA5zARDXPj5+VF0bwDZWH/o0QQWJVDc5srdC/DngcCZXskR33eR/4PielGvBjLQpQOd6KiQbmtqVkeZA==", + "integrity": "sha1-mXtBondStIUK8mg7xKjYIiwlvQI=", "dev": true }, "@types/jquery": { @@ -268,7 +268,7 @@ "@types/mime": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz", - "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==", + "integrity": "sha1-WnMG42fFObn2VDSZ3o3VGfrDeos=", "dev": true }, "@types/minimatch": { @@ -291,7 +291,7 @@ "@types/serve-static": { "version": "1.7.32", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.7.32.tgz", - "integrity": "sha512-WpI0g7M1FiOmJ/a97Qrjafq2I938tjAZ3hZr9O7sXyA6oUhH3bqUNZIt7r1KZg8TQAKxcvxt6JjQ5XuLfIBFvg==", + "integrity": "sha1-D2cy5NqwgTdx3Y/I/hSUDzRyi0w=", "dev": true, "requires": { "@types/express-serve-static-core": "4.0.53", @@ -315,7 +315,7 @@ "@types/uglify-js": { "version": "2.6.29", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-2.6.29.tgz", - "integrity": "sha512-BdFLCZW0GTl31AbqXSak8ss/MqEZ3DN2MH9rkAyGoTuzK7ifGUlX+u0nfbWeTsa7IPcZhtn8BlpYBXSV+vqGhQ==", + "integrity": "sha1-UhNH9p4gIB0hj1mRrmbhCHivzxo=", "requires": { "@types/source-map": "0.5.2" } @@ -323,7 +323,7 @@ "@types/undertaker": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@types/undertaker/-/undertaker-1.1.2.tgz", - "integrity": "sha512-cfqbNE5SKyXIWKaWdeThRgZewNUX5D1yp4xPnFkuTvr93l6EreBxO9FS3bAluiadarKMBGq6aiFosLZkMsolLw==", + "integrity": "sha1-zw9izcvfYq2fcKTXj4GGmlw0mgk=", "dev": true, "requires": { "@types/undertaker-registry": "1.0.0" @@ -358,7 +358,7 @@ "@uirouter/angularjs": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.8.tgz", - "integrity": "sha512-GNgCyLmtOryzyBO4o8F+e41wkkLzihEN/6hrClQvmA+vf6zX1yvTaC26bFpNg2CJFUNb+DIv8gY5Id3/F0OvZA==", + "integrity": "sha1-CedSiIR1L6QHGrHPdDJfEMbW2Mk=", "requires": { "@uirouter/core": "5.0.10" }, @@ -540,7 +540,7 @@ "ansi-escapes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.0.0.tgz", - "integrity": "sha512-O/klc27mWNUigtv0F8NJWbLF00OcegQalkqKURWdosW08YZKi4m6CnSUSvIZG1otNJbTWhN01Hhz389DW7mvDQ==", + "integrity": "sha1-7D6LTp+AZPwCw6ybZfHCdb2o75I=", "dev": true }, "ansi-regex": { @@ -551,7 +551,7 @@ "ansi-styles": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", - "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=", "dev": true, "requires": { "color-convert": "1.9.0" @@ -560,7 +560,7 @@ "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "dev": true, "requires": { "micromatch": "2.3.11", @@ -594,7 +594,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -744,7 +744,7 @@ "async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=", "dev": true, "requires": { "lodash": "4.17.4" @@ -771,7 +771,7 @@ "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "integrity": "sha1-1l0UuDx80d17yAHaoAVXrd9aBrI=", "dev": true, "requires": { "browserslist": "2.5.1", @@ -1595,7 +1595,7 @@ "bignumber.js": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", - "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" + "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, "binary-extensions": { "version": "1.10.0", @@ -1635,7 +1635,7 @@ "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=", "dev": true }, "body-parser": { @@ -2340,7 +2340,7 @@ "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=", "dev": true, "requires": { "ansi-styles": "3.2.0", @@ -2380,7 +2380,7 @@ "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=", "dev": true, "requires": { "inherits": "2.0.3", @@ -2390,7 +2390,7 @@ "circular-json": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", - "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "integrity": "sha1-gVyZ6oT2gJUp0vRXkb34JxE1LWY=", "dev": true }, "clean-css": { @@ -2588,7 +2588,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=" }, "commoner": { "version": "0.10.8", @@ -2756,7 +2756,7 @@ "content-type": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "integrity": "sha1-4TjMdeBAxyexlm/l5fjJruJW/js=", "dev": true }, "convert-source-map": { @@ -2786,7 +2786,7 @@ "cosmiconfig": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=", "dev": true, "requires": { "is-directory": "0.3.1", @@ -2866,7 +2866,7 @@ "crypto-browserify": { "version": "3.11.1", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", - "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=", "dev": true, "requires": { "browserify-cipher": "1.0.0", @@ -4032,7 +4032,7 @@ "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", "dev": true, "requires": { "ms": "2.0.0" @@ -4157,7 +4157,7 @@ "evp_bytestokey": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=", "dev": true, "requires": { "md5.js": "1.3.4", @@ -4265,7 +4265,7 @@ "external-editor": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz", - "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", + "integrity": "sha1-UsJJo5gbm6GHx8rPW+tQvx2Rprw=", "dev": true, "requires": { "iconv-lite": "0.4.18", @@ -4276,7 +4276,7 @@ "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=", "dev": true, "requires": { "os-tmpdir": "1.0.2" @@ -5103,8 +5103,7 @@ "jsbn": { "version": "0.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "json-schema": { "version": "0.2.3", @@ -5570,7 +5569,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", "dev": true }, "functional-red-black-tree": { @@ -5772,7 +5771,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=", "dev": true }, "globby": { @@ -6285,7 +6284,7 @@ "gulp-copy": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/gulp-copy/-/gulp-copy-1.0.1.tgz", - "integrity": "sha512-uhIdHo9SoWkf+pjfjETOMD/6ez10ZItO5/L1bFRfVGH+7lq9zE3TSjkh3WVPuTS9ttPRHA7yW4g1QRE1hPwUOA==", + "integrity": "sha1-93c724Ab5Mj5EjtXW48zun2x+d8=", "dev": true, "requires": { "gulp": "3.9.1", @@ -7000,7 +6999,7 @@ "hash.js": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=", "dev": true, "requires": { "inherits": "2.0.3", @@ -7069,7 +7068,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=" }, "html-minifier": { "version": "3.5.7", @@ -7094,7 +7093,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=" }, "uglify-js": { "version": "3.2.1", @@ -7155,12 +7154,12 @@ "i18next": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/i18next/-/i18next-9.1.0.tgz", - "integrity": "sha512-oarlBl8AX+2xSae45aT57y/i0dlhRP+MAYhuV2AMtih4Cv+ICpAApOILxtxi0BKPL95FMDStIH4F0PX/4CwfCQ==" + "integrity": "sha1-QIAF/iYqmQyNk5RqbeDHe7oRZns=" }, "i18next-xhr-backend": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.4.3.tgz", - "integrity": "sha512-l9YfIMl0N17Ka/F1KmzLF97iDC6xl5FtmTG60h/ETAfFwFQnYmmZ6B+oUKdNU4bZzBQR1QYWp58zVvUv95c5LA==" + "integrity": "sha1-1y9wU2o79qOJImHd41K8d9cIiGo=" }, "iconv-lite": { "version": "0.4.18", @@ -7170,7 +7169,7 @@ "identity-img": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/identity-img/-/identity-img-1.0.0.tgz", - "integrity": "sha512-lOl0WslzXMFChhtnE6XeuSg68QjkfL5A1kNgQMlooo5+FDM6qBGiITlg1jMXHnXYoQ+t+4uPpCdjfjpV/wBwOw==" + "integrity": "sha1-vkmdR2GqzWf23qyR26JrqiuXMFk=" }, "ieee754": { "version": "1.1.8", @@ -7181,7 +7180,7 @@ "ignore": { "version": "3.3.5", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "integrity": "sha1-xOcVRV9gc6jX5drnLS/J1xZj26Y=", "dev": true }, "image-size": { @@ -7250,7 +7249,7 @@ "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", - "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", + "integrity": "sha1-ndLyrXZdyrH/BEO0kUQqILoifck=", "dev": true, "requires": { "ansi-escapes": "3.0.0", @@ -7284,7 +7283,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -7577,7 +7576,7 @@ "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", "dev": true, "requires": { "isobject": "3.0.1" @@ -7828,7 +7827,7 @@ "jschardet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==", + "integrity": "sha1-xRn2KfhrOlvtuliojTETCe7Al/k=", "dev": true }, "jsesc": { @@ -7952,7 +7951,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "3.5.0", @@ -7993,7 +7992,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "tmp": { @@ -8010,7 +8009,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "1.0.1", @@ -8605,7 +8604,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "dev": true, "requires": { "pseudomap": "1.0.2", @@ -8742,7 +8741,7 @@ "mime": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/mime/-/mime-2.0.3.tgz", - "integrity": "sha512-TrpAd/vX3xaLPDgVRm6JkZwLR0KHfukMdU2wTEbqMDdCnY6Yo3mE+mjs9YE6oMNw2QRfXVeBEYpmpO94BIqiug==", + "integrity": "sha1-Q1MzeFR0fEjqSYMw3ANPn0u7zAs=", "dev": true }, "mime-db": { @@ -8995,7 +8994,7 @@ "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "integrity": "sha1-YLgTOWvjmz8SiKTB7V0efSi0ZKw=", "requires": { "lower-case": "1.1.4" } @@ -9021,7 +9020,7 @@ "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -9548,7 +9547,7 @@ "pbkdf2": { "version": "3.0.14", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz", - "integrity": "sha512-gjsZW9O34fm0R7PaLHRJmLLVfSoesxztjPjE9o6R+qtVJij90ltg1joIovN9GKrRW3t1PzhDDG3UMEMFfZ+1wA==", + "integrity": "sha1-o14TxkeZsGzhUyD0WcIw5o5zut4=", "dev": true, "requires": { "create-hash": "1.1.3", @@ -9613,7 +9612,7 @@ "pluralize": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", - "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "integrity": "sha1-KYuJ34uTsCIdv0Ia0rGx6iP8Z3c=", "dev": true }, "postcss": { @@ -9704,7 +9703,7 @@ "postcss-reporter": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-5.0.0.tgz", - "integrity": "sha512-rBkDbaHAu5uywbCR2XE8a25tats3xSOsGNx6mppK6Q9kSFGKc/FyAzfci+fWM2l+K402p1D0pNcfDGxeje5IKg==", + "integrity": "sha1-oUF3/RNCgp0pFlPyeG79ZxEDMsM=", "dev": true, "requires": { "chalk": "2.1.0", @@ -9716,7 +9715,7 @@ "log-symbols": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.1.0.tgz", - "integrity": "sha512-zLeLrzMA1A2vRF1e/0Mo+LNINzi6jzBylHj5WqvQ/WK/5WCZt8si9SyN4p9llr/HRYvVR1AoXHRHl4WTHyQAzQ==", + "integrity": "sha1-81+mDieIMrU43E3dy7R4pF0+O+Y=", "dev": true, "requires": { "chalk": "2.1.0" @@ -9800,7 +9799,7 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", "requires": { "asap": "2.0.6" } @@ -9851,7 +9850,7 @@ "qrcode-reader": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/qrcode-reader/-/qrcode-reader-1.0.3.tgz", - "integrity": "sha512-J1UTJS2vGxJdVPXH1KqFAu/nVMaBJsRLVYus1oDnKKcEVUtktUZDGNwmVTYriEgMz0VCM+uPbBX7136VnuRCEQ==" + "integrity": "sha1-QphaxHUcE04FYTLiUJcNaXldE4w=" }, "qs": { "version": "6.4.0", @@ -9874,7 +9873,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "dev": true, "requires": { "is-number": "3.0.0", @@ -9915,7 +9914,7 @@ "randombytes": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", - "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -10393,7 +10392,7 @@ "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "integrity": "sha1-p1vgHFPaJdk0qY69DkxKcxL5KoY=", "dev": true, "requires": { "path-parse": "1.0.5" @@ -10481,7 +10480,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=", "dev": true }, "sanitize-filename": { @@ -10502,7 +10501,7 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=" }, "semver-diff": { "version": "2.1.0", @@ -10516,7 +10515,7 @@ "send": { "version": "0.16.1", "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "integrity": "sha1-pw4coh0TgsEdDZ9iMd6ygQgNerM=", "dev": true, "requires": { "debug": "2.6.9", @@ -10546,7 +10545,7 @@ "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true } } @@ -10560,7 +10559,7 @@ "serve-static": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "integrity": "sha1-TFfVNASnYdjy58HooYpH2/J4pxk=", "dev": true, "requires": { "encodeurl": "1.0.1", @@ -10673,7 +10672,7 @@ "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==", + "integrity": "sha1-BE8aSdiEL/MHqta1Be0Xi9lQE00=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0" @@ -11044,7 +11043,7 @@ "stream-http": { "version": "2.7.2", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", - "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=", "dev": true, "requires": { "builtin-status-codes": "3.0.0", @@ -11241,7 +11240,7 @@ "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", - "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", + "integrity": "sha1-ozRHN1OR52atNNNIbm4q7chNLjY=", "dev": true, "requires": { "ajv": "5.2.3", @@ -11279,7 +11278,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "dev": true, "requires": { "is-fullwidth-code-point": "2.0.0", @@ -11441,7 +11440,7 @@ "ts-api-validator": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ts-api-validator/-/ts-api-validator-2.0.0.tgz", - "integrity": "sha512-VovTPe5am/TP6doPConDwTWeWcxF9D04OmagSTaKpOTfvHfRe8rxg0zktyhZMAuo2/EUV6HpgAafVVYf6Z1HUQ==", + "integrity": "sha1-Au99P+TGvKQlE9yEJDYUuE8yPU4=", "requires": { "dts-gen": "0.5.6", "dts-generator": "2.1.0", @@ -11451,14 +11450,14 @@ "ts-utils": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-4.5.0.tgz", - "integrity": "sha512-nLchzdDOiZ93CxZCsY6Od9q0FwFJivRD0qLSL/au6qjoCE3iBdLr5GnvMENOYdS7Z2ThUBHjq+D1UiMq0aYqng==" + "integrity": "sha1-vjz94AN7KfJR/R/EqiEilNg8dlY=" } } }, "ts-utils": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/ts-utils/-/ts-utils-6.0.0.tgz", - "integrity": "sha512-4LQHT6Nb2Er942WprkOtrAeYpFW6UZZUfq6meq8wA3jNHcht/MJi4YcGfVqXtK6muUHWA5bPE/o33jnzbS7Mgg==" + "integrity": "sha1-b3O1o1oBADD7w4GXTT5w8EcDMkc=" }, "tty-browserify": { "version": "0.0.0", @@ -11510,7 +11509,7 @@ "typescript": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==" + "integrity": "sha1-3z3Nw48764ANS8MiZGsEo/bKfw0=" }, "ua-parser-js": { "version": "0.7.14", @@ -11520,7 +11519,7 @@ "uglify-es": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.1.3.tgz", - "integrity": "sha512-Nuo5gkv/Q6PmLa+Ui2LvK+87YdMAcuXfRIWF0uVfkHVSfpT3Ue0euCSu4t0b8xv4Bt05lmXUT8bLI9OmnyPj8A==", + "integrity": "sha1-oh7rFJyxIKH4MCVjaJ4ZSWVQeAs=", "dev": true, "requires": { "commander": "2.11.0", @@ -11702,7 +11701,7 @@ "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", - "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=", "dev": true }, "v8flags": { @@ -11874,7 +11873,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "dev": true, "requires": { "isexe": "2.0.0" @@ -11944,7 +11943,7 @@ "worker-wrapper": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/worker-wrapper/-/worker-wrapper-1.2.2.tgz", - "integrity": "sha512-rXz1Ct+n1KFq5X24LPwGP/qMYyQiVXaWgaOsuLvoBpQ4H5IrIvSTsR7JCUcLGbDxfRcjh537tDhEw7AwzsIEEA==" + "integrity": "sha1-jYSssjCBFSGaJy94ele0E9g4MEM=" }, "wrap-ansi": { "version": "2.1.0", From 76820fee53439544219f6f9f5be234edd702dbbe Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 11:48:57 +0300 Subject: [PATCH 37/48] CLIENT-530: up package json version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94cc3a58be..6eeac4ddde 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.0.0-beta.12", + "version": "1.0.0-beta.13", "description": "The official client application for the Waves platform", "private": true, "repository": { From c7909e85e88c94a27a31604c31a20fe21a327dc3 Mon Sep 17 00:00:00 2001 From: uiskander Date: Thu, 15 Feb 2018 13:23:33 +0300 Subject: [PATCH 38/48] rebirth-responsive: fixing responsiveMneu --- src/modules/dex/directives/orderBook/OrderBook.js | 3 +++ src/modules/dex/directives/orderBook/orderBook.less | 3 ++- src/modules/dex/less/dex.less | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/dex/directives/orderBook/OrderBook.js b/src/modules/dex/directives/orderBook/OrderBook.js index e9086d7db7..f49833794c 100644 --- a/src/modules/dex/directives/orderBook/OrderBook.js +++ b/src/modules/dex/directives/orderBook/OrderBook.js @@ -124,6 +124,9 @@ }; }) .then(({ bids, spread, asks }) => { + + + const template = `
${asks}
${spread}
${bids}
`; const $box = $element.find('w-scroll-box'); const box = $box.get(0); diff --git a/src/modules/dex/directives/orderBook/orderBook.less b/src/modules/dex/directives/orderBook/orderBook.less index 8dfdfffb41..5d86f4b6fa 100644 --- a/src/modules/dex/directives/orderBook/orderBook.less +++ b/src/modules/dex/directives/orderBook/orderBook.less @@ -41,7 +41,8 @@ w-dex-order-book { } .spread { - margin: 7px 0; + padding: 7px 0; + background-color: @color-disabled-50; .cell-0 { color: @color-error-400; diff --git a/src/modules/dex/less/dex.less b/src/modules/dex/less/dex.less index 48f7d98876..7f7f097da6 100644 --- a/src/modules/dex/less/dex.less +++ b/src/modules/dex/less/dex.less @@ -97,7 +97,8 @@ body.dex { } .spread w-row { - .body-2(); + .footnote-1(); + font-weight: bold; } .table-row { From 8009fd8d5d55a477b65c53ee3946e5e09e5f6ddf Mon Sep 17 00:00:00 2001 From: uiskander Date: Thu, 15 Feb 2018 13:24:06 +0300 Subject: [PATCH 39/48] rebirth-responsive: fixing responsiveMneu --- src/modules/dex/less/dex.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/dex/less/dex.less b/src/modules/dex/less/dex.less index 7f7f097da6..2d40c78e37 100644 --- a/src/modules/dex/less/dex.less +++ b/src/modules/dex/less/dex.less @@ -99,6 +99,7 @@ body.dex { .spread w-row { .footnote-1(); font-weight: bold; + white-space: nowrap; } .table-row { From 46702ce952a2bdaaf9c9a3d532fc35c9afeda04a Mon Sep 17 00:00:00 2001 From: uiskander Date: Thu, 15 Feb 2018 13:24:06 +0300 Subject: [PATCH 40/48] client-293-fix-orders --- src/modules/dex/directives/orderBook/OrderBook.js | 2 -- src/modules/dex/less/dex.less | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/dex/directives/orderBook/OrderBook.js b/src/modules/dex/directives/orderBook/OrderBook.js index f49833794c..00d766e4f4 100644 --- a/src/modules/dex/directives/orderBook/OrderBook.js +++ b/src/modules/dex/directives/orderBook/OrderBook.js @@ -125,8 +125,6 @@ }) .then(({ bids, spread, asks }) => { - - const template = `
${asks}
${spread}
${bids}
`; const $box = $element.find('w-scroll-box'); const box = $box.get(0); diff --git a/src/modules/dex/less/dex.less b/src/modules/dex/less/dex.less index 7f7f097da6..2d40c78e37 100644 --- a/src/modules/dex/less/dex.less +++ b/src/modules/dex/less/dex.less @@ -99,6 +99,7 @@ body.dex { .spread w-row { .footnote-1(); font-weight: bold; + white-space: nowrap; } .table-row { From 5274eb54d8cabc8c4ed232b78406c1f712037e8a Mon Sep 17 00:00:00 2001 From: tsigel Date: Thu, 15 Feb 2018 17:02:12 +0300 Subject: [PATCH 41/48] CLIENT-411: fix set max for create orders --- .../dex/directives/createOrder/CreateOrder.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js index d8b7a86407..5047b32b32 100644 --- a/src/modules/dex/directives/createOrder/CreateOrder.js +++ b/src/modules/dex/directives/createOrder/CreateOrder.js @@ -142,8 +142,13 @@ setMaxAmount() { if (this.amountBalance.asset.id === this.fee.asset.id) { - this.amount = this.amountBalance.cloneWithTokens(this.amountBalance.sub(this.fee).getTokens() + const amount = this.amountBalance.cloneWithTokens(this.amountBalance.sub(this.fee).getTokens() .round(this.amountBalance.asset.precision, BigNumber.ROUND_FLOOR)); + if (amount.getTokens().lt(0)) { + this.amount = this.amountBalance.cloneWithTokens('0'); + } else { + this.amount = amount; + } } else { this.amount = this.amountBalance.cloneWithTokens(this.amountBalance.getTokens() .round(this.amountBalance.asset.precision, BigNumber.ROUND_FLOOR)); @@ -246,7 +251,7 @@ } if (this.type === 'buy') { - this.canByOrder = !this.priceBalance.lte(this.totalPrice); + this.canByOrder = !(this.priceBalance.lte(this.totalPrice) && this.priceBalance.getTokens().gt(0)); } else { this.canByOrder = true; } @@ -294,7 +299,12 @@ return null; } if (amount.asset.id === fee.asset.id) { - return amount.sub(fee); + const result = amount.sub(fee); + if (result.getTokens().gte('0')) { + return result; + } else { + return amount.cloneWithTokens('0'); + } } else { return amount; } From 461abea63b8bd810e8f995c09e95b3d80ee3939c Mon Sep 17 00:00:00 2001 From: xenohunter Date: Thu, 15 Feb 2018 17:41:52 +0300 Subject: [PATCH 42/48] Merge remote-tracking branch 'origin/client-293-fix-orders' into client-530-release # Conflicts: # package-lock.json --- package-lock.json | 499 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 497 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9549b2a48..4ec5164aa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "waves-client", - "version": "1.0.0-beta.12", + "version": "1.0.0-beta.13", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -557,6 +557,12 @@ "color-convert": "1.9.0" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", + "dev": true + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", @@ -677,6 +683,37 @@ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" }, + "asar": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/asar/-/asar-0.14.2.tgz", + "integrity": "sha512-eKo4ywQDq9dC/0Pu6UJsX4PxNi5ZlC4/NQ1JORUW4xkMRrEWpoLPpkngmQ6K7ZkioVjE2ZafLMmHPAQKMO0BdA==", + "dev": true, + "requires": { + "chromium-pickle-js": "0.2.0", + "commander": "2.11.0", + "cuint": "0.2.2", + "glob": "6.0.4", + "minimatch": "3.0.4", + "mkdirp": "0.5.0", + "mksnapshot": "0.3.1", + "tmp": "0.0.28" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, "asar-integrity": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asar-integrity/-/asar-integrity-0.2.4.tgz", @@ -768,6 +805,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "author-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", + "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", + "dev": true + }, "autoprefixer": { "version": "7.1.5", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", @@ -1597,6 +1640,16 @@ "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-4.1.0.tgz", "integrity": "sha1-228UBnwUC9RmJIFaeRbJLZtsJLE=" }, + "binary": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", + "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=", + "dev": true, + "requires": { + "buffers": "0.1.1", + "chainsaw": "0.1.0" + } + }, "binary-extensions": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", @@ -2093,6 +2146,12 @@ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", "dev": true }, + "buffers": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", + "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=", + "dev": true + }, "bufferstreams": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.1.tgz", @@ -2337,6 +2396,15 @@ "lazy-cache": "1.0.4" } }, + "chainsaw": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", + "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=", + "dev": true, + "requires": { + "traverse": "0.3.9" + } + }, "chalk": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", @@ -2428,6 +2496,16 @@ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, + "clipboard": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz", + "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs=", + "requires": { + "good-listener": "1.2.2", + "select": "1.1.2", + "tiny-emitter": "2.0.2" + } + }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -2897,6 +2975,12 @@ "resolved": "https://registry.npmjs.org/csv-gen/-/csv-gen-0.0.6.tgz", "integrity": "sha512-5b5Yzeo5wpdPi+PCl4OMxexbMpL7tprmhSUIpQf9W0QLI+ulwM1SZvlymknluPc+6kFHkngoXindDixgpn4Zaw==" }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", + "dev": true + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2960,6 +3044,21 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "decompress-zip": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.3.0.tgz", + "integrity": "sha1-rjvLfjTGWHmt/nfhnDD4ZgK0vbA=", + "dev": true, + "requires": { + "binary": "0.3.0", + "graceful-fs": "4.1.11", + "mkpath": "0.1.0", + "nopt": "3.0.6", + "q": "1.5.0", + "readable-stream": "1.1.14", + "touch": "0.0.3" + } + }, "deep-extend": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", @@ -3007,6 +3106,11 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegate": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", + "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==" + }, "depd": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", @@ -3696,6 +3800,164 @@ } } }, + "electron-osx-sign": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz", + "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "compare-version": "0.1.2", + "debug": "2.6.8", + "isbinaryfile": "3.0.2", + "minimist": "1.2.0", + "plist": "2.1.0" + } + }, + "electron-packager": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-11.0.1.tgz", + "integrity": "sha1-wtH/nsqBEL6evIGCbiqSHATRIA4=", + "dev": true, + "requires": { + "asar": "0.14.2", + "debug": "3.1.0", + "electron-download": "4.1.0", + "electron-osx-sign": "0.4.8", + "extract-zip": "1.6.6", + "fs-extra": "5.0.0", + "get-package-info": "1.0.0", + "mz": "2.7.0", + "nodeify": "1.0.1", + "parse-author": "2.0.0", + "pify": "3.0.0", + "plist": "2.1.0", + "pruner": "0.0.7", + "rcedit": "1.0.0", + "resolve": "1.4.0", + "sanitize-filename": "1.6.1", + "semver": "5.4.1", + "yargs-parser": "9.0.2" + }, + "dependencies": { + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "electron-download": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.0.tgz", + "integrity": "sha1-v5MsdG8vh//MCdHdRy8v9rkYeEU=", + "dev": true, + "requires": { + "debug": "2.6.9", + "env-paths": "1.0.0", + "fs-extra": "2.1.2", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "3.0.0", + "rc": "1.2.5", + "semver": "5.4.1", + "sumchecker": "2.0.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0" + } + } + } + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + }, + "dependencies": { + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "sumchecker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", + "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=", + "dev": true, + "requires": { + "debug": "2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, "electron-publish": { "version": "19.55.2", "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-19.55.2.tgz", @@ -5592,6 +5854,77 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" }, + "get-package-info": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", + "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "debug": "2.6.8", + "lodash.get": "4.4.2", + "read-pkg-up": "2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -5855,6 +6188,14 @@ "sparkles": "1.0.0" } }, + "good-listener": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", + "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=", + "requires": { + "delegate": "3.2.0" + } + }, "got": { "version": "6.7.1", "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", @@ -8389,6 +8730,12 @@ "lodash._root": "3.0.1" } }, + "lodash.get": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", + "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -8806,6 +9153,38 @@ } } }, + "mkpath": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz", + "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=", + "dev": true + }, + "mksnapshot": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/mksnapshot/-/mksnapshot-0.3.1.tgz", + "integrity": "sha1-JQHAVldDbXQs6Vik/5LHfkDdN+Y=", + "dev": true, + "requires": { + "decompress-zip": "0.3.0", + "fs-extra": "0.26.7", + "request": "2.81.0" + }, + "dependencies": { + "fs-extra": { + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", + "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.1" + } + } + } + }, "module-deps": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz", @@ -8942,6 +9321,17 @@ "integrity": "sha1-N1hVVaT/GYUwntrHwqBFpGa+bDI=", "dev": true }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, + "requires": { + "any-promise": "1.3.0", + "object-assign": "4.1.1", + "thenify-all": "1.6.0" + } + }, "n3-charts": { "version": "2.0.28", "resolved": "https://registry.npmjs.org/n3-charts/-/n3-charts-2.0.28.tgz", @@ -9008,6 +9398,33 @@ "is-stream": "1.1.0" } }, + "nodeify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nodeify/-/nodeify-1.0.1.tgz", + "integrity": "sha1-ZKtpp7268DzhB7TwM1yHwLnpGx0=", + "dev": true, + "requires": { + "is-promise": "1.0.1", + "promise": "1.3.0" + }, + "dependencies": { + "is-promise": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", + "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=", + "dev": true + }, + "promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-1.3.0.tgz", + "integrity": "sha1-5cyaTIJ45GZP/twBx9qEhCsEAXU=", + "dev": true, + "requires": { + "is-promise": "1.0.1" + } + } + } + }, "nopt": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", @@ -9380,6 +9797,15 @@ "pbkdf2": "3.0.14" } }, + "parse-author": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", + "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", + "dev": true, + "requires": { + "author-regex": "1.0.0" + } + }, "parse-color": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz", @@ -9811,6 +10237,15 @@ "dev": true, "optional": true }, + "pruner": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/pruner/-/pruner-0.0.7.tgz", + "integrity": "sha1-NF+8s+gHARY6HXrfVrrCKaWh5ME=", + "dev": true, + "requires": { + "fs-extra": "4.0.2" + } + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -9958,6 +10393,12 @@ "strip-json-comments": "2.0.1" } }, + "rcedit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-1.0.0.tgz", + "integrity": "sha512-W7DNa34x/3OgWyDHsI172AG/Lr/lZ+PkavFkHj0QhhkBRcV9QTmRJE1tDKrWkx8XHPSBsmZkNv9OKue6pncLFQ==", + "dev": true + }, "react": { "version": "0.14.9", "resolved": "https://registry.npmjs.org/react/-/react-0.14.9.tgz", @@ -10495,9 +10936,14 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", "dev": true }, + "select": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", + "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=" + }, "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", @@ -11323,6 +11769,24 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "thenify": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", + "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", + "dev": true, + "requires": { + "any-promise": "1.3.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", + "dev": true, + "requires": { + "thenify": "3.3.0" + } + }, "throttleit": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", @@ -11374,6 +11838,11 @@ "process": "0.11.10" } }, + "tiny-emitter": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz", + "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==" + }, "tmp": { "version": "0.0.28", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz", @@ -11401,6 +11870,26 @@ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", "dev": true }, + "touch": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.3.tgz", + "integrity": "sha1-Ua7z1ElXHU8oel2Hyci0kYGg2x0=", + "dev": true, + "requires": { + "nopt": "1.0.10" + }, + "dependencies": { + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", + "dev": true, + "requires": { + "abbrev": "1.1.0" + } + } + } + }, "tough-cookie": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", @@ -11410,6 +11899,12 @@ "punycode": "1.4.1" } }, + "traverse": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", + "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", + "dev": true + }, "trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", From 517ddf9007ceefa82a3d506feb4d44affde7bd7e Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 16 Feb 2018 12:30:43 +0300 Subject: [PATCH 43/48] CLIENT-541: fix send validators --- .../directives/balanceInput/BalanceInput.js | 7 ++++- .../utils/modals/sendAsset/AssetSendCtrl.js | 31 ++++++++++++++----- .../utils/modals/sendAsset/send.modal.html | 6 ++-- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/modules/ui/directives/balanceInput/BalanceInput.js b/src/modules/ui/directives/balanceInput/BalanceInput.js index 67aa8cf105..a4b9ca091e 100644 --- a/src/modules/ui/directives/balanceInput/BalanceInput.js +++ b/src/modules/ui/directives/balanceInput/BalanceInput.js @@ -98,7 +98,12 @@ const feeHash = utils.groupMoney(feeList); if (feeHash[this.maxBalance.asset.id]) { - this.realMaxBalance = this.maxBalance.sub(feeHash[this.maxBalance.asset.id]); + const max = this.maxBalance.sub(feeHash[this.maxBalance.asset.id]); + if (max.getTokens().lt(0)) { + this.maxBalance = this.maxBalance.cloneWithTokens('0'); + } else { + this.maxBalance = max; + } } else { this.realMaxBalance = this.maxBalance; } diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js index 310f230c66..457b8918c5 100644 --- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js +++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js @@ -16,13 +16,6 @@ class AssetSendCtrl extends Base { - /** - * @return {number} - */ - get moneyLength() { - return this.moneyHash && Object.keys(this.moneyHash).length; - } - /** * @return {Money} */ @@ -50,6 +43,10 @@ * @type {{BTC: string, USD: string, LTC: string, ETH: string, WAVES: string, EUR: string, ZEC: string}} */ this.defaultAssets = WavesApp.defaultAssets; + /** + * @type {Array} + */ + this.cooseMoneyList = []; /** * @type {string} */ @@ -112,6 +109,8 @@ mirrorId: 'baseAssetId' }); + this.observe('moneyHash', this._onChangeMoneyHash); + /** * @type {Poll} */ @@ -150,6 +149,11 @@ } else { amount = this.balance; } + + if (amount.getTokens().lt(0)) { + amount = this.moneyHash[this.assetId].cloneWithTokens('0'); + } + waves.utils.getRate(this.assetId, this.mirrorId).then((rate) => { this._noCurrentRate = true; this.mirror = amount.convertTo(this.moneyHash[this.mirrorId].asset, rate); @@ -187,6 +191,19 @@ this.focus = ''; } + /** + * @private + */ + _onChangeMoneyHash() { + const hash = this.moneyHash; + const list = Object.values(hash).filter((money) => !money.getTokens().eq(0)); + if (list.length) { + this.cooseMoneyList = list; + } else { + this.cooseMoneyList = [this.moneyHash[WavesApp.defaultAssets.WAVES]]; + } + } + /** * @private */ diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html index d8aef8da2b..ed0f34ea93 100644 --- a/src/modules/utils/modals/sendAsset/send.modal.html +++ b/src/modules/utils/modals/sendAsset/send.modal.html @@ -7,7 +7,7 @@
-
@@ -19,9 +19,9 @@
-
From 00ab4f3ce03bb04379175a3ffae351507005f887 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 16 Feb 2018 12:43:28 +0300 Subject: [PATCH 44/48] CLIENT-411: fix send max in create order --- src/modules/dex/directives/createOrder/CreateOrder.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js index 5047b32b32..f4570eb969 100644 --- a/src/modules/dex/directives/createOrder/CreateOrder.js +++ b/src/modules/dex/directives/createOrder/CreateOrder.js @@ -157,10 +157,15 @@ setMaxPrice() { if (this.priceBalance.asset.id === this.fee.asset.id) { - this.amount = this.amountBalance.cloneWithTokens(this.priceBalance.sub(this.fee) + const amount = this.amountBalance.cloneWithTokens(this.priceBalance.sub(this.fee) .getTokens() .div(this.price.getTokens()) .round(this.amountBalance.asset.precision, BigNumber.ROUND_FLOOR)); + if (amount.getTokens().lt(0)) { + this.amount = amount.cloneWithTokens('0'); + } else { + this.amount = amount; + } } else { this.amount = this.amountBalance.cloneWithTokens(this.priceBalance.getTokens() .div(this.price.getTokens()) From b70852c3b4a59d07dba247c931367ae1092578b8 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 16 Feb 2018 12:49:00 +0300 Subject: [PATCH 45/48] CLIENT-541: fix variable name --- src/modules/utils/modals/sendAsset/AssetSendCtrl.js | 6 +++--- src/modules/utils/modals/sendAsset/send.modal.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js index 457b8918c5..8f9ccd0f2d 100644 --- a/src/modules/utils/modals/sendAsset/AssetSendCtrl.js +++ b/src/modules/utils/modals/sendAsset/AssetSendCtrl.js @@ -46,7 +46,7 @@ /** * @type {Array} */ - this.cooseMoneyList = []; + this.choosableMoneyList = []; /** * @type {string} */ @@ -198,9 +198,9 @@ const hash = this.moneyHash; const list = Object.values(hash).filter((money) => !money.getTokens().eq(0)); if (list.length) { - this.cooseMoneyList = list; + this.choosableMoneyList = list; } else { - this.cooseMoneyList = [this.moneyHash[WavesApp.defaultAssets.WAVES]]; + this.choosableMoneyList = [this.moneyHash[WavesApp.defaultAssets.WAVES]]; } } diff --git a/src/modules/utils/modals/sendAsset/send.modal.html b/src/modules/utils/modals/sendAsset/send.modal.html index ed0f34ea93..7ff02bde03 100644 --- a/src/modules/utils/modals/sendAsset/send.modal.html +++ b/src/modules/utils/modals/sendAsset/send.modal.html @@ -7,7 +7,7 @@
-
@@ -19,9 +19,9 @@
-
From f632ecdcbb4eaf3286be00cb2d1ca5954d5bbc7b Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 16 Feb 2018 13:33:56 +0300 Subject: [PATCH 46/48] CLIENT-541: fix balance input --- src/modules/ui/directives/balanceInput/BalanceInput.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/ui/directives/balanceInput/BalanceInput.js b/src/modules/ui/directives/balanceInput/BalanceInput.js index a4b9ca091e..315b9f5ec3 100644 --- a/src/modules/ui/directives/balanceInput/BalanceInput.js +++ b/src/modules/ui/directives/balanceInput/BalanceInput.js @@ -100,9 +100,9 @@ if (feeHash[this.maxBalance.asset.id]) { const max = this.maxBalance.sub(feeHash[this.maxBalance.asset.id]); if (max.getTokens().lt(0)) { - this.maxBalance = this.maxBalance.cloneWithTokens('0'); + this.realMaxBalance = this.maxBalance.cloneWithTokens('0'); } else { - this.maxBalance = max; + this.realMaxBalance = max; } } else { this.realMaxBalance = this.maxBalance; From 5475731f0c4a51ec37c0b3d30dd8742ac9dc3193 Mon Sep 17 00:00:00 2001 From: tsigel Date: Fri, 16 Feb 2018 18:36:20 +0300 Subject: [PATCH 47/48] CLIENT-530: fix create order locale --- src/modules/dex/directives/createOrder/createOrder.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/dex/directives/createOrder/createOrder.html b/src/modules/dex/directives/createOrder/createOrder.html index 41dcc10e33..a16b1b4fa0 100644 --- a/src/modules/dex/directives/createOrder/createOrder.html +++ b/src/modules/dex/directives/createOrder/createOrder.html @@ -1,4 +1,5 @@
From a2fa20c3dc564860e7de3a6571ebffa69bbcf725 Mon Sep 17 00:00:00 2001 From: tsigel Date: Mon, 19 Feb 2018 12:25:44 +0300 Subject: [PATCH 48/48] CLIENT-530: fix infinity in create order --- .../dex/directives/createOrder/CreateOrder.js | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/modules/dex/directives/createOrder/CreateOrder.js b/src/modules/dex/directives/createOrder/CreateOrder.js index 87558f0895..3d7f26a1ae 100644 --- a/src/modules/dex/directives/createOrder/CreateOrder.js +++ b/src/modules/dex/directives/createOrder/CreateOrder.js @@ -157,14 +157,18 @@ setMaxPrice() { if (this.priceBalance.asset.id === this.fee.asset.id) { - const amount = this.amountBalance.cloneWithTokens(this.priceBalance.sub(this.fee) - .getTokens() - .div(this.price.getTokens()) - .round(this.amountBalance.asset.precision, BigNumber.ROUND_FLOOR)); - if (amount.getTokens().lt(0)) { - this.amount = amount.cloneWithTokens('0'); + if (this.price.getTokens().eq(0)) { + this.amount = this.amountBalance.cloneWithTokens('0'); } else { - this.amount = amount; + const amount = this.amountBalance.cloneWithTokens(this.priceBalance.sub(this.fee) + .getTokens() + .div(this.price.getTokens()) + .round(this.amountBalance.asset.precision, BigNumber.ROUND_FLOOR)); + if (amount.getTokens().lt(0)) { + this.amount = amount.cloneWithTokens('0'); + } else { + this.amount = amount; + } } } else { this.amount = this.amountBalance.cloneWithTokens(this.priceBalance.getTokens() @@ -288,7 +292,7 @@ const sell = Number(this.bid.price); const buy = Number(this.ask.price); - this.spreadPercent = (((buy - sell) * 100 / buy) || 0).toFixed(2); + this.spreadPercent = buy ? (((buy - sell) * 100 / buy) || 0).toFixed(2) : '0.00'; } /**