From 139c2184e7cce59c759cdf4bd41d2aab3dcfd484 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 15 Nov 2019 11:00:26 +0100 Subject: [PATCH 01/76] frontend : add ngx-datatable, backend : add route GET observations by user id --- backend/gncitizen/core/observations/routes.py | 104 + frontend/angular.json | 37 +- frontend/package-lock.json | 4520 ++--------------- frontend/package.json | 1 + frontend/src/app/app.module.ts | 2 + frontend/src/assets/css/material.css | 303 ++ frontend/src/styles.css | 2 + 7 files changed, 980 insertions(+), 3989 deletions(-) create mode 100644 frontend/src/assets/css/material.css diff --git a/backend/gncitizen/core/observations/routes.py b/backend/gncitizen/core/observations/routes.py index ef81b09e..2fb42e3e 100644 --- a/backend/gncitizen/core/observations/routes.py +++ b/backend/gncitizen/core/observations/routes.py @@ -697,3 +697,107 @@ def get_rewards(id): }, 200, ) + + +@routes.route("/observations/users/", methods=["GET"]) +@json_resp +def get_observations_by_user_id(user_id) : + try: + observations = ( + db.session.query( + ObservationModel, + UserModel.username, + MediaModel.filename.label("image"), + LAreas.area_name, + LAreas.area_code, + ) + .filter(ObservationModel.id_role == user_id, ProgramsModel.is_active) + .join(LAreas, LAreas.id_area == ObservationModel.municipality, isouter=True) + .join( + ProgramsModel, + isouter=True, + ) + .join( + ObservationMediaModel, + ObservationMediaModel.id_data_source == ObservationModel.id_observation, + isouter=True, + ) + .join( + MediaModel, + ObservationMediaModel.id_media == MediaModel.id_media, + isouter=True, + ) + .join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True) + ) + + observations = observations.order_by(ObservationModel.timestamp_create.desc()) + # current_app.logger.debug(str(observations)) + observations = observations.all() + if current_app.config.get("API_TAXHUB") is not None: + taxhub_list_id = ( + ProgramsModel.query.one().taxonomy_list + ) + taxon_repository = mkTaxonRepository(taxhub_list_id) + features = [] + for observation in observations: + feature = get_geojson_feature(observation.ObservationModel.geom) + feature["properties"]["municipality"] = { + "name": observation.area_name, + "code": observation.area_code, + } + + # Observer + feature["properties"]["observer"] = {"username": observation.username} + # Observer submitted media + feature["properties"]["image"] = ( + "/".join( + [ + current_app.config["API_ENDPOINT"], + current_app.config["MEDIA_FOLDER"], + observation.image, + ] + ) + if observation.image + else None + ) + # Municipality + observation_dict = observation.ObservationModel.as_dict(True) + for k in observation_dict: + if k in obs_keys and k != "municipality": + feature["properties"][k] = observation_dict[k] + + # TaxRef + if current_app.config.get("API_TAXHUB") is None: + taxref = Taxref.query.filter( + Taxref.cd_nom == observation.ObservationModel.cd_nom + ).first() + if taxref: + feature["properties"]["taxref"] = taxref.as_dict(True) + + medias = TMedias.query.filter( + TMedias.cd_ref == observation.ObservationModel.cd_nom + ).all() + if medias: + feature["properties"]["medias"] = [ + media.as_dict(True) for media in medias + ] + else: + try: + taxon = next( + taxon + for taxon in taxon_repository + if taxon and taxon["cd_nom"] == feature["properties"]["cd_nom"] + ) + feature["properties"]["nom_francais"] = taxon["nom_francais"] + feature["properties"]["taxref"] = taxon["taxref"] + feature["properties"]["medias"] = taxon["medias"] + except StopIteration: + pass + features.append(feature) + + return FeatureCollection(features) + + except Exception as e: + raise e + current_app.logger.critical("[get_program_observations] Error: %s", str(e)) + return {"message": str(e)}, 400 \ No newline at end of file diff --git a/frontend/angular.json b/frontend/angular.json index cacd1c8c..80a49452 100644 --- a/frontend/angular.json +++ b/frontend/angular.json @@ -18,7 +18,11 @@ "main": "src/main.ts", "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.app.json", - "assets": ["src/favicon.ico", "src/assets", "src/robots.txt"], + "assets": [ + "src/favicon.ico", + "src/assets", + "src/robots.txt" + ], "styles": [ "node_modules/ngx-toastr/toastr.css", "node_modules/font-awesome/css/font-awesome.min.css", @@ -138,16 +142,26 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", - "styles": ["src/styles.css"], + "styles": [ + "src/styles.css" + ], "scripts": [], - "assets": ["src/favicon.ico", "src/assets"] + "assets": [ + "src/favicon.ico", + "src/assets" + ] } }, "lint": { "builder": "@angular-devkit/build-angular:tslint", "options": { - "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], - "exclude": ["**/node_modules/**"] + "tsConfig": [ + "src/tsconfig.app.json", + "src/tsconfig.spec.json" + ], + "exclude": [ + "**/node_modules/**" + ] } }, "server": { @@ -190,11 +204,18 @@ "builder": "@angular-devkit/build-angular:tslint", "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] + "exclude": [ + "**/node_modules/**" + ] } } } } }, - "defaultProject": "frontend" -} + "defaultProject": "frontend", + "schematics": { + "@schematics/angular:component": { + "styleext": "scss" + } + } +} \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 22f5bdac..b74f2e09 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2,26 +2,18 @@ "name": "frontend", "version": "0.0.0", "lockfileVersion": 1, - "requires": true, "dependencies": { "@angular-devkit/architect": { "version": "0.802.2", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.2.tgz", "integrity": "sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==", "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "rxjs": "6.4.0" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, @@ -30,56 +22,6 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.802.2.tgz", "integrity": "sha512-48WCSX5IpSbVe/cG9+KrcL6f93JwHicKfYLyrrGhywSENlBYVNLNfbJHz/AuaxjmsiCmiI9gLnRb/W5JoVxuMA==", "dev": true, - "requires": { - "@angular-devkit/architect": "0.802.2", - "@angular-devkit/build-optimizer": "0.802.2", - "@angular-devkit/build-webpack": "0.802.2", - "@angular-devkit/core": "8.2.2", - "@ngtools/webpack": "8.2.2", - "ajv": "6.10.2", - "autoprefixer": "9.6.1", - "browserslist": "4.6.6", - "caniuse-lite": "1.0.30000986", - "circular-dependency-plugin": "5.0.2", - "clean-css": "4.2.1", - "copy-webpack-plugin": "5.0.4", - "core-js": "3.1.4", - "file-loader": "4.1.0", - "glob": "7.1.4", - "istanbul-instrumenter-loader": "3.0.1", - "karma-source-map-support": "1.4.0", - "less": "3.9.0", - "less-loader": "5.0.0", - "license-webpack-plugin": "2.1.1", - "loader-utils": "1.2.3", - "mini-css-extract-plugin": "0.8.0", - "minimatch": "3.0.4", - "open": "6.4.0", - "parse5": "4.0.0", - "postcss": "7.0.17", - "postcss-import": "12.0.1", - "postcss-loader": "3.0.0", - "raw-loader": "1.0.0", - "rxjs": "6.4.0", - "sass": "1.22.7", - "sass-loader": "7.1.0", - "semver": "6.3.0", - "source-map-loader": "0.2.4", - "source-map-support": "0.5.12", - "speed-measure-webpack-plugin": "1.3.1", - "style-loader": "0.23.1", - "stylus": "0.54.5", - "stylus-loader": "3.0.2", - "terser-webpack-plugin": "1.3.0", - "tree-kill": "1.2.1", - "webpack": "4.38.0", - "webpack-dev-middleware": "3.7.0", - "webpack-dev-server": "3.7.2", - "webpack-merge": "4.2.1", - "webpack-sources": "1.3.0", - "webpack-subresource-integrity": "1.1.0-rc.6", - "worker-plugin": "3.1.0" - }, "dependencies": { "core-js": { "version": "3.1.4", @@ -97,10 +39,7 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, @@ -109,13 +48,6 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.802.2.tgz", "integrity": "sha512-0QkTxMgCr2YiysdRVY64smtogDnWz0eyqhmUJbd9kEq1xxDDfuvs+6OT1Lk6xU7tcucVf33DKB9jK/3n3LZIpw==", "dev": true, - "requires": { - "loader-utils": "1.2.3", - "source-map": "0.5.6", - "tslib": "1.10.0", - "typescript": "3.5.3", - "webpack-sources": "1.3.0" - }, "dependencies": { "source-map": { "version": "0.5.6", @@ -130,21 +62,12 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.802.2.tgz", "integrity": "sha512-odsY7hkqUBsRgqTCcGXFuIBd6NJYSCduFHheoDpqwK0SIAlAZ6Q9pB6jv9J0FTwKUJBsVsHk+cXUuaeZhUQcIg==", "dev": true, - "requires": { - "@angular-devkit/architect": "0.802.2", - "@angular-devkit/core": "8.2.2", - "rxjs": "6.4.0", - "webpack-merge": "4.2.1" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, @@ -153,22 +76,12 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true }, "source-map": { "version": "0.7.3", @@ -183,55 +96,25 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.2.tgz", "integrity": "sha512-wAbP+IriWgTSLR4prezuFlLbxMZMGXiN0FNH2i/v8MfxNXCBiEvD4YtD/8s8YRsZs+IW7sp3bErSD/EIlS4DyQ==", "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "rxjs": "6.4.0" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, "@angular/animations": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.2.tgz", - "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==" }, "@angular/cli": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.2.2.tgz", "integrity": "sha512-iQvNVbegNXvnuAo8Pal6hjwK8joGcaCTcIa3jh1GLZ9JT4fZk2p9D/8Kay8C0jLm2KytV3f4eSlPAuX5V6p/XQ==", "dev": true, - "requires": { - "@angular-devkit/architect": "0.802.2", - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2", - "@schematics/angular": "8.2.2", - "@schematics/update": "0.802.2", - "@yarnpkg/lockfile": "1.1.0", - "ansi-colors": "4.1.1", - "debug": "^4.1.1", - "ini": "1.3.5", - "inquirer": "6.5.0", - "npm-package-arg": "6.1.0", - "open": "6.4.0", - "pacote": "9.5.4", - "read-package-tree": "5.3.1", - "semver": "6.3.0", - "symbol-observable": "1.2.0", - "universal-analytics": "^0.4.20", - "uuid": "^3.3.2" - }, "dependencies": { "ansi-colors": { "version": "4.1.1", @@ -243,10 +126,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -259,36 +139,18 @@ "@angular/common": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.2.tgz", - "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==" }, "@angular/compiler": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.2.tgz", - "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==" }, "@angular/compiler-cli": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.2.tgz", "integrity": "sha512-lEfWykViorBom4iWeZusoH4yAFkalyys/k9sI2qiTSVaH6TyowXbnfTMGfFQXKFydxI9sE86cCPoaRcR6fQcKQ==", "dev": true, - "requires": { - "canonical-path": "1.0.0", - "chokidar": "^2.1.1", - "convert-source-map": "^1.5.1", - "dependency-graph": "^0.7.2", - "magic-string": "^0.25.0", - "minimist": "^1.2.0", - "reflect-metadata": "^0.1.2", - "source-map": "^0.6.1", - "tslib": "^1.9.0", - "yargs": "13.1.0" - }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -301,19 +163,12 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "dev": true } } }, @@ -327,60 +182,25 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } + "dev": true }, "chokidar": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } + "dev": true }, "fsevents": { "version": "1.2.9", @@ -940,19 +760,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } + "dev": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } + "dev": true }, "isarray": { "version": "1.0.0", @@ -964,36 +778,19 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } + "dev": true }, "require-main-filename": { "version": "2.0.0", @@ -1001,99 +798,58 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } + "dev": true }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "dev": true }, "yargs": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz", "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.0.0" - } + "dev": true }, "yargs-parser": { "version": "13.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "dev": true } } }, "@angular/core": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.2.tgz", - "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==" }, "@angular/forms": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.2.tgz", - "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==" }, "@angular/http": { "version": "7.2.15", "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.15.tgz", - "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==" }, "@angular/language-service": { "version": "8.2.2", @@ -1104,58 +860,34 @@ "@angular/platform-browser": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.2.tgz", - "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==" }, "@angular/platform-browser-dynamic": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.2.tgz", - "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==" }, "@angular/platform-server": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.2.tgz", - "integrity": "sha512-LSi+CL7uApdSMuCf5IYqO2UbvPzDbvTvpFrpFZgcqweeKhpcaNjfm3M51hrec8eTlpd06ONd93SwKC2gqkmr7A==", - "requires": { - "domino": "^2.1.2", - "tslib": "^1.9.0", - "xhr2": "^0.1.4" - } + "integrity": "sha512-LSi+CL7uApdSMuCf5IYqO2UbvPzDbvTvpFrpFZgcqweeKhpcaNjfm3M51hrec8eTlpd06ONd93SwKC2gqkmr7A==" }, "@angular/router": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.2.tgz", - "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==" }, "@babel/code-frame": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.0.0" - } + "dev": true }, "@babel/generator": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, - "requires": { - "@babel/types": "^7.5.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, "dependencies": { "jsesc": { "version": "2.5.2", @@ -1175,41 +907,25 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" - } + "dev": true }, "@babel/helper-get-function-arity": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } + "dev": true }, "@babel/helper-split-export-declaration": { "version": "7.4.4", "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } + "dev": true }, "@babel/highlight": { "version": "7.5.0", "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - }, "dependencies": { "js-tokens": { "version": "4.0.0", @@ -1229,38 +945,19 @@ "version": "7.4.4", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } + "dev": true }, "@babel/traverse": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.5", - "@babel/types": "^7.5.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "globals": { "version": "11.12.0", @@ -1281,11 +978,6 @@ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, "dependencies": { "to-fast-properties": { "version": "2.0.0", @@ -1298,32 +990,19 @@ "@ng-bootstrap/ng-bootstrap": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-5.1.0.tgz", - "integrity": "sha512-IYoKE1NMrIPbRV0077/uHOjdwPb3qyhHpbBXiMGjclkSm2GvKXNPIzgd3Vjon/lbKelHdAW4A/upUHN2VYUi3w==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-IYoKE1NMrIPbRV0077/uHOjdwPb3qyhHpbBXiMGjclkSm2GvKXNPIzgd3Vjon/lbKelHdAW4A/upUHN2VYUi3w==" }, "@ngtools/webpack": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz", "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==", "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "enhanced-resolve": "4.1.0", - "rxjs": "6.4.0", - "tree-kill": "1.2.1", - "webpack-sources": "1.3.0" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, @@ -1341,39 +1020,27 @@ "version": "8.2.2", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2" - } + "dev": true }, "@schematics/update": { "version": "0.802.2", "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz", "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==", "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2", - "@yarnpkg/lockfile": "1.1.0", - "ini": "1.3.5", - "pacote": "9.5.4", - "rxjs": "6.4.0", - "semver": "6.3.0", - "semver-intersect": "1.4.0" - }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true } } }, + "@swimlane/ngx-datatable": { + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-16.0.2.tgz", + "integrity": "sha512-+JxVumYGr4wON2YC0dXYt0vWmWNaWcVFWdAfrb6gXL/6iAJco70rX59lFvQ6ubFVgDKCsf+QycBXODvLnHaGUQ==" + }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -1390,12 +1057,7 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "dev": true, - "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" - } + "dev": true }, "@types/jasmine": { "version": "3.4.0", @@ -1407,37 +1069,25 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz", "integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==", - "dev": true, - "requires": { - "@types/jasmine": "*" - } + "dev": true }, "@types/leaflet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.5.1.tgz", "integrity": "sha512-E5k+vyE2Tv9wQsO6ZsEy08Pjd8RjHPkCzz3Ubt7feMc+5+VkbXtcZMcciczRWuMN5rFIsVywLxRhvTp7fAbbzg==", - "dev": true, - "requires": { - "@types/geojson": "*" - } + "dev": true }, "@types/leaflet.locatecontrol": { "version": "0.60.7", "resolved": "https://registry.npmjs.org/@types/leaflet.locatecontrol/-/leaflet.locatecontrol-0.60.7.tgz", "integrity": "sha512-sac/MeK4gB+3XTJ3JzCe3HqLwKNHblIpZrxUJ6FapWK8uISZ0wcy8motVO7+v/yO47tQgsnYaobwFZ//beWHBQ==", - "dev": true, - "requires": { - "@types/leaflet": "*" - } + "dev": true }, "@types/leaflet.markercluster": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.0.tgz", "integrity": "sha512-ctCkUvknqzt+6eLOhZK7ta+G6WQ9wkTeFvOw1KhWYoPY/ZuzLD+QUg1Umnw7yzMNA+L00ne3cmTk/xmVNkRSLQ==", - "dev": true, - "requires": { - "@types/leaflet": "*" - } + "dev": true }, "@types/minimatch": { "version": "3.0.3", @@ -1473,23 +1123,13 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz", "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.6.1" - } + "dev": true }, "@webassemblyjs/ast": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", - "dev": true, - "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" - } + "dev": true }, "@webassemblyjs/floating-point-hex-parser": { "version": "1.8.5", @@ -1513,10 +1153,7 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", - "dev": true, - "requires": { - "@webassemblyjs/wast-printer": "1.8.5" - } + "dev": true }, "@webassemblyjs/helper-fsm": { "version": "1.8.5", @@ -1528,11 +1165,7 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "mamacro": "^0.0.3" - } + "dev": true }, "@webassemblyjs/helper-wasm-bytecode": { "version": "1.8.5", @@ -1544,31 +1177,19 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" - } + "dev": true }, "@webassemblyjs/ieee754": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } + "dev": true }, "@webassemblyjs/leb128": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } + "dev": true }, "@webassemblyjs/utf8": { "version": "1.8.5", @@ -1580,81 +1201,37 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" - } + "dev": true }, "@webassemblyjs/wasm-gen": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } + "dev": true }, "@webassemblyjs/wasm-opt": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" - } + "dev": true }, "@webassemblyjs/wasm-parser": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } + "dev": true }, "@webassemblyjs/wast-parser": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/floating-point-hex-parser": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-code-frame": "1.8.5", - "@webassemblyjs/helper-fsm": "1.8.5", - "@xtuc/long": "4.2.2" - } + "dev": true }, "@webassemblyjs/wast-printer": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", - "@xtuc/long": "4.2.2" - } + "dev": true }, "@xtuc/ieee754": { "version": "1.2.0", @@ -1674,16 +1251,6 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -1692,11 +1259,7 @@ "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==" }, "acorn": { "version": "4.0.13", @@ -1706,10 +1269,7 @@ "acorn-globals": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", - "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", - "requires": { - "acorn": "^4.0.4" - } + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=" }, "adm-zip": { "version": "0.4.13", @@ -1727,30 +1287,18 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } + "dev": true }, "agentkeepalive": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", - "dev": true, - "requires": { - "humanize-ms": "^1.2.1" - } + "dev": true }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==" }, "ajv-errors": { "version": "1.0.1", @@ -1798,20 +1346,13 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } + "dev": true }, "anymatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } + "dev": true }, "app-root-path": { "version": "2.2.1", @@ -1823,10 +1364,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true, - "requires": { - "default-require-extensions": "^2.0.0" - } + "dev": true }, "aproba": { "version": "1.2.0", @@ -1844,20 +1382,13 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "~1.0.2" - } + "dev": true }, "aria-query": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - } + "dev": true }, "arr-diff": { "version": "4.0.0", @@ -1891,10 +1422,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } + "dev": true }, "array-uniq": { "version": "1.0.3", @@ -1929,31 +1457,19 @@ "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==" }, "asn1.js": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } + "dev": true }, "assert": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, "dependencies": { "inherits": { "version": "2.0.1", @@ -1965,10 +1481,7 @@ "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } + "dev": true } } }, @@ -1993,10 +1506,7 @@ "version": "2.6.3", "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } + "dev": true }, "async-each": { "version": "1.0.3", @@ -2025,16 +1535,7 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", - "dev": true, - "requires": { - "browserslist": "^4.6.3", - "caniuse-lite": "^1.0.30000980", - "chalk": "^2.4.2", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.17", - "postcss-value-parser": "^4.0.0" - } + "dev": true }, "aws-sign2": { "version": "0.7.0", @@ -2050,21 +1551,13 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } + "dev": true }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, "dependencies": { "ansi-styles": { "version": "2.2.1", @@ -2076,14 +1569,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } + "dev": true }, "supports-color": { "version": "2.0.0", @@ -2098,16 +1584,6 @@ "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, "dependencies": { "source-map": { "version": "0.5.7", @@ -2121,20 +1597,13 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } + "dev": true }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - }, "dependencies": { "core-js": { "version": "2.6.9", @@ -2148,43 +1617,19 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } + "dev": true }, "babel-traverse": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } + "dev": true }, "babel-types": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } + "dev": true }, "babylon": { "version": "6.18.0", @@ -2208,53 +1653,30 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } + "dev": true }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } + "dev": true } } }, @@ -2285,19 +1707,13 @@ "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - } + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=" }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } + "dev": true }, "big.js": { "version": "5.2.2", @@ -2321,10 +1737,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz", "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } + "dev": true }, "bluebird": { "version": "3.5.5", @@ -2341,33 +1754,13 @@ "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - } + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==" }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, - "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" - }, "dependencies": { "array-flatten": { "version": "2.1.2", @@ -2385,20 +1778,13 @@ "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } + "dev": true }, "brorand": { "version": "1.1.0", @@ -2410,103 +1796,55 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, - "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "dev": true }, "browserify-cipher": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, - "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" - } + "dev": true }, "browserify-des": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } + "dev": true }, "browserify-rsa": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" - } + "dev": true }, "browserify-sign": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" - } + "dev": true }, "browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "~1.0.5" - } + "dev": true }, "browserslist": { "version": "4.6.6", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" - } + "dev": true }, "browserstack": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz", "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==", - "dev": true, - "requires": { - "https-proxy-agent": "^2.2.1" - } + "dev": true }, "buffer": { "version": "4.9.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", "dev": true, - "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -2520,11 +1858,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true, - "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" - } + "dev": true }, "buffer-alloc-unsafe": { "version": "1.1.0", @@ -2583,58 +1917,25 @@ "version": "11.3.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } + "dev": true }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" - } + "dev": true }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true, - "requires": { - "callsites": "^2.0.0" - } + "dev": true }, "caller-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true, - "requires": { - "caller-callsite": "^2.0.0" - } + "dev": true }, "callsite": { "version": "1.0.0", @@ -2675,12 +1976,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } + "dev": true }, "chardet": { "version": "0.7.0", @@ -2693,25 +1989,12 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", "dev": true, - "requires": { - "anymatch": "^3.0.1", - "braces": "^3.0.2", - "fsevents": "^2.0.6", - "glob-parent": "^5.0.0", - "is-binary-path": "^2.1.0", - "is-glob": "^4.0.1", - "normalize-path": "^3.0.0", - "readdirp": "^3.1.1" - }, "dependencies": { "glob-parent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } + "dev": true } } }, @@ -2725,20 +2008,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } + "dev": true }, "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==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "dev": true }, "circular-dependency-plugin": { "version": "5.0.2", @@ -2751,21 +2027,12 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, - "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "dev": true } } }, @@ -2773,28 +2040,18 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", - "dev": true, - "requires": { - "source-map": "~0.6.0" - } + "dev": true }, "cli": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", - "requires": { - "exit": "0.1.2", - "glob": "^7.1.1" - } + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=" }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "^2.0.0" - } + "dev": true }, "cli-width": { "version": "2.2.0", @@ -2807,11 +2064,6 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - }, "dependencies": { "ansi-regex": { "version": "3.0.0", @@ -2823,10 +2075,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } + "dev": true } } }, @@ -2840,13 +2089,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "dev": true, - "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" - } + "dev": true }, "co": { "version": "4.6.0", @@ -2865,17 +2108,6 @@ "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.0.tgz", "integrity": "sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==", "dev": true, - "requires": { - "app-root-path": "^2.2.1", - "aria-query": "^3.0.0", - "axobject-query": "^2.0.2", - "css-selector-tokenizer": "^0.7.1", - "cssauron": "^1.4.0", - "damerau-levenshtein": "^1.0.4", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.2" - }, "dependencies": { "source-map": { "version": "0.5.7", @@ -2895,20 +2127,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" - } + "dev": true }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } + "dev": true }, "color-name": { "version": "1.1.3", @@ -2925,10 +2150,7 @@ "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "requires": { - "delayed-stream": "~1.0.0" - } + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==" }, "commander": { "version": "2.20.0", @@ -2970,25 +2192,13 @@ "version": "2.0.17", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", - "dev": true, - "requires": { - "mime-db": ">= 1.40.0 < 2" - } + "dev": true }, "compression": { "version": "1.7.4", "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, - "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, "dependencies": { "bytes": { "version": "3.0.0", @@ -3008,12 +2218,6 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -3025,25 +2229,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -3051,13 +2243,7 @@ "version": "3.7.0", "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true, - "requires": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" - } + "dev": true }, "connect-history-api-fallback": { "version": "1.6.0", @@ -3068,10 +2254,7 @@ "console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "requires": { - "date-now": "^0.1.4" - } + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=" }, "constants-browserify": { "version": "1.0.0", @@ -3082,10 +2265,7 @@ "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", - "requires": { - "safe-buffer": "5.1.2" - } + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==" }, "content-type": { "version": "1.0.4", @@ -3101,10 +2281,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } + "dev": true }, "cookie": { "version": "0.4.0", @@ -3120,15 +2297,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" - } + "dev": true }, "copy-descriptor": { "version": "0.1.1", @@ -3140,21 +2309,7 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz", "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==", - "dev": true, - "requires": { - "cacache": "^11.3.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", - "normalize-path": "^3.0.0", - "p-limit": "^2.2.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "webpack-log": "^2.0.0" - } + "dev": true }, "core-js": { "version": "3.2.1", @@ -3170,63 +2325,31 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true, - "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - } + "dev": true }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" - } + "dev": true }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" - } + "dev": true }, "create-hmac": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, - "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } + "dev": true }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, - "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -3240,20 +2363,7 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" - } + "dev": true }, "css-parse": { "version": "1.7.0", @@ -3265,21 +2375,13 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", - "dev": true, - "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" - } + "dev": true }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", - "dev": true, - "requires": { - "through": "X.X.X" - } + "dev": true }, "cssesc": { "version": "0.1.0", @@ -3295,10 +2397,7 @@ "cssstyle": { "version": "0.2.37", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", - "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", - "requires": { - "cssom": "0.3.x" - } + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=" }, "custom-event": { "version": "1.0.1", @@ -3321,10 +2420,7 @@ "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "requires": { - "assert-plus": "^1.0.0" - } + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=" }, "date-format": { "version": "2.1.0", @@ -3340,10 +2436,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "requires": { - "ms": "2.0.0" - } + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" }, "debuglog": { "version": "1.0.1", @@ -3378,68 +2471,43 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" - } + "dev": true }, "default-require-extensions": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", - "dev": true, - "requires": { - "strip-bom": "^3.0.0" - } + "dev": true }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true, - "requires": { - "object-keys": "^1.0.12" - } + "dev": true }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, - "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } + "dev": true } } }, @@ -3448,28 +2516,12 @@ "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, - "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, "dependencies": { "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, "dependencies": { "pify": { "version": "2.3.0", @@ -3501,11 +2553,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } + "dev": true }, "destroy": { "version": "1.0.4", @@ -3522,10 +2570,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } + "dev": true }, "detect-node": { "version": "2.0.4", @@ -3537,11 +2582,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", - "dev": true, - "requires": { - "asap": "^2.0.0", - "wrappy": "1" - } + "dev": true }, "di": { "version": "0.0.1", @@ -3559,21 +2600,13 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" - } + "dev": true }, "dir-glob": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", - "dev": true, - "requires": { - "path-type": "^3.0.0" - } + "dev": true }, "dns-equal": { "version": "1.0.0", @@ -3585,41 +2618,24 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true, - "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" - } + "dev": true }, "dns-txt": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "^1.0.0" - } + "dev": true }, "dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "requires": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" - } + "dev": true }, "dom-serializer": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==", - "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" - }, "dependencies": { "domelementtype": { "version": "2.0.1", @@ -3647,10 +2663,7 @@ "domhandler": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", - "requires": { - "domelementtype": "1" - } + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=" }, "domino": { "version": "2.1.3", @@ -3660,23 +2673,13 @@ "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "requires": { - "dom-serializer": "0", - "domelementtype": "1" - } + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, - "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -3688,36 +2691,20 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=" }, "ee-first": { "version": "1.1.1", @@ -3734,16 +2721,7 @@ "version": "6.5.0", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", - "dev": true, - "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" - } + "dev": true }, "emoji-regex": { "version": "7.0.3", @@ -3766,33 +2744,19 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "dev": true, - "requires": { - "iconv-lite": "~0.4.13" - } + "dev": true }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } + "dev": true }, "engine.io": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "dev": true, - "requires": { - "accepts": "~1.3.4", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" - }, "dependencies": { "cookie": { "version": "0.3.1", @@ -3804,10 +2768,7 @@ "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" - } + "dev": true } } }, @@ -3816,19 +2777,6 @@ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "dev": true, - "requires": { - "component-emitter": "1.2.1", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" - }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -3840,10 +2788,7 @@ "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" - } + "dev": true } } }, @@ -3851,25 +2796,13 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", - "dev": true, - "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.5", - "has-binary2": "~1.0.2" - } + "dev": true }, "enhanced-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" - } + "dev": true }, "ent": { "version": "2.2.0", @@ -3892,44 +2825,25 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "requires": { - "prr": "~1.0.1" - } + "dev": true }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } + "dev": true }, "es-abstract": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" - } + "dev": true }, "es-to-primitive": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, - "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" - } + "dev": true }, "es6-promise": { "version": "4.2.8", @@ -3941,10 +2855,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true, - "requires": { - "es6-promise": "^4.0.3" - } + "dev": true }, "escape-html": { "version": "1.0.3", @@ -3960,24 +2871,13 @@ "escodegen": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz", - "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==", - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" - } + "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==" }, "eslint-scope": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } + "dev": true }, "esprima": { "version": "3.1.3", @@ -3988,10 +2888,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, - "requires": { - "estraverse": "^4.1.0" - } + "dev": true }, "estraverse": { "version": "4.3.0", @@ -4024,35 +2921,19 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } + "dev": true }, "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==", - "dev": true, - "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" - } + "dev": true }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } + "dev": true }, "exit": { "version": "0.1.2", @@ -4064,33 +2945,18 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true } } }, @@ -4098,47 +2964,12 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } + "dev": true }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", - "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - } + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==" }, "extend": { "version": "3.0.2", @@ -4150,19 +2981,12 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } + "dev": true } } }, @@ -4170,75 +2994,43 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } + "dev": true }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } + "dev": true } } }, @@ -4272,10 +3064,7 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } + "dev": true }, "figgy-pudding": { "version": "3.5.1", @@ -4287,30 +3076,19 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } + "dev": true }, "file-loader": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz", "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==", "dev": true, - "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.0.0" - }, "dependencies": { "schema-utils": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - } + "dev": true } } }, @@ -4323,66 +3101,36 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "dev": true, - "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" - } + "dev": true }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } + "dev": true }, "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", - "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" - } + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" }, "find-cache-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" - } + "dev": true }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } + "dev": true }, "findup-sync": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.0", - "micromatch": "^3.0.4", - "resolve-dir": "^1.0.1" - } + "dev": true }, "flatted": { "version": "2.0.1", @@ -4395,10 +3143,6 @@ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, - "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4410,25 +3154,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -4437,18 +3169,12 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "dev": true, - "requires": { - "debug": "^3.2.6" - }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -4473,10 +3199,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } + "dev": true }, "forever-agent": { "version": "0.6.1", @@ -4486,12 +3209,7 @@ "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==" }, "forwarded": { "version": "0.1.2", @@ -4502,10 +3220,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "^0.2.2" - } + "dev": true }, "fresh": { "version": "0.5.2", @@ -4517,10 +3232,6 @@ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, - "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4532,25 +3243,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -4558,33 +3257,19 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - } + "dev": true }, "fs-minipass": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", - "dev": true, - "requires": { - "minipass": "^2.2.1" - } + "dev": true }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" - } + "dev": true }, "fs.realpath": { "version": "1.0.0", @@ -4620,10 +3305,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } + "dev": true }, "get-value": { "version": "2.0.6", @@ -4634,42 +3316,24 @@ "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "requires": { - "assert-plus": "^1.0.0" - } + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=" }, "glob": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==" }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, "dependencies": { "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } + "dev": true } } }, @@ -4678,20 +3342,12 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "dev": true, - "requires": { - "global-prefix": "^3.0.0" - }, "dependencies": { "global-prefix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "requires": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - } + "dev": true } } }, @@ -4699,14 +3355,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - } + "dev": true }, "globals": { "version": "9.18.0", @@ -4719,14 +3368,6 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, - "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - }, "dependencies": { "pify": { "version": "3.0.0", @@ -4752,13 +3393,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "dev": true, - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } + "dev": true }, "har-schema": { "version": "2.0.0", @@ -4768,38 +3403,25 @@ "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==" }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } + "dev": true }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } + "dev": true }, "has-binary2": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", "dev": true, - "requires": { - "isarray": "2.0.1" - }, "dependencies": { "isarray": { "version": "2.0.1", @@ -4831,40 +3453,25 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, - "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" - } + "dev": true }, "has-values": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, - "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" - }, "dependencies": { "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -4872,10 +3479,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -4883,41 +3487,25 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "dev": true }, "hash.js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" - } + "dev": true }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" - } + "dev": true }, "homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } + "dev": true }, "hosted-git-info": { "version": "2.8.4", @@ -4930,12 +3518,6 @@ "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, - "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4947,35 +3529,20 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, "html-encoding-sniffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", - "requires": { - "whatwg-encoding": "^1.0.1" - } + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==" }, "html-entities": { "version": "1.2.1", @@ -4986,14 +3553,7 @@ "htmlparser2": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", - "requires": { - "domelementtype": "1", - "domhandler": "2.3", - "domutils": "1.5", - "entities": "1.0", - "readable-stream": "1.1" - } + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=" }, "http-cache-semantics": { "version": "3.8.1", @@ -5010,14 +3570,7 @@ "http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" - } + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==" }, "http-parser-js": { "version": "0.4.10", @@ -5029,31 +3582,19 @@ "version": "1.17.0", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", - "dev": true, - "requires": { - "eventemitter3": "^3.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" - } + "dev": true }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, - "requires": { - "agent-base": "4", - "debug": "3.1.0" - }, "dependencies": { "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" - } + "dev": true } } }, @@ -5061,23 +3602,12 @@ "version": "0.19.1", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", - "dev": true, - "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" - } + "dev": true }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=" }, "https-browserify": { "version": "1.0.0", @@ -5090,19 +3620,12 @@ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", "dev": true, - "requires": { - "agent-base": "^4.3.0", - "debug": "^3.1.0" - }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -5116,18 +3639,12 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", - "dev": true, - "requires": { - "ms": "^2.0.0" - } + "dev": true }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" }, "ieee754": { "version": "1.1.13", @@ -5151,10 +3668,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "dev": true, - "requires": { - "minimatch": "^3.0.4" - } + "dev": true }, "image-size": { "version": "0.5.5", @@ -5173,39 +3687,25 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "dev": true, - "requires": { - "import-from": "^2.1.0" - } + "dev": true }, "import-fresh": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true, - "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" - } + "dev": true }, "import-from": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } + "dev": true }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true, - "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" - } + "dev": true }, "imurmurhash": { "version": "0.1.4", @@ -5228,11 +3728,7 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" }, "inherits": { "version": "2.0.3", @@ -5250,21 +3746,6 @@ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", "dev": true, - "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -5276,10 +3757,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } + "dev": true } } }, @@ -5287,11 +3765,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true, - "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - } + "dev": true }, "interpret": { "version": "1.2.0", @@ -5303,10 +3777,7 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } + "dev": true }, "invert-kv": { "version": "2.0.0", @@ -5336,18 +3807,12 @@ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -5361,10 +3826,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } + "dev": true }, "is-buffer": { "version": "1.1.6", @@ -5383,18 +3845,12 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -5409,11 +3865,6 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - }, "dependencies": { "kind-of": { "version": "5.1.0", @@ -5445,10 +3896,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -5460,10 +3908,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } + "dev": true }, "is-number": { "version": "7.0.0", @@ -5481,19 +3926,13 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } + "dev": true }, "is-path-inside": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } + "dev": true }, "is-plain-obj": { "version": "1.1.0", @@ -5505,10 +3944,7 @@ "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==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } + "dev": true }, "is-promise": { "version": "2.1.0", @@ -5520,10 +3956,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "^1.0.1" - } + "dev": true }, "is-stream": { "version": "1.1.0", @@ -5535,10 +3968,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true, - "requires": { - "has-symbols": "^1.0.0" - } + "dev": true }, "is-typedarray": { "version": "1.0.0", @@ -5566,10 +3996,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true, - "requires": { - "buffer-alloc": "^1.2.0" - } + "dev": true }, "isexe": { "version": "2.0.0", @@ -5593,21 +4020,6 @@ "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz", "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==", "dev": true, - "requires": { - "async": "^2.6.2", - "compare-versions": "^3.4.0", - "fileset": "^2.0.3", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-hook": "^2.0.7", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.4", - "js-yaml": "^3.13.1", - "make-dir": "^2.1.0", - "minimatch": "^3.0.4", - "once": "^1.4.0" - }, "dependencies": { "istanbul-lib-coverage": { "version": "2.0.5", @@ -5619,16 +4031,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", - "dev": true, - "requires": { - "@babel/generator": "^7.4.0", - "@babel/parser": "^7.4.3", - "@babel/template": "^7.4.0", - "@babel/traverse": "^7.4.3", - "@babel/types": "^7.4.0", - "istanbul-lib-coverage": "^2.0.5", - "semver": "^6.0.0" - } + "dev": true } } }, @@ -5637,24 +4040,12 @@ "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz", "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==", "dev": true, - "requires": { - "convert-source-map": "^1.5.0", - "istanbul-lib-instrument": "^1.7.3", - "loader-utils": "^1.1.0", - "schema-utils": "^0.3.0" - }, "dependencies": { "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } + "dev": true }, "fast-deep-equal": { "version": "1.1.0", @@ -5672,10 +4063,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, - "requires": { - "ajv": "^5.0.0" - } + "dev": true } } }, @@ -5689,25 +4077,13 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "dev": true, - "requires": { - "append-transform": "^1.0.0" - } + "dev": true }, "istanbul-lib-instrument": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz", "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==", "dev": true, - "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.18.0", - "istanbul-lib-coverage": "^1.2.1", - "semver": "^5.3.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -5722,11 +4098,6 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", "dev": true, - "requires": { - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "supports-color": "^6.1.0" - }, "dependencies": { "istanbul-lib-coverage": { "version": "2.0.5", @@ -5738,10 +4109,7 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "dev": true } } }, @@ -5750,22 +4118,12 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", "dev": true, - "requires": { - "debug": "^4.1.1", - "istanbul-lib-coverage": "^2.0.5", - "make-dir": "^2.1.0", - "rimraf": "^2.6.3", - "source-map": "^0.6.1" - }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "istanbul-lib-coverage": { "version": "2.0.5", @@ -5785,21 +4143,13 @@ "version": "2.2.6", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", - "dev": true, - "requires": { - "handlebars": "^4.1.2" - } + "dev": true }, "jasmine": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, - "requires": { - "exit": "^0.1.2", - "glob": "^7.0.6", - "jasmine-core": "~2.8.0" - }, "dependencies": { "jasmine-core": { "version": "2.8.0", @@ -5819,10 +4169,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", - "dev": true, - "requires": { - "colors": "1.1.2" - } + "dev": true }, "jasminewd2": { "version": "2.2.0", @@ -5846,10 +4193,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" - }, "dependencies": { "esprima": { "version": "4.0.1", @@ -5867,28 +4210,7 @@ "jsdom": { "version": "9.12.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz", - "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=", - "requires": { - "abab": "^1.0.3", - "acorn": "^4.0.4", - "acorn-globals": "^3.1.0", - "array-equal": "^1.0.0", - "content-type-parser": "^1.0.1", - "cssom": ">= 0.3.2 < 0.4.0", - "cssstyle": ">= 0.2.37 < 0.3.0", - "escodegen": "^1.6.1", - "html-encoding-sniffer": "^1.0.1", - "nwmatcher": ">= 1.3.9 < 2.0.0", - "parse5": "^1.5.1", - "request": "^2.79.0", - "sax": "^1.2.1", - "symbol-tree": "^3.2.1", - "tough-cookie": "^2.3.2", - "webidl-conversions": "^4.0.0", - "whatwg-encoding": "^1.0.1", - "whatwg-url": "^4.3.0", - "xml-name-validator": "^2.0.1" - } + "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=" }, "jsesc": { "version": "1.3.0", @@ -5899,17 +4221,7 @@ "jshint": { "version": "2.10.2", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", - "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==", - "requires": { - "cli": "~1.0.0", - "console-browserify": "1.1.x", - "exit": "0.1.x", - "htmlparser2": "3.8.x", - "lodash": "~4.17.11", - "minimatch": "~3.0.2", - "shelljs": "0.3.x", - "strip-json-comments": "1.0.x" - } + "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==" }, "json-parse-better-errors": { "version": "1.0.2", @@ -5942,19 +4254,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } + "dev": true }, "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.6" - } + "dev": true }, "jsonparse": { "version": "1.3.1", @@ -5962,28 +4268,22 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=" }, "jszip": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz", "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==", "dev": true, - "requires": { - "lie": "~3.3.0", - "pako": "~1.0.2", - "readable-stream": "~2.3.6", - "set-immediate-shim": "~1.0.1" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -5995,25 +4295,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -6022,35 +4310,6 @@ "resolved": "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz", "integrity": "sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==", "dev": true, - "requires": { - "bluebird": "^3.3.0", - "body-parser": "^1.16.1", - "braces": "^3.0.2", - "chokidar": "^3.0.0", - "colors": "^1.1.0", - "connect": "^3.6.0", - "core-js": "^3.1.3", - "di": "^0.0.1", - "dom-serialize": "^2.2.0", - "flatted": "^2.0.0", - "glob": "^7.1.1", - "graceful-fs": "^4.1.2", - "http-proxy": "^1.13.0", - "isbinaryfile": "^3.0.0", - "lodash": "^4.17.11", - "log4js": "^4.0.0", - "mime": "^2.3.1", - "minimatch": "^3.0.2", - "optimist": "^0.6.1", - "qjobs": "^1.1.4", - "range-parser": "^1.2.0", - "rimraf": "^2.6.0", - "safe-buffer": "^5.0.1", - "socket.io": "2.1.1", - "source-map": "^0.6.1", - "tmp": "0.0.33", - "useragent": "2.3.0" - }, "dependencies": { "mime": { "version": "2.4.4", @@ -6064,29 +4323,19 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz", "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==", - "dev": true, - "requires": { - "which": "^1.2.1" - } + "dev": true }, "karma-coverage-istanbul-reporter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz", "integrity": "sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==", - "dev": true, - "requires": { - "istanbul-api": "^2.1.6", - "minimatch": "^3.0.4" - } + "dev": true }, "karma-jasmine": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz", "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", - "dev": true, - "requires": { - "jasmine-core": "^3.3" - } + "dev": true }, "karma-jasmine-html-reporter": { "version": "1.4.2", @@ -6098,10 +4347,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", - "dev": true, - "requires": { - "source-map-support": "^0.5.5" - } + "dev": true }, "killable": { "version": "1.0.1", @@ -6119,10 +4365,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true, - "requires": { - "invert-kv": "^2.0.0" - } + "dev": true }, "leaflet": { "version": "1.5.1", @@ -6153,57 +4396,30 @@ "version": "3.9.0", "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz", "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", - "dev": true, - "requires": { - "clone": "^2.1.2", - "errno": "^0.1.1", - "graceful-fs": "^4.1.2", - "image-size": "~0.5.0", - "mime": "^1.4.1", - "mkdirp": "^0.5.0", - "promise": "^7.1.1", - "request": "^2.83.0", - "source-map": "~0.6.0" - } + "dev": true }, "less-loader": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz", "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==", - "dev": true, - "requires": { - "clone": "^2.1.1", - "loader-utils": "^1.1.0", - "pify": "^4.0.1" - } + "dev": true }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" - } + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=" }, "license-webpack-plugin": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz", "integrity": "sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==", - "dev": true, - "requires": { - "@types/webpack-sources": "^0.1.5", - "webpack-sources": "^1.2.0" - } + "dev": true }, "lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true, - "requires": { - "immediate": "~3.0.5" - } + "dev": true }, "loader-runner": { "version": "2.4.0", @@ -6215,22 +4431,13 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^2.0.0", - "json5": "^1.0.1" - } + "dev": true }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } + "dev": true }, "lodash": { "version": "4.17.15", @@ -6254,22 +4461,12 @@ "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz", "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==", "dev": true, - "requires": { - "date-format": "^2.0.0", - "debug": "^4.1.1", - "flatted": "^2.0.0", - "rfdc": "^1.1.4", - "streamroller": "^1.0.6" - }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -6289,38 +4486,25 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } + "dev": true }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } + "dev": true }, "magic-string": { "version": "0.25.3", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz", "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==", - "dev": true, - "requires": { - "sourcemap-codec": "^1.4.4" - } + "dev": true }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, - "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -6341,42 +4525,12 @@ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz", "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==", "dev": true, - "requires": { - "agentkeepalive": "^3.4.1", - "cacache": "^12.0.0", - "http-cache-semantics": "^3.8.1", - "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "node-fetch-npm": "^2.0.2", - "promise-retry": "^1.1.1", - "socks-proxy-agent": "^4.0.0", - "ssri": "^6.0.0" - }, "dependencies": { "cacache": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } + "dev": true } } }, @@ -6390,10 +4544,7 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true, - "requires": { - "p-defer": "^1.0.0" - } + "dev": true }, "map-cache": { "version": "0.2.2", @@ -6405,21 +4556,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "requires": { - "object-visit": "^1.0.0" - } + "dev": true }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" - } + "dev": true }, "media-typer": { "version": "0.3.0", @@ -6430,22 +4573,13 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } + "dev": true }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -6457,25 +4591,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -6494,48 +4616,18 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" - }, "dependencies": { "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true } } }, @@ -6544,21 +4636,12 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true } } }, @@ -6567,18 +4650,12 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -6586,11 +4663,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "dev": true } } }, @@ -6598,11 +4671,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" - } + "dev": true }, "mime": { "version": "1.6.0", @@ -6617,10 +4686,7 @@ "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", - "requires": { - "mime-db": "1.40.0" - } + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==" }, "mimic-fn": { "version": "2.1.0", @@ -6632,13 +4698,7 @@ "version": "0.8.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz", "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "normalize-url": "1.9.1", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" - } + "dev": true }, "minimalistic-assert": { "version": "1.0.1", @@ -6655,10 +4715,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "requires": { - "brace-expansion": "^1.1.7" - } + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" }, "minimist": { "version": "1.2.0", @@ -6670,57 +4727,31 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" - } + "dev": true }, "minizlib": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "dev": true, - "requires": { - "minipass": "^2.2.1" - } + "dev": true }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } + "dev": true }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, - "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" - }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } + "dev": true } } }, @@ -6729,10 +4760,6 @@ "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", "dev": true, - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, "dependencies": { "for-in": { "version": "0.1.8", @@ -6747,9 +4774,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "requires": { - "minimist": "0.0.8" - }, "dependencies": { "minimist": { "version": "0.0.8", @@ -6762,25 +4786,13 @@ "mock-browser": { "version": "0.92.14", "resolved": "https://registry.npmjs.org/mock-browser/-/mock-browser-0.92.14.tgz", - "integrity": "sha1-U6hyAO38Xd2+K0YAI7KogSW3ReI=", - "requires": { - "jsdom": "^9.12.0", - "lodash": "^4.5" - } + "integrity": "sha1-U6hyAO38Xd2+K0YAI7KogSW3ReI=" }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" - } + "dev": true }, "ms": { "version": "2.0.0", @@ -6791,11 +4803,7 @@ "version": "6.2.3", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, - "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" - } + "dev": true }, "multicast-dns-service-types": { "version": "1.1.0", @@ -6809,31 +4817,11 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, - "nan": { - "version": "2.14.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", - "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true, - "optional": true - }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - } + "dev": true }, "negotiator": { "version": "0.6.2", @@ -6849,10 +4837,7 @@ "ngx-toastr": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-10.1.0.tgz", - "integrity": "sha512-LXGL8jKIm0SGklkXytNKbR6VrF94all35SaUfgd1gOUzgllTW2ldqORDZlgIaiMB3Dcybaald8p3boEHvfjEIQ==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-LXGL8jKIm0SGklkXytNKbR6VrF94all35SaUfgd1gOUzgllTW2ldqORDZlgIaiMB3Dcybaald8p3boEHvfjEIQ==" }, "nice-try": { "version": "1.0.5", @@ -6864,12 +4849,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", - "dev": true, - "requires": { - "encoding": "^0.1.11", - "json-parse-better-errors": "^1.0.0", - "safe-buffer": "^5.1.1" - } + "dev": true }, "node-forge": { "version": "0.7.5", @@ -6882,31 +4862,6 @@ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, - "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", - "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", - "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -6925,24 +4880,12 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, "dependencies": { "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -6951,9 +4894,6 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - }, "dependencies": { "safe-buffer": { "version": "5.2.0", @@ -6970,9 +4910,6 @@ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz", "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==", "dev": true, - "requires": { - "semver": "^5.3.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -6987,12 +4924,6 @@ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -7018,13 +4949,7 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true, - "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" - } + "dev": true }, "npm-bundled": { "version": "1.0.6", @@ -7037,12 +4962,6 @@ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", "dev": true, - "requires": { - "hosted-git-info": "^2.6.0", - "osenv": "^0.1.5", - "semver": "^5.5.0", - "validate-npm-package-name": "^3.0.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -7056,22 +4975,13 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz", "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==", - "dev": true, - "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" - } + "dev": true }, "npm-pick-manifest": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, - "requires": { - "figgy-pudding": "^3.5.1", - "npm-package-arg": "^6.0.0", - "semver": "^5.4.1" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -7085,24 +4995,13 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz", "integrity": "sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==", - "dev": true, - "requires": { - "JSONStream": "^1.3.4", - "bluebird": "^3.5.1", - "figgy-pudding": "^3.4.1", - "lru-cache": "^5.1.1", - "make-fetch-happen": "^5.0.0", - "npm-package-arg": "^6.1.0" - } + "dev": true }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } + "dev": true }, "num2fraction": { "version": "1.2.2", @@ -7143,29 +5042,18 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, - "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" - }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "dev": true }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -7179,29 +5067,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "requires": { - "isobject": "^3.0.0" - } + "dev": true }, "object.getownpropertydescriptors": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true, - "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" - } + "dev": true }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } + "dev": true }, "obuf": { "version": "1.1.2", @@ -7212,10 +5090,7 @@ "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "requires": { - "ee-first": "1.1.1" - } + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" }, "on-headers": { "version": "1.0.2", @@ -7226,19 +5101,13 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "requires": { - "wrappy": "1" - } + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, - "requires": { - "mimic-fn": "^1.0.0" - }, "dependencies": { "mimic-fn": { "version": "1.2.0", @@ -7252,29 +5121,19 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } + "dev": true }, "opn": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } + "dev": true }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, "dependencies": { "minimist": { "version": "0.0.10", @@ -7293,24 +5152,13 @@ "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - } + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=" }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true, - "requires": { - "url-parse": "^1.4.3" - } + "dev": true }, "os-browserify": { "version": "0.3.0", @@ -7328,12 +5176,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } + "dev": true }, "os-tmpdir": { "version": "1.0.2", @@ -7345,11 +5188,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" - } + "dev": true }, "p-defer": { "version": "1.0.0", @@ -7373,19 +5212,13 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } + "dev": true }, "p-locate": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } + "dev": true }, "p-map": { "version": "2.1.0", @@ -7397,10 +5230,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", - "dev": true, - "requires": { - "retry": "^0.12.0" - } + "dev": true }, "p-try": { "version": "2.2.0", @@ -7413,58 +5243,12 @@ "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz", "integrity": "sha512-nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw==", "dev": true, - "requires": { - "bluebird": "^3.5.3", - "cacache": "^12.0.0", - "figgy-pudding": "^3.5.1", - "get-stream": "^4.1.0", - "glob": "^7.1.3", - "lru-cache": "^5.1.1", - "make-fetch-happen": "^5.0.0", - "minimatch": "^3.0.4", - "minipass": "^2.3.5", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "normalize-package-data": "^2.4.0", - "npm-package-arg": "^6.1.0", - "npm-packlist": "^1.1.12", - "npm-pick-manifest": "^2.2.3", - "npm-registry-fetch": "^4.0.0", - "osenv": "^0.1.5", - "promise-inflight": "^1.0.1", - "promise-retry": "^1.1.1", - "protoduck": "^5.0.1", - "rimraf": "^2.6.2", - "safe-buffer": "^5.1.2", - "semver": "^5.6.0", - "ssri": "^6.0.1", - "tar": "^4.4.8", - "unique-filename": "^1.1.1", - "which": "^1.3.1" - }, "dependencies": { "cacache": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } + "dev": true }, "semver": { "version": "5.7.1", @@ -7485,11 +5269,6 @@ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, - "requires": { - "cyclist": "~0.2.2", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -7501,25 +5280,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -7527,25 +5294,13 @@ "version": "5.1.4", "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", - "dev": true, - "requires": { - "asn1.js": "^4.0.0", - "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" - } + "dev": true }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } + "dev": true }, "parse-passwd": { "version": "1.0.0", @@ -7562,19 +5317,13 @@ "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } + "dev": true }, "parseuri": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true, - "requires": { - "better-assert": "~1.0.0" - } + "dev": true }, "parseurl": { "version": "1.3.3", @@ -7638,9 +5387,6 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, - "requires": { - "pify": "^3.0.0" - }, "dependencies": { "pify": { "version": "3.0.0", @@ -7654,14 +5400,7 @@ "version": "3.0.17", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "dev": true, - "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" - } + "dev": true }, "performance-now": { "version": "2.1.0", @@ -7690,30 +5429,19 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } + "dev": true }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true, - "requires": { - "find-up": "^3.0.0" - } + "dev": true }, "portfinder": { "version": "1.0.23", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz", "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==", "dev": true, - "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" - }, "dependencies": { "async": { "version": "1.5.2", @@ -7734,20 +5462,12 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, "dependencies": { "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "dev": true } } }, @@ -7756,12 +5476,6 @@ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz", "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", "dev": true, - "requires": { - "postcss": "^7.0.1", - "postcss-value-parser": "^3.2.3", - "read-cache": "^1.0.0", - "resolve": "^1.1.7" - }, "dependencies": { "postcss-value-parser": { "version": "3.3.1", @@ -7775,23 +5489,13 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", - "dev": true, - "requires": { - "cosmiconfig": "^5.0.0", - "import-cwd": "^2.0.0" - } + "dev": true }, "postcss-loader": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" - } + "dev": true }, "postcss-value-parser": { "version": "4.0.2", @@ -7827,10 +5531,7 @@ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, - "optional": true, - "requires": { - "asap": "~2.0.3" - } + "optional": true }, "promise-inflight": { "version": "1.0.1", @@ -7843,10 +5544,6 @@ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", "dev": true, - "requires": { - "err-code": "^1.0.0", - "retry": "^0.10.0" - }, "dependencies": { "retry": { "version": "0.10.1", @@ -7860,33 +5557,13 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", - "dev": true, - "requires": { - "genfun": "^5.0.0" - } + "dev": true }, "protractor": { "version": "5.4.2", "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz", "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==", "dev": true, - "requires": { - "@types/q": "^0.0.32", - "@types/selenium-webdriver": "^3.0.0", - "blocking-proxy": "^1.0.0", - "browserstack": "^1.5.1", - "chalk": "^1.1.3", - "glob": "^7.0.3", - "jasmine": "2.8.0", - "jasminewd2": "^2.1.0", - "optimist": "~0.6.0", - "q": "1.4.1", - "saucelabs": "^1.5.0", - "selenium-webdriver": "3.6.0", - "source-map-support": "~0.4.0", - "webdriver-js-extender": "2.1.0", - "webdriver-manager": "^12.0.6" - }, "dependencies": { "ansi-styles": { "version": "2.2.1", @@ -7898,43 +5575,19 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } + "dev": true }, "del": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true, - "requires": { - "globby": "^5.0.0", - "is-path-cwd": "^1.0.0", - "is-path-in-cwd": "^1.0.0", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "rimraf": "^2.2.8" - } + "dev": true }, "globby": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "arrify": "^1.0.0", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - } + "dev": true }, "is-path-cwd": { "version": "1.0.0", @@ -7946,19 +5599,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "^1.0.0" - } + "dev": true }, "is-path-inside": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "^1.0.1" - } + "dev": true }, "pify": { "version": "2.3.0", @@ -7982,10 +5629,7 @@ "version": "0.4.18", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } + "dev": true }, "supports-color": { "version": "2.0.0", @@ -7997,31 +5641,14 @@ "version": "12.1.6", "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.6.tgz", "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==", - "dev": true, - "requires": { - "adm-zip": "^0.4.9", - "chalk": "^1.1.1", - "del": "^2.2.0", - "glob": "^7.0.3", - "ini": "^1.3.4", - "minimist": "^1.2.0", - "q": "^1.4.1", - "request": "^2.87.0", - "rimraf": "^2.5.2", - "semver": "^5.3.0", - "xml2js": "^0.4.17" - } + "dev": true } } }, "proxy-addr": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", - "requires": { - "forwarded": "~0.1.2", - "ipaddr.js": "1.9.0" - } + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==" }, "prr": { "version": "1.0.1", @@ -8044,46 +5671,25 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true, - "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" - } + "dev": true }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } + "dev": true }, "pumpify": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, - "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" - }, "dependencies": { "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } + "dev": true } } }, @@ -8113,11 +5719,7 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true, - "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" - } + "dev": true }, "querystring": { "version": "0.2.0", @@ -8141,20 +5743,13 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.1.0" - } + "dev": true }, "randomfill": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" - } + "dev": true }, "range-parser": { "version": "1.2.1", @@ -8164,32 +5759,19 @@ "raw-body": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", - "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==" }, "raw-loader": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz", "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" - } + "dev": true }, "read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, - "requires": { - "pify": "^2.3.0" - }, "dependencies": { "pify": { "version": "2.3.0", @@ -8203,57 +5785,30 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", - "dev": true, - "requires": { - "glob": "^7.1.1", - "graceful-fs": "^4.1.2", - "json-parse-better-errors": "^1.0.1", - "normalize-package-data": "^2.0.0", - "slash": "^1.0.0" - } + "dev": true }, "read-package-tree": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz", "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==", - "dev": true, - "requires": { - "read-package-json": "^2.0.0", - "readdir-scoped-modules": "^1.0.0", - "util-promisify": "^2.1.0" - } + "dev": true }, "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=" }, "readdir-scoped-modules": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", - "dev": true, - "requires": { - "debuglog": "^1.0.1", - "dezalgo": "^1.0.0", - "graceful-fs": "^4.1.2", - "once": "^1.3.0" - } + "dev": true }, "readdirp": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz", "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==", - "dev": true, - "requires": { - "picomatch": "^2.0.4" - } + "dev": true }, "reflect-metadata": { "version": "0.1.13", @@ -8277,22 +5832,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" - } + "dev": true }, "regexpu-core": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true, - "requires": { - "regenerate": "^1.2.1", - "regjsgen": "^0.2.0", - "regjsparser": "^0.1.4" - } + "dev": true }, "regjsgen": { "version": "0.2.0", @@ -8305,9 +5851,6 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, - "requires": { - "jsesc": "~0.5.0" - }, "dependencies": { "jsesc": { "version": "0.5.0", @@ -8339,37 +5882,12 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } + "dev": true }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, "dependencies": { "punycode": { "version": "1.4.1", @@ -8384,11 +5902,7 @@ "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - } + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==" } } }, @@ -8414,40 +5928,25 @@ "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", - "dev": true, - "requires": { - "path-parse": "^1.0.6" - } + "dev": true }, "resolve-cwd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "^3.0.0" - } + "dev": true }, "resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, "dependencies": { "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } + "dev": true } } }, @@ -8467,11 +5966,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" - } + "dev": true }, "ret": { "version": "0.1.15", @@ -8495,46 +5990,30 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } + "dev": true }, "ripemd160": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" - } + "dev": true }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } + "dev": true }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "^1.1.1" - } + "dev": true }, "rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", - "requires": { - "tslib": "^1.9.0" - } + "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==" }, "safe-buffer": { "version": "5.1.2", @@ -8545,10 +6024,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "requires": { - "ret": "~0.1.10" - } + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -8559,24 +6035,13 @@ "version": "1.22.7", "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.7.tgz", "integrity": "sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==", - "dev": true, - "requires": { - "chokidar": ">=2.0.0 <4.0.0" - } + "dev": true }, "sass-loader": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", "dev": true, - "requires": { - "clone-deep": "^2.0.1", - "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", - "neo-async": "^2.5.0", - "pify": "^3.0.0", - "semver": "^5.5.0" - }, "dependencies": { "pify": { "version": "3.0.0", @@ -8596,10 +6061,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz", "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", - "dev": true, - "requires": { - "https-proxy-agent": "^2.2.1" - } + "dev": true }, "sax": { "version": "1.2.4", @@ -8610,12 +6072,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } + "dev": true }, "select-hose": { "version": "2.0.0", @@ -8628,21 +6085,12 @@ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, - "requires": { - "jszip": "^3.1.3", - "rimraf": "^2.5.4", - "tmp": "0.0.30", - "xml2js": "^0.4.17" - }, "dependencies": { "tmp": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.1" - } + "dev": true } } }, @@ -8650,10 +6098,7 @@ "version": "1.10.4", "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", - "dev": true, - "requires": { - "node-forge": "0.7.5" - } + "dev": true }, "semver": { "version": "6.3.0", @@ -8666,9 +6111,6 @@ "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, - "requires": { - "semver": "^5.3.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -8683,9 +6125,6 @@ "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz", "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", "dev": true, - "requires": { - "semver": "^5.0.0" - }, "dependencies": { "semver": { "version": "5.7.1", @@ -8699,21 +6138,6 @@ "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", - "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" - }, "dependencies": { "ms": { "version": "2.1.1", @@ -8733,27 +6157,12 @@ "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, - "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" - }, "dependencies": { "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" - } + "dev": true }, "setprototypeof": { "version": "1.1.0", @@ -8766,13 +6175,7 @@ "serve-static": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", - "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" - } + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==" }, "set-blocking": { "version": "2.0.0", @@ -8791,21 +6194,12 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" - }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true } } }, @@ -8824,22 +6218,13 @@ "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" - } + "dev": true }, "shallow-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, - "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, "dependencies": { "kind-of": { "version": "5.1.0", @@ -8853,10 +6238,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "^1.0.0" - } + "dev": true }, "shebang-regex": { "version": "1.0.0", @@ -8892,34 +6274,18 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, - "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" - }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true }, "source-map": { "version": "0.5.7", @@ -8934,49 +6300,30 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, - "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } + "dev": true }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "dev": true }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } + "dev": true } } }, @@ -8985,18 +6332,12 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, - "requires": { - "kind-of": "^3.2.0" - }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true } } }, @@ -9005,23 +6346,12 @@ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, - "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" - }, "dependencies": { "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" - } + "dev": true } } }, @@ -9036,22 +6366,6 @@ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", "dev": true, - "requires": { - "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", - "to-array": "0.1.4" - }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -9063,10 +6377,7 @@ "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" - } + "dev": true } } }, @@ -9075,11 +6386,6 @@ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", "dev": true, - "requires": { - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "isarray": "2.0.1" - }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -9091,10 +6397,7 @@ "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" - } + "dev": true }, "isarray": { "version": "2.0.1", @@ -9108,43 +6411,25 @@ "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true, - "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" - } + "dev": true }, "sockjs-client": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", "dev": true, - "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" - }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "faye-websocket": { "version": "0.11.3", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -9158,30 +6443,19 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", - "dev": true, - "requires": { - "ip": "^1.1.5", - "smart-buffer": "4.0.2" - } + "dev": true }, "socks-proxy-agent": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", "dev": true, - "requires": { - "agent-base": "~4.2.1", - "socks": "~2.3.2" - }, "dependencies": { "agent-base": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } + "dev": true } } }, @@ -9189,10 +6463,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "^1.0.0" - } + "dev": true }, "source-list-map": { "version": "2.0.1", @@ -9209,34 +6480,19 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", - "dev": true, - "requires": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" - } + "dev": true }, "source-map-resolve": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, - "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" - } + "dev": true }, "source-map-support": { "version": "0.5.12", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } + "dev": true }, "source-map-url": { "version": "0.4.0", @@ -9254,11 +6510,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } + "dev": true }, "spdx-exceptions": { "version": "2.2.0", @@ -9270,11 +6522,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } + "dev": true }, "spdx-license-ids": { "version": "3.0.5", @@ -9287,22 +6535,12 @@ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", "dev": true, - "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" - }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -9317,23 +6555,12 @@ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, - "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" - }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -9345,12 +6572,7 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } + "dev": true }, "safe-buffer": { "version": "5.2.0", @@ -9362,10 +6584,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "requires": { - "safe-buffer": "~5.2.0" - } + "dev": true } } }, @@ -9373,19 +6592,13 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1" - } + "dev": true }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } + "dev": true }, "sprintf-js": { "version": "1.0.3", @@ -9396,46 +6609,25 @@ "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==" }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1" - } + "dev": true }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, - "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" - }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "dev": true } } }, @@ -9449,10 +6641,6 @@ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -9464,25 +6652,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -9490,24 +6666,13 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" - } + "dev": true }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, - "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -9519,25 +6684,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -9552,22 +6705,12 @@ "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", "dev": true, - "requires": { - "async": "^2.6.2", - "date-format": "^2.0.0", - "debug": "^3.2.6", - "fs-extra": "^7.0.1", - "lodash": "^4.17.14" - }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -9583,15 +6726,16 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - }, "dependencies": { "ansi-regex": { "version": "3.0.0", @@ -9603,26 +6747,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } + "dev": true } } }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } + "dev": true }, "strip-bom": { "version": "3.0.0", @@ -9645,39 +6778,19 @@ "version": "0.23.1", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" - } + "dev": true }, "stylus": { "version": "0.54.5", "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, - "requires": { - "css-parse": "1.7.x", - "debug": "*", - "glob": "7.0.x", - "mkdirp": "0.5.x", - "sax": "0.5.x", - "source-map": "0.1.x" - }, "dependencies": { "glob": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } + "dev": true }, "sax": { "version": "0.5.8", @@ -9689,10 +6802,7 @@ "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } + "dev": true } } }, @@ -9700,21 +6810,13 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, - "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" - } + "dev": true }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "dev": true }, "symbol-observable": { "version": "1.2.0", @@ -9737,45 +6839,19 @@ "version": "4.4.10", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } + "dev": true }, "terser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz", "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==", - "dev": true, - "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" - } + "dev": true }, "terser-webpack-plugin": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", - "dev": true, - "requires": { - "cacache": "^11.3.2", - "find-cache-dir": "^2.0.0", - "is-wsl": "^1.1.0", - "loader-utils": "^1.2.3", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "source-map": "^0.6.1", - "terser": "^4.0.0", - "webpack-sources": "^1.3.0", - "worker-farm": "^1.7.0" - } + "dev": true }, "through": { "version": "2.3.8", @@ -9788,10 +6864,6 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - }, "dependencies": { "isarray": { "version": "1.0.0", @@ -9803,25 +6875,13 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true } } }, @@ -9835,19 +6895,13 @@ "version": "2.0.11", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", - "dev": true, - "requires": { - "setimmediate": "^1.0.4" - } + "dev": true }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } + "dev": true }, "to-array": { "version": "0.1.4", @@ -9872,18 +6926,12 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, "dependencies": { "kind-of": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true } } }, @@ -9891,22 +6939,13 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" - } + "dev": true }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } + "dev": true }, "toidentifier": { "version": "1.0.0", @@ -9916,11 +6955,7 @@ "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" }, "tr46": { "version": "0.0.3", @@ -9944,23 +6979,12 @@ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.0.4.tgz", "integrity": "sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==", "dev": true, - "requires": { - "chalk": "^2.3.0", - "enhanced-resolve": "^4.0.0", - "loader-utils": "^1.0.2", - "micromatch": "^4.0.0", - "semver": "^6.0.0" - }, "dependencies": { "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" - } + "dev": true } } }, @@ -9968,14 +6992,7 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz", "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==", - "dev": true, - "requires": { - "arg": "^4.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "source-map-support": "^0.5.6", - "yn": "^3.0.0" - } + "dev": true }, "tslib": { "version": "1.10.0", @@ -9987,21 +7004,6 @@ "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz", "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==", "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^3.2.0", - "glob": "^7.1.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.29.0" - }, "dependencies": { "diff": { "version": "3.5.0", @@ -10021,10 +7023,7 @@ "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - } + "dev": true }, "tty-browserify": { "version": "0.0.0", @@ -10035,10 +7034,7 @@ "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "requires": { - "safe-buffer": "^5.0.1" - } + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=" }, "tweetnacl": { "version": "0.14.5", @@ -10048,19 +7044,12 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "requires": { - "prelude-ls": "~1.1.2" - } + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=" }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" }, "typedarray": { "version": "0.0.6", @@ -10079,11 +7068,7 @@ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", "dev": true, - "optional": true, - "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" - } + "optional": true }, "ultron": { "version": "1.1.1", @@ -10100,51 +7085,31 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } + "dev": true }, "unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true, - "requires": { - "unique-slug": "^2.0.0" - } + "dev": true }, "unique-slug": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4" - } + "dev": true }, "universal-analytics": { "version": "0.4.20", "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==", "dev": true, - "requires": { - "debug": "^3.0.0", - "request": "^2.88.0", - "uuid": "^3.0.0" - }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -10170,30 +7135,18 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, "dependencies": { "has-value": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, - "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" - }, "dependencies": { "isobject": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } + "dev": true } } }, @@ -10220,10 +7173,7 @@ "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - } + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==" }, "urix": { "version": "0.1.0", @@ -10236,10 +7186,6 @@ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, "dependencies": { "punycode": { "version": "1.3.2", @@ -10253,11 +7199,7 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } + "dev": true }, "use": { "version": "3.1.1", @@ -10270,20 +7212,12 @@ "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, - "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" - }, "dependencies": { "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } + "dev": true }, "yallist": { "version": "2.1.2", @@ -10297,10 +7231,7 @@ "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "dev": true, - "requires": { - "inherits": "2.0.3" - } + "dev": true }, "util-deprecate": { "version": "1.0.2", @@ -10312,10 +7243,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz", "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=", - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3" - } + "dev": true }, "utils-merge": { "version": "1.0.1", @@ -10337,20 +7265,13 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } + "dev": true }, "validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", - "dev": true, - "requires": { - "builtins": "^1.0.3" - } + "dev": true }, "vary": { "version": "1.1.2", @@ -10360,12 +7281,7 @@ "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=" }, "vm-browserify": { "version": "1.1.0", @@ -10384,30 +7300,18 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, - "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" - }, "dependencies": { "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "dev": true } } }, @@ -10421,60 +7325,25 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } + "dev": true }, "chokidar": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } + "dev": true }, "fsevents": { "version": "1.2.9", @@ -11028,19 +7897,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } + "dev": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } + "dev": true }, "isarray": { "version": "1.0.0", @@ -11052,55 +7915,31 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "dev": true } } }, @@ -11108,20 +7947,13 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "^1.0.0" - } + "dev": true }, "webdriver-js-extender": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz", "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==", - "dev": true, - "requires": { - "@types/selenium-webdriver": "^3.0.0", - "selenium-webdriver": "^3.0.1" - } + "dev": true }, "webidl-conversions": { "version": "4.0.2", @@ -11133,31 +7965,6 @@ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.38.0.tgz", "integrity": "sha512-lbuFsVOq8PZY+1Ytz/mYOvYOo+d4IJ31hHk/7iyoeWtwN33V+5HYotSH+UIb9tq914ey0Hot7z6HugD+je3sWw==", "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/wasm-edit": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "acorn": "^6.2.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", - "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^1.0.0", - "tapable": "^1.1.0", - "terser-webpack-plugin": "^1.1.0", - "watchpack": "^1.5.0", - "webpack-sources": "^1.3.0" - }, "dependencies": { "acorn": { "version": "6.3.0", @@ -11172,19 +7979,6 @@ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.7.tgz", "integrity": "sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==", "dev": true, - "requires": { - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "enhanced-resolve": "4.1.0", - "findup-sync": "3.0.0", - "global-modules": "2.0.0", - "import-local": "2.0.0", - "interpret": "1.2.0", - "loader-utils": "1.2.3", - "supports-color": "6.1.0", - "v8-compile-cache": "2.0.3", - "yargs": "13.2.4" - }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -11196,12 +7990,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } + "dev": true }, "get-caller-file": { "version": "2.0.5", @@ -11219,70 +8008,37 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } + "dev": true }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } + "dev": true }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "dev": true }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } + "dev": true }, "yargs": { "version": "13.2.4", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", - "dev": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.0" - } + "dev": true }, "yargs-parser": { "version": "13.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "dev": true } } }, @@ -11291,10 +8047,6 @@ "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, - "requires": { - "source-list-map": "~0.1.7", - "source-map": "~0.4.1" - }, "dependencies": { "source-list-map": { "version": "0.1.8", @@ -11306,10 +8058,7 @@ "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } + "dev": true } } }, @@ -11318,12 +8067,6 @@ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz", "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==", "dev": true, - "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.2", - "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" - }, "dependencies": { "mime": { "version": "2.4.4", @@ -11338,58 +8081,18 @@ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz", "integrity": "sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==", "dev": true, - "requires": { - "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.1.6", - "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", - "express": "^4.17.1", - "html-entities": "^1.2.1", - "http-proxy-middleware": "^0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "killable": "^1.0.1", - "loglevel": "^1.6.3", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.20", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.4", - "semver": "^6.1.1", - "serve-index": "^1.9.1", - "sockjs": "0.3.19", - "sockjs-client": "1.3.0", - "spdy": "^4.0.0", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.0", - "webpack-log": "^2.0.0", - "yargs": "12.0.5" - }, "dependencies": { "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "dev": true } } }, @@ -11403,69 +8106,31 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } + "dev": true }, "chokidar": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true, - "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" - } + "dev": true }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } + "dev": true }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "dev": true }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } + "dev": true }, "fsevents": { "version": "1.2.9", @@ -12019,19 +8684,13 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "^1.0.0" - } + "dev": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } + "dev": true }, "isarray": { "version": "1.0.0", @@ -12043,10 +8702,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } + "dev": true }, "ms": { "version": "2.1.2", @@ -12058,55 +8714,31 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } + "dev": true }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" - } + "dev": true }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } + "dev": true }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "dev": true }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" - } + "dev": true } } }, @@ -12114,50 +8746,31 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true, - "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" - } + "dev": true }, "webpack-merge": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", - "dev": true, - "requires": { - "lodash": "^4.17.5" - } + "dev": true }, "webpack-sources": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", - "dev": true, - "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } + "dev": true }, "webpack-subresource-integrity": { "version": "1.1.0-rc.6", "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz", "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==", - "dev": true, - "requires": { - "webpack-core": "^0.6.8" - } + "dev": true }, "websocket-driver": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", - "dev": true, - "requires": { - "http-parser-js": ">=0.4.0 <0.4.11", - "safe-buffer": ">=5.1.0", - "websocket-extensions": ">=0.1.1" - } + "dev": true }, "websocket-extensions": { "version": "0.1.3", @@ -12168,19 +8781,12 @@ "whatwg-encoding": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "requires": { - "iconv-lite": "0.4.24" - } + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==" }, "whatwg-url": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz", "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=", - "requires": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - }, "dependencies": { "webidl-conversions": { "version": "3.0.1", @@ -12199,10 +8805,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } + "dev": true }, "which-module": { "version": "2.0.0", @@ -12219,49 +8822,31 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "dev": true, - "requires": { - "errno": "~0.1.7" - } + "dev": true }, "worker-plugin": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.1.0.tgz", "integrity": "sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0" - } + "dev": true }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, "dependencies": { "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "dev": true }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } + "dev": true } } }, @@ -12274,12 +8859,7 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - } + "dev": true }, "xhr2": { "version": "0.1.4", @@ -12295,11 +8875,7 @@ "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true, - "requires": { - "sax": ">=0.6.0", - "xmlbuilder": "~9.0.1" - } + "dev": true }, "xmlbuilder": { "version": "9.0.7", @@ -12335,31 +8911,13 @@ "version": "12.0.5", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } + "dev": true }, "yargs-parser": { "version": "11.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } + "dev": true }, "yeast": { "version": "0.1.2", diff --git a/frontend/package.json b/frontend/package.json index 6ae4df77..90aebe84 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -30,6 +30,7 @@ "@ng-bootstrap/ng-bootstrap": "^5.1.0", "@nguniversal/express-engine": "^8.1.1", "@nguniversal/module-map-ngfactory-loader": "8.1.1", + "@swimlane/ngx-datatable": "^16.0.2", "bootstrap": "^4.3.1", "core-js": "^3.2.1", "domino": "^2.1.3", diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 52f58416..1583a7c1 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -5,6 +5,7 @@ import { FormsModule, ReactiveFormsModule } from "@angular/forms"; import { registerLocaleData } from "@angular/common"; import { NgbModule } from "@ng-bootstrap/ng-bootstrap"; +import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { AppComponent } from "./app.component"; import { routing } from "./app.routing"; @@ -56,6 +57,7 @@ import { CommonModule } from '@angular/common'; ReactiveFormsModule, FormsModule, NgbModule, + NgxDatatableModule, CommonModule, BrowserAnimationsModule, ToastrModule.forRoot( diff --git a/frontend/src/assets/css/material.css b/frontend/src/assets/css/material.css new file mode 100644 index 00000000..5ea414cf --- /dev/null +++ b/frontend/src/assets/css/material.css @@ -0,0 +1,303 @@ +/* + This stylesheet uses scss valiables for most of the colors / background-colors of the table + to enable the customization of the displayed table without cloning the stylesheet into the + own application. + + To modify table colors, add the following lines to the scss file of your application + (this example modifies the color of the selected row - selectionType = single, multi or multiClick): + + $ngx-datatable-selected-active-background: yellow; + $ngx-datatable-selected-active-background-hover: rgba(yellow, 0.2); + + @import '~@swimlane/ngx-datatable/index.css'; + @import '~@swimlane/ngx-datatable/themes/material.scss'; + @import '~@swimlane/ngx-datatable/assets/icons.css'; + +That's all. +*/ +.ngx-datatable.material { + background: #fff; + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); + /** + * Shared Styles + */ + /** + * Global Row Styles + */ + /** + * Header Styles + */ + /** + * Body Styles + */ + /** + * Footer Styles + */ } + .ngx-datatable.material.striped .datatable-row-odd { + background: #eee; } + .ngx-datatable.material.single-selection .datatable-body-row.active, + .ngx-datatable.material.single-selection .datatable-body-row.active .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active, + .ngx-datatable.material.multi-selection .datatable-body-row.active .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active, + .ngx-datatable.material.multi-click-selection .datatable-body-row.active .datatable-row-group { + background-color: #304ffe; + color: #fff; } + .ngx-datatable.material.single-selection .datatable-body-row.active:hover, + .ngx-datatable.material.single-selection .datatable-body-row.active:hover .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active:hover, + .ngx-datatable.material.multi-selection .datatable-body-row.active:hover .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:hover, + .ngx-datatable.material.multi-click-selection .datatable-body-row.active:hover .datatable-row-group { + background-color: #193ae4; + color: #fff; } + .ngx-datatable.material.single-selection .datatable-body-row.active:focus, + .ngx-datatable.material.single-selection .datatable-body-row.active:focus .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active:focus, + .ngx-datatable.material.multi-selection .datatable-body-row.active:focus .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:focus, + .ngx-datatable.material.multi-click-selection .datatable-body-row.active:focus .datatable-row-group { + background-color: #2041ef; + color: #fff; } + .ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover, + .ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover .datatable-row-group { + background-color: #eee; + transition-property: background; + transition-duration: 0.3s; + transition-timing-function: linear; } + .ngx-datatable.material:not(.cell-selection) .datatable-body-row:focus, + .ngx-datatable.material:not(.cell-selection) .datatable-body-row:focus .datatable-row-group { + background-color: #ddd; } + .ngx-datatable.material.cell-selection .datatable-body-cell:hover, + .ngx-datatable.material.cell-selection .datatable-body-cell:hover .datatable-row-group { + background-color: #eee; + transition-property: background; + transition-duration: 0.3s; + transition-timing-function: linear; } + .ngx-datatable.material.cell-selection .datatable-body-cell:focus, + .ngx-datatable.material.cell-selection .datatable-body-cell:focus .datatable-row-group { + background-color: #ddd; } + .ngx-datatable.material.cell-selection .datatable-body-cell.active, + .ngx-datatable.material.cell-selection .datatable-body-cell.active .datatable-row-group { + background-color: #304ffe; + color: #fff; } + .ngx-datatable.material.cell-selection .datatable-body-cell.active:hover, + .ngx-datatable.material.cell-selection .datatable-body-cell.active:hover .datatable-row-group { + background-color: #193ae4; + color: #fff; } + .ngx-datatable.material.cell-selection .datatable-body-cell.active:focus, + .ngx-datatable.material.cell-selection .datatable-body-cell.active:focus .datatable-row-group { + background-color: #2041ef; + color: #fff; } + .ngx-datatable.material .empty-row { + height: 50px; + text-align: left; + padding: 0.5rem 1.2rem; + vertical-align: top; + border-top: 0; } + .ngx-datatable.material .loading-row { + text-align: left; + padding: 0.5rem 1.2rem; + vertical-align: top; + border-top: 0; } + .ngx-datatable.material .datatable-header .datatable-row-left, + .ngx-datatable.material .datatable-body .datatable-row-left { + background-color: #fff; + background-position: 100% 0; + background-repeat: repeat-y; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQIHWPSkNeSBmJhTQVtbiDNCgASagIIuJX8OgAAAABJRU5ErkJggg==); } + .ngx-datatable.material .datatable-header .datatable-row-right, + .ngx-datatable.material .datatable-body .datatable-row-right { + background-position: 0 0; + background-color: #fff; + background-repeat: repeat-y; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAABCAYAAAD5PA/NAAAAFklEQVQI12PQkNdi1VTQ5gbSwkAsDQARLAIGtOSFUAAAAABJRU5ErkJggg==); } + .ngx-datatable.material .datatable-header { + border-bottom: 1px solid rgba(0, 0, 0, 0.12); } + .ngx-datatable.material .datatable-header .datatable-header-cell { + text-align: left; + padding: 0.9rem 1.2rem; + font-weight: 400; + background-color: #fff; + color: rgba(0, 0, 0, 0.54); + vertical-align: bottom; + font-size: 12px; + font-weight: 500; } + .ngx-datatable.material .datatable-header .datatable-header-cell .datatable-header-cell-wrapper { + position: relative; } + .ngx-datatable.material .datatable-header .datatable-header-cell.longpress .draggable::after { + transition: transform 400ms ease, opacity 400ms ease; + opacity: 0.5; + transform: scale(1); } + .ngx-datatable.material .datatable-header .datatable-header-cell .draggable::after { + content: ' '; + position: absolute; + top: 50%; + left: 50%; + margin: -30px 0 0 -30px; + height: 60px; + width: 60px; + background: #eee; + border-radius: 100%; + opacity: 1; + filter: none; + transform: scale(0); + z-index: 9999; + pointer-events: none; } + .ngx-datatable.material .datatable-header .datatable-header-cell.dragging .resize-handle { + border-right: none; } + .ngx-datatable.material .datatable-header .resize-handle { + border-right: solid 1px #eee; } + .ngx-datatable.material .datatable-body .datatable-row-detail { + background: #f5f5f5; + padding: 10px; } + .ngx-datatable.material .datatable-body .datatable-group-header { + background: #f5f5f5; + border-bottom: solid 1px #d9d8d9; + border-top: solid 1px #d9d8d9; } + .ngx-datatable.material .datatable-body .datatable-body-row .datatable-body-cell { + text-align: left; + padding: 0.9rem 1.2rem; + vertical-align: top; + border-top: 0; + color: rgba(0, 0, 0, 0.87); + transition: width 0.3s ease; + font-size: 14px; + font-weight: 400; } + .ngx-datatable.material .datatable-body .datatable-body-row .datatable-body-group-cell { + text-align: left; + padding: 0.9rem 1.2rem; + vertical-align: top; + border-top: 0; + color: rgba(0, 0, 0, 0.87); + transition: width 0.3s ease; + font-size: 14px; + font-weight: 400; } + .ngx-datatable.material .datatable-body .progress-linear { + display: block; + position: relative; + width: 100%; + height: 5px; + padding: 0; + margin: 0; + position: absolute; } + .ngx-datatable.material .datatable-body .progress-linear .container { + display: block; + position: relative; + overflow: hidden; + width: 100%; + height: 5px; + -webkit-transform: translate(0, 0) scale(1, 1); + transform: translate(0, 0) scale(1, 1); + background-color: #aad1f9; } + .ngx-datatable.material .datatable-body .progress-linear .container .bar { + transition: all 0.2s linear; + -webkit-animation: query 0.8s infinite cubic-bezier(0.39, 0.575, 0.565, 1); + animation: query 0.8s infinite cubic-bezier(0.39, 0.575, 0.565, 1); + transition: -webkit-transform 0.2s linear; + transition: transform 0.2s linear; + background-color: #106cc8; + position: absolute; + left: 0; + top: 0; + bottom: 0; + width: 100%; + height: 5px; } + .ngx-datatable.material .datatable-footer { + border-top: 1px solid rgba(0, 0, 0, 0.12); + font-size: 12px; + font-weight: 400; + color: rgba(0, 0, 0, 0.54); } + .ngx-datatable.material .datatable-footer .page-count { + line-height: 50px; + height: 50px; + padding: 0 1.2rem; } + .ngx-datatable.material .datatable-footer .datatable-pager { + margin: 0 10px; } + .ngx-datatable.material .datatable-footer .datatable-pager li { + vertical-align: middle; } + .ngx-datatable.material .datatable-footer .datatable-pager li.disabled a { + color: rgba(0, 0, 0, 0.26) !important; + background-color: transparent !important; } + .ngx-datatable.material .datatable-footer .datatable-pager li.active a { + background-color: rgba(158, 158, 158, 0.2); + font-weight: bold; } + .ngx-datatable.material .datatable-footer .datatable-pager a { + height: 22px; + min-width: 24px; + line-height: 22px; + padding: 0 6px; + border-radius: 3px; + margin: 6px 3px; + text-align: center; + vertical-align: top; + color: rgba(0, 0, 0, 0.54); + text-decoration: none; + vertical-align: bottom; } + .ngx-datatable.material .datatable-footer .datatable-pager a:hover { + color: rgba(0, 0, 0, 0.75); + background-color: rgba(158, 158, 158, 0.2); } + .ngx-datatable.material .datatable-footer .datatable-pager .datatable-icon-left, + .ngx-datatable.material .datatable-footer .datatable-pager .datatable-icon-skip, + .ngx-datatable.material .datatable-footer .datatable-pager .datatable-icon-right, + .ngx-datatable.material .datatable-footer .datatable-pager .datatable-icon-prev { + font-size: 20px; + line-height: 20px; + padding: 0 3px; } + .ngx-datatable.material .datatable-summary-row .datatable-body-row { + background-color: #ddd; } + .ngx-datatable.material .datatable-summary-row .datatable-body-row:hover { + background-color: #ddd; } + .ngx-datatable.material .datatable-summary-row .datatable-body-row .datatable-body-cell { + font-weight: bold; } + +/** + * Checkboxes +**/ +.datatable-checkbox { + position: relative; + margin: 0; + cursor: pointer; + vertical-align: middle; + display: inline-block; + box-sizing: border-box; + padding: 0; } + .datatable-checkbox input[type='checkbox'] { + position: relative; + margin: 0 1rem 0 0; + cursor: pointer; + outline: none; } + .datatable-checkbox input[type='checkbox']:before { + -webkit-transition: all 0.3s ease-in-out; + -moz-transition: all 0.3s ease-in-out; + transition: all 0.3s ease-in-out; + content: ''; + position: absolute; + left: 0; + z-index: 1; + width: 1rem; + height: 1rem; + border: 2px solid #f2f2f2; } + .datatable-checkbox input[type='checkbox']:checked:before { + -webkit-transform: rotate(-45deg); + -moz-transform: rotate(-45deg); + -ms-transform: rotate(-45deg); + transform: rotate(-45deg); + height: 0.5rem; + border-color: #009688; + border-top-style: none; + border-right-style: none; } + .datatable-checkbox input[type='checkbox']:after { + content: ''; + position: absolute; + top: 0; + left: 0; + width: 1rem; + height: 1rem; + background: #fff; + cursor: pointer; } + +/** + * Progress bar animations + */ +@keyframes query { + 0% { + opacity: 1; + transform: translateX(35%) scale(0.3, 1); } + 100% { + opacity: 0; + transform: translateX(-50%) scale(0, 1); } } diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 0c328759..7c5c87ee 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -1,4 +1,6 @@ /* You can add global styles to this file, and also import other style files */ +@import 'assets/css/material.css'; + @font-face { font-display: auto; From 06016cf4e103b747115f787b285caac2d5eda888 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Wed, 20 Nov 2019 12:00:53 +0100 Subject: [PATCH 02/76] Back to DEV --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 679c772d..13668bbb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0.dev0 +0.3.0.dev0 From b018145827089f6cfeff9c8389f666708a887e4b Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Wed, 20 Nov 2019 12:01:49 +0100 Subject: [PATCH 03/76] Back to DEV --- docs/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index b1ccdb38..c231c352 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,13 @@ CHANGELOG ========= +0.3.0 (unreleased) +------------------ + +**🐛 Fixes** + +* + 0.2.0 (2019-11-20) ------------------ From b1928c28e54e10ab37f18a5ce9e7760223e05a54 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Wed, 20 Nov 2019 12:06:18 +0100 Subject: [PATCH 04/76] Update README.md --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dfbe5e26..9100716f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # GeoNature-citizen -Portail d'inventaire participatif de la biodiversité à destination du grand public ([**Démo**](http://democitizen.geonature.fr)) +Portail d'inventaire participatif de la biodiversité à destination du grand public ([**Démo**](http://democitizen.geonature.fr)). ![logo](https://github.com/PnX-SI/GeoNature-citizen/raw/master/frontend/src/assets/logo.png) @@ -9,14 +9,19 @@ Portail d'inventaire participatif de la biodiversité à destination du grand pu **English:** GeoNature-citizen is a free and Open Source web solution for citizen science projects for biodiversity data collection. It is fully customizable. Your platform may be a single or a multiple program and be based on existing or adoc list of species. + The data collection is gamified to improve the user management using badges and scores. It can also be customized to accept new user to be created or not. + It is based on a fully open Source stack from PostgreSQL to Angular. **Francais:** GeoNature-citizen est une solution web gratuite et à code source ouvert pour les projets de science citoyenne destinés à la collecte de données sur la biodiversité. L'outil est entièrement personnalisable. Votre plateforme peut être constituée d'un programme unique ou de plusieurs programmes de collecte et être basée sur une liste d'espèces existante ou adoc. + La collecte de données est ludifiée pour améliorer la gestion des utilisateurs à l’aide de badges et de scores. Elle peut également être personnalisée pour accepter que de nouveaux utilisateurs soient créés ou non. +Documentation : https://geonature-citizen.readthedocs.io + ## Cas d'utilisation - https://obs.mercantour-parcnational.fr @@ -50,7 +55,7 @@ GeoNature-citizen s'appuie sur [TaxHub](https://github.com/PnX-SI/TaxHub) pour l Ce projet est initialement développé pour répondre aux besoins de collectes participatives dans le cadre des démarches d'atlas de biodiversité communal/territorial (ABC/ABT). La première version de ce projet est le fruit d'une démarche mutualisée entre différents projects : * Projet d'Atlas de biodiversité de territorie de [Valence Romans Agglo](http://www.valenceromansagglo.fr/fr/index.html), en partenariat avec la [LPO Auvergne-Rhône-Alpes](https://auvergne-rhone-alpes.lpo.fr/). -* Projets d'inventaires participatifs du [Parc national du Mercantour](http://www.mercantour-parcnational.fr/fr) et du [Syndicat Mixte pour la gestion et la protection de la Camargue Gardoise](https://www.camarguegardoise.com/), avec une réalisation par [NaturalSolutions](https://www.natural-solutions.eu/). +* Projets d'inventaires participatifs du [Parc national du Mercantour](http://www.mercantour-parcnational.fr/fr) et du [Syndicat Mixte pour la gestion et la protection de la Camargue Gardoise](https://www.camarguegardoise.com/), avec une réalisation par [Natural Solutions](https://www.natural-solutions.eu/). Il constitue l'une des briques du projet GeoNature, porté par les [Parcs nationaux de France](http://www.parcsnationaux.fr/fr) et bénéficie de l'appui technique du [Parc national des Ecrins](http://www.ecrins-parcnational.fr/). From c5f7945af279942aafce69dd600e8b20b1c79d97 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Wed, 20 Nov 2019 12:45:18 +0100 Subject: [PATCH 05/76] DOC install - Un peu de mise en forme --- docs/index.rst | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 8552cf21..df4c03ab 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,5 +1,5 @@ ==================================== -Installation de Geonature Citizen +Installation de GeoNature-citizen ==================================== @@ -10,10 +10,10 @@ Application développée et installée sur un serveur Debian 9. Ce serveur doit aussi disposer de : -- sudo (apt-get install sudo) +- sudo (``apt-get install sudo``) - un utilisateur (``monuser`` dans cette documentation) appartenant au groupe ``sudo`` (pour pouvoir bénéficier des droits d'administrateur) -**1. Créer un utilisateur debian :** +**1. Créer un utilisateur Debian :** :: @@ -39,26 +39,26 @@ Ce serveur doit aussi disposer de : INSTALLATION DE TAXHUB ====================== -Pour plus de détails, lien officiel pour l’installation de taxhub : +Pour plus de détails, lien officiel pour l’installation de TaxHub : https://taxhub.readthedocs.io/fr/latest/ Configurer le serveur : -https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-du-serveur : +https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-du-serveur -Configurer postgresql : +Configurer PostgreSQL : https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-de-posgresql Configuration et installation de l’application : https://taxhub.readthedocs.io/fr/latest/installation.html :notes: - - Bien vérifier de ne pas être en root : + - Bien vérifier de ne pas être en ``root`` : :: su - nom_utilisateur (geonatadmin) - - Pour avoir les caractéristiques de votre instance: + - Pour avoir les caractéristiques de votre instance : :: @@ -66,17 +66,15 @@ https://taxhub.readthedocs.io/fr/latest/installation.html uname -a -INSTALLATION DE GEONATURE CITIZEN +INSTALLATION DE GEONATURE-CITIZEN ================================= - -**Etape 1 : Configurer postgresql:** - +**Etape 1 : Configurer PostgreSQL :** :notes: - - Cette étape n'est nécessaire que si Taxhub n’est pas installé - - voir init_launch_db.rst: https://github.com/PnX-SI/GeoNature citizen/blob/taxhub_rest/docs/devs/init_launch_db.rst + - Cette étape n'est nécessaire que si TaxHub n’est pas installé + - voir init_launch_db.rst : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst :: @@ -108,15 +106,15 @@ installer virtualenv : virtualenv -p /usr/bin/python3 venv source venv/bin/activate -**Etape 3 : Installation du backend et de la base des données:** +**Etape 3 : Installation du backend et de la base des données :** :notes: - init_launch_backend.rst - creation referentiel géo - - voir : https://github.com/PnX-SI/GeoNature-citizen//blob/taxhub_rest/docs/devs/init_launch_backend.rst + - voir : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst -Cloner le dépôt github de Geonature Citizen +Cloner le dépôt Github de GeoNature-citizen :: @@ -126,7 +124,7 @@ Cloner le dépôt github de Geonature Citizen cd citizen/backend -Création du référentiel des géométries communales: +Création du référentiel des géométries communales : :: @@ -157,28 +155,28 @@ Pour restaurer en cas de besoin : psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/ref_geo_municipalities.sql psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "DROP TABLE ref_geo.temp_fr_municipalities;" -lancement du backend pour générer les schémas: +Lancement du backend pour générer les schémas : -en mode debug: +En mode debug : :: export FLASK_ENV=development; export FLASK_DEBUG=1; export FLASK_RUN_PORT=5002; export FLASK_APP=wsgi; python -m flask run --host=0.0.0.0 -enregistrement du module principal: +Enregistrement du module principal : :: insert into gnc_core.t_modules values (1, 'main', 'main', 'main', NULL, false, '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933'); -enregistrement d’un programme exemple +Enregistrement d’un programme exemple :: psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "INSERT INTO gnc_core.t_programs VALUES (1, 'Au 68', 'inventaire du 68', 'desc', NULL, NULL, 1, 1, 't', '0106000020E6100000010000000103000000010000000500000001000070947C154042CA401665A5454001000070EE7C15402235D7E667A54540010000D81C7D1540AFBA27365AA5454000000040C47C1540DD9BD74A58A5454001000070947C154042CA401665A54540', '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933');" -**Etape 4 : éditer le fichier de config :** +**Etape 4 : éditer le fichier de config :** :notes: @@ -221,7 +219,7 @@ enregistrement d’un programme exemple cp -v src/assets/badges_* ../media/ -éditer la conf: +Editer la conf : :: @@ -229,14 +227,14 @@ enregistrement d’un programme exemple # copier le template css alternatif cp src/custom/custom.css.template src/custom/custom.css -Lancer le front: +Lancer le front : :: npm run start -- --host=0.0.0.0 -ré génération des locales après modification de l’UI: +Ré-génération des locales après modification de l’UI : :: From 66e87076beb3135b4539f56cc12975a0eb6bfe0e Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 25 Nov 2019 14:11:05 +0100 Subject: [PATCH 06/76] add observations user dashbord --- backend/gncitizen/core/badges/routes.py | 17 +- backend/gncitizen/core/observations/routes.py | 132 ++- frontend/src/app/app.component.css | 10 +- frontend/src/app/app.component.html | 14 +- .../user-dashboard.component.css | 45 +- .../user-dashboard.component.html | 56 +- .../user-dashboard.component.ts | 170 ++- .../user-dashboard/user.service.service.ts | 64 ++ frontend/src/app/home/home.component.css | 119 +- frontend/src/app/home/home.component.html | 39 +- frontend/src/app/home/home.component.ts | 6 + .../observations/form/form.component.html | 192 +--- .../observations/form/form.component.ts | 310 ++--- .../observations/form/formValidators.ts | 21 + .../observations/list/list.component.css | 45 +- .../observations/list/list.component.html | 21 +- .../modalflow/modalflow.component.html | 11 + .../modalflow/modalflow.component.ts | 25 +- .../modalflow/modalflow.service.ts | 12 +- .../steps/committed/committed.component.html | 21 +- .../steps/committed/committed.component.ts | 6 +- .../programs/observations/obs.component.css | 530 +-------- .../programs/observations/obs.component.html | 2 +- .../observations/observations.service.ts | 25 + frontend/src/assets/css/material.css | 12 +- frontend/src/styles.css | 1024 +++++++++++++---- 26 files changed, 1684 insertions(+), 1245 deletions(-) create mode 100644 frontend/src/app/auth/user-dashboard/user.service.service.ts create mode 100644 frontend/src/app/programs/observations/form/formValidators.ts create mode 100644 frontend/src/app/programs/observations/modalflow/modalflow.component.html create mode 100644 frontend/src/app/programs/observations/observations.service.ts diff --git a/backend/gncitizen/core/badges/routes.py b/backend/gncitizen/core/badges/routes.py index 5655cc8b..80340415 100644 --- a/backend/gncitizen/core/badges/routes.py +++ b/backend/gncitizen/core/badges/routes.py @@ -32,7 +32,6 @@ def get_rewards(id): } ) total_obs = total_obs + item.nb_obs - print('total_obs',total_obs) taxon_classe_query = ObservationModel.query.filter( ObservationModel.id_role == id).outerjoin( Taxref, Taxref.cd_nom == ObservationModel.cd_nom @@ -156,3 +155,19 @@ def monthdelta(d1, d2): else: break return delta + + +@routes.route("/stats", methods=["GET"]) +@json_resp +def get_stat(): + try: + stats = {} + stats["nb_obs"] = ObservationModel.query.count() + stats["nb_user"] = UserModel.query.count() + stats["nb_program"] = ProgramsModel.query.count() + stats["nb_espece"] = ObservationModel.query.distinct( + ObservationModel.cd_nom).count() + return (stats, 200) + except Exception as e: + current_app.logger.critical("[get_observations] Error: %s", str(e)) + return {"message": str(e)}, 400 diff --git a/backend/gncitizen/core/observations/routes.py b/backend/gncitizen/core/observations/routes.py index 2fb42e3e..f66aa694 100644 --- a/backend/gncitizen/core/observations/routes.py +++ b/backend/gncitizen/core/observations/routes.py @@ -14,7 +14,7 @@ from geojson import FeatureCollection from geoalchemy2.shape import from_shape from shapely.geometry import Point, asShape - +from sqlalchemy import desc from gncitizen.core.commons.models import MediaModel, ProgramsModel from gncitizen.core.ref_geo.models import LAreas from .models import ObservationMediaModel, ObservationModel @@ -42,6 +42,7 @@ "cd_nom", "id_observation", "observer", + "id_program", "municipality", "obs_txt", "count", @@ -103,7 +104,8 @@ def generate_observation_geojson(id_observation): TMedias.cd_ref == observation.ObservationModel.cd_nom ).all() if medias: - feature["properties"]["medias"] = [media.as_dict(True) for media in medias] + feature["properties"]["medias"] = [ + media.as_dict(True) for media in medias] else: taxhub_list_id = ( @@ -228,7 +230,8 @@ def post_observation(): """ try: request_datas = request.form - current_app.logger.debug("[post_observation] request data:", request_datas) + current_app.logger.debug( + "[post_observation] request data:", request_datas) datas2db = {} for field in request_datas: if hasattr(ObservationModel, field): @@ -257,9 +260,8 @@ def post_observation(): if newobs.obs_txt is None or len(newobs.obs_txt) == 0: newobs.obs_txt = "Anonyme" - newobs.uuid_sinp = uuid.uuid4() - newobs.municipality = get_municipality_id_from_wkb(newobs.geom) + newobs.uuid_sinp = uuid.uuid4() db.session.add(newobs) db.session.commit() current_app.logger.debug(newobs.as_dict()) @@ -275,11 +277,13 @@ def post_observation(): newobs.id_observation, ObservationMediaModel, ) - current_app.logger.debug("[post_observation] ObsTax UPLOAD FILE {}".format(file)) + current_app.logger.debug( + "[post_observation] ObsTax UPLOAD FILE {}".format(file)) features[0]["properties"]["images"] = file except Exception as e: - current_app.logger.warning("[post_observation] ObsTax ERROR ON FILE SAVING", str(e)) + current_app.logger.warning( + "[post_observation] ObsTax ERROR ON FILE SAVING", str(e)) # raise GeonatureApiError(e) return ({"message": "Nouvelle observation créée.", "features": features}, 200) @@ -313,7 +317,7 @@ def get_observations(): """ try: observations = ObservationModel.query.order_by( - ObservationModel.timestamp_create.desc() + desc(ObservationModel.timestamp_create) ).all() features = [] for observation in observations: @@ -374,7 +378,7 @@ def get_observations_from_list(id): # noqa: A002 current_app.logger.debug("R", t["cd_nom"]) datas = ( ObservationModel.query.filter_by(cd_nom=t["cd_nom"]) - .order_by(ObservationModel.timestamp_create.desc()) + .order_by(desc(ObservationModel.timestamp_create)) .all() ) for d in datas: @@ -383,13 +387,15 @@ def get_observations_from_list(id): # noqa: A002 for k in observation_dict: if k in obs_keys: feature["properties"][k] = observation_dict[k] - taxref = get_specie_from_cd_nom(feature["properties"]["cd_nom"]) + taxref = get_specie_from_cd_nom( + feature["properties"]["cd_nom"]) for k in taxref: feature["properties"][k] = taxref[k] features.append(feature) return FeatureCollection(features) except Exception as e: - current_app.logger.critical("[get_observations_from_list] Error: %s", str(e)) + current_app.logger.critical( + "[get_observations_from_list] Error: %s", str(e)) return {"message": str(e)}, 400 @@ -453,13 +459,15 @@ def get_program_observations( .join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True) ) - observations = observations.order_by(ObservationModel.timestamp_create.desc()) + observations = observations.order_by( + desc(ObservationModel.timestamp_create)) # current_app.logger.debug(str(observations)) observations = observations.all() if current_app.config.get("API_TAXHUB") is not None: taxhub_list_id = ( - ProgramsModel.query.filter_by(id_program=program_id).one().taxonomy_list + ProgramsModel.query.filter_by( + id_program=program_id).one().taxonomy_list ) taxon_repository = mkTaxonRepository(taxhub_list_id) @@ -472,7 +480,8 @@ def get_program_observations( } # Observer - feature["properties"]["observer"] = {"username": observation.username} + feature["properties"]["observer"] = { + "username": observation.username} # Observer submitted media feature["properties"]["image"] = ( @@ -536,7 +545,8 @@ def get_program_observations( # trace = traceback.format_exc() # return("
" + trace + "
"), 500 raise e - current_app.logger.critical("[get_program_observations] Error: %s", str(e)) + current_app.logger.critical( + "[get_program_observations] Error: %s", str(e)) return {"message": str(e)}, 400 @@ -581,25 +591,27 @@ def get_all_observations() -> Union[FeatureCollection, Tuple[Dict, int]]: .join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True) ) - observations = observations.order_by(ObservationModel.timestamp_create.desc()) + observations = observations.order_by( + desc(ObservationModel.timestamp_create)) # current_app.logger.debug(str(observations)) observations = observations.all() # loop to retrieve taxonomic data from all programs if current_app.config.get("API_TAXHUB") is not None: - programs = ProgramsModel.query.all() - taxon_repository = [] - for program in programs: - taxhub_list_id = ( - ProgramsModel.query.filter_by(id_program=program.id_program).one().taxonomy_list - ) - taxon_data = mkTaxonRepository(taxhub_list_id) - try: - for taxon in taxon_data: - if taxon not in taxon_repository: - taxon_repository.append(taxon) - except Exception as e: - current_app.logger.critical(str(e)) + programs = ProgramsModel.query.all() + taxon_repository = [] + for program in programs: + taxhub_list_id = ( + ProgramsModel.query.filter_by( + id_program=program.id_program).one().taxonomy_list + ) + taxon_data = mkTaxonRepository(taxhub_list_id) + try: + for taxon in taxon_data: + if taxon not in taxon_repository: + taxon_repository.append(taxon) + except Exception as e: + current_app.logger.critical(str(e)) features = [] for observation in observations: @@ -610,7 +622,8 @@ def get_all_observations() -> Union[FeatureCollection, Tuple[Dict, int]]: } # Observer - feature["properties"]["observer"] = {"username": observation.username} + feature["properties"]["observer"] = { + "username": observation.username} # Observer submitted media feature["properties"]["image"] = ( @@ -673,7 +686,8 @@ def get_all_observations() -> Union[FeatureCollection, Tuple[Dict, int]]: # trace = traceback.format_exc() # return("
" + trace + "
"), 500 raise e - current_app.logger.critical("[get_program_observations] Error: %s", str(e)) + current_app.logger.critical( + "[get_program_observations] Error: %s", str(e)) return {"message": str(e)}, 400 @@ -701,20 +715,22 @@ def get_rewards(id): @routes.route("/observations/users/", methods=["GET"]) @json_resp -def get_observations_by_user_id(user_id) : +def get_observations_by_user_id(user_id): try: observations = ( db.session.query( ObservationModel, + ProgramsModel, UserModel.username, MediaModel.filename.label("image"), LAreas.area_name, LAreas.area_code, ) - .filter(ObservationModel.id_role == user_id, ProgramsModel.is_active) + .filter(ObservationModel.id_role == user_id) .join(LAreas, LAreas.id_area == ObservationModel.municipality, isouter=True) .join( ProgramsModel, + ProgramsModel.id_program == ObservationModel.id_program, isouter=True, ) .join( @@ -730,9 +746,11 @@ def get_observations_by_user_id(user_id) : .join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True) ) - observations = observations.order_by(ObservationModel.timestamp_create.desc()) + observations = observations.order_by( + desc(ObservationModel.timestamp_create)) # current_app.logger.debug(str(observations)) observations = observations.all() + if current_app.config.get("API_TAXHUB") is not None: taxhub_list_id = ( ProgramsModel.query.one().taxonomy_list @@ -747,7 +765,8 @@ def get_observations_by_user_id(user_id) : } # Observer - feature["properties"]["observer"] = {"username": observation.username} + feature["properties"]["observer"] = { + "username": observation.username} # Observer submitted media feature["properties"]["image"] = ( "/".join( @@ -765,7 +784,11 @@ def get_observations_by_user_id(user_id) : for k in observation_dict: if k in obs_keys and k != "municipality": feature["properties"][k] = observation_dict[k] - + # Program + program_dict = observation.ProgramsModel.as_dict(True) + for program in program_dict: + if program == "title": + feature["properties"]["program_title"] = program_dict[program] # TaxRef if current_app.config.get("API_TAXHUB") is None: taxref = Taxref.query.filter( @@ -799,5 +822,38 @@ def get_observations_by_user_id(user_id) : except Exception as e: raise e - current_app.logger.critical("[get_program_observations] Error: %s", str(e)) - return {"message": str(e)}, 400 \ No newline at end of file + current_app.logger.critical( + "[get_program_observations] Error: %s", str(e)) + return {"message": str(e)}, 400 + + +@routes.route("/observations", methods=["PATCH"]) +@json_resp +@jwt_optional +def update_observation(): + try: + update_data = request.form + update_obs = {} + for prop in ["cd_nom", "count", "comment", "date"]: + update_obs[prop] = update_data[prop] + try: + _coordinates = json.loads(update_data["geometry"]) + _point = Point(_coordinates["x"], _coordinates["y"]) + _shape = asShape(_point) + update_obs["geom"] = from_shape(Point(_shape), srid=4326) + update_obs["municipality"] = get_municipality_id_from_wkb( + update_obs['geom']) + except Exception as e: + current_app.logger.warning("[post_observation] coords ", e) + raise GeonatureApiError(e) + + ObservationModel.query.filter_by(id_observation=update_data.get( + 'id_observation')).update(update_obs, synchronize_session='fetch') + db.session.commit() + + return ('observation updated successfully'), 200 + except Exception as e: + current_app.logger.critical("[post_observation] Error: %s", str(e)) + return {"message": str(e)}, 400 + + diff --git a/frontend/src/app/app.component.css b/frontend/src/app/app.component.css index ff45e6be..5e667883 100644 --- a/frontend/src/app/app.component.css +++ b/frontend/src/app/app.component.css @@ -1,9 +1,7 @@ .router-app { - margin-top: var(--router-outlet-margin-top); + height: 100%; } -@media screen and (max-width: 576px) { - .router-app { - margin-top: 65px !important; - } -} + + + diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index 29fa550b..93949b86 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -1,9 +1,9 @@ -
- - -
-
+ +
+
+ + +
+
- - diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index 7d10eb51..76b729e0 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -72,14 +72,13 @@ margin-top: 30px; } -#badges h3 { +section h3 { text-align: center; font-weight: normal; text-transform: uppercase; } #badges .inner-row { - padding: 8px 10px; background: #f3f3f3; border: solid 3px #fff; @@ -91,8 +90,16 @@ height: 70px; } -/* DONNEES PERSO */ +.main-photo { + margin-left: -14px; + object-fit: cover; + min-width: 140px !important; + max-width: 140px !important; + height: 100px; + +} +/* DONNEES PERSO */ .personal-data { margin: 20px 0px; display: flex; @@ -106,12 +113,15 @@ .personal-data button { font-size: 16px; - background: var(--primary); padding: 10px 30px; margin: 10px 25px; max-height: 115px; } +.personal-data button.export { + background: var(--primary); +} + .personal-data button i { margin-right: 15px; } @@ -120,7 +130,7 @@ padding: 0px 10px; } -form > button { +form>button { background: var(--primary); padding: 10px 30px; margin: 0 auto; @@ -129,6 +139,11 @@ form > button { display: block; } +app-modalflow { + position: relative; + display: contents; +} + /* MODIF DATA */ .modal-header { @@ -151,6 +166,25 @@ form > button { margin: 0; } +.title { + padding-top: 50px; + padding-bottom: 20px; + text-align: center; + text-transform: uppercase; + font-size: 22px; + font-weight: 600; + color: #626262 +} + +.title::before, +.title::after { + display: inline-block; + content: ""; + border-top: 1px solid #b1b0b0; + width: 6rem; + margin: 0 1rem; + transform: translateY(-8px); +} /* @media screen and (min-width: 992px) { #badges .row div:nth-child(2):before { content: " "; @@ -183,6 +217,7 @@ form > button { height: 2px; width: 60%; } + #badges .row div:nth-child(2):after { content: " "; background-color: #333; diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 9720462b..7bd25e12 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -3,18 +3,45 @@
-
+
{ +stats?.platform_attendance, plural, =0 { aucune observation} =1 {une observation} other {{{stats?.platform_attendance}} observations} } -

{{ username }}

+

{{ username }}

-
-

Vos badges

+
+

Mes observations

+ + + + + + + + + {{row.taxref.nom_complet}} + + + + + + + + + + + + + + +
+
+

Mes badges

-
Récompenses géneral
+
Récompenses géneral
@@ -34,16 +61,19 @@
Récompenses d'identification d'espèces
[alt]="r_badge.type + r_badge.name" [ngbTooltip]="r_badge.reward_label +' '+ r_badge.name" />
-
+
-
- - + -
+
@@ -141,3 +171,9 @@

Mettre à jour vos données personnelles

+ +
+
+
+
+
diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index 20c567b7..11b7bacb 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { HttpClient, HttpHeaders } from "@angular/common/http"; -import { Observable, Subject, throwError } from "rxjs"; +import { throwError, forkJoin } from "rxjs"; import { tap, catchError } from "rxjs/operators"; - import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; - import { AppConfig } from "../../../conf/app.config"; import { AuthService } from "./../auth.service"; - +import { UseService } from "./user.service.service"; import { saveAs } from "file-saver"; +import * as _ from "lodash"; +import { Point } from "leaflet"; +import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; @Component({ selector: "app-user-dashboard", @@ -17,9 +17,6 @@ import { saveAs } from "file-saver"; styleUrls: ["./user-dashboard.component.css"] }) export class UserDashboardComponent implements OnInit { - private headers: HttpHeaders = new HttpHeaders({ - "Content-Type": "application/json" - }); readonly AppConfig = AppConfig; modalRef: NgbModalRef; username: string = "not defined"; @@ -31,32 +28,35 @@ export class UserDashboardComponent implements OnInit { main_badges: any = []; programs_badges: any = []; recognition_badges: any = []; + observations: any; + rows: any = []; + obsToExport: any = []; constructor( private auth: AuthService, - private http: HttpClient, + private userService: UseService, private router: Router, - private modalService: NgbModal + private modalService: NgbModal, + private flowService: ModalFlowService ) {} ngOnInit(): void { const access_token = localStorage.getItem("access_token"); - console.debug("dashboard", access_token); if (access_token) { this.auth .ensureAuthorized() .pipe( tap(user => { - console.debug("user:", user); if (user && user["features"] && user["features"]["id_role"]) { this.isLoggedIn = true; this.username = user["features"]["username"]; this.stats = user["features"]["stats"]; this.role_id = user["features"]["id_role"]; // FIXME: source backend conf - if (AppConfig["REWARDS"]) { - this.getBadgeCategories(); - } + this.getData(); + this.flowService.getModalCloseSatus().subscribe(status => { + if (status === "updateObs") this.getData(); + }); } }), catchError(err => throwError(err)) @@ -65,7 +65,84 @@ export class UserDashboardComponent implements OnInit { } } - deletePersonalData() { + getData() { + let data = []; + this.rows = []; + this.obsToExport = []; + this.observations = null; + this.badges = null; + this.main_badges = []; + this.programs_badges = []; + this.recognition_badges =[]; + let badgeCategories = this.userService.getBadgeCategories(this.role_id); + let userObservations = this.userService.getObservationsByUserId( + this.role_id + ); + if (AppConfig["REWARDS"]) { + data.push(badgeCategories); + } + data.push(userObservations); + + forkJoin(data).subscribe((data: any) => { + if (data.length > 1) { + this.badges = data[0]; + localStorage.setItem("badges", JSON.stringify(this.badges)); + this.badges.forEach(badge => { + if (badge.type == "all_attendance" || badge.type == "seniority") + this.main_badges.push(badge); + if (badge.type == "program_attendance") + this.programs_badges.push(badge); + if (badge.type == "recognition") this.recognition_badges.push(badge); + }); + this.observations = data[1].features; + this.observations.forEach(obs => { + let coords: Point = new Point( + obs.geometry.coordinates[0], + obs.geometry.coordinates[1] + ); + this.obsToExport.push({ + id_observation: obs.properties.id_observation, + date: obs.properties.date, + program: obs.properties.program_title, + count: obs.properties.count, + comment: obs.properties.comment, + municipality: obs.properties.municipality.name, + taxref: obs.properties.taxref.nom_complet, + }) + this.rows.push({ + media_url: + obs.properties.images && !!obs.properties.images.length + ? AppConfig.API_ENDPOINT + "/media/" + obs.properties.images[0] + : obs.properties.image + ? obs.properties.image + : obs.properties.medias && !!obs.properties.medias.length + ? AppConfig.API_TAXHUB + + "/tmedias/thumbnail/" + + obs.properties.medias[0].id_media + + "?h=80&v=80" + : "assets/default_image.png", + taxref: obs.properties.taxref, + date: obs.properties.date, + municipality: obs.properties.municipality.name, + program_id: obs.properties.id_program, + program: obs.properties.program_title, + count: obs.properties.count, + comment: obs.properties.comment, + id_observation: obs.properties.id_observation, + taxon: { + media: obs.properties.media, + taxref: obs.properties.taxref + }, + coords: coords + }); + }); + } else { + this.observations = data[0].features; + } + }); + } + + onDeletePersonalData() { const access_token = localStorage.getItem("access_token"); this.auth .selfDeleteAccount(access_token) @@ -82,13 +159,8 @@ export class UserDashboardComponent implements OnInit { .catch(err => console.log("err", err)); } - getPersonalInfo(): Observable { - let url = `${AppConfig.API_ENDPOINT}/user/info`; - return this.http.get(url, { headers: this.headers }); - } - - exportPersonalData() { - this.getPersonalInfo().subscribe(data => { + onExportPersonalData() { + this.userService.getPersonalInfo().subscribe(data => { let blob = new Blob([JSON.stringify(data)], { type: "text/plain;charset=utf-8" }); @@ -98,8 +170,14 @@ export class UserDashboardComponent implements OnInit { }); } - editInfos(content): void { - this.getPersonalInfo().subscribe(data => { + onExportObservations() { + let csv_str = this.userService.ConvertToCSV(this.obsToExport, ['id_observation','taxref','date','program', 'count', 'comment', 'municipality']) + let blob = new Blob([csv_str], {type: 'text/csv' }) + saveAs(blob, "mydata.csv"); + } + + onEditInfos(content): void { + this.userService.getPersonalInfo().subscribe(data => { this.personalInfo = data; this.modalRef = this.modalService.open(content, { size: "lg", @@ -108,44 +186,14 @@ export class UserDashboardComponent implements OnInit { }); } - onUpdatePersonalData(): void | Error { - this.http - .post(`${AppConfig.API_ENDPOINT}/user/info`, this.personalInfo, { - headers: this.headers - }) - .pipe( - catchError(error => { - //window.alert(error); - return throwError(error); - }) - ) - .subscribe(() => { - this.modalRef.close(); - }); + onUpdatePersonalData() { + this.userService.updatePersonalData(this.personalInfo).subscribe(() => { + this.modalRef.close(); + }); } - getBadgeCategories() { - this.http - .get(`${AppConfig.API_ENDPOINT}/rewards/${this.role_id}`) - .subscribe( - rewards => { - this.badges = rewards; - localStorage.setItem("badges", JSON.stringify(this.badges)); - this.badges.forEach(badge => { - if (badge.type == "all_attendance" || badge.type == "seniority") - this.main_badges.push(badge); - if (badge.type == "program_attendance") - this.programs_badges.push(badge); - if (badge.type == "recognition") - this.recognition_badges.push(badge); - }); - }, - err => { - throwError(err); - } - ); - } ngOnDestroy(): void { - if (this.modalRef) this.modalRef.close() + if (this.modalRef) this.modalRef.close(); + this.flowService.setModalCloseSatus(null) } } diff --git a/frontend/src/app/auth/user-dashboard/user.service.service.ts b/frontend/src/app/auth/user-dashboard/user.service.service.ts new file mode 100644 index 00000000..d36411b9 --- /dev/null +++ b/frontend/src/app/auth/user-dashboard/user.service.service.ts @@ -0,0 +1,64 @@ +import { Injectable } from "@angular/core"; +import { HttpClient, HttpHeaders } from "@angular/common/http"; +import { AppConfig } from "../../../conf/app.config"; +import { catchError } from "rxjs/operators"; +import { throwError } from "rxjs"; + +@Injectable({ + providedIn: "root" +}) +export class UseService { + private headers: HttpHeaders = new HttpHeaders({ + "Content-Type": "application/json" + }); + + constructor(private http: HttpClient) {} + + getPersonalInfo() { + let url = `${AppConfig.API_ENDPOINT}/user/info`; + return this.http.get(url, { headers: this.headers }); + } + + getBadgeCategories(userId: number) { + return this.http.get(`${AppConfig.API_ENDPOINT}/rewards/${userId}`); + } + + updatePersonalData(personalInfo): any { + this.http + .post(`${AppConfig.API_ENDPOINT}/user/info`, personalInfo, { + headers: this.headers + }) + .pipe( + catchError(error => { + return throwError(error); + }) + ); + } + + getObservationsByUserId(userId: number) { + return this.http.get( + `${AppConfig.API_ENDPOINT}/observations/users/${userId}` + ); + } + + ConvertToCSV(objArray, headerList) { + let array = typeof objArray != "object" ? JSON.parse(objArray) : objArray; + let str = ""; + let row = ""; + for (let index in headerList) { + row += headerList[index] + ";"; + } + row = row.slice(0, -1); + str += row + "\r\n"; + for (let i = 0; i < array.length; i++) { + let line ="" ; + for (let index in headerList) { + let head = headerList[index]; + line += ";" + array[i][head]; + } + line = line.slice(1); + str += line + "\r\n"; + } + return str; + } +} diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index f7f7e67e..70687666 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -2,7 +2,6 @@ section { width: 100%; min-height: 70vh; position: relative; - margin-bottom: 20px; } .section:before { @@ -32,7 +31,8 @@ section { background: url(../../assets/background.jpg) no-repeat; background-size: cover; position: relative; - height: calc(100vh - 113px); + height: calc(100vh - var(--router-outlet-margin-top)); + margin-top: var(--router-outlet-margin-top); } #welcome:before { @@ -643,3 +643,118 @@ app-observations { margin-bottom: 15px; } } + + +.panel-container { + padding-top: 20px; +} +.panel { + margin: 20px 0; + background-color: #fff; + border: 1px solid transparent; + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05); +} + +.no-padding { + padding: 0; + margin: 0; +} + +.panel-widget { + padding: 10px 0; + position: relative; + box-shadow: none; + border-radius: 0; + background: none; + text-align: center; + color: #333; +} + +.panel-widget .text-muted { + margin-top: -6px; + text-transform: uppercase; + font-weight: bold; + font-size: 0.8em; +} + +.panel-widget .large { + color: #373b45; + font-size: 3em; +} + +.panel-heading { + padding: 10px 15px; + border-bottom: 1px solid transparent; + font-size: 20px; + font-weight: 300; + letter-spacing: 0.025em; + height: 60px; + line-height: 38px; +} + +.title-spaced { + font-size: 20px; + font-weight: 300; + letter-spacing: 0.025em; + height: 60px; + line-height: 38px; +} +.falsy-btn { + padding-right: 5px; + padding-left: 5px; + border-color: black; + border-width: 1px; + border-style: solid; +} + +.panel-body { + padding: 15px; +} + +.panel-default .panel-heading { + background: #fff; + border-bottom: 1px solid #e9ecf2; + color: #444444; +} + +.panel-default > .panel-heading { + color: #333; + border-color: #ddd; +} + +.text-muted { + color: #c5c7cc; +} + +.fa-xl { + font-size: 3em; +} + +.large { + font-size: 2em; +} + +.color-blue { + color: #30a5ff; +} + +.color-orange { + color: #ffb53e; +} + +.color-teal { + color: #1ebfae; +} + +.color-gray { + color: #6e7579; +} + +.float-right { + float: right; +} + +.general-stat{ + background-color: white; +} diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 5db83d15..3ac9ff2b 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -8,6 +8,42 @@

+ +
+
+
+
+
{{stats.nb_obs}}
+
Observations
+
+
+
+
+
+
+
{{stats.nb_espece}}
+
Espèces
+
+
+
+
+
+
+
{{stats.nb_user}}
+
Observateurs
+
+
+
+
+
+
+
{{stats.nb_program}}
+
Programmes
+
+
+
+
+
@@ -25,19 +61,16 @@

: 'url(' + 'assets/prog1.jpg' + ')', 'background-size': 'cover' }">
-
{{ p.title }} 

-

{{ AppConfig.platform_participate[localeId] }}

- diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index 4af138ea..c14a09f9 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -6,6 +6,7 @@ import { Meta, SafeHtml, DomSanitizer } from "@angular/platform-browser"; import { AppConfig } from "../../conf/app.config"; import { ProgramsResolve } from "../programs/programs-resolve.service"; import { Program } from "../programs/programs.models"; +import { ObservationsService } from "../programs/observations/observations.service"; @Component({ selector: "app-home", @@ -21,11 +22,13 @@ export class HomeComponent implements OnInit, AfterViewChecked { platform_intro: SafeHtml; AppConfig = AppConfig; htmlContent: SafeHtml; + stats: Object; constructor( @Inject(LOCALE_ID) readonly localeId: string, private route: ActivatedRoute, private meta: Meta, + private observationsService: ObservationsService, protected domSanitizer: DomSanitizer, protected http: HttpClient ) {} @@ -33,6 +36,9 @@ export class HomeComponent implements OnInit, AfterViewChecked { ngOnInit() { this.route.data.subscribe((data: { programs: Program[] }) => { this.programs = data.programs; + this.observationsService.getStat().subscribe( + (stats) => this.stats=stats + ) }); this.route.fragment.subscribe(fragment => { this.fragment = fragment; diff --git a/frontend/src/app/programs/observations/form/form.component.html b/frontend/src/app/programs/observations/form/form.component.html index 2a60d689..0261eefa 100644 --- a/frontend/src/app/programs/observations/form/form.component.html +++ b/frontend/src/app/programs/observations/form/form.component.html @@ -1,92 +1,47 @@ -
- - +
- +
-
= taxonSelectInputThreshold && taxaCount < taxonAutocompleteInputThreshold - " - class="d-inline-flex toolbar" - > + " class="d-inline-flex toolbar">
- -
-
+
+
- + " [alt]="!!s.nom_francais ? s.nom_francais : s.taxref.nom_vern" (click)="onTaxonSelected(s)" /> {{ !!s.nom_francais ? s.nom_francais : s.taxref.nom_vern }}
- -
+
- +
@@ -95,64 +50,30 @@
Informations complémentaires
- +
- +
- +
- - + +
-
@@ -166,58 +87,31 @@
Où avez-vous observé cette espèce ?
-
+
- +

- Cliquez sur la carte pour renseigner le lieu précis de votre - observation + Cliquez sur la carte pour renseigner le lieu précis de votre + observation

-
- - {{ AppConfig.program_allow_email_contact[localeId] }} -
-
- - -
+
+ + {{ AppConfig.program_allow_email_contact[localeId] }} +
+
+ + +
-

+ (obsForm.touched || obsForm.dirty) + "> Champs manquants

diff --git a/frontend/src/app/programs/observations/form/form.component.ts b/frontend/src/app/programs/observations/form/form.component.ts index cea3bfa3..318032e9 100644 --- a/frontend/src/app/programs/observations/form/form.component.ts +++ b/frontend/src/app/programs/observations/form/form.component.ts @@ -1,13 +1,7 @@ +import { FormGroup, FormBuilder, Validators } from "@angular/forms"; +import { geometryValidator, ngbDateMaxIsToday } from "./formValidators"; import { MAP_CONFIG } from "./../../../../conf/map.config"; import * as L from "leaflet"; -import { - AbstractControl, - FormControl, - FormGroup, - ValidatorFn, - Validators -} from "@angular/forms"; -import { ActivatedRoute } from "@angular/router"; import { AfterViewInit, Component, @@ -31,19 +25,19 @@ import { } from "rxjs/operators"; import { FeatureCollection } from "geojson"; import { GncProgramsService } from "../../../api/gnc-programs.service"; -import { HttpClient, HttpHeaders } from "@angular/common/http"; import { LeafletMouseEvent } from "leaflet"; -import { NgbDate } from "@ng-bootstrap/ng-bootstrap"; +import { NgbDate, NgbDateParserFormatter } from "@ng-bootstrap/ng-bootstrap"; import { Observable } from "rxjs"; import { ObservationFeature, PostObservationResponse, - TaxonomyList, - TaxonomyListItem + TaxonomyList } from "../observation.model"; import "leaflet-gesture-handling"; import "leaflet-fullscreen/dist/Leaflet.fullscreen"; import { ToastrService } from "ngx-toastr"; +import { ModalFlowService } from "../modalflow/modalflow.service"; +import { ObservationsService } from "../observations.service"; declare let $: any; @@ -71,25 +65,6 @@ export const obsFormMarkerIcon = L.icon({ iconAnchor: [16, 42] }); -export function ngbDateMaxIsToday(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } | null => { - const today = new Date(); - const selected = NgbDate.from(control.value); - if (!selected) return { "Null date": true }; - const date_impl = new Date(selected.year, selected.month - 1, selected.day); - return date_impl > today ? { "Parsed a date in the future": true } : null; - }; -} - -export function geometryValidator(): ValidatorFn { - return (control: AbstractControl): { [key: string]: any } | null => { - const validGeometry = /Point\(\d{1,3}(|\.\d{1,7}),(|\s)\d{1,3}(|\.\d{1,7})\)$/.test( - control.value - ); - return validGeometry ? null : { geometry: { value: control.value } }; - }; -} - @Component({ selector: "app-obs-form", templateUrl: "./form.component.html", @@ -98,37 +73,15 @@ export function geometryValidator(): ValidatorFn { }) export class ObsFormComponent implements AfterViewInit { private readonly URL = AppConfig.API_ENDPOINT; - @Input("coords") coords: L.Point; + @Input("data") data; @Output("newObservation") newObservation: EventEmitter< ObservationFeature > = new EventEmitter(); @ViewChild("photo", { static: true }) photo: ElementRef; today = new Date(); - program_id: any; - obsForm = new FormGroup( - { - cd_nom: new FormControl("", Validators.required), - count: new FormControl("1", Validators.required), - comment: new FormControl(""), - date: new FormControl( - { - year: this.today.getFullYear(), - month: this.today.getMonth() + 1, - day: this.today.getDate() - }, - [Validators.required, ngbDateMaxIsToday()] - ), - photo: new FormControl(""), - geometry: new FormControl(this.coords ? this.coords : "", [ - Validators.required, - geometryValidator() - ]), - id_program: new FormControl(this.program_id), - email: new FormControl({value:'',disabled:true}), - agreeContactRGPD: new FormControl(""), - } - //{ updateOn: "submit" } - ); + program_id: number; + coords: L.Point; + modalflow; taxonSelectInputThreshold = taxonSelectInputThreshold; taxonAutocompleteInputThreshold = taxonAutocompleteInputThreshold; autocomplete = "isOff"; @@ -144,70 +97,29 @@ export class ObsFormComponent implements AfterViewInit { hasZoomAlert: boolean; zoomAlertTimeout: any; AppConfig = AppConfig; - - disabledDates = (date: NgbDate, current: { month: number }) => { - const date_impl = new Date(date.year, date.month - 1, date.day); - return date_impl > this.today; - }; - - inputAutoCompleteSearch = (text$: Observable) => - text$.pipe( - debounceTime(200), - distinctUntilChanged(), - map(term => - term === "" // term.length < n - ? [] - : this.species - .filter( - v => new RegExp(term, "gi").test(v["name"]) - // v => v["name"].toLowerCase().indexOf(term.toLowerCase()) > -1 - ) - .slice(0, taxonAutocompleteMaxResults) - ) - ); - - inputAutoCompleteFormatter = (x: { name: string }) => x.name; - - inputAutoCompleteSetup = () => { - for (let taxon in this.taxa) { - for (let field of taxonAutocompleteFields) { - if (this.taxa[taxon]["taxref"][field]) { - this.species.push({ - name: - field === "cd_nom" - ? `${this.taxa[taxon]["taxref"]["cd_nom"]} - ${ - this.taxa[taxon]["taxref"]["nom_complet"] - }` - : this.taxa[taxon]["taxref"][field], - cd_nom: this.taxa[taxon]["taxref"]["cd_nom"], - icon: - this.taxa[taxon]["medias"].length >= 1 - ? // ? this.taxa[taxon]["medias"][0]["url"] - AppConfig.API_TAXHUB + - "/tmedias/thumbnail/" + - this.taxa[taxon]["medias"][0]["id_media"] + - "?h=20" - : "assets/default_image.png" - }); - } - } - } - this.autocomplete = "isOn"; - }; + obsForm: FormGroup; constructor( @Inject(LOCALE_ID) readonly localeId: string, - private http: HttpClient, + private observationsService: ObservationsService, + private formBuilder: FormBuilder, + private dateParser: NgbDateParserFormatter, private programService: GncProgramsService, - private route: ActivatedRoute, + private flowService: ModalFlowService, private toastr: ToastrService, private auth: AuthService ) {} + ngOnInit(): void { + this.program_id = this.data.program_id; + this.coords = this.data.coords; + this.intiForm(); + if (this.data.updateData) this.patchForm(this.data.updateData); + } + ngAfterViewInit() { - this.route.params.subscribe(params => (this.program_id = params["id"])); - this.http - .get(`${AppConfig.API_ENDPOINT}/programs/${this.program_id}`) + this.programService + .getProgram(this.program_id) .subscribe((result: FeatureCollection) => { this.program = result; this.taxonomyListID = this.program.features[0].properties.taxonomy_list; @@ -245,7 +157,7 @@ export class ObsFormComponent implements AfterViewInit { L.control .locate({ - icon: 'fa fa-compass', + icon: "fa fa-compass", position: map_conf.GEOLOCATION_CONTROL_POSITION, getLocationBounds: locationEvent => locationEvent.bounds.extend(L.LatLngBounds), @@ -339,62 +251,135 @@ export class ObsFormComponent implements AfterViewInit { }); } - onTaxonSelected(taxon: TaxonomyListItem): void { - this.selectedTaxon = taxon; - this.obsForm.controls["cd_nom"].patchValue(taxon.taxref["cd_nom"]); + intiForm() { + this.obsForm = this.formBuilder.group( + { + cd_nom: ["", Validators.required], + count: [1, Validators.required], + comment: [""], + date: [ + { + year: this.today.getFullYear(), + month: this.today.getMonth() + 1, + day: this.today.getDate() + }, + [Validators.required, ngbDateMaxIsToday()] + ], + photo: [""], + geometry: [ + this.data.coords ? this.coords : "", + [Validators.required, geometryValidator()] + ], + id_program: [this.program_id], + email: [{ value: "", disabled: true }], + agreeContactRGPD: [""] + } + //{ updateOn: "submit" } + ); } - onChangeContactCheckBoxRGPD(): void{ - this.obsForm.controls["agreeContactRGPD"].value ? this.obsForm.controls["email"].enable() : this.obsForm.controls["email"].disable(); - this.obsForm.controls["email"].setValue(''); - }; + patchForm(updateData) { + this.onTaxonSelected(updateData.taxon); + this.obsForm.patchValue({ + count: updateData.count, + comment: updateData.comment, + date: this.dateParser.parse(updateData.date), + geometry: this.data.coords ? this.coords : "", + id_program: updateData.program_id + }); - isSelectedTaxon(taxon: TaxonomyListItem): boolean { - return this.selectedTaxon === taxon; } - onFormSubmit(): void { - let obs: ObservationFeature; - this.postObservation().subscribe( - (data: PostObservationResponse) => { - obs = data.features[0]; - }, - err => console.log(err), - //alert(err), - () => { - this.newObservation.emit(obs); + inputAutoCompleteSetup = () => { + for (let taxon in this.taxa) { + for (let field of taxonAutocompleteFields) { + if (this.taxa[taxon]["taxref"][field]) { + this.species.push({ + name: + field === "cd_nom" + ? `${this.taxa[taxon]["taxref"]["cd_nom"]} - ${this.taxa[taxon]["taxref"]["nom_complet"]}` + : this.taxa[taxon]["taxref"][field], + cd_nom: this.taxa[taxon]["taxref"]["cd_nom"], + icon: + this.taxa[taxon]["medias"].length >= 1 + ? // ? this.taxa[taxon]["medias"][0]["url"] + AppConfig.API_TAXHUB + + "/tmedias/thumbnail/" + + this.taxa[taxon]["medias"][0]["id_media"] + + "?h=20" + : "assets/default_image.png" + }); + } } + } + this.autocomplete = "isOn"; + }; + + inputAutoCompleteSearch = (text$: Observable) => + text$.pipe( + debounceTime(200), + distinctUntilChanged(), + map(term => + term === "" // term.length < n + ? [] + : this.species + .filter( + v => v["name"].toLowerCase().indexOf(term.toLowerCase()) > -1 + // v => new RegExp(term, "gi").test(v["name"]) + ) + .slice(0, taxonAutocompleteMaxResults) + ) ); + + inputAutoCompleteFormatter = (x: { name: string }) => x.name; + disabledDates = (date: NgbDate, current: { month: number }) => { + const date_impl = new Date(date.year, date.month - 1, date.day); + return date_impl > this.today; + }; + + onTaxonSelected(taxon: any): void { + this.selectedTaxon = taxon; + this.obsForm.controls["cd_nom"].patchValue({ + cd_nom: taxon.taxref["cd_nom"], + name: taxon.taxref.nom_complet + }); } - postObservation(): Observable { - const httpOptions = { - headers: new HttpHeaders({ - Accept: "application/json" - }) - }; + onChangeContactCheckBoxRGPD(): void { + this.obsForm.controls["agreeContactRGPD"].value + ? this.obsForm.controls["email"].enable() + : this.obsForm.controls["email"].disable(); + this.obsForm.controls["email"].setValue(""); + } - this.obsForm.controls["id_program"].patchValue(this.program_id); + isSelectedTaxon(taxon: any): boolean { + if (this.selectedTaxon) + return this.selectedTaxon.taxref.cd_nom === taxon.taxref.cd_nom; + } - let formData: FormData = new FormData(); + onFormSubmit(): void { + this.postObservation(); + } - const files: FileList = this.photo.nativeElement.files; - if (files.length > 0) { - formData.append("file", files[0], files[0].name); + creatFromDataToPost(): FormData { + this.obsForm.controls["id_program"].patchValue(this.program_id); + let formData: FormData = new FormData(); + if (!this.data.updateData) { + const files: FileList = this.photo.nativeElement.files; + if (files.length > 0) { + formData.append("file", files[0], files[0].name); + } } - formData.append( "geometry", JSON.stringify(this.obsForm.get("geometry").value) ); - const taxon = this.obsForm.get("cd_nom").value; let cd_nom = Number.parseInt(taxon); if (isNaN(cd_nom)) { cd_nom = Number.parseInt(taxon.cd_nom); } formData.append("cd_nom", cd_nom.toString()); - const obsDateControlValue = NgbDate.from(this.obsForm.controls.date.value); const obsDate = new Date( obsDateControlValue.year, @@ -407,16 +392,35 @@ export class ObsFormComponent implements AfterViewInit { .toISOString() .match(/\d{4}-\d{2}-\d{2}/)[0]; formData.append("date", normDate); - - for (let item of ["count", "comment", "id_program","email"]) { + for (let item of ["count", "comment", "id_program", "email"]) { formData.append(item, this.obsForm.get(item).value); } + return formData; + } + + postObservation() { + let obs: ObservationFeature; + let formData = this.creatFromDataToPost(); + this.observationsService.postObservation(formData).subscribe( + (data: PostObservationResponse) => { + obs = data.features[0]; + this.newObservation.emit(obs); + this.flowService.setModalCloseSatus("newObs"); + }, + err => console.error(err) + ); + } - return this.http.post( - `${this.URL}/observations`, - formData, - httpOptions + onFormUpdate(): void { + let formData = this.creatFromDataToPost(); + formData.append( + "id_observation", + this.data.updateData.id_observation.toString() ); + this.observationsService.updateObservation(formData).subscribe(() => { + this.flowService.closeModal(); + this.flowService.setModalCloseSatus("updateObs"); + }); } isLoggedIn(): Observable { @@ -426,6 +430,4 @@ export class ObsFormComponent implements AfterViewInit { }) ); } - - getMediaUrl() {} } diff --git a/frontend/src/app/programs/observations/form/formValidators.ts b/frontend/src/app/programs/observations/form/formValidators.ts new file mode 100644 index 00000000..d957b4fd --- /dev/null +++ b/frontend/src/app/programs/observations/form/formValidators.ts @@ -0,0 +1,21 @@ +import { AbstractControl, ValidatorFn } from "@angular/forms"; +import { NgbDate } from "@ng-bootstrap/ng-bootstrap"; + +export function ngbDateMaxIsToday(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } | null => { + const today = new Date(); + const selected = NgbDate.from(control.value); + if (!selected) return { "Null date": true }; + const date_impl = new Date(selected.year, selected.month - 1, selected.day); + return date_impl > today ? { "Parsed a date in the future": true } : null; + }; +} + +export function geometryValidator(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } | null => { + const validGeometry = /Point\(\d{1,3}(|\.\d{1,7}),(|\s)\d{1,3}(|\.\d{1,7})\)$/.test( + control.value + ); + return validGeometry ? null : { geometry: { value: control.value } }; + }; +} diff --git a/frontend/src/app/programs/observations/list/list.component.css b/frontend/src/app/programs/observations/list/list.component.css index c0542284..a71fc440 100644 --- a/frontend/src/app/programs/observations/list/list.component.css +++ b/frontend/src/app/programs/observations/list/list.component.css @@ -104,13 +104,11 @@ .obs-found { /* background-color: var(--secondary); */ - background-image: linear-gradient( - 178deg, - var(--secondary) 0%, - var(--secondary) 60%, - var(--secondary-gradient) 63%, - var(--secondary-gradient) - ) !important; + background-image: linear-gradient(178deg, + var(--secondary) 0%, + var(--secondary) 60%, + var(--secondary-gradient) 63%, + var(--secondary-gradient)) !important; min-height: 1.5em !important; } @@ -144,16 +142,20 @@ max-height: 40vh; height: inherit; } + .toggle { display: none; } + .side-bar, .map { position: static !important; } + .map { height: auto; } + /* #map{ height: 50vh; } */ @@ -161,3 +163,32 @@ transform: translateX(-0%); } } + + +.btn-detail-espece { + color: #fff !important; + background-position: -1px -1px; + background-repeat: repeat-x; + background-size: 110% 110%; + border: 1px solid; + border-radius: .25em; + background-color: var(--primary); + border-color: var(--primary); + cursor: pointer; + display: inline-block; + font-size: 14px; + font-weight: 600; + line-height: 20px; + padding: 6px 12px; + width: fit-content; + position: relative; + user-select: none; + vertical-align: middle; + white-space: nowrap; + +} + +.btn-detail-espece i { + vertical-align: text-bottom; + margin-left: 10px; +} diff --git a/frontend/src/app/programs/observations/list/list.component.html b/frontend/src/app/programs/observations/list/list.component.html index b1d88a15..47524634 100644 --- a/frontend/src/app/programs/observations/list/list.component.html +++ b/frontend/src/app/programs/observations/list/list.component.html @@ -1,14 +1,15 @@
- -

- {{ (features$ | async)?.length }} { +(features$ | async)?.length, plural, =0 { observation trouvée } =1 { observation trouvée !} other { observations trouvées !} } + {{ (features$ | async)?.length }} { +(features$ | async)?.length, plural, =0 { observation trouvée } =1 { + observation trouvée !} other { observations trouvées !} }

-
+
- à {{ o.properties.municipality?.name }} + à {{ o.properties.municipality?.name }}

+ + En savoir plus +
diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.html b/frontend/src/app/programs/observations/modalflow/modalflow.component.html new file mode 100644 index 00000000..c09b2bed --- /dev/null +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.html @@ -0,0 +1,11 @@ +
+ + +
+ + + diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.ts b/frontend/src/app/programs/observations/modalflow/modalflow.component.ts index e7e696f2..8a1cb405 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.ts +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.ts @@ -14,26 +14,15 @@ import { AppConfig } from "../../../../conf/app.config"; @Component({ selector: "app-modalflow", - template: ` -
- - -
- - - - `, + templateUrl: "./modalflow.component.html", styleUrls: ["./modalflow.component.css"], encapsulation: ViewEncapsulation.None }) export class ModalFlowComponent { @Input("coords") coords; - @ViewChild("content", {static: true}) content: ElementRef; + @Input("program_id") program_id; + @Input("updateData") updateData; + @ViewChild("content", { static: true }) content: ElementRef; AppConfig = AppConfig; flowitems: FlowItem[]; timeout: any; @@ -44,7 +33,11 @@ export class ModalFlowComponent { ) {} clicked() { - this.flowitems = this.flowService.getFlowItems({ coords: this.coords }); + this.flowitems = this.flowService.getFlowItems({ + coords: this.coords, + program_id: this.program_id, + updateData: this.updateData + }); this.flowService.open(this.content); } diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts index 4b8522b4..c1336f51 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts +++ b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts @@ -1,4 +1,5 @@ import { Injectable } from "@angular/core"; +import { Observable, BehaviorSubject, Subscription } from "rxjs"; import { NgbModal, @@ -24,6 +25,7 @@ export const MODAL_DEFAULTS: NgbModalOptions = { }) export class ModalFlowService extends FlowService { modalRef: NgbModalRef; + private modalCloseStatus: BehaviorSubject = new BehaviorSubject(null); constructor(private modalService: NgbModal) { super(); @@ -55,8 +57,6 @@ export class ModalFlowService extends FlowService { ); } - next_(data) {} - close(data) { this.modalRef.close(data); } @@ -72,4 +72,12 @@ export class ModalFlowService extends FlowService { new FlowItem(RewardComponent, { ...initialState, service: this }) ]; } + + getModalCloseSatus(): Observable { + return this.modalCloseStatus.asObservable(); + } + + setModalCloseSatus(type: "updateObs" | "newObs" | null) { + this.modalCloseStatus.next(type); + } } diff --git a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html index 6b53f7ba..9fe3193f 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html +++ b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html @@ -1,23 +1,20 @@
-

AJOUTER UNE OBSERVATION

+

AJOUTER UNE OBSERVATION

+

MODIFIER L'OBSERVATION

- +
- +
diff --git a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts index 01d1c704..d315c38c 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts @@ -11,7 +11,7 @@ import { ObservationFeature } from "../../../observation.model"; }) export class CommittedComponent implements IFlowComponent { @Input() data: any; - @ViewChild(ObsFormComponent, {static: true}) form: ObsFormComponent; + @ViewChild(ObsFormComponent, { static: true }) form: ObsFormComponent; onNewObservation(observation: ObservationFeature) { if (observation) { @@ -31,4 +31,8 @@ export class CommittedComponent implements IFlowComponent { committed() { this.form.onFormSubmit(); } + + onUdpdateObs() { + this.form.onFormUpdate(); + } } diff --git a/frontend/src/app/programs/observations/obs.component.css b/frontend/src/app/programs/observations/obs.component.css index 17bfee2a..53ecfd5e 100644 --- a/frontend/src/app/programs/observations/obs.component.css +++ b/frontend/src/app/programs/observations/obs.component.css @@ -18,7 +18,8 @@ section { #welcome { background: url(/assets/background.jpg) no-repeat; background-size: cover; - height: calc(100vh - var(--router-outlet-offset)); + height: calc(100vh - var(--router-outlet-margin-top)); + margin-top: var(--router-outlet-margin-top); } #welcome h1 { @@ -217,530 +218,3 @@ section .observations { background-color: var(--primary); } -/* POPUP CUSTOM */ - -.leaflet-popup-content-wrapper { - padding: 0px; -} - -.leaflet-popup-content { - margin: 0px; - min-width: 300px !important; - min-height: 80px !important; - max-height: 80px !important; - display: flex; - align-items: center; - justify-content: space-between; -} - -.leaflet-popup-tip, -.leaflet-popup-content-wrapper { - border-radius: 0px !important; -} - -.leaflet-popup-tip span, -.leaflet-popup-content-wrapper span { - color: var(--primary); - font-style: italic; - font-size: 13px; -} - -.leaflet-popup-tip p, -.leaflet-popup-content-wrapper p { - margin: 0 !important; - font-size: 14px; -} - -.leaflet-popup img, -.leaflet-popup-content-wrapper img { - width: 80px; - height: 80px; - object-fit: cover; - float: left; - margin-right: 3px; - padding: 2px; -} - -.leaflet-popup-content-wrapper img.icon { - width: 25px; - height: 17px; -} - -.leaflet-popup-content div { - height: 80px; - width: 40px; - background: var(--primary); - color: #fff; - display: flex; - justify-content: center; - align-items: center; - font-size: 18px; -} - -.modal-header { - background: var(--secondary); - background: var(--modal-header-bg-moz); - background: var(--modal-header-bg-webkit); - background: var(--modal-header-bg-linear); - border-radius: 0px; - align-items: center; - max-height: 61px; -} - -.modal-header h4 { - color: #fff; - text-transform: uppercase; - margin: 0 auto; - text-align: center; -} - -.modal-content { - max-height: 95vh; - overflow-y: auto; -} - -.modal-body, -.modal-content { - border-radius: 0px !important; -} - -span.input-group-text { - background-color: var(--secondary); - color: #fff; -} - -.modal-body input.ng-valid, -.modal-body input.pristine { - border: solid 1px rgb(206, 212, 218); -} - -.modal-content .row { - margin: 0 !important; -} - -.modal-content .col-lg-6, -.modal-content .col-lg-12 { - padding: 5px 5px; -} - -.modal-body input::placeholder, -.modal-body textarea::placeholder { - color: #ccc; -} - -.modal-footer button { - background-color: var(--secondary) !important; - color: #fff; - border: solid 1px transparent; - display: flex; - margin: 0 auto; - text-transform: uppercase; - padding: 6px 30px; -} - -.modal-footer button:hover, -.modal-footer button:active { - background: transparent; - color: var(--secondary); - border: solid 1px; - border-color: var(--secondary); -} - -/* MODALES AJOUTER UNE OBS */ - -.add-obs .obs-images { - overflow: hidden; - justify-content: space-between; - padding: 0px; -} - -.obs-img { - position: relative; - background-color:#e6e6e6; - margin: 0 8px; -} - -.obs-img span { - font-size: 11px; - color: #222; - text-align: center; - font-weight: 700; - display: block; - background: rgba(255, 255, 255, 0.5); - position: absolute; - bottom: 2px; - width: 100%; - padding: 2px 5px; -} - -.add-obs .form-group.btn { - background-color: var(--primary); - color: #fff; - padding: 5px 10px; - border-radius: 0px; -} - -.add-obs .form-group.btn i { - margin-right: 10px; -} - -.add-obs .form-group.btn label { - margin: 0; -} - -.half #obsMap { - height: 228px; - overflow: hidden; -} - -form .d-inline-flex { - width: 100%; -} - -/* .add-obs .col-lg-8 { - margin: 0 auto; - margin-bottom: 20px; -} */ - -.add-obs .form-group .form-group { - margin-bottom: 0; -} - -.add-obs select, -.add-obs .d-inline-flex input { - border: solid 1px var(--primary) !important; -} - -.toolbar select { - width: 50%; -} - -.obs-images img { - width: 120px; - height: 120px; - object-fit: cover; - opacity: 0.7; - -} - -.obs-img:hover img, -.obs-img.selected img { - opacity: 1; - cursor: pointer; - /* box-shadow: 0 0 0 3px var(--secondary);*/ - border: 3px solid var(--secondary) -} - -.scroll-img { - display: inline-flex; - overflow-x: auto; -} - -.obs-add-img { - margin: 5px; - background: #dcdcdc; - color: #fff; - display: flex; - justify-content: center; - text-align: center; - flex-direction: column; - min-width: 120px; - height: 120px; -} - -.obs-add-img:hover { - background: #a1a1a1; -} - -.obs-add-img input:hover, -.obs-add-img i:hover, -.obs-add-img label:hover, -.obs-add-img:hover { - cursor: pointer !important; -} - -.obs-add-img i { - font-size: 30px; -} - -.obs-add-img input { - height: 120px; - width: 120px; -} - -.add-obs ::-webkit-scrollbar-thumb { - background: var(--primary); - width: 10px; - border: 1px solid #eee; - margin: 5px; - border-radius: 5px; -} - -.add-obs ::-webkit-scrollbar { - background: #eee; - width: 10px; - height: 10px; - margin: 5px; - cursor: pointer; - border-radius: 5px; -} - -/* MODALE CONNEXION OU NON */ - -.modal-body .sign { - display: flex; - flex-direction: column; - text-align: center; - align-items: center; - padding: 40px; -} - -.modal-body .sign:hover i { - transform: translateY(-5px); -} - -.modal-body .sign i { - display: flex; - justify-content: center; - align-items: center; - -webkit-box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; - -moz-box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; - box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; - margin-bottom: 30px; - height: 130px; - width: 130px; - border-radius: 50%; - transition: all 0.3s ease-in-out; -} - -.modal-body .sign i:before { - font-size: 60px; - color: #fff; -} - -.modal-body .sign:hover { - cursor: pointer; -} - -.modal-body .sign:first-child i { - background: var(--primary); -} - -.modal-body .sign:first-child span { - color: var(--primary); - font-size: 20px; - font-weight: 600; -} - -.modal-body .sign:last-child i { - background: #e8e1db; -} - -.modal-body .sign:last-child span { - color: #a0a0a0; - font-size: 20px; - font-weight: 600; -} - -.modal-footer span { - margin: 0 auto; - font-style: italic; - border-bottom: solid 1px grey; -} - -.modal-footer span:hover { - cursor: pointer; -} - -/* MODALE OBSERVATION AJOUTEE */ - -.obs-added { - text-align: center; -} - -.obs-added img { - display: block; - width: 100%; -} - -.obs-added div { - margin: -16px; - margin-bottom: 0px; -} - -.obs-added h5 { - color: var(--secondary); - font-style: italic; - font-size: 1.8em; - margin-top: 20px; -} - -.obs-added h6 { - text-transform: uppercase; - font-size: 1.2em; - margin-bottom: 20px; -} - -.obs-added p { - font-size: 1.5em; - color: #333; - font-weight: 500; - margin-bottom: 0; -} - -.obs-added span { - font-size: 1.6em; - font-style: italic; - color: #919191; -} - -/* MOdALES NEW BADGES */ - -.new-badge { - text-align: center; -} - -.new-badge img { - display: block; - width: 150px; - height: 150px; - margin: 0 auto; - margin-top: 30px; -} - -.new-badge div { - margin: -16px; - margin-bottom: 0px; -} - -.new-badge h5 { - color: var(--secondary); - font-style: italic; - font-size: 1.8em; - margin-top: 20px; -} - -.new-badge h6 { - text-transform: uppercase; - font-size: 1.2em; - margin-bottom: 20px; -} - -.new-badge p { - font-size: 1.5em; - color: #333; - font-weight: 500; - margin-bottom: 0; -} - -@media screen and (max-width: 991px) { - .sign { - padding: 0px 40px 20px 40px !important; - } - .obs-img span, - .obs-img img { - opacity: 1; - } -} - -@media screen and (max-width: 400px) { - .observations #map .btn-group { - right: 0px; - } -} - -.side-bar { - width: 33%; - position: absolute; - top: 0; - left: 0; - bottom: 0; -} - -input#slide-sidebar[type="checkbox"] { - display: none; -} - -input:checked ~ .map { - left: 0; - width: 100%; -} - -input:not(:checked) ~ .map { - width: 67%; -} - -.toggle { - z-index: 2; - position: absolute; - top: 0; - bottom: 0; - left: 33%; - background-color: var(--primary); - width: var(--list-toggler-width); - display: flex; - transition: left 0.5s ease; - align-items: center; - overflow: hidden; - margin-bottom: 0px; - justify-content: center; -} - -input:checked ~ .toggle { - left: 0; -} - -.toggle i { - transition: all 0.5s ease; -} - -input:checked ~ .toggle i { - transform: rotate(180deg); -} - -.toggle:hover { - cursor: pointer; -} - -.toggle i { - color: #fff; -} - -.map { - position: absolute; - top: 0; - left: 33%; - right: 0; - bottom: 0; - -moz-transition: left 0.5s ease; - transition: left 0.5s ease; -} - -.observation-zoom-statement-warning::after { - position: absolute; - color: darkred; - display: flex; - align-items: center; - padding: 1em; - top: 0; - left: 0; - right: 0; - bottom: 0; - background: rgba(255, 255, 255, 0.8); - content: attr(data-observation-zoom-statement-warning); - z-index: 9999; -} - -@media screen and (max-width: 991px) { - .observations { - height: inherit; - } - - .leaflet-touch .leaflet-control-attribution { - display: none; - } - - .observation-zoom-statement-warning::after { - max-height: 40vh; - } -} diff --git a/frontend/src/app/programs/observations/obs.component.html b/frontend/src/app/programs/observations/obs.component.html index ace138fd..2ecd92b1 100644 --- a/frontend/src/app/programs/observations/obs.component.html +++ b/frontend/src/app/programs/observations/obs.component.html @@ -72,7 +72,7 @@

{{ program.title }}

(onClick)="onMapClicked($event)" >
- +
diff --git a/frontend/src/app/programs/observations/observations.service.ts b/frontend/src/app/programs/observations/observations.service.ts new file mode 100644 index 00000000..83c8a625 --- /dev/null +++ b/frontend/src/app/programs/observations/observations.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { AppConfig } from "../../../conf/app.config"; + +@Injectable({ + providedIn: "root" +}) +export class ObservationsService { + constructor(private http: HttpClient) {} + + updateObservation(formData) { + let url = `${AppConfig.API_ENDPOINT}/observations`; + return this.http.patch(url,formData); + } + + postObservation(formData) { + let url = `${AppConfig.API_ENDPOINT}/observations`; + return this.http.post(url, formData); + } + + getStat(){ + let url = `${AppConfig.API_ENDPOINT}/stats`; + return this.http.get(url); + } +} diff --git a/frontend/src/assets/css/material.css b/frontend/src/assets/css/material.css index 5ea414cf..230677ce 100644 --- a/frontend/src/assets/css/material.css +++ b/frontend/src/assets/css/material.css @@ -39,19 +39,19 @@ That's all. .ngx-datatable.material.single-selection .datatable-body-row.active .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active, .ngx-datatable.material.multi-selection .datatable-body-row.active .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active, .ngx-datatable.material.multi-click-selection .datatable-body-row.active .datatable-row-group { - background-color: #304ffe; + background-color: none; color: #fff; } .ngx-datatable.material.single-selection .datatable-body-row.active:hover, .ngx-datatable.material.single-selection .datatable-body-row.active:hover .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active:hover, .ngx-datatable.material.multi-selection .datatable-body-row.active:hover .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:hover, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:hover .datatable-row-group { - background-color: #193ae4; + background-color: none; color: #fff; } .ngx-datatable.material.single-selection .datatable-body-row.active:focus, .ngx-datatable.material.single-selection .datatable-body-row.active:focus .datatable-row-group, .ngx-datatable.material.multi-selection .datatable-body-row.active:focus, .ngx-datatable.material.multi-selection .datatable-body-row.active:focus .datatable-row-group, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:focus, .ngx-datatable.material.multi-click-selection .datatable-body-row.active:focus .datatable-row-group { - background-color: #2041ef; + background-color: none; color: #fff; } .ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover, .ngx-datatable.material:not(.cell-selection) .datatable-body-row:hover .datatable-row-group { @@ -73,15 +73,15 @@ That's all. background-color: #ddd; } .ngx-datatable.material.cell-selection .datatable-body-cell.active, .ngx-datatable.material.cell-selection .datatable-body-cell.active .datatable-row-group { - background-color: #304ffe; + background-color: #ddd; color: #fff; } .ngx-datatable.material.cell-selection .datatable-body-cell.active:hover, .ngx-datatable.material.cell-selection .datatable-body-cell.active:hover .datatable-row-group { - background-color: #193ae4; + background-color: #ddd; color: #fff; } .ngx-datatable.material.cell-selection .datatable-body-cell.active:focus, .ngx-datatable.material.cell-selection .datatable-body-cell.active:focus .datatable-row-group { - background-color: #2041ef; + background-color: #ddd; color: #fff; } .ngx-datatable.material .empty-row { height: 50px; diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 7c5c87ee..099e5e8f 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -1,40 +1,46 @@ /* You can add global styles to this file, and also import other style files */ @import 'assets/css/material.css'; +@import '~@swimlane/ngx-datatable/assets/icons.css'; @font-face { - font-display: auto; - font-family: "Satisfy"; - src: url("assets/Satisfy-Regular.ttf") format("truetype"); + font-display: auto; + font-family: "Satisfy"; + src: url("assets/Satisfy-Regular.ttf") format("truetype"); +} + + +.ngx-datatable .datatable-footer { + overflow: hidden !important; } /* @import '~ngx-toastr/toastr'; */ :root { - --default-font-color: #5d6970; - --primary: #00a99d; - --dark-primary: #0a998f; - --secondary: #60b15c; - --secondary-gradient: #57a154; - --ternary: #45765c; - --list-toggler-width: 1.2rem; - /* --list-toggler-width: 21px; */ - --list-obs-offset: calc(var(--router-outlet-offset) + 4em); - /* --list-obs-offset: 170px; */ - --router-outlet-margin-top: 6.625em; - /* --router-outlet-margin-top: 106px; */ - --router-outlet-offset: calc(var(--router-outlet-margin-top) + 0.5em); - /* --router-outlet-offset: 113px; */ - --modal-header-bg-moz: moz-linear-gradient( 179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); - --modal-header-bg-webkit: moz-linear-gradient( 179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); - --modal-header-bg-linear: linear-gradient( 179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); + --default-font-color: #5d6970; + --primary: #00a99d; + --dark-primary: #0a998f; + --secondary: #60b15c; + --secondary-gradient: #57a154; + --ternary: #45765c; + --list-toggler-width: 1.2rem; + /* --list-toggler-width: 21px; */ + --list-obs-offset: calc(var(--router-outlet-offset) + 4em); + /* --list-obs-offset: 170px; */ + --router-outlet-margin-top: 6.625em; + /* --router-outlet-margin-top: 106px; */ + --router-outlet-offset: calc(var(--router-outlet-margin-top) + 0.5em); + /* --router-outlet-offset: 113px; */ + --modal-header-bg-moz: moz-linear-gradient(179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); + --modal-header-bg-webkit: moz-linear-gradient(179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); + --modal-header-bg-linear: linear-gradient(179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); } html, body { - height: 100%; - color: var(--default-font-color); + height: 100%; + color: var(--default-font-color); } h1, @@ -43,284 +49,289 @@ h3, h4, h5, h6 { - font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-family: "Open Sans", Helvetica, Arial, sans-serif; } .loading-text { - text-align: center; - /* font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; */ - display: block; - margin-left: auto; - margin-right: auto; - margin-top: 5%; - color: var(--default-font-color); - /* position: absolute !important; */ - /* padding: 10px; */ + text-align: center; + /* font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; */ + display: block; + margin-left: auto; + margin-right: auto; + margin-top: 5%; + color: var(--default-font-color); + /* position: absolute !important; */ + /* padding: 10px; */ } .loader-1 { - /* border: 1px solid #eeeeee; */ - border-top: 3px solid var(--primary); - border-radius: 50%; - position: absolute !important; - left: 50%; - top: 50%; - margin-top: -60px; - margin-left: -60px; - width: 120px; - height: 120px; - animation: spin 5s linear infinite; - z-index: 999; + /* border: 1px solid #eeeeee; */ + border-top: 3px solid var(--primary); + border-radius: 50%; + position: absolute !important; + left: 50%; + top: 50%; + margin-top: -60px; + margin-left: -60px; + width: 120px; + height: 120px; + animation: spin 5s linear infinite; + z-index: 999; } .loader-2 { - /* border: 1px solid #eeeeee; */ - border-top: 3px solid var(--primary); - border-radius: 50%; - position: absolute !important; - left: 50%; - top: 50%; - margin-top: -50px; - margin-left: -50px; - width: 100px; - height: 100px; - animation: spin 2s linear infinite; - animation-direction: reverse; - z-index: 999; + /* border: 1px solid #eeeeee; */ + border-top: 3px solid var(--primary); + border-radius: 50%; + position: absolute !important; + left: 50%; + top: 50%; + margin-top: -50px; + margin-left: -50px; + width: 100px; + height: 100px; + animation: spin 2s linear infinite; + animation-direction: reverse; + z-index: 999; } .loader-3 { - /* border: 1px solid #eeeeee; */ - border-top: 3px solid var(--primary); - border-radius: 50%; - position: absolute !important; - left: 50%; - top: 50%; - margin-top: -40px; - margin-left: -40px; - width: 80px; - height: 80px; - animation: spin 1s linear infinite; - z-index: 999; + /* border: 1px solid #eeeeee; */ + border-top: 3px solid var(--primary); + border-radius: 50%; + position: absolute !important; + left: 50%; + top: 50%; + margin-top: -40px; + margin-left: -40px; + width: 80px; + height: 80px; + animation: spin 1s linear infinite; + z-index: 999; } .loader-icon { - color: var(--primary); - /* position: absolute !important; */ - margin: 0; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); + color: var(--primary); + /* position: absolute !important; */ + margin: 0; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); } @keyframes spin { - 0% { - transform: rotate(0deg); - } - 100% { - transform: rotate(360deg); - } + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } } .bubblingG { - text-align: center; - width: 78px; - height: 49px; - margin: auto; + text-align: center; + width: 78px; + height: 49px; + margin: auto; } .bubblingG span { - display: inline-block; - vertical-align: middle; - width: 10px; - height: 10px; - margin: 24px auto; - background: rgb(0, 0, 0); - border-radius: 49px; - -o-border-radius: 49px; - -ms-border-radius: 49px; - -webkit-border-radius: 49px; - -moz-border-radius: 49px; - animation: bubblingG 1.5s infinite alternate; - -o-animation: bubblingG 1.5s infinite alternate; - -ms-animation: bubblingG 1.5s infinite alternate; - -webkit-animation: bubblingG 1.5s infinite alternate; - -moz-animation: bubblingG 1.5s infinite alternate; + display: inline-block; + vertical-align: middle; + width: 10px; + height: 10px; + margin: 24px auto; + background: rgb(0, 0, 0); + border-radius: 49px; + -o-border-radius: 49px; + -ms-border-radius: 49px; + -webkit-border-radius: 49px; + -moz-border-radius: 49px; + animation: bubblingG 1.5s infinite alternate; + -o-animation: bubblingG 1.5s infinite alternate; + -ms-animation: bubblingG 1.5s infinite alternate; + -webkit-animation: bubblingG 1.5s infinite alternate; + -moz-animation: bubblingG 1.5s infinite alternate; } #bubblingG_1 { - animation-delay: 0s; - -o-animation-delay: 0s; - -ms-animation-delay: 0s; - -webkit-animation-delay: 0s; - -moz-animation-delay: 0s; + animation-delay: 0s; + -o-animation-delay: 0s; + -ms-animation-delay: 0s; + -webkit-animation-delay: 0s; + -moz-animation-delay: 0s; } #bubblingG_2 { - animation-delay: 0.45s; - -o-animation-delay: 0.45s; - -ms-animation-delay: 0.45s; - -webkit-animation-delay: 0.45s; - -moz-animation-delay: 0.45s; + animation-delay: 0.45s; + -o-animation-delay: 0.45s; + -ms-animation-delay: 0.45s; + -webkit-animation-delay: 0.45s; + -moz-animation-delay: 0.45s; } #bubblingG_3 { - animation-delay: 0.9s; - -o-animation-delay: 0.9s; - -ms-animation-delay: 0.9s; - -webkit-animation-delay: 0.9s; - -moz-animation-delay: 0.9s; + animation-delay: 0.9s; + -o-animation-delay: 0.9s; + -ms-animation-delay: 0.9s; + -webkit-animation-delay: 0.9s; + -moz-animation-delay: 0.9s; } @keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - transform: translateY(-20px); - } + 0% { + width: 10px; + height: 10px; + background-color: rgb(0, 0, 0); + transform: translateY(0); + } + + 100% { + width: 23px; + height: 23px; + background-color: rgb(255, 255, 255); + transform: translateY(-20px); + } } @-o-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -o-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -o-transform: translateY(-20px); - } + 0% { + width: 10px; + height: 10px; + background-color: rgb(0, 0, 0); + -o-transform: translateY(0); + } + + 100% { + width: 23px; + height: 23px; + background-color: rgb(255, 255, 255); + -o-transform: translateY(-20px); + } } @-ms-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -ms-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -ms-transform: translateY(-20px); - } + 0% { + width: 10px; + height: 10px; + background-color: rgb(0, 0, 0); + -ms-transform: translateY(0); + } + + 100% { + width: 23px; + height: 23px; + background-color: rgb(255, 255, 255); + -ms-transform: translateY(-20px); + } } @-webkit-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -webkit-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -webkit-transform: translateY(-20px); - } + 0% { + width: 10px; + height: 10px; + background-color: rgb(0, 0, 0); + -webkit-transform: translateY(0); + } + + 100% { + width: 23px; + height: 23px; + background-color: rgb(255, 255, 255); + -webkit-transform: translateY(-20px); + } } @-moz-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -moz-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -moz-transform: translateY(-20px); - } + 0% { + width: 10px; + height: 10px; + background-color: rgb(0, 0, 0); + -moz-transform: translateY(0); + } + + 100% { + width: 23px; + height: 23px; + background-color: rgb(255, 255, 255); + -moz-transform: translateY(-20px); + } } button, .btn { - font-family: "Open Sans", Helvetica, Arial, sans-serif; + font-family: "Open Sans", Helvetica, Arial, sans-serif; } .btn-big { - text-transform: uppercase; - color: #fff !important; - padding: 20px 30px; - border: none; - font-weight: 500; - font-size: 18px; - width: fit-content; - transition: all 0.2s ease-in-out; + text-transform: uppercase; + color: #fff !important; + padding: 20px 30px; + border: none; + font-weight: 500; + font-size: 18px; + width: fit-content; + transition: all 0.2s ease-in-out; } .btn-big:hover { - -webkit-box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; - -moz-box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; - box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; - color: #fff !important; - transform: translateY(-5px); + -webkit-box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; + -moz-box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; + box-shadow: 0px 5px 11px -2px rgba(0, 0, 0, 0.75) !important; + color: #fff !important; + transform: translateY(-5px); } button:disabled:hover { - transform: none; - box-shadow: none !important; - cursor: not-allowed; + transform: none; + box-shadow: none !important; + cursor: not-allowed; } ul { - list-style-type: none; + list-style-type: none; } a, button, *:focus { - color: #000; - box-shadow: none !important; - cursor: pointer; - outline: none; + color: #000; + box-shadow: none !important; + cursor: pointer; + outline: none; } a:hover, a:focus, a:active { - text-decoration: none !important; - color: #555; + text-decoration: none !important; + color: #555; } input:focus, textarea:focus, select:focus { - outline: none !important; - box-shadow: none !important; - border: solid 2px var(--primary) !important; + outline: none !important; + box-shadow: none !important; + border: solid 2px var(--primary) !important; } .ng-valid[required], -.ng-valid.required, -.ng-valid:not(form) { - border-left: 5px solid #42a948; - /* green */ +.ng-valid.required { + border-left: 5px solid #42a948; + /* green */ } .ng-invalid.ng-dirty:not(form) { - border-left: 5px solid #a94442; - /* red */ + border-left: 5px solid #a94442; + /* red */ } .modal-content { - border-radius: 0px !important; - border: none !important; + border-radius: 0px !important; + border: none !important; } @@ -340,9 +351,9 @@ select:focus { } */ @media screen and (max-width: 1024px) { - .btn-big { - padding: 10px 20px; - } + .btn-big { + padding: 10px 20px; + } } @@ -352,28 +363,585 @@ select:focus { /* firefox */ * { - scrollbar-color: var(--primary) var(--light); + scrollbar-color: var(--primary) var(--light); } /* blink scroll bar custom design */ ::-webkit-scrollbar-thumb { - background: var(--primary); - width: 10px; - border: 1px solid #eee; - margin: 5px; + background: var(--primary); + width: 10px; + border: 1px solid #eee; + margin: 5px; } ::-webkit-scrollbar { - background: #eee; - width: 10px; - height: 10px; - margin: 5px; - cursor: pointer; + background: #eee; + width: 10px; + height: 10px; + margin: 5px; + cursor: pointer; } .default-img { - position: relative; - background-color:#e6e6e6; - } \ No newline at end of file + position: relative; + background-color: #e6e6e6; +} + +/* POPUP CUSTOM */ + +.leaflet-popup-content-wrapper { + padding: 0px; +} + +.leaflet-popup-content { + margin: 0px; + min-width: 300px !important; + min-height: 80px !important; + max-height: 80px !important; + display: flex; + align-items: center; + justify-content: space-between; +} + +.leaflet-popup-tip, +.leaflet-popup-content-wrapper { + border-radius: 0px !important; +} + +.leaflet-popup-tip span, +.leaflet-popup-content-wrapper span { + color: var(--primary); + font-style: italic; + font-size: 13px; +} + +.leaflet-popup-tip p, +.leaflet-popup-content-wrapper p { + margin: 0 !important; + font-size: 14px; +} + +.leaflet-popup img, +.leaflet-popup-content-wrapper img { + width: 80px; + height: 80px; + object-fit: cover; + float: left; + margin-right: 3px; + padding: 2px; +} + +.leaflet-popup-content-wrapper img.icon { + width: 25px; + height: 17px; +} + +.leaflet-popup-content div { + height: 80px; + width: 40px; + background: var(--primary); + color: #fff; + display: flex; + justify-content: center; + align-items: center; + font-size: 18px; +} + +.modal-header { + background: var(--secondary); + background: var(--modal-header-bg-moz); + background: var(--modal-header-bg-webkit); + background: var(--modal-header-bg-linear); + border-radius: 0px; + align-items: center; + max-height: 61px; +} + +.modal-header h4 { + color: #fff; + text-transform: uppercase; + margin: 0 auto; + text-align: center; +} + +.modal-content { + max-height: 95vh; + overflow-y: auto; +} + +.modal-body, +.modal-content { + border-radius: 0px !important; +} + +span.input-group-text { + background-color: var(--secondary); + color: #fff; +} + +.modal-body input.ng-valid, +.modal-body input.pristine { + border: solid 1px rgb(206, 212, 218); +} + +.modal-content .row { + margin: 0 !important; +} + +.modal-content .col-lg-6, +.modal-content .col-lg-12 { + padding: 5px 5px; +} + +.modal-body input::placeholder, +.modal-body textarea::placeholder { + color: #ccc; +} + +.modal-footer button { + background-color: var(--secondary) !important; + color: #fff; + border: solid 1px transparent; + display: flex; + margin: 0 auto; + text-transform: uppercase; + padding: 6px 30px; +} + +.modal-footer button:hover, +.modal-footer button:active { + background: transparent; + color: var(--secondary); + border: solid 1px; + border-color: var(--secondary); +} + +/* MODALES AJOUTER UNE OBS */ + +.add-obs .obs-images { + overflow: hidden; + justify-content: space-between; + padding: 0px; +} + +.obs-img { + position: relative; + background-color: #e6e6e6; + margin: 0 8px; +} + +.obs-img span { + font-size: 11px; + color: #222; + text-align: center; + font-weight: 700; + display: block; + background: rgba(255, 255, 255, 0.5); + position: absolute; + bottom: 2px; + width: 100%; + padding: 2px 5px; +} + +.add-obs .form-group.btn { + background-color: var(--primary); + color: #fff; + padding: 5px 10px; + border-radius: 0px; +} + +.add-obs .form-group.btn i { + margin-right: 10px; +} + +.add-obs .form-group.btn label { + margin: 0; +} + +.half #obsMap { + height: 228px; + overflow: hidden; +} + +form .d-inline-flex { + width: 100%; +} + +/* .add-obs .col-lg-8 { + margin: 0 auto; + margin-bottom: 20px; + } */ + +.add-obs .form-group .form-group { + margin-bottom: 0; +} + +.add-obs select, +.add-obs .d-inline-flex input { + border: solid 1px var(--primary) !important; +} + +.toolbar select { + width: 50%; +} + +.obs-images img { + width: 120px; + height: 120px; + object-fit: cover; + opacity: 0.7; + +} + +.obs-img:hover img, +.obs-img.selected img { + opacity: 1; + cursor: pointer; + /* box-shadow: 0 0 0 3px var(--secondary);*/ + border: 3px solid var(--secondary) +} + +.scroll-img { + display: inline-flex; + overflow-x: auto; +} + +.obs-add-img { + margin: 5px; + background: #dcdcdc; + color: #fff; + display: flex; + justify-content: center; + text-align: center; + flex-direction: column; + min-width: 120px; + height: 120px; +} + +.obs-add-img:hover { + background: #a1a1a1; +} + +.obs-add-img input:hover, +.obs-add-img i:hover, +.obs-add-img label:hover, +.obs-add-img:hover { + cursor: pointer !important; +} + +.obs-add-img i { + font-size: 30px; +} + +.obs-add-img input { + height: 120px; + width: 120px; +} + +.add-obs ::-webkit-scrollbar-thumb { + background: var(--primary); + width: 10px; + border: 1px solid #eee; + margin: 5px; + border-radius: 5px; +} + +.add-obs ::-webkit-scrollbar { + background: #eee; + width: 10px; + height: 10px; + margin: 5px; + cursor: pointer; + border-radius: 5px; +} + +/* MODALE CONNEXION OU NON */ + +.modal-body .sign { + display: flex; + flex-direction: column; + text-align: center; + align-items: center; + padding: 40px; +} + +.modal-body .sign:hover i { + transform: translateY(-5px); +} + +.modal-body .sign i { + display: flex; + justify-content: center; + align-items: center; + -webkit-box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; + -moz-box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; + box-shadow: 0px 28px 91px -29px rgba(0, 0, 0, 0.75) !important; + margin-bottom: 30px; + height: 130px; + width: 130px; + border-radius: 50%; + transition: all 0.3s ease-in-out; +} + +.modal-body .sign i:before { + font-size: 60px; + color: #fff; +} + +.modal-body .sign:hover { + cursor: pointer; +} + +.modal-body .sign:first-child i { + background: var(--primary); +} + +.modal-body .sign:first-child span { + color: var(--primary); + font-size: 20px; + font-weight: 600; +} + +.modal-body .sign:last-child i { + background: #e8e1db; +} + +.modal-body .sign:last-child span { + color: #a0a0a0; + font-size: 20px; + font-weight: 600; +} + +.modal-footer span { + margin: 0 auto; + font-style: italic; + border-bottom: solid 1px grey; +} + +.modal-footer span:hover { + cursor: pointer; +} + +/* MODALE OBSERVATION AJOUTEE */ + +.obs-added { + text-align: center; +} + +.obs-added img { + display: block; + width: 100%; +} + +.obs-added div { + margin: -16px; + margin-bottom: 0px; +} + +.obs-added h5 { + color: var(--secondary); + font-style: italic; + font-size: 1.8em; + margin-top: 20px; +} + +.obs-added h6 { + text-transform: uppercase; + font-size: 1.2em; + margin-bottom: 20px; +} + +.obs-added p { + font-size: 1.5em; + color: #333; + font-weight: 500; + margin-bottom: 0; +} + +.obs-added span { + font-size: 1.6em; + font-style: italic; + color: #919191; +} + +/* MOdALES NEW BADGES */ + +.new-badge { + text-align: center; +} + +.new-badge img { + display: block; + width: 150px; + height: 150px; + margin: 0 auto; + margin-top: 30px; +} + +.new-badge div { + margin: -16px; + margin-bottom: 0px; +} + +.new-badge h5 { + color: var(--secondary); + font-style: italic; + font-size: 1.8em; + margin-top: 20px; +} + +.new-badge h6 { + text-transform: uppercase; + font-size: 1.2em; + margin-bottom: 20px; +} + +.new-badge p { + font-size: 1.5em; + color: #333; + font-weight: 500; + margin-bottom: 0; +} + +@media screen and (max-width: 991px) { + .sign { + padding: 0px 40px 20px 40px !important; + } + + .obs-img span, + .obs-img img { + opacity: 1; + } +} + +@media screen and (max-width: 400px) { + .observations #map .btn-group { + right: 0px; + } +} + +.side-bar { + width: 33%; + position: absolute; + top: 0; + left: 0; + bottom: 0; +} + +input#slide-sidebar[type="checkbox"] { + display: none; +} + +input:checked~.map { + left: 0; + width: 100%; +} + +input:not(:checked)~.map { + width: 67%; +} + +.toggle { + z-index: 2; + position: absolute; + top: 0; + bottom: 0; + left: 33%; + background-color: var(--primary); + width: var(--list-toggler-width); + display: flex; + transition: left 0.5s ease; + align-items: center; + overflow: hidden; + margin-bottom: 0px; + justify-content: center; +} + +input:checked~.toggle { + left: 0; +} + +.toggle i { + transition: all 0.5s ease; +} + +input:checked~.toggle i { + transform: rotate(180deg); +} + +.toggle:hover { + cursor: pointer; +} + +.toggle i { + color: #fff; +} + +.map { + position: absolute; + top: 0; + left: 33%; + right: 0; + bottom: 0; + -moz-transition: left 0.5s ease; + transition: left 0.5s ease; +} + +.observation-zoom-statement-warning::after { + position: absolute; + color: darkred; + display: flex; + align-items: center; + padding: 1em; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: rgba(255, 255, 255, 0.8); + content: attr(data-observation-zoom-statement-warning); + z-index: 9999; +} + +@media screen and (max-width: 991px) { + .observations { + height: inherit; + } + + .leaflet-touch .leaflet-control-attribution { + display: none; + } + + .observation-zoom-statement-warning::after { + max-height: 40vh; + } +} + +.datatable-scroll { + width: 100% !important; +} + +.datatable-row-wrapper { + width: 100% !important; +} + +.page-count { + display: none !important +} + +.datatable-body-row { + border-bottom: 1px solid rgba(0, 0, 0, 0.12) !important; + width: 100% !important; + +} + +.datatable-body-cell { + display: flex !important; + align-items: center !important; + +} + +.datatable-row-wrapper:last-child .datatable-body-row { + border-bottom: none !important +} From 561c18a46a7e29bd588bb03ff3a119e9ddb48b41 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 4 Dec 2019 17:50:43 +0100 Subject: [PATCH 07/76] =?UTF-8?q?=20Avatar=20utilisateur=20#145=20&&=20Mis?= =?UTF-8?q?e=20=C3=A0=20jour=20des=20donn=C3=A9es=20personnelles=20#144?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/gncitizen/core/commons/routes.py | 2 - backend/gncitizen/core/ref_geo/routes.py | 1 - backend/gncitizen/core/users/models.py | 2 + backend/gncitizen/core/users/routes.py | 56 +++-- backend/gncitizen/utils/env.py | 2 - backend/server.py | 1 - backend/test_old.py | 1 - frontend/src/app/auth/auth.service.ts | 4 +- frontend/src/app/auth/models.ts | 2 + .../app/auth/register/register.component.css | 1 + .../app/auth/register/register.component.html | 193 +++++------------- .../app/auth/register/register.component.ts | 16 ++ .../user-dashboard/customFormValidator.ts | 22 ++ .../user-dashboard.component.css | 39 +++- .../user-dashboard.component.html | 68 +++--- .../user-dashboard.component.ts | 93 ++++++++- .../user-dashboard/user.service.service.ts | 8 +- frontend/src/app/home/home.component.html | 2 +- frontend/src/assets/user.jpg | Bin 29925 -> 0 bytes frontend/src/styles.css | 64 ++++++ 20 files changed, 360 insertions(+), 217 deletions(-) create mode 100644 frontend/src/app/auth/user-dashboard/customFormValidator.ts delete mode 100644 frontend/src/assets/user.jpg diff --git a/backend/gncitizen/core/commons/routes.py b/backend/gncitizen/core/commons/routes.py index 421e27a1..16c071e1 100644 --- a/backend/gncitizen/core/commons/routes.py +++ b/backend/gncitizen/core/commons/routes.py @@ -241,14 +241,12 @@ def post_program(): try: newprogram = ProgramsModel(**datas2db) except Exception as e: - print(e) raise GeonatureApiError(e) try: shape = asShape(request_datas["geometry"]) newprogram.geom = from_shape(MultiPolygon(shape), srid=4326) except Exception as e: - print(e) raise GeonatureApiError(e) db.session.add(newprogram) diff --git a/backend/gncitizen/core/ref_geo/routes.py b/backend/gncitizen/core/ref_geo/routes.py index 28ce7c3f..4b49e087 100644 --- a/backend/gncitizen/core/ref_geo/routes.py +++ b/backend/gncitizen/core/ref_geo/routes.py @@ -75,7 +75,6 @@ def get_municipality(insee): 200: description: A municipality """ - print('INSEE: ', insee) try: q = db.session.query( LAreas.area_name, diff --git a/backend/gncitizen/core/users/models.py b/backend/gncitizen/core/users/models.py index 1bc622a6..a54bf716 100644 --- a/backend/gncitizen/core/users/models.py +++ b/backend/gncitizen/core/users/models.py @@ -46,6 +46,7 @@ class UserModel(TimestampMixinModel, db.Model): email = db.Column(db.String(150), unique=True, nullable=False) phone = db.Column(db.String(15)) organism = db.Column(db.String(100)) + avatar = db.Column(db.String()) admin = db.Column(db.Boolean, default=False) def save_to_db(self): @@ -66,6 +67,7 @@ def as_secured_dict(self, recursif=False, columns=()): "email": self.email, "phone": self.phone, "organism": self.organism, + "avatar": self.avatar, "full_name": name + " " + surname, "admin": self.admin, "timestamp_create": self.timestamp_create.isoformat(), diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index aadebb3b..77d0c0b7 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -1,4 +1,5 @@ import flask +import os from flask import request, Blueprint, current_app from flask_jwt_extended import ( create_access_token, @@ -12,6 +13,7 @@ from sqlalchemy.exc import IntegrityError from gncitizen.utils.errors import GeonatureApiError +from gncitizen.utils.env import MEDIA_DIR from gncitizen.utils.sqlalchemy import json_resp from server import db, jwt from gncitizen.core.observations.models import ObservationModel @@ -21,6 +23,7 @@ import smtplib from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText +import base64 routes = Blueprint("users", __name__) @@ -76,19 +79,23 @@ def registration(): """ try: request_datas = dict(request.get_json()) - - # Génération du dictionnaire des données à sauvegarder datas_to_save = {} for data in request_datas: if hasattr(UserModel, data) and data != "password": datas_to_save[data] = request_datas[data] # Hashed password - datas_to_save["password"] = UserModel.generate_hash(request_datas["password"]) + datas_to_save["password"] = UserModel.generate_hash( + request_datas["password"]) # Protection against admin creation from API datas_to_save["admin"] = False - + if ('extention' in request_datas and 'avatar' in request_datas): + extention = request_datas["extention"] + imgdata = base64.b64decode(request_datas["avatar"].replace( + 'data:image/'+extention+';base64,', '')) + filename = 'avatar_' + request_datas["username"] + '.' + extention + datas_to_save["avatar"] = filename try: newuser = UserModel(**datas_to_save) except Exception as e: @@ -132,6 +139,13 @@ def registration(): access_token = create_access_token(identity=newuser.username) refresh_token = create_refresh_token(identity=newuser.username) + + # save user avatar + if ('extention' in request_datas and 'avatar' in request_datas): + handler = open(os.path.join(str(MEDIA_DIR), filename), "wb+") + handler.write(imgdata) + handler.close() + return ( { "message": """Félicitations, l'utilisateur "{}" a été créé""".format( @@ -293,7 +307,7 @@ def get_allusers(): return allusers, 200 -@routes.route("/user/info", methods=["GET", "POST"]) +@routes.route("/user/info", methods=["GET", "PATCH"]) @json_resp @jwt_required def logged_user(): @@ -324,21 +338,35 @@ def logged_user(): return ({"message": "Vos données personelles", "features": result}, 200) - if flask.request.method == "POST": + if flask.request.method == "PATCH": is_admin = user.admin or False - current_app.logger.debug("[logged_user] Update current user personnal data") + current_app.logger.debug( + "[logged_user] Update current user personnal data") request_data = dict(request.get_json()) + if ('extention' in request_data and 'avatar' in request_data): + extention = request_data["extention"] + imgdata = base64.b64decode(request_data["avatar"].replace( + 'data:image/'+extention+';base64,', '')) + filename = 'avatar_' + \ + current_user + '.' + extention + request_data['avatar'] = filename + if os.path.exists(os.path.join(str(MEDIA_DIR), user.as_secured_dict(True)["avatar"])): + os.remove(os.path.join(str(MEDIA_DIR), + user.as_secured_dict(True)["avatar"])) + handler = open(os.path.join(str(MEDIA_DIR), filename), "wb+") + handler.write(imgdata) + handler.close() + for data in request_data: if hasattr(UserModel, data) and data not in { "id_user", - "password", + "username", "admin", }: setattr(user, data, request_data[data]) - - user.password = UserModel.generate_hash(request_data["password"]) + if ('newPassword' in request_data): + user.password = UserModel.generate_hash(request_data["newPassword"]) user.admin = is_admin - # QUESTION: do we want to update corresponding obs IDs ... in any case ? user.update() return ( { @@ -420,7 +448,8 @@ def reset_user_password(): user = UserModel.query.filter_by(username=username, email=email).one() except Exception: return ( - {"message": """L'email "{}" n'est pas enregistré.""".format(email)}, + {"message": """L'email "{}" n'est pas enregistré.""".format( + email)}, 400, ) @@ -462,7 +491,8 @@ def reset_user_password(): str(current_app.config["MAIL"]["MAIL_AUTH_PASSWD"]), ) server.sendmail( - current_app.config["MAIL"]["MAIL_FROM"], user.email, msg.as_string() + current_app.config["MAIL"]["MAIL_FROM"], user.email, msg.as_string( + ) ) server.quit() user.password = passwd_hash diff --git a/backend/gncitizen/utils/env.py b/backend/gncitizen/utils/env.py index 22d29e23..e38cd421 100644 --- a/backend/gncitizen/utils/env.py +++ b/backend/gncitizen/utils/env.py @@ -110,6 +110,4 @@ def list_and_import_gnc_modules(app, mod_path=GNC_EXTERNAL_MODULE): sys.path.pop(0) conf_module = load_toml(str(f / "config/conf_gn_module.toml")) - print(conf_module, conf_manifest, module_blueprint) - yield conf_module, conf_manifest, module_blueprint diff --git a/backend/server.py b/backend/server.py index aa653eae..df36a01a 100644 --- a/backend/server.py +++ b/backend/server.py @@ -124,7 +124,6 @@ def get_app(config, _app=None, with_external_mods=True, url_prefix="/api"): except Exception as e: current_app.logger.debug(e) prefix = url_prefix - print(prefix) app.register_blueprint( module.backend.blueprint.blueprint, url_prefix=prefix ) diff --git a/backend/test_old.py b/backend/test_old.py index 744fb817..1a9bdec2 100644 --- a/backend/test_old.py +++ b/backend/test_old.py @@ -79,7 +79,6 @@ def getsights(): if __name__ == "__main__": - print("test.py is being run directly") registration() login() logout() diff --git a/frontend/src/app/auth/auth.service.ts b/frontend/src/app/auth/auth.service.ts index b16d0ab2..1bfa7602 100644 --- a/frontend/src/app/auth/auth.service.ts +++ b/frontend/src/app/auth/auth.service.ts @@ -44,8 +44,10 @@ export class AuthService { } register(user: RegisterUser): Observable { + console.log('user',user); + let url: string = `${AppConfig.API_ENDPOINT}/registration`; - return this.http.post(url, user, { headers: this.headers }).pipe( + return this.http.post(url, user).pipe( map(user => { if (user) { this.authenticate(user); diff --git a/frontend/src/app/auth/models.ts b/frontend/src/app/auth/models.ts index abe090c1..a803ec2c 100644 --- a/frontend/src/app/auth/models.ts +++ b/frontend/src/app/auth/models.ts @@ -4,6 +4,8 @@ export class RegisterUser { email?: string; name?: string; surname?: string; + avatar?: string | ArrayBuffer; + extention?: string; constructor() {} } diff --git a/frontend/src/app/auth/register/register.component.css b/frontend/src/app/auth/register/register.component.css index 0610fdba..04cfe5a4 100644 --- a/frontend/src/app/auth/register/register.component.css +++ b/frontend/src/app/auth/register/register.component.css @@ -68,3 +68,4 @@ span.input-group-text { margin: 0 auto; } } + diff --git a/frontend/src/app/auth/register/register.component.html b/frontend/src/app/auth/register/register.component.html index cb0465fa..bf551951 100644 --- a/frontend/src/app/auth/register/register.component.html +++ b/frontend/src/app/auth/register/register.component.html @@ -1,40 +1,29 @@

Créez votre compte

-
- {{ errorMessage }} + {{ errorMessage }} - {{ successMessage }} - - + {{ successMessage }} + + + Impossible de valider votre email. +
+
+ +
+ +
+ +
+
+
@@ -43,18 +32,9 @@

Créez votre compte

- +
@@ -63,24 +43,12 @@

Créez votre compte

- +
- +
@@ -89,127 +57,60 @@

Créez votre compte

- +
- +
- + " i18n> Les mots de passe diffèrent.
- +
- - + +
Veuillez accepter les conditions d'utilisation. - + J'accepte les - conditions d'utilisation + conditions d'utilisation +
- - diff --git a/frontend/src/app/auth/register/register.component.ts b/frontend/src/app/auth/register/register.component.ts index 6e8ea724..ebb2a737 100644 --- a/frontend/src/app/auth/register/register.component.ts +++ b/frontend/src/app/auth/register/register.component.ts @@ -22,6 +22,7 @@ export class RegisterComponent { staticAlertClosed = false; errorMessage: string; successMessage: string; + userAvatar: string | ArrayBuffer; constructor( @Inject(LOCALE_ID) readonly localeId: string, @@ -93,4 +94,19 @@ export class RegisterComponent { this._success.next(message); console.info("successMessage:", message); } + + onUploadAvatar($event) { + if ($event) { + if ($event.target.files && $event.target.files[0]) { + let reader = new FileReader(); + let file = $event.target.files[0]; + reader.readAsDataURL(file); + reader.onload = () => { + this.userAvatar = reader.result; + this.user.avatar = this.userAvatar; + this.user.extention = $event.target.files[0].type.split("/").pop(); + }; + } + } + } } diff --git a/frontend/src/app/auth/user-dashboard/customFormValidator.ts b/frontend/src/app/auth/user-dashboard/customFormValidator.ts new file mode 100644 index 00000000..ec967785 --- /dev/null +++ b/frontend/src/app/auth/user-dashboard/customFormValidator.ts @@ -0,0 +1,22 @@ +import { AbstractControl} from '@angular/forms'; + +export class CustomFormValidator{ + + static password(control: AbstractControl){ + var regEx = /^(?=.*[0-9]+.*)(?=.*[A-Z])(?=.*[a-z])[0-9a-zA-Z]{5,}$/; + var valid = regEx.test(control.value); + return valid ? null : { password: true }; + } + + + static MatchPassword(AC: AbstractControl) { + const password = AC.get('newPassword').value; // to get value in input tag + const confirmPassword = AC.get('confirmPassword').value; // to get value in input tag + if (password !== confirmPassword) { + return {MatchPassword: true}; + } else { + return null + } + } + +} diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index 76b729e0..c1a8dd4c 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -56,6 +56,10 @@ height: auto; margin: 0 auto; border-radius: 50%; + + fill: red; + + } .user-infos p { @@ -207,7 +211,9 @@ app-modalflow { transform: translateY(-50%); } } */ - +.danger{ + color: red; +} @media screen and (max-width: 991px) { #badges .row div:nth-child(2):before { content: " "; @@ -233,3 +239,34 @@ app-modalflow { width: 100% !important; } } + +.avatar-main-wrapper { + position: relative; + height: 160px; + width: 160px; + border-radius: 50%; + margin-top: 8px; + overflow: hidden; + box-shadow: 1px 1px 15px -5px black; + transition: all .3s ease; +} + +.avatar-main-wrapper .profile-pic { + height: 100%; + width: 100%; + transition: all .3s ease; +} + +.avatar-main-wrapper .profile-pic:after { + font-family: FontAwesome; + content: "\f007"; + top: 0; + left: 0; + width: 100%; + height: 100%; + position: absolute; + font-size: 140px; + background: #ecf0f1; + color: #34495e; + text-align: center; +} \ No newline at end of file diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 7bd25e12..586972e9 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -7,7 +7,9 @@ { +stats?.platform_attendance, plural, =0 { aucune observation} =1 {une observation} other {{{stats?.platform_attendance}} observations} } - +
+ +

{{ username }}

@@ -31,7 +33,7 @@

Mes observations

- + @@ -78,7 +80,6 @@
Récompenses d'identification d'espèces
-

Mettre à jour vos données personnelles

@@ -89,35 +90,38 @@

Mettre à jour vos données personnelles

{{ errorMessage }} -
- - Impossible de valider votre email. - + +
+
+ +
+ +
+ +
+
- +
- +
- +
- +
@@ -125,47 +129,43 @@

Mettre à jour vos données personnelles

- - + +
- - + +
Les mots de passe diffèrent.
- - + +
- - + + +

* Le mot de passe n'est pas identique.

diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index 11b7bacb..2f2cc259 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -10,6 +10,8 @@ import { saveAs } from "file-saver"; import * as _ from "lodash"; import { Point } from "leaflet"; import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; +import { FormBuilder, FormGroup, Validators } from "@angular/forms"; +import { CustomFormValidator } from "./customFormValidator"; @Component({ selector: "app-user-dashboard", @@ -31,13 +33,19 @@ export class UserDashboardComponent implements OnInit { observations: any; rows: any = []; obsToExport: any = []; + userForm: FormGroup; + currentUser: any; + userAvatar: string | ArrayBuffer; + extentionFile: any; + newAvatar: string | ArrayBuffer; constructor( private auth: AuthService, private userService: UseService, private router: Router, private modalService: NgbModal, - private flowService: ModalFlowService + private flowService: ModalFlowService, + private formBuilder: FormBuilder ) {} ngOnInit(): void { @@ -52,6 +60,11 @@ export class UserDashboardComponent implements OnInit { this.username = user["features"]["username"]; this.stats = user["features"]["stats"]; this.role_id = user["features"]["id_role"]; + if (user["features"]["avatar"]) + this.userAvatar = + AppConfig.API_ENDPOINT + + "/media/" + + user["features"]["avatar"]; // FIXME: source backend conf this.getData(); this.flowService.getModalCloseSatus().subscribe(status => { @@ -61,7 +74,9 @@ export class UserDashboardComponent implements OnInit { }), catchError(err => throwError(err)) ) - .subscribe(); + .subscribe(user => { + this.currentUser = user; + }); } } @@ -73,7 +88,7 @@ export class UserDashboardComponent implements OnInit { this.badges = null; this.main_badges = []; this.programs_badges = []; - this.recognition_badges =[]; + this.recognition_badges = []; let badgeCategories = this.userService.getBadgeCategories(this.role_id); let userObservations = this.userService.getObservationsByUserId( this.role_id @@ -107,8 +122,8 @@ export class UserDashboardComponent implements OnInit { count: obs.properties.count, comment: obs.properties.comment, municipality: obs.properties.municipality.name, - taxref: obs.properties.taxref.nom_complet, - }) + taxref: obs.properties.taxref.nom_complet + }); this.rows.push({ media_url: obs.properties.images && !!obs.properties.images.length @@ -171,14 +186,23 @@ export class UserDashboardComponent implements OnInit { } onExportObservations() { - let csv_str = this.userService.ConvertToCSV(this.obsToExport, ['id_observation','taxref','date','program', 'count', 'comment', 'municipality']) - let blob = new Blob([csv_str], {type: 'text/csv' }) - saveAs(blob, "mydata.csv"); + let csv_str = this.userService.ConvertToCSV(this.obsToExport, [ + "id_observation", + "taxref", + "date", + "program", + "count", + "comment", + "municipality" + ]); + let blob = new Blob([csv_str], { type: "text/csv" }); + saveAs(blob, "mydata.csv"); } onEditInfos(content): void { this.userService.getPersonalInfo().subscribe(data => { this.personalInfo = data; + this.intiForm(); this.modalRef = this.modalService.open(content, { size: "lg", centered: true @@ -186,14 +210,61 @@ export class UserDashboardComponent implements OnInit { }); } - onUpdatePersonalData() { - this.userService.updatePersonalData(this.personalInfo).subscribe(() => { + onUpdatePersonalData(userForm) { + userForm = _.omitBy(userForm, _.isNil); + delete userForm.username; + if (this.newAvatar && this.extentionFile) { + userForm.avatar = this.userAvatar; + userForm.extention = this.extentionFile; + } + this.userService.updatePersonalData(userForm).subscribe(() => { this.modalRef.close(); }); } + onUploadAvatar($event) { + if ($event) { + if ($event.target.files && $event.target.files[0]) { + let reader = new FileReader(); + let file = $event.target.files[0]; + reader.readAsDataURL(file); + reader.onload = () => { + this.userAvatar = reader.result; + this.newAvatar = reader.result; + this.extentionFile = $event.target.files[0].type.split("/").pop(); + }; + } + } + } + ngOnDestroy(): void { if (this.modalRef) this.modalRef.close(); - this.flowService.setModalCloseSatus(null) + this.flowService.setModalCloseSatus(null); + } + + intiForm() { + this.userForm = this.formBuilder.group( + { + username: [ + { value: this.personalInfo.features.username, disabled: true } + ], + email: [ + this.personalInfo.features.email, + [ + Validators.required, + Validators.pattern( + "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$" + ) + ] + ], + name: [this.personalInfo.features.name, Validators.required], + surname: [this.personalInfo.features.surname, Validators.required], + newPassword: [null], + confirmPassword: [null] + }, + { + validator: CustomFormValidator.MatchPassword + } + ); } } diff --git a/frontend/src/app/auth/user-dashboard/user.service.service.ts b/frontend/src/app/auth/user-dashboard/user.service.service.ts index d36411b9..484df189 100644 --- a/frontend/src/app/auth/user-dashboard/user.service.service.ts +++ b/frontend/src/app/auth/user-dashboard/user.service.service.ts @@ -23,9 +23,11 @@ export class UseService { return this.http.get(`${AppConfig.API_ENDPOINT}/rewards/${userId}`); } - updatePersonalData(personalInfo): any { - this.http - .post(`${AppConfig.API_ENDPOINT}/user/info`, personalInfo, { + updatePersonalData(personalInfo) { + console.log('up',personalInfo); + + return this.http + .patch(`${AppConfig.API_ENDPOINT}/user/info`, personalInfo, { headers: this.headers }) .pipe( diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 3ac9ff2b..12af0a16 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -9,7 +9,7 @@

-
+
diff --git a/frontend/src/assets/user.jpg b/frontend/src/assets/user.jpg deleted file mode 100644 index e2ba3c2f267bb5c1ba417b3079359fdaa3e68a6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 29925 zcmeI4byOVPy5d+CaR}0Q(CK{V zyXTy_Gk;uWX3bi&hU%{FUDeO7UGJ}-uHLn4)q6L6w+uW|lvR)g;Nai@Fzf-`tVVI>CGf;Sv40D_g_U=IL}^PlUp;kf=PK)1Re-H5O^T) z|0Mw(YX>t&Pgm*}R*r6t)G}t)ZjLV0oE&T%Y@8e%oSbZ&eB1&&z<*7}#la~k#K9@V zDL~E1BgDZc#LEMym^j*7Q_Cu7NXyHp0|0zB+`sxX|LT{ZBK?8?&@cJ_(t-~`KM;5z z@Ic^!zypDQBcKA90FHn?U=2_MvVa1h0Z0S#fD8cZMF0R29O&IjDm`W4inTpf<+7h!6SeW5fNa6LU4Yt&jAD+MBK-ml1O-JCdf3- z_*_A8IViMJRh< zqx(|N)Xdz%(#qP#)y>_*6YS;v_FZsDXxRJk_=Loy;);s)1SpSUd zKgERuiwhnB0fd13CoVX6PuL8?K|p-WiG(YuhHT=DN5d6_f-e=9Q`Lz|%dLJ$@Y-br zjgXFKg&z7Rw7(+zuLbtze<`wm2KKMGW&sQk9PG;j;Q->m`6UyO8;GU|*vh{@|A1D; zkcaDpr3~oUYi_P9hV5wJeSr_eyOK58R%a_+EqyD2TUh#TC56DAEjRYMLM#!EL$Dwl zJ{(~B=Zopr;wID48V6qPb5p7);Dwiwbnw?7u|C4{T$4O=7 zKrhxvj$=3EBpaP3`Hu#+FHAt`6u&k6k;`HtToiBjU{A8ZNpUgIiw~$tpdZLv!Kbqe zHojV2-_sEqhEqf}l0%*iRI!w`6|;SU9>9Nrz>1gJeb5y>!B4jlNMju<|EQk$gn)fC z5RE$=z!GJ?N!pGKn_u_a0vT}7(iX77s=$+mTWb?XG&sBo`U zZa26Y831gaAZlKQyThb#G5|+k6tznS$CmZ&MK*i_Z5zNo87-NOsVufj`@?m}W)vT& zeF0CI6j7{Vp72V970`fzDD$#n(|H?mnvJs8J1-#nLeq`c%`7HB5im}4?^AXWV}jZ* zCKPuUS$n*9^?;@t|FmOf8VWFC0wo$p2)(r)-Jw-}`)i~ztODBNbq56b=xD6OkhGWi z++>x^Mkr0Ga?v9{o|+y;HeM3kQyQb#0zO@py`@;Q!3G_?KngYP3kNjqBgx$fI_x=; zspX7L;CS)j5Xaj!F&4f;J}c0_7gf~*6q$hhUVwcyyxhmnzG${>V*Up{6RM@@XrRCo zUsDJ>o*{4LyV_q8SYmTr*Lm~q73!)eJ8981l?tUhM>nN?^V~ehR(5-<+XE~q-!0j@ ze^{6Ma+5AS57jZ*w2aH-aL#Oc4Du&{N3ZGb8K7f41W4Dyj4pJxBzWw8%C;u&7`pW-hz`<1fg9+N6ZQ?A9V ziue{C=Oj@KX;po$AA34EI!YgcPpl;wUObDHeooYYiDU%zc0O75S;u#Hm`;+9Vc z=-&bTK|jfF7PD6L?trObNK#jS*7dW)H%7XAO@;kyJN42(WmV9F#z|Y2_ng3?-P$QL zWHTOLMTxO&;vy%aY`^)oSkRV0K6{6ok$P)3Es#+aSl@I zpzG<+KK#^?baYcam_Z{%BP#_8A2K>`t06_!BC0(yP~PL(^IcZ0X0~-`W$Ie#bm)=Q zhaQh}#5g}V#%n}93oV=}oA~u)&h6Qnufm?DmGG(WdGp&1zsJolPhM>P9)=&0Ae&Te zp7ATr#&|in{oyh#IuLsl_Jgk2CFSl|kW7$p7YTjQ0p*W$+cQ?HYbErSsW<_!QxC;2 zPn&YBb*2Ik2**^uH70TsAR|`0$lB0-jNmJ38j{Z4!P9NaNO?!WV0QF#tiJ(aGkrDf zGzRNs7W#!0N*&1^usX{%S|!4!5>W2CvdYr(Q6W!NX~LejjhEfdYzg6Q2=D6gg}%lp z`$7C}x20ydm(r(^K8mpGj&d#Vw_o_@LXIKLVmYS8J37jytih46AMV;$!P9=5b+(go zhXY7`a~k62%s$SucQ~=vb=Hd4&8g!$79GLY(q84P^Q39a#xn}*N)0)ymAi&Y0sU!~ zh2E1zg1~q3OyTgQ+Jv7CvO|-BjJbilwbgn^lp*23kAU_iJ^MdLm=^{`8P?3~^nHjx z4D;c{FOF*=C|?ryQynM8-|vU$Ug_lc@}vn~gNkaO6EhQ77^UKW~MePww5%3*TGUX!lpSkgw45Tmme0<686&C+lu?J<3wkU=E!k^hPDllKJ@022)%Kt zlmAl56Cyh=i!8w+t(XuJd5aHMq;McX+N|)K{xX~iB<5W2NqI`~=OC_w8@6n5R(ff- zXh$q6d6JE#(QAy&Q*Po=N5HLb==FT?wJ$QYXNB{+S%TEFC%(t%b#?vClw$FUs2A^B83nBq`hg=`<}QEMubRrNRHJhugX@z za>si$#lkV8ah{93_wYSi1INxWiYH|Dw(=9NZ+aKXyEcPbXkb<^pdW5=i4ZhuD~l;uR{M`x%?7e%S4lRPnG#&%|s=Bex}8ALz|jN($qf*I}{D{ZaCKpg?!~a4r?Y zx$YQql*(?Eci?T0pGi#~j@(S1#lgxQ@P3b#)TfLBmr2cKloJiO+^DXN!bOiVv2#fH zl@iaGif|T>87a8kU+1RXCLlB#SJaBmd{Fk_Zzcn(!x<76}6}aJLRTG(Iyeco;zWBEajPD}jbkRT2 z>oh%asgwC5ms!}zXj;4Wd$w}@*tO~!<2%=3zMG3l!}ZVTK!dt?L*J!Ymc$gUnzfYpOTq%5?T|EF81tE4K`C@S~uuiPES^_w)fj3_-oa5IJKS*HSz9R5Qj0d zk_#xRpQU9)jekQ-9}}CtRy&Y3J22434djv*@ExUS!i1`6%ZfE(pi2!s4a;`7e1(YpN>J$_ zER$-?+{~wvH`J;xK+Pbe4RYaYLUd-4nm4cP7BKPcZQ?lrUvrh3N74@=i( z)2ScR<6K5U2)cl@_oFLo6z2MF&=?#y%}npq3#A*G7mTa32|Xbx=hrwBxQbUnvUNz| z@QI2hkJ@)?>%~>=``U+BXaz4Yk?;NtA>Oua^jB|2JcF18i4D*eIU<3sS%=QkR%bQs z8W|2i*s^UsI5}8qv%Z&+gQi9U1^0aVVy%wQg{}POip6odT9>b;k}oR!JXSUOI%sE+ z47ULRV)4o9B$$()=s#UZJi1We`Z@2e31v-fb%kcwrk9a z&_hJ=`m26>Cq)&H(;8Oihw;0ug%3>K;`UOsp5KzUWs-yrCa<*1^5VTStK)xHfR|o% zcpl{|?G#(fs2q*>xWI*DK)bRPrvU6SXs^-7pL^zoyuTXt8A}LmtlU)b9rb=hhP9G( zSo@VuSSp>}^mO+fKsmYlRc*)h)~l4CkUx3VmBvu+WTRQIJZH!u-}@O+g3Z~Xm8%lw zc;)RUN}?T>@jYMTk_#8Jv1>JxI%yNOVRO~Vf~iQ0+@G^T23y*>2|VV49RE zWDzqey)Bi?c(-=S(FPoMrq$B$9Zm^!832Dwf<$jHnf(jwDnm@HKvGrC=oGDPCH53;cQTH7#;z4v}ZJp)C=}wIy=zj35pwtfHSZ>QE%ZzCj?kJN~-e zfw)AKWKBtyrM!Hn7_;(=|nB|wMBgK7p{l$=FS?# z*_Y}=>0b8T0nU1ieh8^$kR@X4TjDYL=ElU@K~BVWr$PVBq!rH;z0mh{a3wbTy_ygd z)D;=5uY~Jyk$}LhW?u2o^GW3$K7$J{M-u4X6qz%YtT3KYrJuQ@56Jp5orSl>2_56~ zq>_lUjOjI=EUUrs#|Yb@P@%4hvn=HFmS5MkEmNfw9TYm93mbhBjHVT{B{fC7+d+sMaQVA?rx7#G{h* zA9)&-Qi)e=hs0UDM*Kdc#rsN6B#RAfo4e2}(gM4HlSc=>7`MVm6D*;Yx{uH3YtK_X5z zM@!DcXi#5KvqbM1*8ss**k9+>&(-a-QP`fYGy#f1Rimvn5b>ZoWgYdZ_OT@MkOh^s zL2SpviYF#1wVN^wUK0};1Bsc2Ke6$mb3&N0+5`(HqTeyd%1W+Qu;BVBt{0_u?UZ5L zS@J;Y@WWFas^_<-Y(7%Tb+5L$b??8`q7G~u05N7WiY29MG}&h$cMoCh9IT>$tg@z& zcnv6a!?#UNDTIs0E9Mk{$}L5hOLQ{QM=io$JaIO9qdgpCRR}xR{p*DHabXfw1`C|@ zi{Xhfrz6f9A#YSw* z_&D@J{{YeS?WLw}%a+BC7}WybVvg3hVnt=6>e1=s#z@YQoP(M}${SXESxQX9t@&v2(IJV4g#F)}{vTQVwFc&4SiOHb z9#)h3|HAap$h{yx;CjGyF9P=xKe+1w*S!ebOZ?!j2VD0ea4+$LyB=`ei@?3a5AJ%v zbuR+<50oT0<+)Mo6t_NKAB5*J9gS#GZ-HX7z#1HOzz;!PI_Yyz2>jBrj2;58j z;I0Q;_abmF@q@b_aNUc*y~Gdhdcbur0{0R>xa$Gey$IY({NSz!T=ybyFY$xB9&p`@ zz`eu|?s~v=F9P=xKe+1w*S!ebOZ?!j2VD0ea4+$LyZ*1^`qy1E<_@r1WjtZ`#Qc@T z1_TfP=Lwq-U{6GpKlxw~(U6gmP%zLiFwoJ^(J`@bA7NtQV4ZN z^MwIvcTa*(=IgJ3^9tdY(C&b;dKK>TVo+7u5!s99)y#g%uNT3i-{+HbaQO?IbV!4H zR|(V9XEsSn_l^TDi$R}LARq@C0VGkI$V|Srxai?hmh}F1Yq>hWjb&A7T~JuQObvYL z)^{O|wvKX|KPxqY#u%I>`UhoSfAX<)SbH!8QO#Jz5uT4%*-E)H{g`IF^g zbbn@b zbwc#XK>SJB1_%nzhr^$w8Y6yBGHIp~6zc8Bzk9=7?+&u-eNY`6rn|se&n=s;&aSsyez&hG9gjc6+U<0areR#+zO*8=;rI zqkx{w3hp+PoYeHmn)~W#&BoY1-MG3l-*jR?*|&14)Q_UrHo%uL2Y12=3%tU|L*FI# z^w&a$CQDRH^!wdDi+p5o4Q$-i0RRlQgDgG3KqD`<%QJ`R%O;ERAk#uaIPgnE5OSUL zX1hrQ=?)3`W1nWNu{gxEPRl;c7@Qp#xvygCE*W~E`O9BqV`NBODywgA zqzDXAt!Vk1P8Hc0oSx+GNuc;|izRh|o7LNCBgHR^4{cj^bu;M?cWmS0L(QhI#^EY4 z-pJ>@k|mL4R-J6hpm5I+wr{OMeQX3euZVN`jt$pRl8x+luwgCmWqIv{m}hmp0z~lC z8{W3lU(|nicB*@cKo_jvMfy}|u}!qb$iS~uDozr2e^8$m^UIgb$~CwHedp7I&U}+b zx38z21c&M3hc7ztlvnhZ@Y#cTj`Q{A>EFLIVE^DiCb0VRPof!uy$<+0z`87k3LJJ} z+nXi@_Uv)(K5G%s+*b;7@{%3Imj3+$xwS5x+c1BKn2Y+iJ_WND1sO48IWk&jO{@fU zjMNiZJS#>|SQ?nZ1Ff$PwP$_Y1{H0e$XGo_=^c{*E^qQ-Wc5;?8yS#GV`nc~Z?*R( zg5MKQ49h|$P~D+_J6+`LV7HSvJMVPmWUI@fsUz3VbfNU{Q&A#yL#aM~BLfWn$v~ds zLL@qn3}CT48(1}F9!t(?oZMP3%OyY9|8zcWx77qo@D=BVa1xpH$OWyd1d(%6cAtaR4DG zU)p`#XTVE|n+i%_8w! zAu`S#&?Q&gCz7<8Y(yrW1a{y2wFkKaNWfPRzp2Ppd#{_Ol?6_QG<%M))a?nL zmpyP26yh^fNtQo7<*@wKq_0S~^`fH=U(ZrKGS=^iE>Nux5zfOr0#;nd9dF%tsc^(! zA4Dyo6&~J}tcW_dnp&=WdpEfSrC^I5kP<-j)h&gi zUpWw+AY6&jZB@y(KJLkwK0!iRvNE@{hsi)fmQ3|z;AzU#lM*@>2j9vAj|$H({B!T> zt8tOQ6+;~wM~9ezu*W1_WR~KN2wurYpP`zj-)4dYKR_1~5hPJ<6d08*{WY_nKGopx#2$JJMAj}MnQVjN&ig!%Eg z6Lz_kZ&TN3mPrFN|BKO^K*EGKPV$s{qtU|S{5opWa|6!emtmSMapM^7_;#W*ay@B* zqu0EpiyaFMwP~hrkfd@%q4Q|Jk8e?jOwqyEeVJn8=22!-yb+gcvWlB&{sTLc*jlDWuP zVet#-o)Whi-A`Fd3K5{~5QB7xpQ;A7vtGDE9C5qLu2~!@rgw-cov{jR?Hcg#sR8V7 z{i=Gc%GM(nrcU`u3NN#=(=5Yy#KTA_zK!y-80vkun(@^CN)}%P#6T;f0!-n3sh~uV zhCuk=9%)9!qn$VcN8L4`OQwp-GpY+mh$GrXS?^^}J7w!(O2`2L;gmuvM!vuo*4jhi zlhaBJC{dt@AB26*6k;ZhdD`*IUVBks|D~DoH!(dG>~%v;n=9QCy?!hPq1u=#5g&iE zG%_<<;#rV)S-7H z#gST2p!)?Kq5C=CnCS^ytz`x{{=FRYnGUV z_rCaGUYSt7zjmI}J2#uMa6nH{4_V{|+!lBA^`t|S?M+ecqBPOqSdI*^nwi8_<6G}- zSG`H~7{r^jT&}b?>m?^>{#wZF?KstFU|XFS%LOeYfZWcP97ql-pHHyxl%A zDv4qR%D0X7s+-VLVLy#C)5HAa_@`y$nE3H>=h9E8V}APRr1<*ZMEO!cX($|f4(s+q zKi!1CWUxgIr|&MsI}Vg}4KfxF=;RBqnz(SRScGM$dbVquZ)~J+ljX$$M=0Z=ZMfj% zb;I(6FX@tEd~<~I!0$@MSNCvfF9^B&>IPmo2HjvVPR7~Rmb%C8iz91eH1=_&{7w6{ z<|5I}NB6B)<_f2b;otd&=xWR2ep|G4oo&jGUAJ8Qh!7xWa;z7oMh3mX^ew-#25+vM z_oxQDUiec{Z1Z^!q<{0Ys}X)Q_>LSG|2WoLn{s4vNV?)0+HBc!JJ60B@ns1lLRIii zxAh}A&}+=Twg*8Vfd#Q+p zuMh3V^wjI9ANyoSE1w?^k;p?Evn07@`DO2_Hg?Uja4Zh2b%JH_L@V`tP`{_j585z+$_3)S@n-c#`;B=8j+rNU@C z*C20?A2ypg-=~PSP=0u)jU2B3u9?V=O(zs6q@D2d8sPc-<&_Kfi$%loy7VdJsJDzu z+sb462`{Rnb^8#~Z!iJRI{^DbgwL?BP|Wa%#swieTb~zaPc+IkEa}6Ki(C*^ofEOU zAVE^Cj^XN@_>znh5eYFv6Zz{v%nlB~J==q(n#=%aciXxp`n1A{Bvb;+3KS3B lV z4<&1cRErS#PBvF2t01I1IS)uf&@1bAFYG>yuU={qzI2-#;Us(J7%RhA3K|hnLiyO8 z_Q^-qtUifL=qO)j6Z^{@5UfYl%Z_}}-R+%j?^v?kJkgUp<(v`U^*mYvd9*|F`ejK# zuebwFhnHJAm9#PT?GO=dHx+sNV{m{brEGzx``K55{w3*zxI4fv{I@?{iBU3|JIDU0 zUY1O3A8xOUrq1&Q&nq5Vp``c5WY>}t?onuiTqC;uOfdk)@*4Reb{jY#-Ace3g@>S)NNy;uHW-jr;Oxwr}|Vn8Rk{pW0A#j zu8uv%Rd+ydCAO8T4QWScD{|4aB(WD;p;;8I0p6S5z<$`#wJ{)6937U_uRr!8Kqv4b zz__L1$|$4Mib!HkvB@NlGK_I_HXNruKHwyHdhdb zN!(zn%=giub~)rA%zAY|RY8nwl;=wI^R|$Va6F~_LcEG6w_9cTAg6#YA+FYAVeZZ9 zdEV!;^fLWY%8n~3eK)QOcfdPFO=yjcKT2Ge!TeDJ5=X$qX(#d7p6(q`?fLGPFD>*V zL^id+H_bm2Iwy;)nv`y)Ge${0{%X{XLiTdGAD>g|mp)_A6lkdc9QsQxcc8+`pB5?- z`(aMI-BUK6wNTi>Hbzc)|%DfD+uS^bh~Uxz~5B^9X5JJGJTqn5g{ z@n)P^C=>Nk3st195sAwwbe)&}^txfxLPh7ZMlb=$JOi6}yH=fK)@HV0ww2w6;12NO z|0?ItJQP^@cD5Bmf!PJQNX@|h)2Px@rE8pa330voLzzw(m3X>Ysh=LPVzqE5mcb^E zwxE_#^CNnEXRn2IP08&H)FkkIWr{xDaLIt!%HoXlojL0iGF3`Z#P!aS)uNMDvk3PB zKJS@v6*eR>85axFQkv;Cfm^NfET)MDJ?^qkk+p`d?SeB%x}{@&&zGg zo#w$F=;GYAZepvWf!y}A@jL4UvOj9}H`}CrN0r^FJ?N^$*-uKIPAd6q$*ZUSmg{Jf zDc>ax2-UN$*e_p}Vf3BCMO3>;P_=*dgUTWK>emSWbv3aTBPd4i;%b#(42*sDY54TV z@tM82dflV)F1AM;vm61mMiG$8IqsFLH;!~6tGZXdr7GG3&)RP>SANV;Apu|NOu=C23HLKuIDi3N!Oc-wWMY+&s48{mv<{_m2FPlIkRD9lBXX>`#ibr?A4?)0OY?FGbza4b3oQXWD(S0jY+cC^r22T?^-?i#5 zL@9Sv>2(;|)8gmSN7lx5#ws<@L~N3uk0#cMI`Hm+l;R5#!i=n^nnI(XAjXl~_F5UN{qE}+^>hY6OPltYc#Sgx8Ucchvu9UA8$F7B!l~wwOkoLhI zlJG~PoC3@K?qjz+|2bqyaYEwK;!^<$tjpIr-2^|lK^&%^2lToo@e+_QUq zR#^Ggx`B*9yw4UC+zH<^Wo?&yiLQLWV!!Qwo$fJTb&sYqe=7a?b_@XviF>glyU~)_ z%K>+EVc%am(-bx=lUFU)5~>ys;l?~XCd*D~o+vk(czUA$sv0@6#-7E1=-sv7$`bj@ zhzuf~+P1LBy{Jxy1+R)h2*Yh>J?(~t2b^mr%Py{m-R}}#3w;OFI{yP#)rJrS%@5@Nu^tb?>im23Jlk)T=LCoyl^se~HB3fhuI z^yji-&jtf7PdDm0l)RkDALV#jeEG7`o_k0XGS%%*`3AEwS+ZHR9B|9(LKPUmFXXuK z_Q(ySw9SO3gsedMqIf@rqr)|!o>l~x@~L-6V*n9RI z`hlPry-PWWP7qPgtgV85*g@s+s<~9`YY9FUX68W3;g7I zjlSc{TdgF;*dn4QEp%Mxy&bcTsuzwfX@p7Uu>W)Z2sSY#KQZhNc^(UIzf`^#x1!L8 zFx0KWXW=?n9{zHbWqUlP6`m8-0tm(3*dB<(dc8Gup`9&=lXa(tp8c0;zsD8~m;#>0 zb;U@ryt!$!`oq@-x)?btQi0c`>q#Jv%$B4=(DSedfi_;N}HT9Fdx{My*6v0vNZ zGEyUjUh9BvW=zE)GtNWI;IN@{D5isiSNAD>l_P?_^+@#(KQ{>lI^sU(^v%qP21v(@ zBkaJ6c)}{zyF`Av1{EuC>)4vCk0+iuiwssf%5;tyZ11?q6}P$rFs@M#gZIlz7I~VZ zzRVO^KkoV_d^*TEM(tktvl7>Kk^W*8k_0u5s-TM(P$2bB>wki4NlV+IVK9Dp;9SA720keltA_lFmQ%2qfeoc#on*LbKnIhGuEpA$ z$Lh*{1S00!Ny&QARbM*q8arB1)mnz%qU{hal3ui}bYmzn%=!7xcuMsLC5tv^POOVp z)yLT~?(vpm=F%h!k69q~(P3;tE1N}hR{XeoVCh^*q2`g^$tg_JQ8Xdcv4Y4kLt=GD zGex*RSo-=Rbl!Ih7@HC<^~7CN529b`$NAVZE#Qxkml*4L3fLDpqc<4@5Q%acv)hug zwOkQ`&zRar7|IS?v>V|CKg8QDL}SyPoK@D};$2XKCs=tyAD^V+Fuai=7m7sz9pA9* ze+HL=zvEP@=rj$E>1W7wE&-`#%CDjF#%-jKw(=Ltt}kY1`z_I=(NI<-gVnSNTM(FX zlVO8gPpp~X1%aocO_dx_oiAA!w(Z=M+=gs85b*L5;W<#hsJeMfHQFYV;9Te>u;q1K zmex)w5bjbW`eEqff!oI{jBld*l{mH~`Z$LYyMfLp@a@lUYU_4mxH}2Qst;P5;_chM zXiHy5`KQ{7kyTHwYPAHL&wWprZGU`ICvGlIbS(k(47rwE0q3=k)i%y6IABeY%z{^u z_b<;Ye>z>WYk)p5Lp|S5kVZ(a^1^B9RFd3S`#I|g9fX{!qA&QRXpL=rP6s7scw}N% zs@&G4H##;;`(gTJu|$WKkQkz*3aeV|u%u1Z>hBt=FZGC#wR}{DVn!f`Kycw=qdhVO zw=Z=Rnxv`S>DU+1PzBB^`6hgw%aluOl+8t)q>Iw`SmGCZ{8$uqni5aO6BMAyMNs|z z6rrM+I>E|TIjnJcHuzvrp#&(}V=A{&Kw}yM!)-SW8uMsgI-m@!q!$k7=EUQ-V)?M7foN>_6F?>gEP}GY18- zD7;1kfLA^m^;1jcFU>_N!V8p_ntm?y`;3lyo)uI&#s1@B$Da!xOmO9DJS>9}g1dLX zPHuPv12PNj=NOzx3>~P7&>dynujXvc#t`l7^*vpUxnMjG=GBh3N4vFu@-e=~|1Ha)!5uJye$9vEqs Date: Thu, 5 Dec 2019 22:42:51 +0100 Subject: [PATCH 08/76] fix taxhublist --- backend/gncitizen/core/observations/routes.py | 44 ++++++---- backend/gncitizen/core/users/routes.py | 22 +++-- .../user-dashboard.component.html | 25 +++--- .../user-dashboard.component.ts | 87 +++++++++++-------- .../steps/reward/reward.component.ts | 1 - 5 files changed, 106 insertions(+), 73 deletions(-) diff --git a/backend/gncitizen/core/observations/routes.py b/backend/gncitizen/core/observations/routes.py index f66aa694..4851833e 100644 --- a/backend/gncitizen/core/observations/routes.py +++ b/backend/gncitizen/core/observations/routes.py @@ -131,7 +131,7 @@ def generate_observation_geojson(id_observation): return features -@routes.route("/observations/") +@routes.route("/observations/", methods=["GET"]) @json_resp def get_observation(pk): """Get on observation by id @@ -731,7 +731,7 @@ def get_observations_by_user_id(user_id): .join( ProgramsModel, ProgramsModel.id_program == ObservationModel.id_program, - isouter=True, + isouter=True, full=True ) .join( ObservationMediaModel, @@ -751,12 +751,21 @@ def get_observations_by_user_id(user_id): # current_app.logger.debug(str(observations)) observations = observations.all() - if current_app.config.get("API_TAXHUB") is not None: - taxhub_list_id = ( - ProgramsModel.query.one().taxonomy_list - ) - taxon_repository = mkTaxonRepository(taxhub_list_id) - features = [] + try: + if current_app.config.get("API_TAXHUB") is not None: + taxon_repository = [] + taxhub_list_id = [] + for observation in observations: + if observation.ProgramsModel.taxonomy_list not in taxhub_list_id: + taxhub_list_id.append( + observation.ProgramsModel.taxonomy_list) + for tax_list in taxhub_list_id: + taxon_repository.append(mkTaxonRepository(tax_list)) + + features = [] + except Exception as e: + return {"message": str(e)}, 500 + for observation in observations: feature = get_geojson_feature(observation.ObservationModel.geom) feature["properties"]["municipality"] = { @@ -806,19 +815,18 @@ def get_observations_by_user_id(user_id): ] else: try: - taxon = next( - taxon - for taxon in taxon_repository - if taxon and taxon["cd_nom"] == feature["properties"]["cd_nom"] - ) - feature["properties"]["nom_francais"] = taxon["nom_francais"] - feature["properties"]["taxref"] = taxon["taxref"] - feature["properties"]["medias"] = taxon["medias"] + for taxon_rep in taxon_repository: + for taxon in taxon_rep: + if taxon["taxref"]["cd_nom"] == observation.ObservationModel.cd_nom: + feature["properties"]["nom_francais"] = taxon["nom_francais"] + feature["properties"]["taxref"] = taxon["taxref"] + feature["properties"]["medias"] = taxon["medias"] + except StopIteration: pass features.append(feature) - return FeatureCollection(features) + return FeatureCollection(features), 200 except Exception as e: raise e @@ -855,5 +863,3 @@ def update_observation(): except Exception as e: current_app.logger.critical("[post_observation] Error: %s", str(e)) return {"message": str(e)}, 400 - - diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index 77d0c0b7..da2c0ab5 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -350,12 +350,19 @@ def logged_user(): filename = 'avatar_' + \ current_user + '.' + extention request_data['avatar'] = filename - if os.path.exists(os.path.join(str(MEDIA_DIR), user.as_secured_dict(True)["avatar"])): + if os.path.exists(os.path.join(str(MEDIA_DIR), str(user.as_secured_dict(True)["avatar"]))): os.remove(os.path.join(str(MEDIA_DIR), - user.as_secured_dict(True)["avatar"])) - handler = open(os.path.join(str(MEDIA_DIR), filename), "wb+") - handler.write(imgdata) - handler.close() + str(user.as_secured_dict(True)["avatar"]))) + try: + handler = open(os.path.join( + str(MEDIA_DIR), str(filename)), "wb+") + handler.write(imgdata) + handler.close() + except Exception as e: + return ( + {"message": e}, + 500, + ) for data in request_data: if hasattr(UserModel, data) and data not in { @@ -365,7 +372,8 @@ def logged_user(): }: setattr(user, data, request_data[data]) if ('newPassword' in request_data): - user.password = UserModel.generate_hash(request_data["newPassword"]) + user.password = UserModel.generate_hash( + request_data["newPassword"]) user.admin = is_admin user.update() return ( @@ -380,7 +388,7 @@ def logged_user(): # raise GeonatureApiError(e) current_app.logger.error("AUTH ERROR:", str(e)) return ( - {"message": "Connectez vous pour obtenir vos données personnelles."}, + {"message": str(e)}, 400, ) diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 586972e9..1fd80add 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -7,8 +7,8 @@ { +stats?.platform_attendance, plural, =0 { aucune observation} =1 {une observation} other {{{stats?.platform_attendance}} observations} } -
- +
+

{{ username }}

@@ -40,23 +40,23 @@

Mes observations

-
+

Mes badges

-
+
Récompenses géneral
-
+
Récompenses par programmes
-
+
Récompenses d'identification d'espèces
Mettre à jour vos données personnelles
- +
@@ -151,15 +151,18 @@

Mettre à jour vos données personnelles

- +
- -

* Le mot de passe n'est pas identique.

+ +

* Le mot de passe n'est pas identique.

diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index 2f2cc259..9a7475b0 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -115,48 +115,65 @@ export class UserDashboardComponent implements OnInit { obs.geometry.coordinates[0], obs.geometry.coordinates[1] ); - this.obsToExport.push({ - id_observation: obs.properties.id_observation, - date: obs.properties.date, - program: obs.properties.program_title, - count: obs.properties.count, - comment: obs.properties.comment, - municipality: obs.properties.municipality.name, - taxref: obs.properties.taxref.nom_complet - }); - this.rows.push({ - media_url: - obs.properties.images && !!obs.properties.images.length - ? AppConfig.API_ENDPOINT + "/media/" + obs.properties.images[0] - : obs.properties.image - ? obs.properties.image - : obs.properties.medias && !!obs.properties.medias.length - ? AppConfig.API_TAXHUB + - "/tmedias/thumbnail/" + - obs.properties.medias[0].id_media + - "?h=80&v=80" - : "assets/default_image.png", - taxref: obs.properties.taxref, - date: obs.properties.date, - municipality: obs.properties.municipality.name, - program_id: obs.properties.id_program, - program: obs.properties.program_title, - count: obs.properties.count, - comment: obs.properties.comment, - id_observation: obs.properties.id_observation, - taxon: { - media: obs.properties.media, - taxref: obs.properties.taxref - }, - coords: coords - }); + this.rowData(obs, coords); + this.obsExport(obs) }); } else { this.observations = data[0].features; + this.observations.forEach(obs => { + let coords: Point = new Point( + obs.geometry.coordinates[0], + obs.geometry.coordinates[1] + ); + this.rowData(obs, coords); + this.obsExport(obs) + }); } }); } + + rowData(obs,coords){ + this.rows.push({ + media_url: + obs.properties.images && !!obs.properties.images.length + ? AppConfig.API_ENDPOINT + "/media/" + obs.properties.images[0] + : obs.properties.image + ? obs.properties.image + : obs.properties.medias && !!obs.properties.medias.length + ? AppConfig.API_TAXHUB + + "/tmedias/thumbnail/" + + obs.properties.medias[0].id_media + + "?h=80&v=80" + : "assets/default_image.png", + taxref: obs.properties.taxref, + date: obs.properties.date, + municipality: obs.properties.municipality.name, + program_id: obs.properties.id_program, + program: obs.properties.program_title, + count: obs.properties.count, + comment: obs.properties.comment, + id_observation: obs.properties.id_observation, + taxon: { + media: obs.properties.media, + taxref: obs.properties.taxref + }, + coords: coords + }); + } + + obsExport(obs){ + this.obsToExport.push({ + id_observation: obs.properties.id_observation, + date: obs.properties.date, + program: obs.properties.program_title, + count: obs.properties.count, + comment: obs.properties.comment, + municipality: obs.properties.municipality.name, + taxref: obs.properties.taxref.nom_complet + }); + } + onDeletePersonalData() { const access_token = localStorage.getItem("access_token"); this.auth diff --git a/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts b/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts index 0b741fe9..ac0b9f84 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts @@ -134,7 +134,6 @@ export class BadgeFacade { template: `
-
Félicitations !
{ +rewards?.length, plural, =1 { Vous venez d'obtenir ce badge } From 9fbffd9d3098f14b60c1971fd583f9d521a2dffa Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 10 Dec 2019 11:34:05 +0100 Subject: [PATCH 09/76] retour phase1 && delete obs --- backend/gncitizen/core/observations/routes.py | 22 +++++++- .../user-dashboard.component.css | 16 +++++- .../user-dashboard.component.html | 27 ++++++++- .../user-dashboard.component.ts | 34 ++++++++++-- .../user-dashboard/user.service.service.ts | 5 ++ .../observations/list/list.component.html | 6 +- .../observations/map/map.component.ts | 2 +- .../modalflow/modalflow.component.css | 6 +- .../modalflow/modalflow.component.html | 7 ++- frontend/src/styles.css | 55 ++++++++++++++++++- 10 files changed, 156 insertions(+), 24 deletions(-) diff --git a/backend/gncitizen/core/observations/routes.py b/backend/gncitizen/core/observations/routes.py index 4851833e..8a51f8c3 100644 --- a/backend/gncitizen/core/observations/routes.py +++ b/backend/gncitizen/core/observations/routes.py @@ -10,7 +10,7 @@ # from datetime import datetime import requests from flask import Blueprint, current_app, request, json, send_from_directory -from flask_jwt_extended import jwt_optional +from flask_jwt_extended import jwt_optional, jwt_required, get_jwt_identity from geojson import FeatureCollection from geoalchemy2.shape import from_shape from shapely.geometry import Point, asShape @@ -837,7 +837,7 @@ def get_observations_by_user_id(user_id): @routes.route("/observations", methods=["PATCH"]) @json_resp -@jwt_optional +@jwt_required def update_observation(): try: update_data = request.form @@ -863,3 +863,21 @@ def update_observation(): except Exception as e: current_app.logger.critical("[post_observation] Error: %s", str(e)) return {"message": str(e)}, 400 + + +@routes.route("/observations/", methods=["DELETE"]) +@json_resp +@jwt_required +def delete_observation(idObs): + current_user = get_jwt_identity() + try: + observation = db.session.query(ObservationModel, UserModel).filter( + ObservationModel.id_observation == idObs).join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True).first() + if (current_user == observation.UserModel.username): + ObservationModel.query.filter_by(id_observation=idObs).delete() + db.session.commit() + return ('observation deleted successfully'), 200 + else: + return ('delete unauthorized'), 403 + except Exception as e: + return {"message": str(e)}, 500 diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index c1a8dd4c..e9fef465 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -56,10 +56,7 @@ height: auto; margin: 0 auto; border-radius: 50%; - fill: red; - - } .user-infos p { @@ -214,6 +211,9 @@ app-modalflow { .danger{ color: red; } +.btn-danger{ + color: white !important; +} @media screen and (max-width: 991px) { #badges .row div:nth-child(2):before { content: " "; @@ -269,4 +269,14 @@ app-modalflow { background: #ecf0f1; color: #34495e; text-align: center; +} + +.green-btn { + background-color: var(--color-green); + color: #fff; + border: none; + padding: 5px 30px; + text-transform: uppercase; + font-size: 13px; + width: fit-content; } \ No newline at end of file diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 1fd80add..02969e0a 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -22,9 +22,9 @@

Mes observations

- + - {{row.taxref.nom_complet}} + {{row.taxref.nom_vern}} @@ -33,9 +33,10 @@

Mes observations

 - + + @@ -175,8 +176,28 @@

Mettre à jour vos données personnelles

+ + + + +
+
+
+
+ Êtes-vous sûr de vouloir supprimer cette observation ? +
+ Sa suppression sera définitive +
+
+ + +
+ +
+ + diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index 9a7475b0..f3a9ef7e 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -21,6 +21,7 @@ import { CustomFormValidator } from "./customFormValidator"; export class UserDashboardComponent implements OnInit { readonly AppConfig = AppConfig; modalRef: NgbModalRef; + modalRefDel: NgbModalRef; username: string = "not defined"; role_id: number; isLoggedIn: boolean = false; @@ -38,6 +39,7 @@ export class UserDashboardComponent implements OnInit { userAvatar: string | ArrayBuffer; extentionFile: any; newAvatar: string | ArrayBuffer; + idObsToDelete: number; constructor( private auth: AuthService, @@ -254,11 +256,6 @@ export class UserDashboardComponent implements OnInit { } } - ngOnDestroy(): void { - if (this.modalRef) this.modalRef.close(); - this.flowService.setModalCloseSatus(null); - } - intiForm() { this.userForm = this.formBuilder.group( { @@ -284,4 +281,29 @@ export class UserDashboardComponent implements OnInit { } ); } -} + + openDeleteModal(deleteModal: any, idObs :number) { + this.idObsToDelete = idObs; + this.modalRefDel = this.modalService.open(deleteModal, { windowClass: 'delete-modal', centered: true }); + } + + onCancelDelete() { + this.modalRefDel.close(); + } + + onDeleteObs(){ + this.userService.deleteObsservation(this.idObsToDelete).subscribe(() => { + this.modalRefDel.close(); + this.getData(); + this.idObsToDelete = null; + }); + } + + ngOnDestroy(): void { + if (this.modalRef) this.modalRef.close(); + if (this.modalRefDel) this.modalRefDel.close(); + this.flowService.setModalCloseSatus(null); + } + + +} \ No newline at end of file diff --git a/frontend/src/app/auth/user-dashboard/user.service.service.ts b/frontend/src/app/auth/user-dashboard/user.service.service.ts index 484df189..1643d30e 100644 --- a/frontend/src/app/auth/user-dashboard/user.service.service.ts +++ b/frontend/src/app/auth/user-dashboard/user.service.service.ts @@ -8,6 +8,7 @@ import { throwError } from "rxjs"; providedIn: "root" }) export class UseService { + private headers: HttpHeaders = new HttpHeaders({ "Content-Type": "application/json" }); @@ -43,6 +44,10 @@ export class UseService { ); } + deleteObsservation(idObs: any) { + return this.http.delete(`${AppConfig.API_ENDPOINT}/observations/${idObs}`); + } + ConvertToCSV(objArray, headerList) { let array = typeof objArray != "object" ? JSON.parse(objArray) : objArray; let str = ""; diff --git a/frontend/src/app/programs/observations/list/list.component.html b/frontend/src/app/programs/observations/list/list.component.html index 47524634..5c8e5209 100644 --- a/frontend/src/app/programs/observations/list/list.component.html +++ b/frontend/src/app/programs/observations/list/list.component.html @@ -50,11 +50,9 @@
{{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properti à {{ o.properties.municipality?.name }}

- - En savoir plus - -
+ diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 05b2217f..b0788b4f 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -414,7 +414,7 @@ export class ObsMapComponent implements OnInit, OnChanges { le {{ data.date }}

-
+ ` }) diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.css b/frontend/src/app/programs/observations/modalflow/modalflow.component.css index 3077652e..fd08cd60 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.css +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.css @@ -12,4 +12,8 @@ app-modalflow { app-modalflow button:first-child{ margin: 0px !important; } -} \ No newline at end of file +} +.btn-secondary{ + color: white !important; + margin-right: 20px ; +} diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.html b/frontend/src/app/programs/observations/modalflow/modalflow.component.html index c09b2bed..34be4f8c 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.html +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.html @@ -2,9 +2,10 @@ - + diff --git a/frontend/src/styles.css b/frontend/src/styles.css index f5a60e94..792d99d1 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -449,6 +449,17 @@ select:focus { font-size: 18px; } +.leaflet-popup-content a { + height: 80px; + width: 40px; + background: var(--primary); + color: #fff; + display: flex; + justify-content: center; + align-items: center; + font-size: 18px; +} + .modal-header { background: var(--secondary); background: var(--modal-header-bg-moz); @@ -1008,4 +1019,46 @@ input:checked~.toggle i { .avatar-wrapper .upload-button:hover .fa-arrow-circle-up { opacity: .9; -} \ No newline at end of file +} + +.delete-modal .modal-delete-content { + min-width: 300px; +} + +.delete-modal .modal-delete-body { + padding: 20px; +} + +.delete-modal .modal-delete-header { + padding: 10px; + color: white; + display: flex; + justify-content: center; + background-color: #ff6666 !important; +} + +.delete-modal .cancel-btn { + background-color: #535650 !important; + color: #fff; + border: none; + padding: 5px 30px; + text-transform: uppercase; + font-size: 13px; + width: fit-content; +} + +.delete-modal .green-btn { + background-color: #7AB929 !important; + color: #fff; + border: none; + padding: 5px 30px; + text-transform: uppercase; + font-size: 13px; + width: fit-content; +} + +.delete-modal .modal-delete-footer { + display: flex; + justify-content: flex-end; + padding: 13px; +} From db4dce6feabcf246fa0dcbace75b0b60f6c60b16 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 10 Dec 2019 11:39:17 +0100 Subject: [PATCH 10/76] init branche --- .../app/programs/observations/modalflow/modalflow.component.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.css b/frontend/src/app/programs/observations/modalflow/modalflow.component.css index fd08cd60..cf244cea 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.css +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.css @@ -16,4 +16,5 @@ app-modalflow { .btn-secondary{ color: white !important; margin-right: 20px ; + margin-left: 0px; } From b4bf257844835b7b109c56372db23c541bf2a19d Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 11 Dec 2019 14:47:24 +0100 Subject: [PATCH 11/76] titres/forms modales --- frontend/src/app/auth/login/login.component.css | 6 ++++++ frontend/src/app/auth/logout/logout.component.css | 5 +++++ .../src/app/auth/register/register.component.css | 12 ++++++++++-- .../auth/user-dashboard/user-dashboard.component.css | 7 +++++++ 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/auth/login/login.component.css b/frontend/src/app/auth/login/login.component.css index e7c4ccb6..770e3da3 100644 --- a/frontend/src/app/auth/login/login.component.css +++ b/frontend/src/app/auth/login/login.component.css @@ -66,3 +66,9 @@ span.input-group-text { border: solid 1px; border-color: var(--secondary); } + +@media screen and (max-width: 775px) { + .modal-header h4{ + font-size: 18px; + } +} \ No newline at end of file diff --git a/frontend/src/app/auth/logout/logout.component.css b/frontend/src/app/auth/logout/logout.component.css index 0d55b177..ad715c1d 100644 --- a/frontend/src/app/auth/logout/logout.component.css +++ b/frontend/src/app/auth/logout/logout.component.css @@ -55,4 +55,9 @@ span.input-group-text { background: transparent; color: var(--secondary); border: solid 1px var(--secondary); +} +@media screen and (max-width: 775px) { + .modal-header h4{ + font-size: 18px; + } } \ No newline at end of file diff --git a/frontend/src/app/auth/register/register.component.css b/frontend/src/app/auth/register/register.component.css index 04cfe5a4..1aa4e281 100644 --- a/frontend/src/app/auth/register/register.component.css +++ b/frontend/src/app/auth/register/register.component.css @@ -41,10 +41,12 @@ span.input-group-text { margin-bottom: 10px; } -.modal-body .form-row:first-child, -.modal-body .form-row:nth-child(2n) { +.modal-body .form-row:not(:last-of-type){ border-bottom: solid 1px var(--secondary); } +.modal-body .form-row:not(:first-of-type){ + padding-top: 10px; +} .modal-body button { background: var(--secondary); @@ -60,6 +62,12 @@ span.input-group-text { border: solid 1px var(--secondary); } +@media screen and (max-width: 775px) { + .modal-header h4{ + font-size: 18px; + } +} + @media screen and (max-width: 576px) { .modal-body .form-row { flex-direction: column; diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index e9fef465..b0c63e3a 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -161,6 +161,7 @@ app-modalflow { color: #fff; text-transform: uppercase; margin: 0 auto; + font-size: 18px; } .modal-header button { @@ -234,6 +235,12 @@ app-modalflow { } } +@media screen and (max-width: 775px) { + .modal-header h4{ + font-size: 18px; + } +} + @media screen and (max-width: 577px) { .personal-data button { width: 100% !important; From a68ea01d03c3ea006df46eefa7c8058eb63e8fb6 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 16:55:11 +0100 Subject: [PATCH 12/76] dashboard --- .../user-dashboard.component.css | 25 ++++++++++++++----- .../user-dashboard.component.html | 2 +- .../user-dashboard.component.ts | 1 + 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index b0c63e3a..9573c9fa 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -69,20 +69,23 @@ font-size: 23px; } -#badges { - margin-top: 30px; -} - section h3 { text-align: center; font-weight: normal; text-transform: uppercase; } +#badges.container { + margin-top: 30px; + max-width: 1130px !important; + margin: 0 auto !important; + padding: 0px; +} + #badges .inner-row { padding: 8px 10px; - background: #f3f3f3; - border: solid 3px #fff; + margin-bottom: 10px; + box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12); } #badges div img { @@ -235,6 +238,12 @@ app-modalflow { } } +@media screen and (max-width: 1024px) { + .ngx-datatable .datatable-body .datatable-row-wrapper{ + overflow-x: scroll; + } +} + @media screen and (max-width: 775px) { .modal-header h4{ font-size: 18px; @@ -245,6 +254,10 @@ app-modalflow { .personal-data button { width: 100% !important; } + .title::before, + .title::after { + width: 1rem; + } } .avatar-main-wrapper { diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 02969e0a..ecaae99b 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -16,7 +16,7 @@

Mes observations

+ [limit]="7" [rowHeight]="'auto'" [reorderable]="reorderable" [scrollbarH]="true" [selectionType]="'single'"> diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index f3a9ef7e..f6ec9195 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -224,6 +224,7 @@ export class UserDashboardComponent implements OnInit { this.intiForm(); this.modalRef = this.modalService.open(content, { size: "lg", + windowClass: 'add-obs-modal', centered: true }); }); From 0bb40d22da97d8490fe0c1e22edd8ed8866003d7 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 16:58:21 +0100 Subject: [PATCH 13/76] modals --- .../steps/committed/committed.component.html | 3 +++ .../modalflow/steps/committed/committed.component.ts | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html index 9fe3193f..bbc01535 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html +++ b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.html @@ -2,6 +2,9 @@

AJOUTER UNE OBSERVATION

MODIFIER L'OBSERVATION

+
diff --git a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts index d315c38c..69069e6c 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts @@ -1,9 +1,8 @@ import { Component, Input, ViewChild, ViewEncapsulation } from "@angular/core"; - import { IFlowComponent } from "../../flow/flow"; import { ObsFormComponent } from "../../../form/form.component"; import { ObservationFeature } from "../../../observation.model"; - +import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; @Component({ templateUrl: "./committed.component.html", styleUrls: ["./committed.component.css"], @@ -13,6 +12,10 @@ export class CommittedComponent implements IFlowComponent { @Input() data: any; @ViewChild(ObsFormComponent, { static: true }) form: ObsFormComponent; + + constructor( + private modalFlowService :ModalFlowService + ){} onNewObservation(observation: ObservationFeature) { if (observation) { this.data.obs = observation; @@ -35,4 +38,8 @@ export class CommittedComponent implements IFlowComponent { onUdpdateObs() { this.form.onFormUpdate(); } + + closeModal(){ + this.modalFlowService.closeModal() + } } From d7bb4d51b6fc6bbf987e49b086343c5c907a3dde Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 16:59:35 +0100 Subject: [PATCH 14/76] topbar --- frontend/src/app/core/topbar/modalTopbar.service.ts | 2 +- frontend/src/app/core/topbar/topbar.component.css | 8 ++++++++ frontend/src/app/core/topbar/topbar.component.ts | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/core/topbar/modalTopbar.service.ts b/frontend/src/app/core/topbar/modalTopbar.service.ts index fec95c9e..37e4e0ec 100644 --- a/frontend/src/app/core/topbar/modalTopbar.service.ts +++ b/frontend/src/app/core/topbar/modalTopbar.service.ts @@ -16,4 +16,4 @@ export class ModalsTopbarService { close() { if (this.modalRef) this.modalRef.close(); } -} +} \ No newline at end of file diff --git a/frontend/src/app/core/topbar/topbar.component.css b/frontend/src/app/core/topbar/topbar.component.css index 2366f214..1b7619e1 100644 --- a/frontend/src/app/core/topbar/topbar.component.css +++ b/frontend/src/app/core/topbar/topbar.component.css @@ -121,6 +121,7 @@ div.btn-group a:first-child { .navbar form ul li { min-width: none !important; max-width: none !important; + text-align: right; } .navbar div.btn-group { @@ -141,4 +142,11 @@ div.btn-group a:first-child { .navbar img { height: 40px; } + .programs-modal .modal-dialog, .obs-modal .modal-dialog{ + margin: 0px !important; + } + .programs-modal .modal-content, .obs-modal .modal-content{ + max-height: inherit; + height: 100vh; + } } diff --git a/frontend/src/app/core/topbar/topbar.component.ts b/frontend/src/app/core/topbar/topbar.component.ts index cc27436d..40b4b803 100644 --- a/frontend/src/app/core/topbar/topbar.component.ts +++ b/frontend/src/app/core/topbar/topbar.component.ts @@ -24,6 +24,7 @@ export class TopbarComponent implements OnInit { title: string = AppConfig.appName; // isLoggedIn: boolean = false; username: any; + isCollapsed = true; programs$ = new Subject(); isAdmin = false; canDisplayAbout: boolean = AppConfig.about; @@ -92,6 +93,7 @@ export class TopbarComponent implements OnInit { programs() { this.modalService.open(ProgramsComponent, { size: "lg", + windowClass: 'programs-modal', centered: true }); } From 6b597d83de2a0363b699b35405c636655a61b9b4 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 17:00:10 +0100 Subject: [PATCH 15/76] modals --- .../steps/congrats/congrats.component.html | 3 + .../steps/congrats/congrats.component.ts | 15 +++- .../steps/onboard/onboard.component.html | 3 + .../steps/onboard/onboard.component.ts | 10 ++- .../steps/reward/reward.component.ts | 13 ++- .../programs/observations/obs.component.css | 84 ++++++++++++++++++- .../programs/observations/obs.component.html | 56 +++++++++++-- .../programs/observations/obs.component.ts | 6 +- 8 files changed, 174 insertions(+), 16 deletions(-) diff --git a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.html b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.html index 13c46581..144fe484 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.html +++ b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.html @@ -2,6 +2,9 @@
+ { + /** this.timeout = setTimeout(() => { this.data.next(this.data); - }, 2000); + }, 2000);*/ } + + + closeModal(){ + this.modalFlowService.closeModal() + } } diff --git a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.html b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.html index 1c5f49ec..0fb0960f 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.html +++ b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.html @@ -1,5 +1,8 @@

AJOUTER UNE OBSERVATION

+
diff --git a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts index 3c1546e7..a650427e 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts @@ -9,7 +9,7 @@ import { import { ActivatedRoute } from "@angular/router"; import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; - +import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; import { IFlowComponent } from "../../flow/flow"; import { RegisterComponent } from "../../../../../auth/register/register.component"; import { LoginComponent } from "../../../../../auth/login/login.component"; @@ -32,9 +32,11 @@ export class OnboardComponent implements IFlowComponent, OnInit { constructor( private modalService: NgbModal, private authService: AuthService, - private route: ActivatedRoute + private route: ActivatedRoute, + private flowModal : ModalFlowService ) {} + ngOnInit() { this.authService.authorized$.subscribe(value => { if (value) { @@ -80,4 +82,8 @@ export class OnboardComponent implements IFlowComponent, OnInit { console.debug("continue"); this.data.next(); } + + closeModal(){ + this.flowModal.closeModal() + } } diff --git a/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts b/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts index ac0b9f84..dc359785 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/reward/reward.component.ts @@ -15,6 +15,7 @@ import { import { AppConfig } from "../../../../../../conf/app.config"; import { IFlowComponent } from "../../flow/flow"; import { AuthService } from "../../../../../auth/auth.service"; +import { ModalFlowService } from "../../modalflow.service"; export interface Badge { img: string; @@ -133,6 +134,9 @@ export class BadgeFacade { selector: "app-reward", template: `
+
Félicitations !
@@ -161,7 +165,8 @@ export class RewardComponent implements IFlowComponent { @Input() data: any; reward$: Observable; - constructor(public badges: BadgeFacade) { + constructor(public badges: BadgeFacade, + private modalFlowService :ModalFlowService) { if ( !badges.username || !AppConfig["REWARDS"] ) { @@ -176,7 +181,8 @@ export class RewardComponent implements IFlowComponent { if (!condition && this._init > 1) { if (this._timeout) clearTimeout(this._timeout); - this._timeout = setTimeout(() => this.close("NOREWARD"), 0); + this._timeout = setTimeout(() => + {this.close("NOREWARD")}, 0); } }), filter(reward => reward && !!reward.length && this._init > 1) @@ -191,4 +197,7 @@ export class RewardComponent implements IFlowComponent { clicked(d) { this.close(d); } + closeModal(){ + this.modalFlowService.closeModal() + } } diff --git a/frontend/src/app/programs/observations/obs.component.css b/frontend/src/app/programs/observations/obs.component.css index 53ecfd5e..5c766fa8 100644 --- a/frontend/src/app/programs/observations/obs.component.css +++ b/frontend/src/app/programs/observations/obs.component.css @@ -5,6 +5,11 @@ section { margin-bottom: 20px; } +section#slide{ + margin-top: 106px; + margin-bottom: 0px; +} + .section:before { content: " "; position: absolute; @@ -91,7 +96,7 @@ section { #slider .carousel-text { padding: 35px 20px 35px 35px; - min-width: 450px; + min-width: 100%; max-height: 80%; height: auto; background-color: #eeeeeecf; @@ -103,6 +108,33 @@ section { #slider .carousel-text h3 { font-family: "Satisfy"; color: var(--ternary); + padding-right: 20px; + position: relative; +} + +/*#slider .carousel-text h3[aria-expanded="true"]:before{ + content: 'v'; + font-family: arial, sans-serif; + font-size: 20px; + position: absolute; + right: 0px; + top: 0; + transition: all 0.5s ease-in-out; + transform: rotate(180deg); +} +#slider .carousel-text h3[aria-expanded="false"]:before{ + content: 'v'; + font-family: arial, sans-serif; + font-size: 20px; + position: absolute; + right: 0px; + top: 3px; + transition: all 0.5s ease-in-out; + transform: rotate(0deg); +}*/ + +#slider .carousel-text .collapse{ + transition: all 0.5s ease-in-out; } #slider .carousel-text > p { @@ -125,6 +157,9 @@ section { text-align: center; margin: 0 auto; } +#slider .carousel-text a.btn-big{ + background-color: var(--secondary) !important; +} .mobile-hidden { overflow: hidden; @@ -161,6 +196,7 @@ app-observations { section .observations { min-width: 100%; + margin-top: 106px; } .observations { @@ -218,3 +254,49 @@ section .observations { background-color: var(--primary); } +/* TABS */ + +.obs-tabs .nav-item{ + width: 50%; + text-align: center; + text-transform: uppercase; + font-weight: bold; + padding-bottom: 5px; +} + +.obs-tabs .nav-item a{ + color: #a8a8a8; + border: none; + border-bottom: solid 3px #a8a8a8; + transition: all 0.3s ease-in-out; +} + +.obs-tabs .nav-item a.active{ + border:none; + background: none; + color: var(--secondary); + border-bottom: solid 3px var(--secondary); +} + +@media screen and (max-width: 1024px){ + #slider .carousel-text { + min-width: inherit !important; + } +} +@media screen and (max-width: 760px){ + .obs-tabs .tab-pane.active #mapList #list, .obs-tabs .tab-pane.active #map{ + max-height: calc(100vh - 295px); + overflow: scroll; + } +} +@media screen and (max-width: 576px){ + .obs-tabs .tab-pane.active #mapList #list, .obs-tabs .tab-pane.active #map{ + max-height: calc(100vh - 260px); + overflow: scroll; + } +} +@media screen and (max-width: 576px) { + section#slide{ + margin-top: 66px; + } +} \ No newline at end of file diff --git a/frontend/src/app/programs/observations/obs.component.html b/frontend/src/app/programs/observations/obs.component.html index 2ecd92b1..7ea038ee 100644 --- a/frontend/src/app/programs/observations/obs.component.html +++ b/frontend/src/app/programs/observations/obs.component.html @@ -32,9 +32,13 @@

/>
-

{{ program.title }}

-

-
+

{{ program.title }}

+

{{ program.title }}

+
+

+
+ +

@@ -45,7 +49,7 @@

{{ program.title }}

-
+
{{ program.title }}
- + > -->
+ +
+ + + + + +
+ +
+ + + + + + + + + + + +
diff --git a/frontend/src/app/programs/observations/obs.component.ts b/frontend/src/app/programs/observations/obs.component.ts index 0992415a..385e66c8 100644 --- a/frontend/src/app/programs/observations/obs.component.ts +++ b/frontend/src/app/programs/observations/obs.component.ts @@ -44,12 +44,14 @@ export class ObsComponent implements OnInit, AfterViewInit { @ViewChild(ObsListComponent, {static: true}) obsList: ObsListComponent; selectedObs: Feature; + public isCollapsed : boolean = true; constructor( @Inject(LOCALE_ID) readonly localeId: string, private route: ActivatedRoute, private programService: GncProgramsService, - public flowService: ModalFlowService + public flowService: ModalFlowService, + ) { this.route.params.subscribe(params => (this.program_id = params["id"])); this.route.fragment.subscribe(fragment => { @@ -119,4 +121,4 @@ export class ObsComponent implements OnInit, AfterViewInit { ngOnDestroy(): void { this.flowService.closeModal() } -} +} \ No newline at end of file From f9744345a3394ec7b33334c3c379f03a6986e688 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 17:01:17 +0100 Subject: [PATCH 16/76] programs --- .../programs/observations/list/list.component.css | 6 +++++- .../programs/observations/map/map.component.css | 14 ++++++++++---- .../app/programs/observations/map/map.component.ts | 1 + frontend/src/app/programs/programs.component.css | 3 +++ frontend/src/app/programs/programs.component.html | 4 +++- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/programs/observations/list/list.component.css b/frontend/src/app/programs/observations/list/list.component.css index a71fc440..a0cf328c 100644 --- a/frontend/src/app/programs/observations/list/list.component.css +++ b/frontend/src/app/programs/observations/list/list.component.css @@ -138,7 +138,7 @@ } @media screen and (max-width: 992px) { - #list { + .observations #list { max-height: 40vh; height: inherit; } @@ -147,6 +147,10 @@ display: none; } + div#list:not(.sidebar) { + max-height: 33vh; + } + .side-bar, .map { position: static !important; diff --git a/frontend/src/app/programs/observations/map/map.component.css b/frontend/src/app/programs/observations/map/map.component.css index cead644a..4c05cb26 100644 --- a/frontend/src/app/programs/observations/map/map.component.css +++ b/frontend/src/app/programs/observations/map/map.component.css @@ -7,9 +7,11 @@ popup { } #obsMap { - height: calc(100vh - var(--router-outlet-offset) - 25px); + /*height: calc(100vh - var(--router-outlet-offset) - 25px); */ margin-left: var(--list-toggler-width); - width: calc(100% - var(--list-toggler-width)); + /* width: calc(100% - var(--list-toggler-width)); */ + height: 100%; + width: 100%; } .marker-cluster { @@ -53,6 +55,10 @@ a.leaflet-control-layers-toggle { height: 30px !important; } +.btn-group button.btn-big{ + background-color: var(--secondary); +} + @media screen and (max-width: 991px) { .btn-group .btn-big { opacity: 1 !important; @@ -61,11 +67,11 @@ a.leaflet-control-layers-toggle { #obsMap { margin: 0; width: 100%; - max-height: 40vh; + height: 73vh; } #map { width: 100%; - max-height: 40vh; + height: 73vh; } } diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index b0788b4f..9cf43d00 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -188,6 +188,7 @@ export class ObsMapComponent implements OnInit, OnChanges { gestureHandling: true, ...LeafletOptions }); +console.log('intmap',this.map); // TODO: inject controls with options this.observationMap.zoomControl.setPosition( diff --git a/frontend/src/app/programs/programs.component.css b/frontend/src/app/programs/programs.component.css index ad422b11..6da0984d 100644 --- a/frontend/src/app/programs/programs.component.css +++ b/frontend/src/app/programs/programs.component.css @@ -119,6 +119,9 @@ } @media screen and (max-width: 775px) { + .programs .row h1{ + font-size: 18px; + } .programs .img-hover { max-width: 200px; margin: 0 auto; diff --git a/frontend/src/app/programs/programs.component.html b/frontend/src/app/programs/programs.component.html index f9270f1e..63a30f66 100644 --- a/frontend/src/app/programs/programs.component.html +++ b/frontend/src/app/programs/programs.component.html @@ -3,7 +3,9 @@

PROGRAMMES {{ (programs$ | async)?.length - }} + }}

From ea1bde564507017700e6b5e65179cbe1d4ae7370 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Mon, 16 Dec 2019 17:01:47 +0100 Subject: [PATCH 17/76] home --- frontend/src/app/home/home.component.css | 127 ++++++++++++++++------ frontend/src/app/home/home.component.html | 10 +- 2 files changed, 97 insertions(+), 40 deletions(-) diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index 70687666..a28a1738 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -20,7 +20,6 @@ section { transition-duration: 0.2s; } - /* .collapse:not(.show){ transform: translateX(-100%) !important; display: block !important; @@ -220,7 +219,7 @@ section { #slider .carousel-text { background-color: #eeeeeecf; padding: 35px 20px 35px 35px; - min-width: 450px; + min-width: 100%; max-height: 80%; height: auto; display: flex; @@ -245,6 +244,7 @@ section { font-style: italic; font-size: 14px; color: black; + min-height: 80px; } #slider .carousel-text a { @@ -253,6 +253,10 @@ section { margin: 0 auto; } +#slider .carousel-text a.btn-big{ + background-color: var(--secondary) !important; +} + .mobile-hidden { /* overflow: hidden; */ line-height: 22px; @@ -306,7 +310,7 @@ app-observations { /* FIRST SECT */ #welcome h1 { font-size: 44px !important; - padding-left: 10% !important; + padding: 0px 5% !important; } #welcome p { display: none; @@ -326,13 +330,6 @@ app-observations { #slider .carousel-text a { font-size: 16px; } - #slider { - display: block !important; - width: 100%; - } - #programs-cards { - display: none !important; - } } @media screen and (max-width: 992px) { @@ -353,12 +350,24 @@ app-observations { width: 100% !important; } } +@media screen and (min-width: 760px) { + .carousel-text .collapse:not(.show){ + display: block; + } +} @media screen and (max-width: 760px) { #welcome a[role="button"] { left: 50%; transform: translateX(-50%); } + #programs #programs-cards { + display: none !important; + } + #slider { + display: block !important; + width: 100%; + } #slider .carousel-inner { max-height: fit-content; } @@ -390,6 +399,9 @@ app-observations { #slider .carousel-item { max-height: fit-content !important; } + #slider .carousel-item img{ + height: 450px; + } #slider .carousel-text p, #slider .carousel-text a { width: 100%; @@ -402,6 +414,15 @@ app-observations { #slider .carousel-text { min-width: inherit !important; } + #slider .carousel-text button{ + background: var(--secondary); + border: none; + width: 100%; + color: #fff; + } + #slider .carousel-text button[aria-expanded="true"]{ + transform: rotate(180deg); + } } @media screen and (min-width: 760px) { @@ -462,6 +483,30 @@ app-observations { } } +@media screen and (max-width: 650px){ + #slider .carousel-item img{ + height: 400px; + } +} + +@media screen and (max-width: 600px){ + #slider .carousel-item img{ + height: 350px; + } +} + +@media screen and (max-width: 550px){ + #slider .carousel-item img{ + height: 300px; + } +} + +@media screen and (max-width: 450px){ + #slider .carousel-item img{ + height: 250px; + } +} + /* Programs */ @@ -633,6 +678,10 @@ app-observations { } @media screen and (max-width: 576px) { + #welcome{ + margin-top: 66px !important; + height: calc(100vh - 66px) !important; + } .text-center h5.card-title { min-height: inherit; } @@ -688,19 +737,6 @@ app-observations { border-bottom: 1px solid transparent; font-size: 20px; font-weight: 300; - letter-spacing: 0.025em; - height: 60px; - line-height: 38px; -} - -.title-spaced { - font-size: 20px; - font-weight: 300; - letter-spacing: 0.025em; - height: 60px; - line-height: 38px; -} -.falsy-btn { padding-right: 5px; padding-left: 5px; border-color: black; @@ -735,20 +771,12 @@ app-observations { font-size: 2em; } -.color-blue { - color: #30a5ff; -} - -.color-orange { - color: #ffb53e; +.color-secondary { + color: var(--secondary); } -.color-teal { - color: #1ebfae; -} - -.color-gray { - color: #6e7579; +.color-primary{ + color: var(--primary); } .float-right { @@ -758,3 +786,32 @@ app-observations { .general-stat{ background-color: white; } + +@media screen and (max-width: 780px){ + .general-stat .no-padding.col-lg-3{ + width: 50%; + } +} + +@media screen and (min-width: 760px){ + .mobile{ + display: none; + } + .desktop{ + display: block; + } +} +@media screen and (max-width: 760px){ + .mobile{ + display: block; + } + .desktop{ + display: none; + } +} + +@media screen and (max-width: 576px) { + .programs-modal .modal-dialog, .obs-modal .modal-dialog{ + margin: 0px !important; + } +} \ No newline at end of file diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 12af0a16..3e6ef26a 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -12,7 +12,7 @@

-
+
{{stats.nb_obs}}
Observations
@@ -20,7 +20,7 @@

-
+
{{stats.nb_espece}}
Espèces
@@ -28,7 +28,7 @@

-
+
{{stats.nb_user}}
Observateurs
@@ -36,7 +36,7 @@

-
+
{{stats.nb_program}}
Programmes
@@ -50,7 +50,7 @@

-
+
- - GeoNature Citizen logo: flamengo origami - - - + +
diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.css b/frontend/src/app/programs/observations/modalflow/modalflow.component.css index cf244cea..e29742d9 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.css +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.css @@ -5,10 +5,6 @@ app-modalflow { } @media screen and (max-width: 450px){ - app-modalflow { - right: 0px; - left: 0px; - } app-modalflow button:first-child{ margin: 0px !important; } diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts index c1336f51..155a0b3f 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts +++ b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts @@ -33,8 +33,9 @@ export class ModalFlowService extends FlowService { open(content, options: NgbModalOptions = {}) { this.modalRef = this.modalService.open(content, { - ...MODAL_DEFAULTS, - ...options + size: "lg", + windowClass: 'obs-modal', + centered: true }); this.modalRef.result.then( result => { diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 792d99d1..00a77895 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -915,6 +915,11 @@ input:checked~.toggle i { z-index: 9999; } +.ngx-datatable{ + max-width: 1130px; + margin: 0 auto; +} + @media screen and (max-width: 991px) { .observations { height: inherit; @@ -1021,6 +1026,18 @@ input:checked~.toggle i { opacity: .9; } +.obs-modal .modal-header{ + padding : 6px; +} + +.obs-modal button.close{ + position: absolute; + z-index: 100; + right: 17px; + padding: 10px; + top: 16px; +} + .delete-modal .modal-delete-content { min-width: 300px; } @@ -1062,3 +1079,26 @@ input:checked~.toggle i { justify-content: flex-end; padding: 13px; } + +@media screen and (max-width: 1200px){ + app-about .container{ + margin-top: 106px !important; + } + app-about .container h2{ + font-size: 20px; + font-weight: bold; + text-transform: uppercase; + } +} +@media screen and (max-width: 576px) { + .programs-modal .modal-dialog, .obs-modal .modal-dialog{ + margin: 0px !important; + } + .programs-modal .modal-content, .obs-modal .modal-content{ + max-height: inherit; + height: 100vh; + } + .obs-modal .modal-header h4{ + font-size: 18px; + } +} From 84ca303729bfa61fefa5b2dd5cd962a0cf765210 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 19 Dec 2019 16:22:45 +0100 Subject: [PATCH 19/76] add confirmEmail to activete user account #143 --- backend/gncitizen/core/commons/admin.py | 6 +- backend/gncitizen/core/users/models.py | 2 + backend/gncitizen/core/users/routes.py | 49 ++++++++++++- backend/gncitizen/utils/mail_check.py | 69 +++++++++++++++++++ config/default_config.toml.example | 9 +++ frontend/src/app/app.module.ts | 4 +- frontend/src/app/app.routing.ts | 5 ++ frontend/src/app/auth/auth.interceptor.ts | 11 ++- frontend/src/app/auth/auth.service.ts | 8 ++- .../confirm-email.component.html | 6 ++ .../confirm-email.component.scss | 9 +++ .../confirm-email.component.spec.ts | 25 +++++++ .../confirm-email/confirm-email.component.ts | 50 ++++++++++++++ .../app/auth/register/register.component.html | 2 +- .../app/auth/register/register.component.ts | 11 ++- frontend/src/app/home/home.component.css | 21 ++++-- frontend/src/app/home/home.component.ts | 3 +- .../observations/map/map.component.css | 2 +- .../observations/map/map.component.ts | 2 - .../steps/congrats/congrats.component.ts | 4 +- .../programs/observations/obs.component.css | 6 +- .../programs/observations/obs.component.html | 37 +++++----- frontend/src/conf/app.config.ts.sample | 3 +- frontend/src/styles.css | 4 ++ 24 files changed, 294 insertions(+), 54 deletions(-) create mode 100644 backend/gncitizen/utils/mail_check.py create mode 100644 frontend/src/app/auth/confirm-email/confirm-email.component.html create mode 100644 frontend/src/app/auth/confirm-email/confirm-email.component.scss create mode 100644 frontend/src/app/auth/confirm-email/confirm-email.component.spec.ts create mode 100644 frontend/src/app/auth/confirm-email/confirm-email.component.ts diff --git a/backend/gncitizen/core/commons/admin.py b/backend/gncitizen/core/commons/admin.py index c5dd2dec..02c5799d 100644 --- a/backend/gncitizen/core/commons/admin.py +++ b/backend/gncitizen/core/commons/admin.py @@ -44,17 +44,17 @@ def taxonomy_lists(): else: from gncitizen.utils.env import taxhub_lists_url rtlists = requests.get(taxhub_lists_url) - current_app.logger.warning(rtlists) + #current_app.logger.warning(rtlists) if rtlists.status_code == 200: try: tlists = rtlists.json()["data"] - current_app.logger.debug(tlists) + #current_app.logger.debug(tlists) for tlist in tlists: l = (tlist['id_liste'], tlist['nom_liste']) taxonomy_lists.append(l) except Exception as e: current_app.logger.critical(str(e)) - current_app.logger.debug(taxonomy_lists) + #current_app.logger.debug(taxonomy_lists) return taxonomy_lists diff --git a/backend/gncitizen/core/users/models.py b/backend/gncitizen/core/users/models.py index a54bf716..c15cd461 100644 --- a/backend/gncitizen/core/users/models.py +++ b/backend/gncitizen/core/users/models.py @@ -47,6 +47,7 @@ class UserModel(TimestampMixinModel, db.Model): phone = db.Column(db.String(15)) organism = db.Column(db.String(100)) avatar = db.Column(db.String()) + active = db.Column(db.Boolean, default=False) admin = db.Column(db.Boolean, default=False) def save_to_db(self): @@ -70,6 +71,7 @@ def as_secured_dict(self, recursif=False, columns=()): "avatar": self.avatar, "full_name": name + " " + surname, "admin": self.admin, + "active": self.active, "timestamp_create": self.timestamp_create.isoformat(), "timestamp_update": self.timestamp_update.isoformat() if self.timestamp_update diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index da2c0ab5..bff0e8c7 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -11,7 +11,7 @@ ) from sqlalchemy import func from sqlalchemy.exc import IntegrityError - +from gncitizen.utils.mail_check import confirm_user_email, confirm_token from gncitizen.utils.errors import GeonatureApiError from gncitizen.utils.env import MEDIA_DIR from gncitizen.utils.sqlalchemy import json_resp @@ -145,10 +145,12 @@ def registration(): handler = open(os.path.join(str(MEDIA_DIR), filename), "wb+") handler.write(imgdata) handler.close() - + # send confirm mail + confirm_user_email(newuser) return ( { - "message": """Félicitations, l'utilisateur "{}" a été créé""".format( + "message": """Félicitations, l'utilisateur "{}" a été créé. \r\n Vous allez recevoir un email + pour activer votre compte """.format( newuser.username ), "username": newuser.username, @@ -208,6 +210,13 @@ def login(): }, 400, ) + if not current_user.active: + return ( + { + "message": "Votre compte n'a pas été activé" + }, + 400, + ) if UserModel.verify_hash(password, current_user.password): access_token = create_access_token(identity=username) refresh_token = create_refresh_token(identity=username) @@ -521,3 +530,37 @@ def reset_user_password(): }, 500, ) + + +@routes.route('/user/confirmEmail/', methods=["GET"]) +@json_resp +def confirm_email(token): + try: + email = confirm_token(token) + except: + return ( + { + "message": "The confirmation link is invalid or has expired." + }, + 404, + ) + user = UserModel.query.filter_by(email=email).first_or_404() + if user.active: + return ( + { + "message": 'Account already confirmed. Please login.', + "status" : 208 + }, + 208, + ) + else: + user.active = True + user.update() + db.session.commit() + return ( + { + "message": 'You have confirmed your account. Thanks!', + "status": 200 + }, + 200, + ) diff --git a/backend/gncitizen/utils/mail_check.py b/backend/gncitizen/utils/mail_check.py new file mode 100644 index 00000000..9d7e82c4 --- /dev/null +++ b/backend/gncitizen/utils/mail_check.py @@ -0,0 +1,69 @@ + +from flask import current_app +from itsdangerous import URLSafeTimedSerializer +import smtplib +from email.mime.multipart import MIMEMultipart +from email.mime.text import MIMEText + + +def confirm_user_email(newuser): + + token = generate_confirmation_token(newuser.email) + msg = MIMEMultipart("alternative") + msg["Subject"] = current_app.config["CONFIRM_EMAIL"]["SUBJECT"] + msg["From"] = current_app.config["CONFIRM_EMAIL"]["FROM"] + msg["To"] = newuser.email + + # Record the MIME text/html. + msg_body = MIMEText( + current_app.config["CONFIRM_EMAIL"]["HTML_TEMPLATE"].format( + activate_url=current_app.config["URL_APPLICATION"] + + "confirmEmail/"+token + ), + "html") + + msg.attach(msg_body) + + try: + with smtplib.SMTP_SSL( + current_app.config["MAIL"]["MAIL_HOST"], + int(current_app.config["MAIL"]["MAIL_PORT"]), + ) as server: + server.login( + str(current_app.config["MAIL"]["MAIL_AUTH_LOGIN"]), + str(current_app.config["MAIL"]["MAIL_AUTH_PASSWD"]), + ) + server.sendmail( + current_app.config["CONFIRM_EMAIL"]["FROM"], newuser.email, msg.as_string( + ) + ) + server.quit() + + except Exception as e: + current_app.logger.warning( + "send confirm_email failled. %s", str(e) + ) + return ( + { + "message": """ send confirm_email failled: "{}".""".format( + str(e) + ) + } + ) + + +def generate_confirmation_token(email): + serializer = URLSafeTimedSerializer(current_app.config['SECRET_KEY']) + return serializer.dumps(email, salt=current_app.config['CONFIRM_MAIL_SALT']) + + +def confirm_token(token): + serializer = URLSafeTimedSerializer(current_app.config['SECRET_KEY']) + try: + email = serializer.loads( + token, + salt=current_app.config['CONFIRM_MAIL_SALT'], + ) + except: + raise Exception('error token') + return email diff --git a/config/default_config.toml.example b/config/default_config.toml.example index 2a9b9b15..eac20a9d 100644 --- a/config/default_config.toml.example +++ b/config/default_config.toml.example @@ -33,6 +33,7 @@ DEFAULT_CENTER_LONG = 5 SESSION_TYPE = 'filesystem' SECRET_KEY = 'MyS3cr3tK3y' +CONFIRM_MAIL_SALT = 'your-secret-salt' # secret salt for corfirm mail token COOKIE_EXPIRATION = 7200 COOKIE_AUTORENEW = true TRAP_ALL_EXCEPTIONS = false @@ -64,6 +65,14 @@ UPLOAD_FOLDER = 'static/medias' Connexion' ''' +[CONFIRM_EMAIL] + SUBJECT = "Activez votre compte" + FROM = 'contact@geonature-citizen.fr' + HTML_TEMPLATE = '''

Bonjour,


Nous vous confirmons que votre compte a bien été créé.

+

Afin d'activer votre compte veuillez cliquer ici. +

Nous vous souhaitons la bienvenue sur notre site.


+

Bien à vous.

+ ''' [MAIL] MAIL_HOST = 'smtpd host' diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 1583a7c1..fc163fd2 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -48,6 +48,7 @@ import { AdminComponent } from "./auth/admin/admin.component"; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ToastrModule } from 'ngx-toastr'; import { CommonModule } from '@angular/common'; +import { ConfirmEmailComponent } from './auth/confirm-email/confirm-email.component' @NgModule({ imports: [ @@ -97,7 +98,8 @@ import { CommonModule } from '@angular/common'; CongratsComponent, ModalFlowComponent, RewardComponent, - AdminComponent + AdminComponent, + ConfirmEmailComponent ], providers: [ AuthService, diff --git a/frontend/src/app/app.routing.ts b/frontend/src/app/app.routing.ts index bed97a73..542c455e 100644 --- a/frontend/src/app/app.routing.ts +++ b/frontend/src/app/app.routing.ts @@ -12,6 +12,7 @@ import { UserDashboardComponent } from "./auth/user-dashboard/user-dashboard.com import { SpeciesComponent } from "./synthesis/species/species.component"; import { AuthGuard } from "./auth/auth.guard"; import { AdminComponent } from "./auth/admin/admin.component"; +import { ConfirmEmailComponent } from './auth/confirm-email/confirm-email.component' const appRoutes: Routes = [ { @@ -46,6 +47,10 @@ const appRoutes: Routes = [ component: ObsComponent, resolve: { programs: ProgramsResolve } }, + { + path: "confirmEmail/:token", + component: ConfirmEmailComponent, + }, { path: "synthesis/species/:id", component: SpeciesComponent }, { path: "**", component: PageNotFoundComponent } ]; diff --git a/frontend/src/app/auth/auth.interceptor.ts b/frontend/src/app/auth/auth.interceptor.ts index 7cdaf667..61dee34d 100644 --- a/frontend/src/app/auth/auth.interceptor.ts +++ b/frontend/src/app/auth/auth.interceptor.ts @@ -61,7 +61,6 @@ export class AuthInterceptor implements HttpInterceptor { this.token$.next(data.access_token); // Fixme: const clone = this.addToken(request, data.access_token); - console.debug(clone); return next.handle(clone); } this.router.navigate(["/home"]); @@ -100,7 +99,7 @@ export class AuthInterceptor implements HttpInterceptor { intercept( request: HttpRequest, next: HttpHandler - ): Observable> { + ): Observable> { if ( (request.url.match(AppConfig.API_ENDPOINT) && (request.url.includes("token_refresh") || @@ -110,12 +109,18 @@ export class AuthInterceptor implements HttpInterceptor { ) { return next.handle(request); } + if + (request.url.match(AppConfig.API_ENDPOINT) && + request.url.includes("confirmEmail") + ) { + return next.handle(request); + } // access_token renewal 2min before expiration if interacting with backend api. const secondsToExpiration = this.auth.tokenExpiration( this.auth.getAccessToken() ); - console.debug(`secs to exp: ${secondsToExpiration}`); + if (secondsToExpiration && secondsToExpiration <= 120.0) { return this.handle401(request, next); } diff --git a/frontend/src/app/auth/auth.service.ts b/frontend/src/app/auth/auth.service.ts index 1bfa7602..9e1dfea0 100644 --- a/frontend/src/app/auth/auth.service.ts +++ b/frontend/src/app/auth/auth.service.ts @@ -50,7 +50,7 @@ export class AuthService { return this.http.post(url, user).pipe( map(user => { if (user) { - this.authenticate(user); + //this.authenticate(user); } return user; }) @@ -148,4 +148,10 @@ export class AuthService { const delta: number = (jwt.payload.exp * 1000 - now) / 1000.0; return delta; } + + + confirmEmail (token): Observable { + let url: string = `${AppConfig.API_ENDPOINT}/user/confirmEmail/${token}`; + return this.http.get(url) + } } diff --git a/frontend/src/app/auth/confirm-email/confirm-email.component.html b/frontend/src/app/auth/confirm-email/confirm-email.component.html new file mode 100644 index 00000000..9b3270af --- /dev/null +++ b/frontend/src/app/auth/confirm-email/confirm-email.component.html @@ -0,0 +1,6 @@ +
+ + +

{{confirmedMessage}}

+

vous allez être redirigé automatiquement sur la page d'accueil

+
diff --git a/frontend/src/app/auth/confirm-email/confirm-email.component.scss b/frontend/src/app/auth/confirm-email/confirm-email.component.scss new file mode 100644 index 00000000..44f6efab --- /dev/null +++ b/frontend/src/app/auth/confirm-email/confirm-email.component.scss @@ -0,0 +1,9 @@ +.container-msg{ + display: flex; + align-items: center; + flex-direction: column; +} +.msg-icon{ + font-size: 60px; + margin-bottom: 20px; +} \ No newline at end of file diff --git a/frontend/src/app/auth/confirm-email/confirm-email.component.spec.ts b/frontend/src/app/auth/confirm-email/confirm-email.component.spec.ts new file mode 100644 index 00000000..2fce8506 --- /dev/null +++ b/frontend/src/app/auth/confirm-email/confirm-email.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ConfirmEmailComponent } from './confirm-email.component'; + +describe('ConfirmEmailComponent', () => { + let component: ConfirmEmailComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ConfirmEmailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ConfirmEmailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/frontend/src/app/auth/confirm-email/confirm-email.component.ts b/frontend/src/app/auth/confirm-email/confirm-email.component.ts new file mode 100644 index 00000000..465d9454 --- /dev/null +++ b/frontend/src/app/auth/confirm-email/confirm-email.component.ts @@ -0,0 +1,50 @@ +import { Component, OnInit } from "@angular/core"; +import { AuthService } from "../auth.service"; +import { ActivatedRoute, Router } from "@angular/router"; + +@Component({ + selector: "app-confirm-email", + templateUrl: "./confirm-email.component.html", + styleUrls: ["./confirm-email.component.scss"] +}) +export class ConfirmEmailComponent implements OnInit { + confirmResponse: any; + isConfirmed = false; + confirmedMessage: string; + constructor( + private activeRoute: ActivatedRoute, + private router: Router, + private authService: AuthService + ) {} + + ngOnInit() { + const token = this.activeRoute.snapshot.params.token; + this.authService.confirmEmail(token).subscribe( + confirmResponse => { + this.isConfirmed = true; + this.confirmResponse = confirmResponse; + if (this.confirmResponse.status === 200) { + this.confirmedMessage = "Vous avez activé votre compte. Merci!"; + } + if (this.confirmResponse.status === 208) { + this.confirmedMessage = + "Votre compte a été déjà activé. Veuillez vous connecter."; + } + setTimeout(() => { + this.router.navigate(['home']) + }, 3000); + }, + error => { + this.isConfirmed = false; + if ((error.status = 404)) { + this.confirmedMessage = "Le lien de confirmation n'est pas valide."; + this.confirmResponse = error.error; + console.log("confirm error", error); + setTimeout(() => { + this.router.navigate(["home"]); + }, 3000); + } + } + ); + } +} diff --git a/frontend/src/app/auth/register/register.component.html b/frontend/src/app/auth/register/register.component.html index bf551951..3582e21f 100644 --- a/frontend/src/app/auth/register/register.component.html +++ b/frontend/src/app/auth/register/register.component.html @@ -7,7 +7,7 @@

Créez votre compte

{{ errorMessage }} - {{ successMessage }} +

{{ successMessage }}

diff --git a/frontend/src/app/auth/register/register.component.ts b/frontend/src/app/auth/register/register.component.ts index ebb2a737..ef22e902 100644 --- a/frontend/src/app/auth/register/register.component.ts +++ b/frontend/src/app/auth/register/register.component.ts @@ -36,16 +36,17 @@ export class RegisterComponent { .register(this.user) .pipe( map(user => { - localStorage.setItem("access_token", user.access_token); - localStorage.setItem("refresh_token", user.refresh_token); - localStorage.setItem("username", user.username); + if (user) { + console.log('user',user); + let message = user.message; this._success.subscribe(message => (this.successMessage = message)); - this._success.pipe(debounceTime(1500)).subscribe(() => { + this._success.pipe(debounceTime(5000)).subscribe(() => { this.successMessage = null; this.activeModal.close(); }); + this.displaySuccessMessage(message); // redirect ? if (this.auth.redirectUrl) { @@ -87,12 +88,10 @@ export class RegisterComponent { displayErrorMessage(message) { this._error.next(message); - console.error("errorMessage:", message); } displaySuccessMessage(message) { this._success.next(message); - console.info("successMessage:", message); } onUploadAvatar($event) { diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index a28a1738..cb88301d 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -1,10 +1,10 @@ -section { +app-home section { width: 100%; min-height: 70vh; position: relative; } -.section:before { +app-home .section:before { content: " "; position: absolute; top: 0; @@ -415,13 +415,22 @@ app-observations { min-width: inherit !important; } #slider .carousel-text button{ - background: var(--secondary); + background: #a8a8a8; border: none; - width: 100%; + margin: 0 auto; + border-radius: 5px; + padding: 5px 10px; color: #fff; + font-size: 18px; + font-weight: bold; + position: relative; + width: 30px; + height: 20px; } - #slider .carousel-text button[aria-expanded="true"]{ - transform: rotate(180deg); + #slider .carousel-text button span{ + position: absolute; + top: -8px; + left: 7px; } } diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index c14a09f9..97e35214 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewEncapsulation, AfterViewChecked, Inject, LOCALE_ID } from "@angular/core"; +import {Component, OnInit, AfterViewChecked, Inject, LOCALE_ID } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { HttpClient } from "@angular/common/http"; import { Meta, SafeHtml, DomSanitizer } from "@angular/platform-browser"; @@ -12,7 +12,6 @@ import { ObservationsService } from "../programs/observations/observations.servi selector: "app-home", templateUrl: "./home.component.html", styleUrls: ["./home.component.css"], - encapsulation: ViewEncapsulation.None, providers: [ProgramsResolve] }) export class HomeComponent implements OnInit, AfterViewChecked { diff --git a/frontend/src/app/programs/observations/map/map.component.css b/frontend/src/app/programs/observations/map/map.component.css index 4c05cb26..5a839997 100644 --- a/frontend/src/app/programs/observations/map/map.component.css +++ b/frontend/src/app/programs/observations/map/map.component.css @@ -11,7 +11,7 @@ popup { margin-left: var(--list-toggler-width); /* width: calc(100% - var(--list-toggler-width)); */ height: 100%; - width: 100%; + } .marker-cluster { diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 9cf43d00..67b76199 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -188,8 +188,6 @@ export class ObsMapComponent implements OnInit, OnChanges { gestureHandling: true, ...LeafletOptions }); -console.log('intmap',this.map); - // TODO: inject controls with options this.observationMap.zoomControl.setPosition( this.options.ZOOM_CONTROL_POSITION diff --git a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts index d670b364..492e4e0d 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts @@ -28,9 +28,9 @@ export class CongratsComponent implements IFlowComponent { ngOnInit(): void { this.username = localStorage.getItem("username"); this.obs = this.data.obs.properties; - /** this.timeout = setTimeout(() => { + this.timeout = setTimeout(() => { this.data.next(this.data); - }, 2000);*/ + }, 2000); } diff --git a/frontend/src/app/programs/observations/obs.component.css b/frontend/src/app/programs/observations/obs.component.css index 5c766fa8..a074944a 100644 --- a/frontend/src/app/programs/observations/obs.component.css +++ b/frontend/src/app/programs/observations/obs.component.css @@ -1,12 +1,12 @@ -section { +.obs-section { width: 100%; min-height: 70vh; position: relative; margin-bottom: 20px; } -section#slide{ - margin-top: 106px; +.obs-section#slide{ + /*margin-top: 106px;*/ margin-bottom: 0px; } diff --git a/frontend/src/app/programs/observations/obs.component.html b/frontend/src/app/programs/observations/obs.component.html index 7ea038ee..25affa7d 100644 --- a/frontend/src/app/programs/observations/obs.component.html +++ b/frontend/src/app/programs/observations/obs.component.html @@ -1,6 +1,6 @@
-
+

-
+
@@ -49,7 +49,7 @@

{{ program.title }}

-
+
{{ program.title }}

-
+
- - - - -
- -
- - {{ program.title }}
- + + + + +
+ +
+ +
diff --git a/frontend/src/conf/app.config.ts.sample b/frontend/src/conf/app.config.ts.sample index ced64f73..51601f9e 100644 --- a/frontend/src/conf/app.config.ts.sample +++ b/frontend/src/conf/app.config.ts.sample @@ -51,5 +51,6 @@ export const AppConfig = { "cd_nom" ], program_list_observers_names: true, - program_list_sort: "-timestamp_create" + program_list_sort: "-timestamp_create", + details_espece_url: "/cd_nom/" // !! gardez bien le cd_nom/ dans l'url } diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 00a77895..342013ae 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -37,6 +37,10 @@ --modal-header-bg-linear: linear-gradient(179.4deg, var(--secondary) 0%, var(--secondary) 50%, var(--secondary-gradient) 51%, var(--secondary-gradient) 100%); } +button:focus{ + outline: transparent; +} + html, body { height: 100%; From 48867a87e676698e521327dc8e11aed03aec169b Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 19 Dec 2019 17:18:39 +0100 Subject: [PATCH 20/76] add obs coordinates && obs cd_nom to export data #148 --- .../user-dashboard.component.html | 4 +- .../user-dashboard.component.ts | 60 ++++++++++--------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index ecaae99b..0ae5c60d 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -22,14 +22,14 @@

Mes observations

- + {{row.taxref.nom_vern}} - + diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index f6ec9195..1f0235bb 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -118,7 +118,7 @@ export class UserDashboardComponent implements OnInit { obs.geometry.coordinates[1] ); this.rowData(obs, coords); - this.obsExport(obs) + this.obsExport(obs); }); } else { this.observations = data[0].features; @@ -128,14 +128,13 @@ export class UserDashboardComponent implements OnInit { obs.geometry.coordinates[1] ); this.rowData(obs, coords); - this.obsExport(obs) + this.obsExport(obs); }); } }); } - - rowData(obs,coords){ + rowData(obs, coords) { this.rows.push({ media_url: obs.properties.images && !!obs.properties.images.length @@ -164,15 +163,18 @@ export class UserDashboardComponent implements OnInit { }); } - obsExport(obs){ + obsExport(obs) { this.obsToExport.push({ id_observation: obs.properties.id_observation, date: obs.properties.date, - program: obs.properties.program_title, - count: obs.properties.count, - comment: obs.properties.comment, - municipality: obs.properties.municipality.name, - taxref: obs.properties.taxref.nom_complet + programme: obs.properties.program_title, + denombrement: obs.properties.count, + commentaire: obs.properties.comment, + municipalite: obs.properties.municipality.name, + cd_nom: obs.properties.taxref.cd_nom, + espece: obs.properties.taxref.nom_vern, + coordonnee_x: obs.geometry.coordinates[0], + coordonnee_y: obs.geometry.coordinates[1] }); } @@ -207,12 +209,15 @@ export class UserDashboardComponent implements OnInit { onExportObservations() { let csv_str = this.userService.ConvertToCSV(this.obsToExport, [ "id_observation", - "taxref", + "espece", + "cd_nom", "date", - "program", - "count", - "comment", - "municipality" + "programme", + "denombrement", + "commentaire", + "municipalite", + "coordonnee_x", + "coordonnee_y" ]); let blob = new Blob([csv_str], { type: "text/csv" }); saveAs(blob, "mydata.csv"); @@ -224,7 +229,7 @@ export class UserDashboardComponent implements OnInit { this.intiForm(); this.modalRef = this.modalService.open(content, { size: "lg", - windowClass: 'add-obs-modal', + windowClass: "add-obs-modal", centered: true }); }); @@ -283,21 +288,24 @@ export class UserDashboardComponent implements OnInit { ); } - openDeleteModal(deleteModal: any, idObs :number) { + openDeleteModal(deleteModal: any, idObs: number) { this.idObsToDelete = idObs; - this.modalRefDel = this.modalService.open(deleteModal, { windowClass: 'delete-modal', centered: true }); + this.modalRefDel = this.modalService.open(deleteModal, { + windowClass: "delete-modal", + centered: true + }); } onCancelDelete() { this.modalRefDel.close(); } - onDeleteObs(){ - this.userService.deleteObsservation(this.idObsToDelete).subscribe(() => { - this.modalRefDel.close(); - this.getData(); - this.idObsToDelete = null; - }); + onDeleteObs() { + this.userService.deleteObsservation(this.idObsToDelete).subscribe(() => { + this.modalRefDel.close(); + this.getData(); + this.idObsToDelete = null; + }); } ngOnDestroy(): void { @@ -305,6 +313,4 @@ export class UserDashboardComponent implements OnInit { if (this.modalRefDel) this.modalRefDel.close(); this.flowService.setModalCloseSatus(null); } - - -} \ No newline at end of file +} From 487d88d6f88f5ca4f493f65effed0ff154a9c45a Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 11:30:12 +0100 Subject: [PATCH 21/76] fix firefox avatar bug #145 --- frontend/src/app/auth/register/register.component.html | 3 ++- .../app/auth/user-dashboard/user-dashboard.component.css | 3 +++ .../app/auth/user-dashboard/user-dashboard.component.html | 6 ++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/auth/register/register.component.html b/frontend/src/app/auth/register/register.component.html index 3582e21f..29de5f56 100644 --- a/frontend/src/app/auth/register/register.component.html +++ b/frontend/src/app/auth/register/register.component.html @@ -15,7 +15,8 @@

Créez votre compte

- +
+
diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index 9573c9fa..895d3199 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -38,6 +38,9 @@ .user-infos i:hover { cursor: pointer; } +.profile-pic{ + cursor: pointer; +} .user-infos span { color: #fff; diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 0ae5c60d..642a4c87 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -8,7 +8,8 @@ {une observation} other {{{stats?.platform_attendance}} observations} }
- +
+

{{ username }}

@@ -94,7 +95,8 @@

Mettre à jour vos données personnelles

- +
+
From 0b60a31a20eea5d917f6734ff43cfb78d4b10660 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 11:53:48 +0100 Subject: [PATCH 22/76] update footer --- .../src/app/core/footer/footer.component.css | 34 +++++++++++-------- .../src/app/core/footer/footer.component.html | 16 ++++----- .../src/app/core/topbar/topbar.component.css | 7 ++-- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/frontend/src/app/core/footer/footer.component.css b/frontend/src/app/core/footer/footer.component.css index 0382810e..1aeffa4d 100644 --- a/frontend/src/app/core/footer/footer.component.css +++ b/frontend/src/app/core/footer/footer.component.css @@ -1,17 +1,23 @@ -/* Sticky footer styles --------------------------------------------------- */ -.footer { - /* position: fixed; +footer{ + padding: 20px 0px; text-align: center; - margin-left: 60px; - width: calc(100vw - 60px); - bottom: 0; */ - /* width: 100%-60px; */ + background: rgb(226, 226, 226); +} + +footer p, footer div{ + margin: 0 auto; + max-width: 80%; +} - /* Set the fixed height of the footer here */ - height: 30px; - line-height: 30px; - /* Vertically center the text there */ - background-color: #fefefe; - box-shadow: 0px -2px 2px 0 rgba(0, 0, 0, 0.2); +footer div{ + margin-bottom: 20px; } + +footer div a { + text-decoration: none; + color: var(--secondary) !important; +} + +footer div a:hover{ + border-bottom: solid 1px black; +} \ No newline at end of file diff --git a/frontend/src/app/core/footer/footer.component.html b/frontend/src/app/core/footer/footer.component.html index 51fbe7d8..56c50bbf 100644 --- a/frontend/src/app/core/footer/footer.component.html +++ b/frontend/src/app/core/footer/footer.component.html @@ -1,11 +1,9 @@ -
-
- Site de démo GeoNature-citizen (version en cours de développement) - - - GeoNature-citizen +
+ + +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ diff --git a/frontend/src/app/core/topbar/topbar.component.css b/frontend/src/app/core/topbar/topbar.component.css index 1b7619e1..25690572 100644 --- a/frontend/src/app/core/topbar/topbar.component.css +++ b/frontend/src/app/core/topbar/topbar.component.css @@ -110,8 +110,9 @@ div.btn-group a:first-child { @media screen and (max-width: 767px) { .navbar form { - flex-direction: column; - align-items: flex-end; + flex-direction: row; + align-items: flex-start; + justify-content: space-between; } .navbar form ul { @@ -121,7 +122,7 @@ div.btn-group a:first-child { .navbar form ul li { min-width: none !important; max-width: none !important; - text-align: right; + text-align : left; } .navbar div.btn-group { From b743a2e112a52a74b4380b8fc85d433384fa0014 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 12:09:39 +0100 Subject: [PATCH 23/76] make Stats optional && count only active program #165 --- backend/gncitizen/core/badges/routes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gncitizen/core/badges/routes.py b/backend/gncitizen/core/badges/routes.py index 80340415..2ce27f8e 100644 --- a/backend/gncitizen/core/badges/routes.py +++ b/backend/gncitizen/core/badges/routes.py @@ -164,7 +164,7 @@ def get_stat(): stats = {} stats["nb_obs"] = ObservationModel.query.count() stats["nb_user"] = UserModel.query.count() - stats["nb_program"] = ProgramsModel.query.count() + stats["nb_program"] = ProgramsModel.query.filter(ProgramsModel.is_active == True).count() stats["nb_espece"] = ObservationModel.query.distinct( ObservationModel.cd_nom).count() return (stats, 200) From 92739a43871fa9b6d67158c74e70adfaf7285019 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 12:10:53 +0100 Subject: [PATCH 24/76] make Stats optional && count only active program #165 --- frontend/src/app/home/home.component.html | 2 +- frontend/src/conf/app.config.ts.sample | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 3e6ef26a..8f164712 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -9,7 +9,7 @@

-
+
diff --git a/frontend/src/conf/app.config.ts.sample b/frontend/src/conf/app.config.ts.sample index 51601f9e..dd253d2d 100644 --- a/frontend/src/conf/app.config.ts.sample +++ b/frontend/src/conf/app.config.ts.sample @@ -7,7 +7,8 @@ export const AppConfig = { MULTILINGUAL:false, DISPLAY_FOOTER: true, DISPLAY_TOPBAR: false, - DISPLAY_SIDEBAR: true + DISPLAY_SIDEBAR: true, + DISPLAY_STATS: true, }, about: true, URL_APPLICATION:"http://127.0.0.1:4200", From 49cc4a8e4365bfbc1404cfc74bba9ac2ca65dc99 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 12:15:19 +0100 Subject: [PATCH 25/76] open CGU in new tab #189 --- frontend/src/app/auth/register/register.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/auth/register/register.component.html b/frontend/src/app/auth/register/register.component.html index 29de5f56..4bad8644 100644 --- a/frontend/src/app/auth/register/register.component.html +++ b/frontend/src/app/auth/register/register.component.html @@ -101,7 +101,7 @@

Créez votre compte

J'accepte les - conditions d'utilisation + conditions d'utilisation
From a48b2b958de9c88045743dabf794ffb705b3590c Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 12:45:39 +0100 Subject: [PATCH 26/76] add species details link on species title click #142 --- .../observations/list/list.component.css | 5 ++++- .../observations/list/list.component.html | 8 +++----- .../programs/observations/map/map.component.ts | 4 ++-- frontend/src/styles.css | 16 ++++++---------- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/programs/observations/list/list.component.css b/frontend/src/app/programs/observations/list/list.component.css index a0cf328c..bc97ebb8 100644 --- a/frontend/src/app/programs/observations/list/list.component.css +++ b/frontend/src/app/programs/observations/list/list.component.css @@ -23,12 +23,15 @@ #list .espece:hover { border: solid 2px; border-color: var(--primary); - cursor: pointer; + } .espece:hover .hide { transform: translateX(0); } +.espece-link{ + width: fit-content; +} #list .espece img { object-fit: cover; diff --git a/frontend/src/app/programs/observations/list/list.component.html b/frontend/src/app/programs/observations/list/list.component.html index 5c8e5209..bce935e1 100644 --- a/frontend/src/app/programs/observations/list/list.component.html +++ b/frontend/src/app/programs/observations/list/list.component.html @@ -23,8 +23,7 @@

-
+
-
{{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properties.taxref?.nom_vern }}
+ {{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properties.taxref?.nom_vern }}

Observé par {{ @@ -51,8 +50,7 @@

{{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properti à {{ o.properties.municipality?.name }}

- +
diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 67b76199..4aca28f7 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -399,7 +399,7 @@ export class ObsMapComponent implements OnInit, OnChanges { " />

- {{ !!data.nom_francais ? data.nom_francais : data.taxref?.nom_vern }}
+ {{ !!data.nom_francais ? data.nom_francais : data.taxref?.nom_vern }}
Observé par @@ -413,7 +413,7 @@ export class ObsMapComponent implements OnInit, OnChanges { le {{ data.date }}

- +
` }) diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 342013ae..5d37aa4c 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -453,17 +453,13 @@ select:focus { font-size: 18px; } -.leaflet-popup-content a { - height: 80px; - width: 40px; - background: var(--primary); - color: #fff; - display: flex; - justify-content: center; - align-items: center; - font-size: 18px; +.leaflet-popup-content .espece-link { + color :black +} +.leaflet-popup-content .espece-link:hover{ + text-decoration: none !important; + color: #555; } - .modal-header { background: var(--secondary); background: var(--modal-header-bg-moz); From d38ed8cfad011fdb8264a2c1b2d4dc288e34940d Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 20 Dec 2019 18:43:14 +0100 Subject: [PATCH 27/76] beautify fix --- frontend/src/app/core/footer/footer.component.css | 1 + frontend/src/app/programs/observations/obs.component.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/core/footer/footer.component.css b/frontend/src/app/core/footer/footer.component.css index 1aeffa4d..af2cddd0 100644 --- a/frontend/src/app/core/footer/footer.component.css +++ b/frontend/src/app/core/footer/footer.component.css @@ -1,4 +1,5 @@ footer{ + margin-top: 20px; padding: 20px 0px; text-align: center; background: rgb(226, 226, 226); diff --git a/frontend/src/app/programs/observations/obs.component.css b/frontend/src/app/programs/observations/obs.component.css index a074944a..2e692a9c 100644 --- a/frontend/src/app/programs/observations/obs.component.css +++ b/frontend/src/app/programs/observations/obs.component.css @@ -7,7 +7,7 @@ .obs-section#slide{ /*margin-top: 106px;*/ - margin-bottom: 0px; + margin-bottom: 20px; } .section:before { From b172edc117ed4061e610f6c32210e1785b0ff555 Mon Sep 17 00:00:00 2001 From: Fred C Date: Mon, 30 Dec 2019 16:36:43 +0100 Subject: [PATCH 28/76] Update models.py --- backend/gncitizen/core/users/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gncitizen/core/users/models.py b/backend/gncitizen/core/users/models.py index c15cd461..e73eed04 100644 --- a/backend/gncitizen/core/users/models.py +++ b/backend/gncitizen/core/users/models.py @@ -47,7 +47,7 @@ class UserModel(TimestampMixinModel, db.Model): phone = db.Column(db.String(15)) organism = db.Column(db.String(100)) avatar = db.Column(db.String()) - active = db.Column(db.Boolean, default=False) + active = db.Column(db.Boolean, default=True) admin = db.Column(db.Boolean, default=False) def save_to_db(self): From 55c3dd127a48b902acecc2ba99bcf193733daf04 Mon Sep 17 00:00:00 2001 From: Fred C Date: Mon, 30 Dec 2019 16:39:42 +0100 Subject: [PATCH 29/76] Update models.py --- backend/gncitizen/core/users/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/gncitizen/core/users/models.py b/backend/gncitizen/core/users/models.py index e73eed04..c15cd461 100644 --- a/backend/gncitizen/core/users/models.py +++ b/backend/gncitizen/core/users/models.py @@ -47,7 +47,7 @@ class UserModel(TimestampMixinModel, db.Model): phone = db.Column(db.String(15)) organism = db.Column(db.String(100)) avatar = db.Column(db.String()) - active = db.Column(db.Boolean, default=True) + active = db.Column(db.Boolean, default=False) admin = db.Column(db.Boolean, default=False) def save_to_db(self): From 8bfef1c1b888d7ba3bd7fedbc66df0f085c7a8a8 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 7 Jan 2020 14:12:54 +0100 Subject: [PATCH 30/76] fix init map and defaultLayer --- backend/gncitizen/core/users/routes.py | 5 +- frontend/package-lock.json | 7556 +++++++++++++++-- frontend/package.json | 5 +- frontend/src/app/app.module.ts | 4 +- frontend/src/app/home/home.component.css | 1 + .../observations/map/map.component.ts | 127 +- .../programs/observations/obs.component.html | 88 +- .../programs/observations/obs.component.ts | 12 + 8 files changed, 6813 insertions(+), 985 deletions(-) diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index bff0e8c7..f424bfba 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -146,7 +146,10 @@ def registration(): handler.write(imgdata) handler.close() # send confirm mail - confirm_user_email(newuser) + try: + confirm_user_email(newuser) + except Exception as e: + return {"message mail faild": str(e)}, 500 return ( { "message": """Félicitations, l'utilisateur "{}" a été créé. \r\n Vous allez recevoir un email diff --git a/frontend/package-lock.json b/frontend/package-lock.json index b74f2e09..feadd969 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2,32 +2,115 @@ "name": "frontend", "version": "0.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { "@angular-devkit/architect": { "version": "0.802.2", "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.2.tgz", "integrity": "sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==", "dev": true, + "requires": { + "@angular-devkit/core": "8.2.2", + "rxjs": "6.4.0" + }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, "@angular-devkit/build-angular": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.802.2.tgz", - "integrity": "sha512-48WCSX5IpSbVe/cG9+KrcL6f93JwHicKfYLyrrGhywSENlBYVNLNfbJHz/AuaxjmsiCmiI9gLnRb/W5JoVxuMA==", - "dev": true, - "dependencies": { - "core-js": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", - "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==", - "dev": true + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.803.21.tgz", + "integrity": "sha512-flfgflvfpwdsm3x/U7QnfbtyZPEbsVipzQAoao1Zo58Beq1a+NsKsWbjrF/x4TSoI2czt0OVWXNytlfXM7LMhg==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.803.21", + "@angular-devkit/build-optimizer": "0.803.21", + "@angular-devkit/build-webpack": "0.803.21", + "@angular-devkit/core": "8.3.21", + "@babel/core": "7.7.5", + "@babel/preset-env": "7.7.6", + "@ngtools/webpack": "8.3.21", + "ajv": "6.10.2", + "autoprefixer": "9.6.1", + "browserslist": "4.6.6", + "cacache": "12.0.2", + "caniuse-lite": "1.0.30000989", + "circular-dependency-plugin": "5.2.0", + "clean-css": "4.2.1", + "copy-webpack-plugin": "5.1.1", + "core-js": "3.2.1", + "file-loader": "4.2.0", + "find-cache-dir": "3.0.0", + "glob": "7.1.4", + "istanbul-instrumenter-loader": "3.0.1", + "jest-worker": "24.9.0", + "karma-source-map-support": "1.4.0", + "less": "3.9.0", + "less-loader": "5.0.0", + "license-webpack-plugin": "2.1.2", + "loader-utils": "1.2.3", + "mini-css-extract-plugin": "0.8.0", + "minimatch": "3.0.4", + "open": "6.4.0", + "parse5": "4.0.0", + "postcss": "7.0.17", + "postcss-import": "12.0.1", + "postcss-loader": "3.0.0", + "raw-loader": "3.1.0", + "regenerator-runtime": "0.13.3", + "rxjs": "6.4.0", + "sass": "1.22.9", + "sass-loader": "7.2.0", + "semver": "6.3.0", + "source-map": "0.7.3", + "source-map-loader": "0.2.4", + "source-map-support": "0.5.13", + "speed-measure-webpack-plugin": "1.3.1", + "style-loader": "1.0.0", + "stylus": "0.54.5", + "stylus-loader": "3.0.2", + "terser": "4.3.9", + "terser-webpack-plugin": "1.4.3", + "tree-kill": "1.2.1", + "webpack": "4.39.2", + "webpack-dev-middleware": "3.7.2", + "webpack-dev-server": "3.9.0", + "webpack-merge": "4.2.1", + "webpack-sources": "1.4.3", + "webpack-subresource-integrity": "1.1.0-rc.6", + "worker-plugin": "3.2.0" + }, + "dependencies": { + "@angular-devkit/architect": { + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.21.tgz", + "integrity": "sha512-E2K/YexIWVyKM/xmyxvDjkJf+wX9u4c8YYpNaK4htsRzA06juc7N1MhlL/jURZiRl5b/K9sapYeq3tMX76saxA==", + "dev": true, + "requires": { + "@angular-devkit/core": "8.3.21", + "rxjs": "6.4.0" + } + }, + "@angular-devkit/core": { + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.21.tgz", + "integrity": "sha512-BYyVbrbys535FplX0+GVOlYBg/cyk1U5SRhSxRRFZYi9epVlEBBPk8/6wV4cQPGb6EwXkVj7YtPWXjXcGfzWmA==", + "dev": true, + "requires": { + "ajv": "6.10.2", + "fast-json-stable-stringify": "2.0.0", + "magic-string": "0.25.3", + "rxjs": "6.4.0", + "source-map": "0.7.3" + } }, "parse5": { "version": "4.0.0", @@ -39,34 +122,105 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true + }, + "source-map-support": { + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } } } }, "@angular-devkit/build-optimizer": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.802.2.tgz", - "integrity": "sha512-0QkTxMgCr2YiysdRVY64smtogDnWz0eyqhmUJbd9kEq1xxDDfuvs+6OT1Lk6xU7tcucVf33DKB9jK/3n3LZIpw==", - "dev": true, + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.803.21.tgz", + "integrity": "sha512-gNN6kPaF4phZco3TmsrNr9tIEKXYsoSeoaUiDUfgmCYwa7fAqM8Ojh7HX6IQuB2PpVmEwKGlCcSh6xDtB33NjA==", + "dev": true, + "requires": { + "loader-utils": "1.2.3", + "source-map": "0.7.3", + "tslib": "1.10.0", + "typescript": "3.5.3", + "webpack-sources": "1.4.3" + }, "dependencies": { "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true } } }, "@angular-devkit/build-webpack": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.802.2.tgz", - "integrity": "sha512-odsY7hkqUBsRgqTCcGXFuIBd6NJYSCduFHheoDpqwK0SIAlAZ6Q9pB6jv9J0FTwKUJBsVsHk+cXUuaeZhUQcIg==", - "dev": true, - "dependencies": { + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.803.21.tgz", + "integrity": "sha512-zCFVla/Xdk8qGVybvnHtoKml2h0/ShasSjT55VNZO1XaTCMqYkQEwwqSGEiVajpauafWjKrKxxBhsmWoI4efAA==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.803.21", + "@angular-devkit/core": "8.3.21", + "rxjs": "6.4.0" + }, + "dependencies": { + "@angular-devkit/architect": { + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.21.tgz", + "integrity": "sha512-E2K/YexIWVyKM/xmyxvDjkJf+wX9u4c8YYpNaK4htsRzA06juc7N1MhlL/jURZiRl5b/K9sapYeq3tMX76saxA==", + "dev": true, + "requires": { + "@angular-devkit/core": "8.3.21", + "rxjs": "6.4.0" + } + }, + "@angular-devkit/core": { + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.21.tgz", + "integrity": "sha512-BYyVbrbys535FplX0+GVOlYBg/cyk1U5SRhSxRRFZYi9epVlEBBPk8/6wV4cQPGb6EwXkVj7YtPWXjXcGfzWmA==", + "dev": true, + "requires": { + "ajv": "6.10.2", + "fast-json-stable-stringify": "2.0.0", + "magic-string": "0.25.3", + "rxjs": "6.4.0", + "source-map": "0.7.3" + } + }, "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true } } @@ -76,12 +230,22 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", "dev": true, + "requires": { + "ajv": "6.10.2", + "fast-json-stable-stringify": "2.0.0", + "magic-string": "0.25.3", + "rxjs": "6.4.0", + "source-map": "0.7.3" + }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.9.0" + } }, "source-map": { "version": "0.7.3", @@ -96,25 +260,72 @@ "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.2.tgz", "integrity": "sha512-wAbP+IriWgTSLR4prezuFlLbxMZMGXiN0FNH2i/v8MfxNXCBiEvD4YtD/8s8YRsZs+IW7sp3bErSD/EIlS4DyQ==", "dev": true, + "requires": { + "@angular-devkit/core": "8.2.2", + "rxjs": "6.4.0" + }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, "@angular/animations": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.2.tgz", - "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==" + "integrity": "sha512-vOfZGMDnP5/n4MIxZqT49nVc305EYpRK+bz68hJmZd2QkTxQA+8j84xr4jfIC6zUWdyQqZhwWEF5Lqqy7G155g==", + "requires": { + "tslib": "^1.9.0" + } + }, + "@angular/cdk": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-8.2.3.tgz", + "integrity": "sha512-ZwO5Sn720RA2YvBqud0JAHkZXjmjxM0yNzCO8RVtRE9i8Gl26Wk0j0nQeJkVm4zwv2QO8MwbKUKGTMt8evsokA==", + "requires": { + "parse5": "^5.0.0", + "tslib": "^1.7.1" + }, + "dependencies": { + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "optional": true + } + } }, "@angular/cli": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.2.2.tgz", "integrity": "sha512-iQvNVbegNXvnuAo8Pal6hjwK8joGcaCTcIa3jh1GLZ9JT4fZk2p9D/8Kay8C0jLm2KytV3f4eSlPAuX5V6p/XQ==", "dev": true, + "requires": { + "@angular-devkit/architect": "0.802.2", + "@angular-devkit/core": "8.2.2", + "@angular-devkit/schematics": "8.2.2", + "@schematics/angular": "8.2.2", + "@schematics/update": "0.802.2", + "@yarnpkg/lockfile": "1.1.0", + "ansi-colors": "4.1.1", + "debug": "^4.1.1", + "ini": "1.3.5", + "inquirer": "6.5.0", + "npm-package-arg": "6.1.0", + "open": "6.4.0", + "pacote": "9.5.4", + "read-package-tree": "5.3.1", + "semver": "6.3.0", + "symbol-observable": "1.2.0", + "universal-analytics": "^0.4.20", + "uuid": "^3.3.2" + }, "dependencies": { "ansi-colors": { "version": "4.1.1", @@ -126,7 +337,10 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -139,18 +353,36 @@ "@angular/common": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.2.tgz", - "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==" + "integrity": "sha512-PLV2+gj4pSe4MC5fwpEpI0JyWSKkNVvA65CCZvG2XXJTp4eS+ppkCZpEvbXqf7IewpKMAeFkuLi16r92pLG5Vw==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/compiler": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.2.tgz", - "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==" + "integrity": "sha512-UMhOQehvi9u1r4u48Ymwm5JkdOKoH057ImCo26WqRqJBUgA44xwmUsKLFAmSg1JqzWCO5pBDyA3RaNBscD8ZzQ==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/compiler-cli": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.2.tgz", "integrity": "sha512-lEfWykViorBom4iWeZusoH4yAFkalyys/k9sI2qiTSVaH6TyowXbnfTMGfFQXKFydxI9sE86cCPoaRcR6fQcKQ==", "dev": true, + "requires": { + "canonical-path": "1.0.0", + "chokidar": "^2.1.1", + "convert-source-map": "^1.5.1", + "dependency-graph": "^0.7.2", + "magic-string": "^0.25.0", + "minimist": "^1.2.0", + "reflect-metadata": "^0.1.2", + "source-map": "^0.6.1", + "tslib": "^1.9.0", + "yargs": "13.1.0" + }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -163,12 +395,19 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } } } }, @@ -182,25 +421,60 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } }, "chokidar": { "version": "2.1.6", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + } }, "fsevents": { "version": "1.2.9", @@ -760,13 +1034,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } }, "isarray": { "version": "1.0.0", @@ -778,19 +1058,36 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } }, "require-main-filename": { "version": "2.0.0", @@ -798,58 +1095,99 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true - }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } }, "yargs": { "version": "13.1.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz", "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==", - "dev": true + "dev": true, + "requires": { + "cliui": "^4.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.0.0" + } }, "yargs-parser": { "version": "13.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, "@angular/core": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.2.tgz", - "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==" + "integrity": "sha512-glQLJ3aeRWHMsN9QeJYis5FVdCg0lBU2s9aFX9i6WvVLscYmGoBk+TKsgO+uJjLnUUgsCPLRLzde02IJEQzCGw==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/forms": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.2.tgz", - "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==" + "integrity": "sha512-2PTTKWP+GoHRLf3S3HKzn5QJtCMMRaMmcTrbR10hgUmDPdMeULGNZG3OacV8rRbRv4TDtXoqbKp0NRFQ7xsofQ==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/http": { "version": "7.2.15", "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.15.tgz", - "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==" + "integrity": "sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/language-service": { "version": "8.2.2", @@ -860,34 +1198,213 @@ "@angular/platform-browser": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.2.tgz", - "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==" + "integrity": "sha512-8PivPsi4Lrtl3vkC/a/s4QUSlv2nXjtea4h+t7zEpj6o9TeONA5iNe1LHSruG66IfOCW/U8l1THHJAsTj/8OAw==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/platform-browser-dynamic": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.2.tgz", - "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==" + "integrity": "sha512-c34GNNe9iDX6OUw7PJua4BbkUVTeX+SYmv5Iv5+pNENp9n6Y/kousbpoaDjLx37/8ujE8c9U378OeopZoasE4Q==", + "requires": { + "tslib": "^1.9.0" + } }, "@angular/platform-server": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-8.2.2.tgz", - "integrity": "sha512-LSi+CL7uApdSMuCf5IYqO2UbvPzDbvTvpFrpFZgcqweeKhpcaNjfm3M51hrec8eTlpd06ONd93SwKC2gqkmr7A==" + "integrity": "sha512-LSi+CL7uApdSMuCf5IYqO2UbvPzDbvTvpFrpFZgcqweeKhpcaNjfm3M51hrec8eTlpd06ONd93SwKC2gqkmr7A==", + "requires": { + "domino": "^2.1.2", + "tslib": "^1.9.0", + "xhr2": "^0.1.4" + } }, "@angular/router": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.2.tgz", - "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==" + "integrity": "sha512-aoIuSiVYBFh53dS4a79ZK23YjQ363x+8hakorDdAdrC3WwGST9YYDpVuNoa/gahkWIWCWN4Q0nl16cjQ6XI6BA==", + "requires": { + "tslib": "^1.9.0" + } }, "@babel/code-frame": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", - "dev": true + "dev": true, + "requires": { + "@babel/highlight": "^7.0.0" + } + }, + "@babel/core": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.5.tgz", + "integrity": "sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helpers": "^7.7.4", + "@babel/parser": "^7.7.5", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "json5": "^2.1.0", + "lodash": "^4.17.13", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "json5": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz", + "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } }, "@babel/generator": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", "dev": true, + "requires": { + "@babel/types": "^7.5.5", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + }, "dependencies": { "jsesc": { "version": "2.5.2", @@ -903,29 +1420,1117 @@ } } }, - "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", - "dev": true - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", - "dev": true - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true + "@babel/helper-annotate-as-pure": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz", + "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } }, - "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz", + "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==", "dev": true, + "requires": { + "@babel/helper-explode-assignable-expression": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-call-delegate": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz", + "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==", + "dev": true, + "requires": { + "@babel/helper-hoist-variables": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-create-regexp-features-plugin": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz", + "integrity": "sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==", + "dev": true, + "requires": { + "@babel/helper-regex": "^7.4.4", + "regexpu-core": "^4.6.0" + }, + "dependencies": { + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", + "dev": true + }, + "regexpu-core": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz", + "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==", + "dev": true, + "requires": { + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.1.0", + "regjsgen": "^0.5.0", + "regjsparser": "^0.6.0", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.1.0" + } + }, + "regjsgen": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz", + "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==", + "dev": true + }, + "regjsparser": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.2.tgz", + "integrity": "sha512-E9ghzUtoLwDekPT0DYCp+c4h+bvuUpe6rRHCTYn6eGoqj1LgKXxT6I0Il4WbjhQkOghzi/V+y03bPKvbllL93Q==", + "dev": true, + "requires": { + "jsesc": "~0.5.0" + } + } + } + }, + "@babel/helper-define-map": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz", + "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.7.4", + "@babel/types": "^7.7.4", + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-explode-assignable-expression": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz", + "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==", + "dev": true, + "requires": { + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", + "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.0.0", + "@babel/template": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", + "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", + "dev": true, + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@babel/helper-hoist-variables": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz", + "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz", + "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-imports": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz", + "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-module-transforms": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz", + "integrity": "sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-simple-access": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4", + "lodash": "^4.17.13" + }, + "dependencies": { + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz", + "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-plugin-utils": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz", + "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==", + "dev": true + }, + "@babel/helper-regex": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz", + "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==", + "dev": true, + "requires": { + "lodash": "^4.17.13" + } + }, + "@babel/helper-remap-async-to-generator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz", + "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-wrap-function": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-replace-supers": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz", + "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==", + "dev": true, + "requires": { + "@babel/helper-member-expression-to-functions": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-simple-access": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz", + "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==", + "dev": true, + "requires": { + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", + "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", + "dev": true, + "requires": { + "@babel/types": "^7.4.4" + } + }, + "@babel/helper-wrap-function": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz", + "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helpers": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz", + "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==", + "dev": true, + "requires": { + "@babel/template": "^7.7.4", + "@babel/traverse": "^7.7.4", + "@babel/types": "^7.7.4" + }, + "dependencies": { + "@babel/generator": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz", + "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + } + }, + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/traverse": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz", + "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/highlight": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", + "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "dev": true, + "requires": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" + }, "dependencies": { "js-tokens": { "version": "4.0.0", @@ -935,29 +2540,678 @@ } } }, - "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", - "dev": true + "@babel/parser": { + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", + "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", + "dev": true + }, + "@babel/plugin-proposal-async-generator-functions": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz", + "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-remap-async-to-generator": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4" + } + }, + "@babel/plugin-proposal-dynamic-import": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz", + "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-dynamic-import": "^7.7.4" + } + }, + "@babel/plugin-proposal-json-strings": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz", + "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-json-strings": "^7.7.4" + } + }, + "@babel/plugin-proposal-object-rest-spread": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz", + "integrity": "sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-object-rest-spread": "^7.7.4" + } + }, + "@babel/plugin-proposal-optional-catch-binding": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4" + } + }, + "@babel/plugin-proposal-unicode-property-regex": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz", + "integrity": "sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz", + "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-dynamic-import": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz", + "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz", + "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz", + "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz", + "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz", + "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-arrow-functions": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz", + "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-async-to-generator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz", + "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-remap-async-to-generator": "^7.7.4" + } + }, + "@babel/plugin-transform-block-scoped-functions": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz", + "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-block-scoping": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz", + "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "lodash": "^4.17.13" + } + }, + "@babel/plugin-transform-classes": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz", + "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-define-map": "^7.7.4", + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-optimise-call-expression": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-replace-supers": "^7.7.4", + "@babel/helper-split-export-declaration": "^7.7.4", + "globals": "^11.1.0" + }, + "dependencies": { + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz", + "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/plugin-transform-computed-properties": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz", + "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-destructuring": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz", + "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-dotall-regex": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz", + "integrity": "sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-duplicate-keys": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz", + "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-exponentiation-operator": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz", + "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==", + "dev": true, + "requires": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-for-of": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz", + "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz", + "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==", + "dev": true, + "requires": { + "@babel/helper-function-name": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + }, + "dependencies": { + "@babel/helper-function-name": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz", + "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/template": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/parser": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz", + "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==", + "dev": true + }, + "@babel/template": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz", + "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.4", + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/plugin-transform-literals": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz", + "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-member-expression-literals": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz", + "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-modules-amd": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz", + "integrity": "sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.7.5", + "@babel/helper-plugin-utils": "^7.0.0", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-commonjs": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz", + "integrity": "sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.7.5", + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-simple-access": "^7.7.4", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-systemjs": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz", + "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==", + "dev": true, + "requires": { + "@babel/helper-hoist-variables": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0", + "babel-plugin-dynamic-import-node": "^2.3.0" + } + }, + "@babel/plugin-transform-modules-umd": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz", + "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==", + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz", + "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.7.4" + } + }, + "@babel/plugin-transform-new-target": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz", + "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-object-super": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz", + "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-replace-supers": "^7.7.4" + } + }, + "@babel/plugin-transform-parameters": { + "version": "7.7.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz", + "integrity": "sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==", + "dev": true, + "requires": { + "@babel/helper-call-delegate": "^7.7.4", + "@babel/helper-get-function-arity": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + }, + "dependencies": { + "@babel/helper-get-function-arity": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz", + "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==", + "dev": true, + "requires": { + "@babel/types": "^7.7.4" + } + }, + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + } + } + }, + "@babel/plugin-transform-property-literals": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz", + "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-regenerator": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz", + "integrity": "sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==", + "dev": true, + "requires": { + "regenerator-transform": "^0.14.0" + } + }, + "@babel/plugin-transform-reserved-words": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz", + "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-shorthand-properties": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz", + "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz", + "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz", + "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/helper-regex": "^7.0.0" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz", + "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz", + "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz", + "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0" + } + }, + "@babel/preset-env": { + "version": "7.7.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.6.tgz", + "integrity": "sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.7.4", + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-async-generator-functions": "^7.7.4", + "@babel/plugin-proposal-dynamic-import": "^7.7.4", + "@babel/plugin-proposal-json-strings": "^7.7.4", + "@babel/plugin-proposal-object-rest-spread": "^7.7.4", + "@babel/plugin-proposal-optional-catch-binding": "^7.7.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.7.4", + "@babel/plugin-syntax-async-generators": "^7.7.4", + "@babel/plugin-syntax-dynamic-import": "^7.7.4", + "@babel/plugin-syntax-json-strings": "^7.7.4", + "@babel/plugin-syntax-object-rest-spread": "^7.7.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.7.4", + "@babel/plugin-syntax-top-level-await": "^7.7.4", + "@babel/plugin-transform-arrow-functions": "^7.7.4", + "@babel/plugin-transform-async-to-generator": "^7.7.4", + "@babel/plugin-transform-block-scoped-functions": "^7.7.4", + "@babel/plugin-transform-block-scoping": "^7.7.4", + "@babel/plugin-transform-classes": "^7.7.4", + "@babel/plugin-transform-computed-properties": "^7.7.4", + "@babel/plugin-transform-destructuring": "^7.7.4", + "@babel/plugin-transform-dotall-regex": "^7.7.4", + "@babel/plugin-transform-duplicate-keys": "^7.7.4", + "@babel/plugin-transform-exponentiation-operator": "^7.7.4", + "@babel/plugin-transform-for-of": "^7.7.4", + "@babel/plugin-transform-function-name": "^7.7.4", + "@babel/plugin-transform-literals": "^7.7.4", + "@babel/plugin-transform-member-expression-literals": "^7.7.4", + "@babel/plugin-transform-modules-amd": "^7.7.5", + "@babel/plugin-transform-modules-commonjs": "^7.7.5", + "@babel/plugin-transform-modules-systemjs": "^7.7.4", + "@babel/plugin-transform-modules-umd": "^7.7.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4", + "@babel/plugin-transform-new-target": "^7.7.4", + "@babel/plugin-transform-object-super": "^7.7.4", + "@babel/plugin-transform-parameters": "^7.7.4", + "@babel/plugin-transform-property-literals": "^7.7.4", + "@babel/plugin-transform-regenerator": "^7.7.5", + "@babel/plugin-transform-reserved-words": "^7.7.4", + "@babel/plugin-transform-shorthand-properties": "^7.7.4", + "@babel/plugin-transform-spread": "^7.7.4", + "@babel/plugin-transform-sticky-regex": "^7.7.4", + "@babel/plugin-transform-template-literals": "^7.7.4", + "@babel/plugin-transform-typeof-symbol": "^7.7.4", + "@babel/plugin-transform-unicode-regex": "^7.7.4", + "@babel/types": "^7.7.4", + "browserslist": "^4.6.0", + "core-js-compat": "^3.4.7", + "invariant": "^2.2.2", + "js-levenshtein": "^1.1.3", + "semver": "^5.5.0" + }, + "dependencies": { + "@babel/types": { + "version": "7.7.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz", + "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } }, "@babel/template": { "version": "7.4.4", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.4.4", + "@babel/types": "^7.4.4" + } }, "@babel/traverse": { "version": "7.5.5", "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", "dev": true, + "requires": { + "@babel/code-frame": "^7.5.5", + "@babel/generator": "^7.5.5", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.4.4", + "@babel/parser": "^7.5.5", + "@babel/types": "^7.5.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" + }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "globals": { "version": "11.12.0", @@ -978,6 +3232,11 @@ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, "dependencies": { "to-fast-properties": { "version": "2.0.0", @@ -990,18 +3249,50 @@ "@ng-bootstrap/ng-bootstrap": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-5.1.0.tgz", - "integrity": "sha512-IYoKE1NMrIPbRV0077/uHOjdwPb3qyhHpbBXiMGjclkSm2GvKXNPIzgd3Vjon/lbKelHdAW4A/upUHN2VYUi3w==" + "integrity": "sha512-IYoKE1NMrIPbRV0077/uHOjdwPb3qyhHpbBXiMGjclkSm2GvKXNPIzgd3Vjon/lbKelHdAW4A/upUHN2VYUi3w==", + "requires": { + "tslib": "^1.9.0" + } }, "@ngtools/webpack": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz", - "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==", - "dev": true, - "dependencies": { + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.3.21.tgz", + "integrity": "sha512-DGqmFQ52sV4uB3y3spQTNLa69oU5cwd1yIqMB4GSM+Qp+hozdzrPA2gVH90N2DDhWe8icsSQHAtZQiR9+BDL8g==", + "dev": true, + "requires": { + "@angular-devkit/core": "8.3.21", + "enhanced-resolve": "4.1.0", + "rxjs": "6.4.0", + "tree-kill": "1.2.1", + "webpack-sources": "1.4.3" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.21.tgz", + "integrity": "sha512-BYyVbrbys535FplX0+GVOlYBg/cyk1U5SRhSxRRFZYi9epVlEBBPk8/6wV4cQPGb6EwXkVj7YtPWXjXcGfzWmA==", + "dev": true, + "requires": { + "ajv": "6.10.2", + "fast-json-stable-stringify": "2.0.0", + "magic-string": "0.25.3", + "rxjs": "6.4.0", + "source-map": "0.7.3" + } + }, "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", "dev": true } } @@ -1020,26 +3311,46 @@ "version": "8.2.2", "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", - "dev": true + "dev": true, + "requires": { + "@angular-devkit/core": "8.2.2", + "@angular-devkit/schematics": "8.2.2" + } }, "@schematics/update": { "version": "0.802.2", "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz", "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==", "dev": true, + "requires": { + "@angular-devkit/core": "8.2.2", + "@angular-devkit/schematics": "8.2.2", + "@yarnpkg/lockfile": "1.1.0", + "ini": "1.3.5", + "pacote": "9.5.4", + "rxjs": "6.4.0", + "semver": "6.3.0", + "semver-intersect": "1.4.0" + }, "dependencies": { "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, "@swimlane/ngx-datatable": { "version": "16.0.2", "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-16.0.2.tgz", - "integrity": "sha512-+JxVumYGr4wON2YC0dXYt0vWmWNaWcVFWdAfrb6gXL/6iAJco70rX59lFvQ6ubFVgDKCsf+QycBXODvLnHaGUQ==" + "integrity": "sha512-+JxVumYGr4wON2YC0dXYt0vWmWNaWcVFWdAfrb6gXL/6iAJco70rX59lFvQ6ubFVgDKCsf+QycBXODvLnHaGUQ==", + "requires": { + "tslib": "^1.9.0" + } }, "@types/events": { "version": "3.0.0", @@ -1057,7 +3368,12 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "dev": true + "dev": true, + "requires": { + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" + } }, "@types/jasmine": { "version": "3.4.0", @@ -1069,25 +3385,37 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz", "integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==", - "dev": true + "dev": true, + "requires": { + "@types/jasmine": "*" + } }, "@types/leaflet": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.5.1.tgz", "integrity": "sha512-E5k+vyE2Tv9wQsO6ZsEy08Pjd8RjHPkCzz3Ubt7feMc+5+VkbXtcZMcciczRWuMN5rFIsVywLxRhvTp7fAbbzg==", - "dev": true + "dev": true, + "requires": { + "@types/geojson": "*" + } }, "@types/leaflet.locatecontrol": { "version": "0.60.7", "resolved": "https://registry.npmjs.org/@types/leaflet.locatecontrol/-/leaflet.locatecontrol-0.60.7.tgz", "integrity": "sha512-sac/MeK4gB+3XTJ3JzCe3HqLwKNHblIpZrxUJ6FapWK8uISZ0wcy8motVO7+v/yO47tQgsnYaobwFZ//beWHBQ==", - "dev": true + "dev": true, + "requires": { + "@types/leaflet": "*" + } }, "@types/leaflet.markercluster": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.0.tgz", "integrity": "sha512-ctCkUvknqzt+6eLOhZK7ta+G6WQ9wkTeFvOw1KhWYoPY/ZuzLD+QUg1Umnw7yzMNA+L00ne3cmTk/xmVNkRSLQ==", - "dev": true + "dev": true, + "requires": { + "@types/leaflet": "*" + } }, "@types/minimatch": { "version": "3.0.3", @@ -1123,13 +3451,23 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz", "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", - "dev": true + "dev": true, + "requires": { + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.6.1" + } }, "@webassemblyjs/ast": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" + } }, "@webassemblyjs/floating-point-hex-parser": { "version": "1.8.5", @@ -1153,7 +3491,10 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/wast-printer": "1.8.5" + } }, "@webassemblyjs/helper-fsm": { "version": "1.8.5", @@ -1165,7 +3506,11 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "mamacro": "^0.0.3" + } }, "@webassemblyjs/helper-wasm-bytecode": { "version": "1.8.5", @@ -1177,19 +3522,31 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5" + } }, "@webassemblyjs/ieee754": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", - "dev": true + "dev": true, + "requires": { + "@xtuc/ieee754": "^1.2.0" + } }, "@webassemblyjs/leb128": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", - "dev": true + "dev": true, + "requires": { + "@xtuc/long": "4.2.2" + } }, "@webassemblyjs/utf8": { "version": "1.8.5", @@ -1201,37 +3558,81 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/helper-wasm-section": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-opt": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "@webassemblyjs/wast-printer": "1.8.5" + } }, "@webassemblyjs/wasm-gen": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } }, "@webassemblyjs/wasm-opt": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5" + } }, "@webassemblyjs/wasm-parser": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" + } }, "@webassemblyjs/wast-parser": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/floating-point-hex-parser": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-code-frame": "1.8.5", + "@webassemblyjs/helper-fsm": "1.8.5", + "@xtuc/long": "4.2.2" + } }, "@webassemblyjs/wast-printer": { "version": "1.8.5", "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", - "dev": true + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" + } }, "@xtuc/ieee754": { "version": "1.2.0", @@ -1251,6 +3652,16 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -1259,7 +3670,11 @@ "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==" + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } }, "acorn": { "version": "4.0.13", @@ -1269,7 +3684,10 @@ "acorn-globals": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", - "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=" + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", + "requires": { + "acorn": "^4.0.4" + } }, "adm-zip": { "version": "0.4.13", @@ -1287,18 +3705,30 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } }, "agentkeepalive": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", - "dev": true + "dev": true, + "requires": { + "humanize-ms": "^1.2.1" + } }, "ajv": { "version": "6.10.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==" + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "requires": { + "fast-deep-equal": "^2.0.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } }, "ajv-errors": { "version": "1.0.1", @@ -1346,13 +3776,20 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } }, "anymatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", - "dev": true + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } }, "app-root-path": { "version": "2.2.1", @@ -1364,7 +3801,10 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true + "dev": true, + "requires": { + "default-require-extensions": "^2.0.0" + } }, "aproba": { "version": "1.2.0", @@ -1382,13 +3822,20 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true + "dev": true, + "requires": { + "sprintf-js": "~1.0.2" + } }, "aria-query": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", - "dev": true + "dev": true, + "requires": { + "ast-types-flow": "0.0.7", + "commander": "^2.11.0" + } }, "arr-diff": { "version": "4.0.0", @@ -1422,7 +3869,10 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } }, "array-uniq": { "version": "1.0.3", @@ -1457,19 +3907,31 @@ "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==" + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } }, "asn1.js": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } }, "assert": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, + "requires": { + "object-assign": "^4.1.1", + "util": "0.10.3" + }, "dependencies": { "inherits": { "version": "2.0.1", @@ -1481,7 +3943,10 @@ "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true + "dev": true, + "requires": { + "inherits": "2.0.1" + } } } }, @@ -1506,7 +3971,10 @@ "version": "2.6.3", "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true + "dev": true, + "requires": { + "lodash": "^4.17.14" + } }, "async-each": { "version": "1.0.3", @@ -1535,7 +4003,16 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", - "dev": true + "dev": true, + "requires": { + "browserslist": "^4.6.3", + "caniuse-lite": "^1.0.30000980", + "chalk": "^2.4.2", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.17", + "postcss-value-parser": "^4.0.0" + } }, "aws-sign2": { "version": "0.7.0", @@ -1551,13 +4028,21 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true + "dev": true, + "requires": { + "ast-types-flow": "0.0.7" + } }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, + "requires": { + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + }, "dependencies": { "ansi-styles": { "version": "2.2.1", @@ -1569,6 +4054,19 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", "dev": true }, "supports-color": { @@ -1584,7 +4082,23 @@ "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, + "requires": { + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + }, "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + }, "source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", @@ -1597,18 +4111,40 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true + "dev": true, + "requires": { + "babel-runtime": "^6.22.0" + } + }, + "babel-plugin-dynamic-import-node": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz", + "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==", + "dev": true, + "requires": { + "object.assign": "^4.1.0" + } }, "babel-runtime": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, "dependencies": { "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==", + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true } } @@ -1617,19 +4153,59 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" + } }, "babel-traverse": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true + "dev": true, + "requires": { + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + }, + "dependencies": { + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true + } + } }, "babel-types": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + }, + "dependencies": { + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true + } + } }, "babylon": { "version": "6.18.0", @@ -1653,30 +4229,53 @@ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, + "requires": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } } } }, @@ -1707,13 +4306,19 @@ "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=" + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", + "requires": { + "tweetnacl": "^0.14.3" + } }, "better-assert": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true + "dev": true, + "requires": { + "callsite": "1.0.0" + } }, "big.js": { "version": "5.2.2", @@ -1727,6 +4332,16 @@ "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", "dev": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "blob": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", @@ -1737,7 +4352,10 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz", "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", - "dev": true + "dev": true, + "requires": { + "minimist": "^1.2.0" + } }, "bluebird": { "version": "3.5.5", @@ -1754,13 +4372,33 @@ "body-parser": { "version": "1.19.0", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==" + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "requires": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + } }, "bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, + "requires": { + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" + }, "dependencies": { "array-flatten": { "version": "2.1.2", @@ -1778,13 +4416,20 @@ "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==" + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } }, "braces": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } }, "brorand": { "version": "1.1.0", @@ -1796,55 +4441,103 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true + "dev": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } }, "browserify-cipher": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true + "dev": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } }, "browserify-des": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } }, "browserify-rsa": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + } }, "browserify-sign": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" + } }, "browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true + "dev": true, + "requires": { + "pako": "~1.0.5" + } }, "browserslist": { "version": "4.6.6", "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", - "dev": true + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30000984", + "electron-to-chromium": "^1.3.191", + "node-releases": "^1.1.25" + } }, "browserstack": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz", "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==", - "dev": true + "dev": true, + "requires": { + "https-proxy-agent": "^2.2.1" + } }, "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -1858,7 +4551,11 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", - "dev": true + "dev": true, + "requires": { + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" + } }, "buffer-alloc-unsafe": { "version": "1.1.0", @@ -1914,28 +4611,62 @@ "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", - "dev": true + "version": "12.0.2", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz", + "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true + "dev": true, + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", - "dev": true + "dev": true, + "requires": { + "callsites": "^2.0.0" + } }, "caller-path": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", - "dev": true + "dev": true, + "requires": { + "caller-callsite": "^2.0.0" + } }, "callsite": { "version": "1.0.0", @@ -1956,9 +4687,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30000986", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz", - "integrity": "sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==", + "version": "1.0.30000989", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000989.tgz", + "integrity": "sha512-vrMcvSuMz16YY6GSVZ0dWDTJP8jqk3iFQ/Aq5iqblPwxSVVZI+zxDyTX0VPqtQsDnfdrBDcsmhgTEOh5R8Lbpw==", "dev": true }, "canonical-path": { @@ -1976,7 +4707,12 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } }, "chardet": { "version": "0.7.0", @@ -1989,12 +4725,25 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", "dev": true, + "requires": { + "anymatch": "^3.0.1", + "braces": "^3.0.2", + "fsevents": "^2.0.6", + "glob-parent": "^5.0.0", + "is-binary-path": "^2.1.0", + "is-glob": "^4.0.1", + "normalize-path": "^3.0.0", + "readdirp": "^3.1.1" + }, "dependencies": { "glob-parent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "dev": true + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } } } }, @@ -2008,18 +4757,25 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.9.0" + } }, "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==", - "dev": true + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } }, "circular-dependency-plugin": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz", - "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz", + "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==", "dev": true }, "class-utils": { @@ -2027,12 +4783,21 @@ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } } } }, @@ -2040,18 +4805,28 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz", "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==", - "dev": true + "dev": true, + "requires": { + "source-map": "~0.6.0" + } }, "cli": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz", - "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=" + "integrity": "sha1-IoF1NPJL+klQw01TLUjsvGIbjBQ=", + "requires": { + "exit": "0.1.2", + "glob": "^7.1.1" + } }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true + "dev": true, + "requires": { + "restore-cursor": "^2.0.0" + } }, "cli-width": { "version": "2.2.0", @@ -2064,6 +4839,11 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + }, "dependencies": { "ansi-regex": { "version": "3.0.0", @@ -2075,7 +4855,10 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } } } }, @@ -2086,10 +4869,15 @@ "dev": true }, "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", - "dev": true + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } }, "co": { "version": "4.6.0", @@ -2108,6 +4896,17 @@ "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.0.tgz", "integrity": "sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==", "dev": true, + "requires": { + "app-root-path": "^2.2.1", + "aria-query": "^3.0.0", + "axobject-query": "^2.0.2", + "css-selector-tokenizer": "^0.7.1", + "cssauron": "^1.4.0", + "damerau-levenshtein": "^1.0.4", + "semver-dsl": "^1.0.1", + "source-map": "^0.5.7", + "sprintf-js": "^1.1.2" + }, "dependencies": { "source-map": { "version": "0.5.7", @@ -2127,13 +4926,20 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true + "dev": true, + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true + "dev": true, + "requires": { + "color-name": "1.1.3" + } }, "color-name": { "version": "1.1.3", @@ -2150,7 +4956,10 @@ "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==" + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "requires": { + "delayed-stream": "~1.0.0" + } }, "commander": { "version": "2.20.0", @@ -2189,16 +4998,36 @@ "dev": true }, "compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", - "dev": true + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dev": true, + "requires": { + "mime-db": ">= 1.43.0 < 2" + }, + "dependencies": { + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", + "dev": true + } + } }, "compression": { "version": "1.7.4", "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, + "requires": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, "dependencies": { "bytes": { "version": "3.0.0", @@ -2218,6 +5047,12 @@ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -2229,13 +5064,25 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -2243,7 +5090,13 @@ "version": "3.7.0", "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", - "dev": true + "dev": true, + "requires": { + "debug": "2.6.9", + "finalhandler": "1.1.2", + "parseurl": "~1.3.3", + "utils-merge": "1.0.1" + } }, "connect-history-api-fallback": { "version": "1.6.0", @@ -2254,7 +5107,10 @@ "console-browserify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=" + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "requires": { + "date-now": "^0.1.4" + } }, "constants-browserify": { "version": "1.0.0", @@ -2265,7 +5121,10 @@ "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==" + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "requires": { + "safe-buffer": "5.1.2" + } }, "content-type": { "version": "1.0.4", @@ -2281,7 +5140,10 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.1" + } }, "cookie": { "version": "0.4.0", @@ -2297,7 +5159,15 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true + "dev": true, + "requires": { + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" + } }, "copy-descriptor": { "version": "0.1.1", @@ -2306,16 +5176,101 @@ "dev": true }, "copy-webpack-plugin": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz", - "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==", - "dev": true + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz", + "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==", + "dev": true, + "requires": { + "cacache": "^12.0.3", + "find-cache-dir": "^2.1.0", + "glob-parent": "^3.1.0", + "globby": "^7.1.1", + "is-glob": "^4.0.1", + "loader-utils": "^1.2.3", + "minimatch": "^3.0.4", + "normalize-path": "^3.0.0", + "p-limit": "^2.2.1", + "schema-utils": "^1.0.0", + "serialize-javascript": "^2.1.2", + "webpack-log": "^2.0.0" + }, + "dependencies": { + "cacache": { + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", + "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + } + } }, "core-js": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz", "integrity": "sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==" }, + "core-js-compat": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.2.tgz", + "integrity": "sha512-+G28dzfYGtAM+XGvB1C5AS1ZPKfQ47HLhcdeIQdZgQnJVdp7/D0m+W/TErwhgsX6CujRUk/LebB6dCrKrtJrvQ==", + "dev": true, + "requires": { + "browserslist": "^4.8.3", + "semver": "7.0.0" + }, + "dependencies": { + "browserslist": { + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz", + "integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001017", + "electron-to-chromium": "^1.3.322", + "node-releases": "^1.1.44" + } + }, + "caniuse-lite": { + "version": "1.0.30001019", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz", + "integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==", + "dev": true + }, + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", + "dev": true + } + } + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -2325,31 +5280,63 @@ "version": "5.2.1", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", - "dev": true + "dev": true, + "requires": { + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" + } }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" + } }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } }, "create-hmac": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true + "dev": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -2363,7 +5350,20 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true + "dev": true, + "requires": { + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" + } }, "css-parse": { "version": "1.7.0", @@ -2375,13 +5375,21 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", - "dev": true + "dev": true, + "requires": { + "cssesc": "^0.1.0", + "fastparse": "^1.1.1", + "regexpu-core": "^1.0.0" + } }, "cssauron": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", - "dev": true + "dev": true, + "requires": { + "through": "X.X.X" + } }, "cssesc": { "version": "0.1.0", @@ -2397,7 +5405,10 @@ "cssstyle": { "version": "0.2.37", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", - "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=" + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "requires": { + "cssom": "0.3.x" + } }, "custom-event": { "version": "1.0.1", @@ -2420,7 +5431,10 @@ "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=" + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "^1.0.0" + } }, "date-format": { "version": "2.1.0", @@ -2436,7 +5450,10 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==" + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } }, "debuglog": { "version": "1.0.1", @@ -2457,10 +5474,18 @@ "dev": true }, "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "dev": true, + "requires": { + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" + } }, "deep-is": { "version": "0.1.3", @@ -2471,43 +5496,68 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", - "dev": true + "dev": true, + "requires": { + "execa": "^1.0.0", + "ip-regex": "^2.1.0" + } }, "default-require-extensions": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", - "dev": true + "dev": true, + "requires": { + "strip-bom": "^3.0.0" + } }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", - "dev": true + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, "dependencies": { "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } } } }, @@ -2516,12 +5566,28 @@ "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" + }, "dependencies": { "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, + "requires": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, "dependencies": { "pify": { "version": "2.3.0", @@ -2550,10 +5616,14 @@ "dev": true }, "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } }, "destroy": { "version": "1.0.4", @@ -2570,7 +5640,10 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true + "dev": true, + "requires": { + "repeating": "^2.0.0" + } }, "detect-node": { "version": "2.0.4", @@ -2582,7 +5655,11 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", - "dev": true + "dev": true, + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + } }, "di": { "version": "0.0.1", @@ -2600,13 +5677,21 @@ "version": "5.0.3", "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } }, "dir-glob": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", - "dev": true + "dev": true, + "requires": { + "path-type": "^3.0.0" + } }, "dns-equal": { "version": "1.0.0", @@ -2618,24 +5703,41 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true + "dev": true, + "requires": { + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" + } }, "dns-txt": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true + "dev": true, + "requires": { + "buffer-indexof": "^1.0.0" + } }, "dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true + "dev": true, + "requires": { + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" + } }, "dom-serializer": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz", "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==", + "requires": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + }, "dependencies": { "domelementtype": { "version": "2.0.1", @@ -2663,7 +5765,10 @@ "domhandler": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", - "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=" + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "requires": { + "domelementtype": "1" + } }, "domino": { "version": "2.1.3", @@ -2673,13 +5778,23 @@ "domutils": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=" + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } }, "duplexify": { "version": "3.7.1", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, + "requires": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -2691,20 +5806,36 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=" + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } }, "ee-first": { "version": "1.1.1", @@ -2712,16 +5843,25 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.236", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.236.tgz", - "integrity": "sha512-LWOvuJ80pLO3FtFqTcGuXB0dxdMtzSCkRmbXdY5mHUvXRQGor3sTVmyfU70aD2yF5i+fbHz52ncWr5T3xUYHlA==", + "version": "1.3.328", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.328.tgz", + "integrity": "sha512-x4XefnFxDxFwaQ01d/pppJP9meWhOIJ/gtI6/4jqkpsadq79uL7NYSaX64naLmJqvzUBjSrO3IM2+1b/W9KdPg==", "dev": true }, "elliptic": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", - "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", - "dev": true + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } }, "emoji-regex": { "version": "7.0.3", @@ -2744,19 +5884,33 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", - "dev": true + "dev": true, + "requires": { + "iconv-lite": "~0.4.13" + } }, "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true + "dev": true, + "requires": { + "once": "^1.4.0" + } }, "engine.io": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", "dev": true, + "requires": { + "accepts": "~1.3.4", + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" + }, "dependencies": { "cookie": { "version": "0.3.1", @@ -2768,7 +5922,10 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -2777,6 +5934,19 @@ "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", + "yeast": "0.1.2" + }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -2788,7 +5958,10 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -2796,13 +5969,25 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", - "dev": true + "dev": true, + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } }, "enhanced-resolve": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" + } }, "ent": { "version": "2.2.0", @@ -2825,25 +6010,44 @@ "version": "0.1.7", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true + "dev": true, + "requires": { + "prr": "~1.0.1" + } }, "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true + "dev": true, + "requires": { + "is-arrayish": "^0.2.1" + } }, "es-abstract": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", - "dev": true + "dev": true, + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + } }, "es-to-primitive": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } }, "es6-promise": { "version": "4.2.8", @@ -2855,7 +6059,10 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true + "dev": true, + "requires": { + "es6-promise": "^4.0.3" + } }, "escape-html": { "version": "1.0.3", @@ -2871,13 +6078,24 @@ "escodegen": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz", - "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==" + "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==", + "requires": { + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } }, "eslint-scope": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", - "dev": true + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } }, "esprima": { "version": "3.1.3", @@ -2888,7 +6106,10 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } }, "estraverse": { "version": "4.3.0", @@ -2921,19 +6142,35 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true + "dev": true, + "requires": { + "original": "^1.0.0" + } }, "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==", - "dev": true + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } }, "exit": { "version": "0.1.2", @@ -2945,18 +6182,33 @@ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } } } }, @@ -2964,12 +6216,47 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", - "dev": true + "dev": true, + "requires": { + "homedir-polyfill": "^1.0.1" + } }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==" + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + } }, "extend": { "version": "3.0.2", @@ -2981,12 +6268,19 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } } } }, @@ -2994,43 +6288,75 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } } } }, @@ -3064,7 +6390,10 @@ "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true + "dev": true, + "requires": { + "websocket-driver": ">=0.5.1" + } }, "figgy-pudding": { "version": "3.5.1", @@ -3076,19 +6405,30 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", - "dev": true + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } }, "file-loader": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz", - "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.2.0.tgz", + "integrity": "sha512-+xZnaK5R8kBJrHK0/6HRlrKNamvVS5rjyuju+rnyxRGuwUJwpAMsVzUl5dz6rK8brkzjV6JpcFNjp6NqV0g1OQ==", "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "schema-utils": "^2.0.0" + }, "dependencies": { "schema-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", - "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==", - "dev": true + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.1.tgz", + "integrity": "sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" + } } } }, @@ -3097,40 +6437,131 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz", "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==" }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "fileset": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "dev": true + "dev": true, + "requires": { + "glob": "^7.0.3", + "minimatch": "^3.0.3" + } }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } }, "finalhandler": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==" + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + } }, "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.0.0.tgz", + "integrity": "sha512-t7ulV1fmbxh5G9l/492O1p5+EBbr3uwpt6odhFTMc+nWyhmbloe+ja9BZ8pIBtqFWhOmCWVjx+pTW4zDkFoclw==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.0", + "pkg-dir": "^4.1.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "make-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz", + "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + } + } + } }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } }, "findup-sync": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", - "dev": true + "dev": true, + "requires": { + "detect-file": "^1.0.0", + "is-glob": "^4.0.0", + "micromatch": "^3.0.4", + "resolve-dir": "^1.0.1" + } }, "flatted": { "version": "2.0.1", @@ -3143,6 +6574,10 @@ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -3154,13 +6589,25 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -3169,12 +6616,18 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", "integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "dev": true, + "requires": { + "debug": "^3.2.6" + }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -3195,12 +6648,6 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -3209,7 +6656,12 @@ "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==" + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } }, "forwarded": { "version": "0.1.2", @@ -3220,7 +6672,10 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true + "dev": true, + "requires": { + "map-cache": "^0.2.2" + } }, "fresh": { "version": "0.5.2", @@ -3232,6 +6687,10 @@ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -3243,13 +6702,25 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -3257,19 +6728,33 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } }, "fs-minipass": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", - "dev": true + "dev": true, + "requires": { + "minipass": "^2.2.1" + } }, "fs-write-stream-atomic": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" + } }, "fs.realpath": { "version": "1.0.0", @@ -3305,7 +6790,10 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true + "dev": true, + "requires": { + "pump": "^3.0.0" + } }, "get-value": { "version": "2.0.6", @@ -3316,24 +6804,42 @@ "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=" + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "^1.0.0" + } }, "glob": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==" + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } }, "glob-parent": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, "dependencies": { "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } } } }, @@ -3342,12 +6848,20 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "dev": true, + "requires": { + "global-prefix": "^3.0.0" + }, "dependencies": { "global-prefix": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true + "dev": true, + "requires": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + } } } }, @@ -3355,12 +6869,19 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", - "dev": true + "dev": true, + "requires": { + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" + } }, "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, "globby": { @@ -3368,6 +6889,14 @@ "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, + "requires": { + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" + }, "dependencies": { "pify": { "version": "3.0.0", @@ -3390,10 +6919,16 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "dev": true + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", + "dev": true, + "requires": { + "neo-async": "^2.6.0", + "optimist": "^0.6.1", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4" + } }, "har-schema": { "version": "2.0.0", @@ -3403,25 +6938,38 @@ "har-validator": { "version": "5.1.3", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==" + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "requires": { + "ajv": "^6.5.5", + "har-schema": "^2.0.0" + } }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } }, "has-binary2": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", "dev": true, + "requires": { + "isarray": "2.0.1" + }, "dependencies": { "isarray": { "version": "2.0.1", @@ -3453,25 +7001,40 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true + "dev": true, + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } }, "has-values": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, "dependencies": { "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -3479,7 +7042,10 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -3487,25 +7053,41 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } }, "hash.js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", - "dev": true + "dev": true, + "requires": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true + "dev": true, + "requires": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } }, "homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true + "dev": true, + "requires": { + "parse-passwd": "^1.0.0" + } }, "hosted-git-info": { "version": "2.8.4", @@ -3518,6 +7100,12 @@ "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, + "requires": { + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -3526,23 +7114,38 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, "html-encoding-sniffer": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==" + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "requires": { + "whatwg-encoding": "^1.0.1" + } }, "html-entities": { "version": "1.2.1", @@ -3553,7 +7156,14 @@ "htmlparser2": { "version": "3.8.3", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", - "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=" + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + } }, "http-cache-semantics": { "version": "3.8.1", @@ -3570,7 +7180,14 @@ "http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==" + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } }, "http-parser-js": { "version": "0.4.10", @@ -3582,19 +7199,31 @@ "version": "1.17.0", "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", - "dev": true + "dev": true, + "requires": { + "eventemitter3": "^3.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + } }, "http-proxy-agent": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, + "requires": { + "agent-base": "4", + "debug": "3.1.0" + }, "dependencies": { "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -3602,12 +7231,23 @@ "version": "0.19.1", "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz", "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", - "dev": true + "dev": true, + "requires": { + "http-proxy": "^1.17.0", + "is-glob": "^4.0.0", + "lodash": "^4.17.11", + "micromatch": "^3.1.10" + } }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=" + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } }, "https-browserify": { "version": "1.0.0", @@ -3616,16 +7256,23 @@ "dev": true }, "https-proxy-agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", - "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", + "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, + "requires": { + "agent-base": "^4.3.0", + "debug": "^3.1.0" + }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -3639,12 +7286,18 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", - "dev": true + "dev": true, + "requires": { + "ms": "^2.0.0" + } }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } }, "ieee754": { "version": "1.1.13", @@ -3668,7 +7321,10 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", - "dev": true + "dev": true, + "requires": { + "minimatch": "^3.0.4" + } }, "image-size": { "version": "0.5.5", @@ -3687,25 +7343,39 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", - "dev": true + "dev": true, + "requires": { + "import-from": "^2.1.0" + } }, "import-fresh": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz", "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", - "dev": true + "dev": true, + "requires": { + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" + } }, "import-from": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", - "dev": true + "dev": true, + "requires": { + "resolve-from": "^3.0.0" + } }, "import-local": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", - "dev": true + "dev": true, + "requires": { + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" + } }, "imurmurhash": { "version": "0.1.4", @@ -3728,7 +7398,11 @@ "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=" + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } }, "inherits": { "version": "2.0.3", @@ -3746,6 +7420,21 @@ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", "dev": true, + "requires": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -3757,7 +7446,10 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } } } }, @@ -3765,7 +7457,11 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz", "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", - "dev": true + "dev": true, + "requires": { + "default-gateway": "^4.2.0", + "ipaddr.js": "^1.9.0" + } }, "interpret": { "version": "1.2.0", @@ -3777,7 +7473,10 @@ "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true + "dev": true, + "requires": { + "loose-envify": "^1.0.0" + } }, "invert-kv": { "version": "2.0.0", @@ -3802,20 +7501,38 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz", "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==" }, + "is-absolute-url": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", + "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", + "dev": true + }, "is-accessor-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -3826,7 +7543,10 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } }, "is-buffer": { "version": "1.1.6", @@ -3845,12 +7565,18 @@ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -3865,6 +7591,11 @@ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, "dependencies": { "kind-of": { "version": "5.1.0", @@ -3896,7 +7627,10 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -3908,7 +7642,10 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } }, "is-number": { "version": "7.0.0", @@ -3926,13 +7663,19 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true + "dev": true, + "requires": { + "is-path-inside": "^2.1.0" + } }, "is-path-inside": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true + "dev": true, + "requires": { + "path-is-inside": "^1.0.2" + } }, "is-plain-obj": { "version": "1.1.0", @@ -3944,7 +7687,10 @@ "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==", - "dev": true + "dev": true, + "requires": { + "isobject": "^3.0.1" + } }, "is-promise": { "version": "2.1.0", @@ -3956,7 +7702,10 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true + "dev": true, + "requires": { + "has": "^1.0.1" + } }, "is-stream": { "version": "1.1.0", @@ -3968,7 +7717,10 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", - "dev": true + "dev": true, + "requires": { + "has-symbols": "^1.0.0" + } }, "is-typedarray": { "version": "1.0.0", @@ -3996,7 +7748,10 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", - "dev": true + "dev": true, + "requires": { + "buffer-alloc": "^1.2.0" + } }, "isexe": { "version": "2.0.0", @@ -4020,6 +7775,21 @@ "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz", "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==", "dev": true, + "requires": { + "async": "^2.6.2", + "compare-versions": "^3.4.0", + "fileset": "^2.0.3", + "istanbul-lib-coverage": "^2.0.5", + "istanbul-lib-hook": "^2.0.7", + "istanbul-lib-instrument": "^3.3.0", + "istanbul-lib-report": "^2.0.8", + "istanbul-lib-source-maps": "^3.0.6", + "istanbul-reports": "^2.2.4", + "js-yaml": "^3.13.1", + "make-dir": "^2.1.0", + "minimatch": "^3.0.4", + "once": "^1.4.0" + }, "dependencies": { "istanbul-lib-coverage": { "version": "2.0.5", @@ -4031,7 +7801,16 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", - "dev": true + "dev": true, + "requires": { + "@babel/generator": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" + } } } }, @@ -4040,12 +7819,24 @@ "resolved": "https://registry.npmjs.org/istanbul-instrumenter-loader/-/istanbul-instrumenter-loader-3.0.1.tgz", "integrity": "sha512-a5SPObZgS0jB/ixaKSMdn6n/gXSrK2S6q/UfRJBT3e6gQmVjwZROTODQsYW5ZNwOu78hG62Y3fWlebaVOL0C+w==", "dev": true, + "requires": { + "convert-source-map": "^1.5.0", + "istanbul-lib-instrument": "^1.7.3", + "loader-utils": "^1.1.0", + "schema-utils": "^0.3.0" + }, "dependencies": { "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } }, "fast-deep-equal": { "version": "1.1.0", @@ -4063,7 +7854,10 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true + "dev": true, + "requires": { + "ajv": "^5.0.0" + } } } }, @@ -4077,13 +7871,25 @@ "version": "2.0.7", "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "dev": true + "dev": true, + "requires": { + "append-transform": "^1.0.0" + } }, "istanbul-lib-instrument": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz", "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==", "dev": true, + "requires": { + "babel-generator": "^6.18.0", + "babel-template": "^6.16.0", + "babel-traverse": "^6.18.0", + "babel-types": "^6.18.0", + "babylon": "^6.18.0", + "istanbul-lib-coverage": "^1.2.1", + "semver": "^5.3.0" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -4098,6 +7904,11 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", "dev": true, + "requires": { + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "supports-color": "^6.1.0" + }, "dependencies": { "istanbul-lib-coverage": { "version": "2.0.5", @@ -4109,7 +7920,10 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } } } }, @@ -4118,12 +7932,22 @@ "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", "dev": true, + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "rimraf": "^2.6.3", + "source-map": "^0.6.1" + }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "istanbul-lib-coverage": { "version": "2.0.5", @@ -4143,13 +7967,21 @@ "version": "2.2.6", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", - "dev": true + "dev": true, + "requires": { + "handlebars": "^4.1.2" + } }, "jasmine": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-2.8.0.tgz", "integrity": "sha1-awicChFXax8W3xG4AUbZHU6Lij4=", "dev": true, + "requires": { + "exit": "^0.1.2", + "glob": "^7.0.6", + "jasmine-core": "~2.8.0" + }, "dependencies": { "jasmine-core": { "version": "2.8.0", @@ -4169,7 +8001,10 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz", "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==", - "dev": true + "dev": true, + "requires": { + "colors": "1.1.2" + } }, "jasminewd2": { "version": "2.2.0", @@ -4177,15 +8012,42 @@ "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, + "jest-worker": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", + "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "dev": true, + "requires": { + "merge-stream": "^2.0.0", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, "jquery": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, + "js-levenshtein": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz", + "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==", + "dev": true + }, "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "dev": true }, "js-yaml": { @@ -4193,6 +8055,10 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, "dependencies": { "esprima": { "version": "4.0.1", @@ -4210,18 +8076,49 @@ "jsdom": { "version": "9.12.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz", - "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=" + "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=", + "requires": { + "abab": "^1.0.3", + "acorn": "^4.0.4", + "acorn-globals": "^3.1.0", + "array-equal": "^1.0.0", + "content-type-parser": "^1.0.1", + "cssom": ">= 0.3.2 < 0.4.0", + "cssstyle": ">= 0.2.37 < 0.3.0", + "escodegen": "^1.6.1", + "html-encoding-sniffer": "^1.0.1", + "nwmatcher": ">= 1.3.9 < 2.0.0", + "parse5": "^1.5.1", + "request": "^2.79.0", + "sax": "^1.2.1", + "symbol-tree": "^3.2.1", + "tough-cookie": "^2.3.2", + "webidl-conversions": "^4.0.0", + "whatwg-encoding": "^1.0.1", + "whatwg-url": "^4.3.0", + "xml-name-validator": "^2.0.1" + } }, "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, "jshint": { "version": "2.10.2", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz", - "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==" + "integrity": "sha512-e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA==", + "requires": { + "cli": "~1.0.0", + "console-browserify": "1.1.x", + "exit": "0.1.x", + "htmlparser2": "3.8.x", + "lodash": "~4.17.11", + "minimatch": "~3.0.2", + "shelljs": "0.3.x", + "strip-json-comments": "1.0.x" + } }, "json-parse-better-errors": { "version": "1.0.2", @@ -4254,13 +8151,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true + "dev": true, + "requires": { + "minimist": "^1.2.0" + } }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } }, "jsonparse": { "version": "1.3.1", @@ -4268,22 +8171,28 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=" + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } }, "jszip": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.2.tgz", "integrity": "sha512-NmKajvAFQpbg3taXQXr/ccS2wcucR1AZ+NtyWp2Nq7HHVsXhcJFR8p0Baf32C2yVvBylFWVeKf+WI2AnvlPhpA==", "dev": true, + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "set-immediate-shim": "~1.0.1" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4295,13 +8204,25 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -4310,6 +8231,35 @@ "resolved": "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz", "integrity": "sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==", "dev": true, + "requires": { + "bluebird": "^3.3.0", + "body-parser": "^1.16.1", + "braces": "^3.0.2", + "chokidar": "^3.0.0", + "colors": "^1.1.0", + "connect": "^3.6.0", + "core-js": "^3.1.3", + "di": "^0.0.1", + "dom-serialize": "^2.2.0", + "flatted": "^2.0.0", + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "http-proxy": "^1.13.0", + "isbinaryfile": "^3.0.0", + "lodash": "^4.17.11", + "log4js": "^4.0.0", + "mime": "^2.3.1", + "minimatch": "^3.0.2", + "optimist": "^0.6.1", + "qjobs": "^1.1.4", + "range-parser": "^1.2.0", + "rimraf": "^2.6.0", + "safe-buffer": "^5.0.1", + "socket.io": "2.1.1", + "source-map": "^0.6.1", + "tmp": "0.0.33", + "useragent": "2.3.0" + }, "dependencies": { "mime": { "version": "2.4.4", @@ -4323,19 +8273,29 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz", "integrity": "sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==", - "dev": true + "dev": true, + "requires": { + "which": "^1.2.1" + } }, "karma-coverage-istanbul-reporter": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-2.1.0.tgz", "integrity": "sha512-UH0mXPJFJyK5uiK7EkwGtQ8f30lCBAfqRResnZ4pzLJ04SOp4SPlYkmwbbZ6iVJ6sQFVzlDUXlntBEsLRdgZpg==", - "dev": true + "dev": true, + "requires": { + "istanbul-api": "^2.1.6", + "minimatch": "^3.0.4" + } }, "karma-jasmine": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz", "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==", - "dev": true + "dev": true, + "requires": { + "jasmine-core": "^3.3" + } }, "karma-jasmine-html-reporter": { "version": "1.4.2", @@ -4347,7 +8307,10 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz", "integrity": "sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==", - "dev": true + "dev": true, + "requires": { + "source-map-support": "^0.5.5" + } }, "killable": { "version": "1.0.1", @@ -4365,7 +8328,10 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", - "dev": true + "dev": true, + "requires": { + "invert-kv": "^2.0.0" + } }, "leaflet": { "version": "1.5.1", @@ -4383,9 +8349,9 @@ "integrity": "sha512-QnKNAqZxaO4nzCsHA9l/vPazF15TILkSaYNoDqMtiVXrsWMWh6fWD4phRuftPC+kvY9OBzVKuTfKlLdhZ/2oIg==" }, "leaflet.locatecontrol": { - "version": "0.67.0", - "resolved": "https://registry.npmjs.org/leaflet.locatecontrol/-/leaflet.locatecontrol-0.67.0.tgz", - "integrity": "sha512-3R8jYBwYyXc5Ka7bZvx6naWUvfmJTGJfZ2o/ZWombhCK7NkOxEpwFA3bhW9/BRZ99cLyjeNuLUaLwcPrMKYrjA==" + "version": "0.68.0", + "resolved": "https://registry.npmjs.org/leaflet.locatecontrol/-/leaflet.locatecontrol-0.68.0.tgz", + "integrity": "sha512-jXJCpBvkyH6shjPEOK/DWu/tKX/WdkNeO96jyPrnGelYp9u6wSDj4V1V4aX9+CMTIrEyVB4/4XuU+T7VTRpb6w==" }, "leaflet.markercluster": { "version": "1.4.1", @@ -4396,30 +8362,57 @@ "version": "3.9.0", "resolved": "https://registry.npmjs.org/less/-/less-3.9.0.tgz", "integrity": "sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==", - "dev": true + "dev": true, + "requires": { + "clone": "^2.1.2", + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "mime": "^1.4.1", + "mkdirp": "^0.5.0", + "promise": "^7.1.1", + "request": "^2.83.0", + "source-map": "~0.6.0" + } }, "less-loader": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-5.0.0.tgz", "integrity": "sha512-bquCU89mO/yWLaUq0Clk7qCsKhsF/TZpJUzETRvJa9KSVEL9SO3ovCvdEHISBhrC81OwC8QSVX7E0bzElZj9cg==", - "dev": true + "dev": true, + "requires": { + "clone": "^2.1.1", + "loader-utils": "^1.1.0", + "pify": "^4.0.1" + } }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=" + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } }, "license-webpack-plugin": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.1.tgz", - "integrity": "sha512-TiarZIg5vkQ2rGdYJn2+5YxO/zqlqjpK5IVglr7OfmrN1sBCakS+PQrsP2uC5gtve1ZDb9WMSUMlmHDQ0FoW4w==", - "dev": true + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.1.2.tgz", + "integrity": "sha512-7poZHRla+ae0eEButlwMrPpkXyhNVBf2EHePYWT0jyLnI6311/OXJkTI2sOIRungRpQgU2oDMpro5bSFPT5F0A==", + "dev": true, + "requires": { + "@types/webpack-sources": "^0.1.5", + "webpack-sources": "^1.2.0" + } }, "lie": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", - "dev": true + "dev": true, + "requires": { + "immediate": "~3.0.5" + } }, "loader-runner": { "version": "2.4.0", @@ -4431,13 +8424,22 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", - "dev": true + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" + } }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } }, "lodash": { "version": "4.17.15", @@ -4450,23 +8452,27 @@ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, "log4js": { "version": "4.5.1", "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz", "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==", "dev": true, + "requires": { + "date-format": "^2.0.0", + "debug": "^4.1.1", + "flatted": "^2.0.0", + "rfdc": "^1.1.4", + "streamroller": "^1.0.6" + }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -4477,34 +8483,47 @@ } }, "loglevel": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz", - "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==", + "version": "1.6.6", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz", + "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==", "dev": true }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true + "dev": true, + "requires": { + "yallist": "^3.0.2" + } }, "magic-string": { "version": "0.25.3", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.3.tgz", "integrity": "sha512-6QK0OpF/phMz0Q2AxILkX2mFhi7m+WMwTRg0LQKq/WBB0cDP4rYH3Wp4/d3OTXlrPLVJT/RFqj8tFeAR4nk8AA==", - "dev": true + "dev": true, + "requires": { + "sourcemap-codec": "^1.4.4" + } }, "make-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -4525,12 +8544,42 @@ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz", "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==", "dev": true, + "requires": { + "agentkeepalive": "^3.4.1", + "cacache": "^12.0.0", + "http-cache-semantics": "^3.8.1", + "http-proxy-agent": "^2.1.0", + "https-proxy-agent": "^2.2.1", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "node-fetch-npm": "^2.0.2", + "promise-retry": "^1.1.1", + "socks-proxy-agent": "^4.0.0", + "ssri": "^6.0.0" + }, "dependencies": { "cacache": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", - "dev": true + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } } } }, @@ -4544,7 +8593,10 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", - "dev": true + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } }, "map-cache": { "version": "0.2.2", @@ -4556,13 +8608,21 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true + "dev": true, + "requires": { + "object-visit": "^1.0.0" + } }, "md5.js": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", - "dev": true + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } }, "media-typer": { "version": "0.3.0", @@ -4573,13 +8633,22 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", - "dev": true + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + } }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4591,13 +8660,25 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -4606,6 +8687,12 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -4616,18 +8703,48 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + }, "dependencies": { "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } } } }, @@ -4636,12 +8753,21 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } } } }, @@ -4650,12 +8776,18 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -4663,7 +8795,11 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } } } }, @@ -4671,7 +8807,11 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + } }, "mime": { "version": "1.6.0", @@ -4686,7 +8826,10 @@ "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==" + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "requires": { + "mime-db": "1.40.0" + } }, "mimic-fn": { "version": "2.1.0", @@ -4698,7 +8841,13 @@ "version": "0.8.0", "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz", "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==", - "dev": true + "dev": true, + "requires": { + "loader-utils": "^1.1.0", + "normalize-url": "1.9.1", + "schema-utils": "^1.0.0", + "webpack-sources": "^1.1.0" + } }, "minimalistic-assert": { "version": "1.0.1", @@ -4715,7 +8864,10 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==" + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "^1.1.7" + } }, "minimist": { "version": "1.2.0", @@ -4727,45 +8879,57 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } }, "minizlib": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", - "dev": true + "dev": true, + "requires": { + "minipass": "^2.2.1" + } }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, "dependencies": { "is-extendable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true - } - } - }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true + "dev": true, + "requires": { + "is-plain-object": "^2.0.4" + } } } }, @@ -4774,6 +8938,9 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "requires": { + "minimist": "0.0.8" + }, "dependencies": { "minimist": { "version": "0.0.8", @@ -4786,13 +8953,25 @@ "mock-browser": { "version": "0.92.14", "resolved": "https://registry.npmjs.org/mock-browser/-/mock-browser-0.92.14.tgz", - "integrity": "sha1-U6hyAO38Xd2+K0YAI7KogSW3ReI=" + "integrity": "sha1-U6hyAO38Xd2+K0YAI7KogSW3ReI=", + "requires": { + "jsdom": "^9.12.0", + "lodash": "^4.5" + } }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true + "dev": true, + "requires": { + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" + } }, "ms": { "version": "2.0.0", @@ -4803,7 +8982,11 @@ "version": "6.2.3", "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true + "dev": true, + "requires": { + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" + } }, "multicast-dns-service-types": { "version": "1.1.0", @@ -4817,11 +9000,31 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "nan": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", + "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", + "dev": true, + "optional": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true + "dev": true, + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + } }, "negotiator": { "version": "0.6.2", @@ -4837,7 +9040,10 @@ "ngx-toastr": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/ngx-toastr/-/ngx-toastr-10.1.0.tgz", - "integrity": "sha512-LXGL8jKIm0SGklkXytNKbR6VrF94all35SaUfgd1gOUzgllTW2ldqORDZlgIaiMB3Dcybaald8p3boEHvfjEIQ==" + "integrity": "sha512-LXGL8jKIm0SGklkXytNKbR6VrF94all35SaUfgd1gOUzgllTW2ldqORDZlgIaiMB3Dcybaald8p3boEHvfjEIQ==", + "requires": { + "tslib": "^1.9.0" + } }, "nice-try": { "version": "1.0.5", @@ -4849,12 +9055,17 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz", "integrity": "sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==", - "dev": true + "dev": true, + "requires": { + "encoding": "^0.1.11", + "json-parse-better-errors": "^1.0.0", + "safe-buffer": "^5.1.1" + } }, "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", + "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", "dev": true }, "node-libs-browser": { @@ -4862,6 +9073,31 @@ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, + "requires": { + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", + "path-browserify": "0.0.1", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", + "tty-browserify": "0.0.0", + "url": "^0.11.0", + "util": "^0.11.0", + "vm-browserify": "^1.0.1" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -4876,16 +9112,28 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + }, "dependencies": { "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -4894,6 +9142,9 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + }, "dependencies": { "safe-buffer": { "version": "5.2.0", @@ -4906,17 +9157,12 @@ } }, "node-releases": { - "version": "1.1.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.27.tgz", - "integrity": "sha512-9iXUqHKSGo6ph/tdXVbHFbhRVQln4ZDTIBJCzsa90HimnBYc5jw8RWYt4wBYFHehGyC3koIz5O4mb2fHrbPOuA==", + "version": "1.1.44", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.44.tgz", + "integrity": "sha512-NwbdvJyR7nrcGrXvKAvzc5raj/NkoJudkarh2yIpJ4t0NH4aqjUDz/486P+ynIW5eokKOfzGNRdYoLfBlomruw==", "dev": true, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } + "requires": { + "semver": "^6.3.0" } }, "normalize-package-data": { @@ -4924,6 +9170,12 @@ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -4949,7 +9201,13 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true + "dev": true, + "requires": { + "object-assign": "^4.0.1", + "prepend-http": "^1.0.0", + "query-string": "^4.1.0", + "sort-keys": "^1.0.0" + } }, "npm-bundled": { "version": "1.0.6", @@ -4962,6 +9220,12 @@ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz", "integrity": "sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==", "dev": true, + "requires": { + "hosted-git-info": "^2.6.0", + "osenv": "^0.1.5", + "semver": "^5.5.0", + "validate-npm-package-name": "^3.0.0" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -4975,13 +9239,22 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz", "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==", - "dev": true + "dev": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } }, "npm-pick-manifest": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, + "requires": { + "figgy-pudding": "^3.5.1", + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -4995,13 +9268,24 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz", "integrity": "sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==", - "dev": true + "dev": true, + "requires": { + "JSONStream": "^1.3.4", + "bluebird": "^3.5.1", + "figgy-pudding": "^3.4.1", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^5.0.0", + "npm-package-arg": "^6.1.0" + } }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true + "dev": true, + "requires": { + "path-key": "^2.0.0" + } }, "num2fraction": { "version": "1.2.2", @@ -5042,21 +9326,44 @@ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, + "object-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", + "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==", + "dev": true + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -5067,19 +9374,41 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true + "dev": true, + "requires": { + "isobject": "^3.0.0" + } + }, + "object.assign": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", + "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "function-bind": "^1.1.1", + "has-symbols": "^1.0.0", + "object-keys": "^1.0.11" + } }, "object.getownpropertydescriptors": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", - "dev": true + "dev": true, + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.5.1" + } }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true + "dev": true, + "requires": { + "isobject": "^3.0.1" + } }, "obuf": { "version": "1.1.2", @@ -5090,7 +9419,10 @@ "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=" + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "requires": { + "ee-first": "1.1.1" + } }, "on-headers": { "version": "1.0.2", @@ -5101,13 +9433,19 @@ "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=" + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1" + } }, "onetime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, + "requires": { + "mimic-fn": "^1.0.0" + }, "dependencies": { "mimic-fn": { "version": "1.2.0", @@ -5121,19 +9459,29 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", - "dev": true + "dev": true, + "requires": { + "is-wsl": "^1.1.0" + } }, "opn": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true + "dev": true, + "requires": { + "is-wsl": "^1.1.0" + } }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + }, "dependencies": { "minimist": { "version": "0.0.10", @@ -5152,13 +9500,24 @@ "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=" + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" + } }, "original": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz", "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", - "dev": true + "dev": true, + "requires": { + "url-parse": "^1.4.3" + } }, "os-browserify": { "version": "0.3.0", @@ -5176,7 +9535,12 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + } }, "os-tmpdir": { "version": "1.0.2", @@ -5188,7 +9552,11 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", - "dev": true + "dev": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } }, "p-defer": { "version": "1.0.0", @@ -5212,13 +9580,19 @@ "version": "2.2.1", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", - "dev": true + "dev": true, + "requires": { + "p-try": "^2.0.0" + } }, "p-locate": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } }, "p-map": { "version": "2.1.0", @@ -5230,7 +9604,10 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz", "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", - "dev": true + "dev": true, + "requires": { + "retry": "^0.12.0" + } }, "p-try": { "version": "2.2.0", @@ -5243,12 +9620,58 @@ "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz", "integrity": "sha512-nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw==", "dev": true, + "requires": { + "bluebird": "^3.5.3", + "cacache": "^12.0.0", + "figgy-pudding": "^3.5.1", + "get-stream": "^4.1.0", + "glob": "^7.1.3", + "lru-cache": "^5.1.1", + "make-fetch-happen": "^5.0.0", + "minimatch": "^3.0.4", + "minipass": "^2.3.5", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "normalize-package-data": "^2.4.0", + "npm-package-arg": "^6.1.0", + "npm-packlist": "^1.1.12", + "npm-pick-manifest": "^2.2.3", + "npm-registry-fetch": "^4.0.0", + "osenv": "^0.1.5", + "promise-inflight": "^1.0.1", + "promise-retry": "^1.1.1", + "protoduck": "^5.0.1", + "rimraf": "^2.6.2", + "safe-buffer": "^5.1.2", + "semver": "^5.6.0", + "ssri": "^6.0.1", + "tar": "^4.4.8", + "unique-filename": "^1.1.1", + "which": "^1.3.1" + }, "dependencies": { "cacache": { "version": "12.0.3", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", - "dev": true + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } }, "semver": { "version": "5.7.1", @@ -5269,6 +9692,11 @@ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", "dev": true, + "requires": { + "cyclist": "~0.2.2", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -5280,27 +9708,51 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", - "dev": true + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", + "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", + "dev": true, + "requires": { + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } }, "parse-json": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } }, "parse-passwd": { "version": "1.0.0", @@ -5317,13 +9769,19 @@ "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", - "dev": true + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } }, "parseuri": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", - "dev": true + "dev": true, + "requires": { + "better-assert": "~1.0.0" + } }, "parseurl": { "version": "1.3.3", @@ -5387,6 +9845,9 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, + "requires": { + "pify": "^3.0.0" + }, "dependencies": { "pify": { "version": "3.0.0", @@ -5400,7 +9861,14 @@ "version": "3.0.17", "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", - "dev": true + "dev": true, + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } }, "performance-now": { "version": "2.1.0", @@ -5429,24 +9897,44 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true + "dev": true, + "requires": { + "pinkie": "^2.0.0" + } }, "pkg-dir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", - "dev": true + "dev": true, + "requires": { + "find-up": "^3.0.0" + } }, "portfinder": { - "version": "1.0.23", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz", - "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==", + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", + "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", "dev": true, + "requires": { + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.1" + }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } @@ -5462,12 +9950,20 @@ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.17.tgz", "integrity": "sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==", "dev": true, + "requires": { + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + }, "dependencies": { "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } } } }, @@ -5476,6 +9972,12 @@ "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz", "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==", "dev": true, + "requires": { + "postcss": "^7.0.1", + "postcss-value-parser": "^3.2.3", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, "dependencies": { "postcss-value-parser": { "version": "3.3.1", @@ -5489,13 +9991,23 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", - "dev": true + "dev": true, + "requires": { + "cosmiconfig": "^5.0.0", + "import-cwd": "^2.0.0" + } }, "postcss-loader": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz", "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", - "dev": true + "dev": true, + "requires": { + "loader-utils": "^1.1.0", + "postcss": "^7.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^1.0.0" + } }, "postcss-value-parser": { "version": "4.0.2", @@ -5514,6 +10026,12 @@ "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "dev": true }, + "private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "dev": true + }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -5531,7 +10049,10 @@ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, - "optional": true + "optional": true, + "requires": { + "asap": "~2.0.3" + } }, "promise-inflight": { "version": "1.0.1", @@ -5544,6 +10065,10 @@ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz", "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=", "dev": true, + "requires": { + "err-code": "^1.0.0", + "retry": "^0.10.0" + }, "dependencies": { "retry": { "version": "0.10.1", @@ -5557,13 +10082,33 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/protoduck/-/protoduck-5.0.1.tgz", "integrity": "sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==", - "dev": true + "dev": true, + "requires": { + "genfun": "^5.0.0" + } }, "protractor": { "version": "5.4.2", "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz", "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==", "dev": true, + "requires": { + "@types/q": "^0.0.32", + "@types/selenium-webdriver": "^3.0.0", + "blocking-proxy": "^1.0.0", + "browserstack": "^1.5.1", + "chalk": "^1.1.3", + "glob": "^7.0.3", + "jasmine": "2.8.0", + "jasminewd2": "^2.1.0", + "optimist": "~0.6.0", + "q": "1.4.1", + "saucelabs": "^1.5.0", + "selenium-webdriver": "3.6.0", + "source-map-support": "~0.4.0", + "webdriver-js-extender": "2.1.0", + "webdriver-manager": "^12.0.6" + }, "dependencies": { "ansi-styles": { "version": "2.2.1", @@ -5575,19 +10120,43 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } }, "del": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", - "dev": true + "dev": true, + "requires": { + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" + } }, "globby": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", - "dev": true + "dev": true, + "requires": { + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } }, "is-path-cwd": { "version": "1.0.0", @@ -5599,13 +10168,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true + "dev": true, + "requires": { + "is-path-inside": "^1.0.0" + } }, "is-path-inside": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true + "dev": true, + "requires": { + "path-is-inside": "^1.0.1" + } }, "pify": { "version": "2.3.0", @@ -5629,7 +10204,10 @@ "version": "0.4.18", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true + "dev": true, + "requires": { + "source-map": "^0.5.6" + } }, "supports-color": { "version": "2.0.0", @@ -5641,14 +10219,31 @@ "version": "12.1.6", "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.6.tgz", "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==", - "dev": true + "dev": true, + "requires": { + "adm-zip": "^0.4.9", + "chalk": "^1.1.1", + "del": "^2.2.0", + "glob": "^7.0.3", + "ini": "^1.3.4", + "minimist": "^1.2.0", + "q": "^1.4.1", + "request": "^2.87.0", + "rimraf": "^2.5.2", + "semver": "^5.3.0", + "xml2js": "^0.4.17" + } } } }, "proxy-addr": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz", - "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==" + "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==", + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.9.0" + } }, "prr": { "version": "1.0.1", @@ -5671,25 +10266,46 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", - "dev": true + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } }, "pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } }, "pumpify": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, + "requires": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + }, "dependencies": { "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } } } }, @@ -5719,7 +10335,11 @@ "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true + "dev": true, + "requires": { + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" + } }, "querystring": { "version": "0.2.0", @@ -5743,13 +10363,20 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } }, "randomfill": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true + "dev": true, + "requires": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } }, "range-parser": { "version": "1.2.1", @@ -5759,19 +10386,44 @@ "raw-body": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==" + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } }, "raw-loader": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-1.0.0.tgz", - "integrity": "sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==", - "dev": true + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-3.1.0.tgz", + "integrity": "sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA==", + "dev": true, + "requires": { + "loader-utils": "^1.1.0", + "schema-utils": "^2.0.1" + }, + "dependencies": { + "schema-utils": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.1.tgz", + "integrity": "sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" + } + } + } }, "read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", "dev": true, + "requires": { + "pify": "^2.3.0" + }, "dependencies": { "pify": { "version": "2.3.0", @@ -5785,30 +10437,57 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", - "dev": true + "dev": true, + "requires": { + "glob": "^7.1.1", + "graceful-fs": "^4.1.2", + "json-parse-better-errors": "^1.0.1", + "normalize-package-data": "^2.0.0", + "slash": "^1.0.0" + } }, "read-package-tree": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.3.1.tgz", "integrity": "sha512-mLUDsD5JVtlZxjSlPPx1RETkNjjvQYuweKwNVt1Sn8kP5Jh44pvYuUHCp6xSVDZWbNxVxG5lyZJ921aJH61sTw==", - "dev": true + "dev": true, + "requires": { + "read-package-json": "^2.0.0", + "readdir-scoped-modules": "^1.0.0", + "util-promisify": "^2.1.0" + } }, "readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=" + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } }, "readdir-scoped-modules": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", - "dev": true + "dev": true, + "requires": { + "debuglog": "^1.0.1", + "dezalgo": "^1.0.0", + "graceful-fs": "^4.1.2", + "once": "^1.3.0" + } }, "readdirp": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz", "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==", - "dev": true + "dev": true, + "requires": { + "picomatch": "^2.0.4" + } }, "reflect-metadata": { "version": "0.1.13", @@ -5822,23 +10501,113 @@ "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", "dev": true }, + "regenerate-unicode-properties": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz", + "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==", + "dev": true, + "requires": { + "regenerate": "^1.4.0" + } + }, "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", "dev": true }, + "regenerator-transform": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz", + "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==", + "dev": true, + "requires": { + "private": "^0.1.6" + } + }, "regex-not": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true + "dev": true, + "requires": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + } + }, + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", + "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + } + } }, "regexpu-core": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true + "dev": true, + "requires": { + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" + } }, "regjsgen": { "version": "0.2.0", @@ -5851,6 +10620,9 @@ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, + "requires": { + "jsesc": "~0.5.0" + }, "dependencies": { "jsesc": { "version": "0.5.0", @@ -5882,12 +10654,37 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true + "dev": true, + "requires": { + "is-finite": "^1.0.0" + } }, "request": { "version": "2.88.0", "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, "dependencies": { "punycode": { "version": "1.4.1", @@ -5902,7 +10699,11 @@ "tough-cookie": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==" + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "requires": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + } } } }, @@ -5928,25 +10729,40 @@ "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", - "dev": true + "dev": true, + "requires": { + "path-parse": "^1.0.6" + } }, "resolve-cwd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true + "dev": true, + "requires": { + "resolve-from": "^3.0.0" + } }, "resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, + "requires": { + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" + }, "dependencies": { "global-modules": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true + "dev": true, + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } } } }, @@ -5966,7 +10782,11 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true + "dev": true, + "requires": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } }, "ret": { "version": "0.1.15", @@ -5990,30 +10810,46 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true + "dev": true, + "requires": { + "glob": "^7.1.3" + } }, "ripemd160": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true + "dev": true, + "requires": { + "aproba": "^1.1.1" + } }, "rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==" + "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", + "requires": { + "tslib": "^1.9.0" + } }, "safe-buffer": { "version": "5.1.2", @@ -6024,7 +10860,10 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true + "dev": true, + "requires": { + "ret": "~0.1.10" + } }, "safer-buffer": { "version": "2.1.2", @@ -6032,23 +10871,27 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.22.7", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.7.tgz", - "integrity": "sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==", - "dev": true + "version": "1.22.9", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.9.tgz", + "integrity": "sha512-FzU1X2V8DlnqabrL4u7OBwD2vcOzNMongEJEx3xMEhWY/v26FFR3aG0hyeu2T965sfR0E9ufJwmG+Qjz78vFPQ==", + "dev": true, + "requires": { + "chokidar": ">=2.0.0 <4.0.0" + } }, "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", - "dev": true, + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz", + "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "loader-utils": "^1.0.1", + "neo-async": "^2.5.0", + "pify": "^4.0.1", + "semver": "^5.5.0" + }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -6061,7 +10904,10 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz", "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", - "dev": true + "dev": true, + "requires": { + "https-proxy-agent": "^2.2.1" + } }, "sax": { "version": "1.2.4", @@ -6072,7 +10918,12 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } }, "select-hose": { "version": "2.0.0", @@ -6085,20 +10936,32 @@ "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", "dev": true, + "requires": { + "jszip": "^3.1.3", + "rimraf": "^2.5.4", + "tmp": "0.0.30", + "xml2js": "^0.4.17" + }, "dependencies": { "tmp": { "version": "0.0.30", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", - "dev": true + "dev": true, + "requires": { + "os-tmpdir": "~1.0.1" + } } } }, "selfsigned": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", - "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", - "dev": true + "version": "1.10.7", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", + "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "dev": true, + "requires": { + "node-forge": "0.9.0" + } }, "semver": { "version": "6.3.0", @@ -6111,6 +10974,9 @@ "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", "dev": true, + "requires": { + "semver": "^5.3.0" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -6125,6 +10991,9 @@ "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz", "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", "dev": true, + "requires": { + "semver": "^5.0.0" + }, "dependencies": { "semver": { "version": "5.7.1", @@ -6138,6 +11007,21 @@ "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, "dependencies": { "ms": { "version": "2.1.1", @@ -6147,9 +11031,9 @@ } }, "serialize-javascript": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz", - "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", + "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", "dev": true }, "serve-index": { @@ -6157,12 +11041,27 @@ "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, + "requires": { + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" + }, "dependencies": { "http-errors": { "version": "1.6.3", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + } }, "setprototypeof": { "version": "1.1.0", @@ -6175,7 +11074,13 @@ "serve-static": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==" + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + } }, "set-blocking": { "version": "2.0.0", @@ -6194,12 +11099,21 @@ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, "dependencies": { "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } } } }, @@ -6218,27 +11132,29 @@ "version": "2.4.11", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true + "dev": true, + "requires": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } }, "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "requires": { + "kind-of": "^6.0.2" } }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } }, "shebang-regex": { "version": "1.0.0", @@ -6274,18 +11190,34 @@ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, "source-map": { "version": "0.5.7", @@ -6300,30 +11232,49 @@ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, "dependencies": { "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^1.0.0" + } }, "is-accessor-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-data-descriptor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } }, "is-descriptor": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } } } }, @@ -6332,12 +11283,18 @@ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, + "requires": { + "kind-of": "^3.2.0" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -6346,12 +11303,23 @@ "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, + "requires": { + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", + "socket.io-client": "2.1.1", + "socket.io-parser": "~3.2.0" + }, "dependencies": { "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -6366,6 +11334,22 @@ "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", "dev": true, + "requires": { + "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "socket.io-parser": "~3.2.0", + "to-array": "0.1.4" + }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -6377,7 +11361,10 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -6386,6 +11373,11 @@ "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", "dev": true, + "requires": { + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" + }, "dependencies": { "component-emitter": { "version": "1.2.1", @@ -6397,7 +11389,10 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true + "dev": true, + "requires": { + "ms": "2.0.0" + } }, "isarray": { "version": "2.0.1", @@ -6411,25 +11406,43 @@ "version": "0.3.19", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true + "dev": true, + "requires": { + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" + } }, "sockjs-client": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", - "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", - "dev": true, + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz", + "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", + "dev": true, + "requires": { + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" + }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "faye-websocket": { "version": "0.11.3", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true + "dev": true, + "requires": { + "websocket-driver": ">=0.5.1" + } }, "ms": { "version": "2.1.2", @@ -6443,19 +11456,30 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", - "dev": true + "dev": true, + "requires": { + "ip": "^1.1.5", + "smart-buffer": "4.0.2" + } }, "socks-proxy-agent": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", "dev": true, + "requires": { + "agent-base": "~4.2.1", + "socks": "~2.3.2" + }, "dependencies": { "agent-base": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", - "dev": true + "dev": true, + "requires": { + "es6-promisify": "^5.0.0" + } } } }, @@ -6463,7 +11487,10 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true + "dev": true, + "requires": { + "is-plain-obj": "^1.0.0" + } }, "source-list-map": { "version": "2.0.1", @@ -6480,19 +11507,34 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", - "dev": true + "dev": true, + "requires": { + "async": "^2.5.0", + "loader-utils": "^1.1.0" + } }, "source-map-resolve": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true + "dev": true, + "requires": { + "atob": "^2.1.1", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } }, "source-map-support": { "version": "0.5.12", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "dev": true + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } }, "source-map-url": { "version": "0.4.0", @@ -6510,7 +11552,11 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", - "dev": true + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } }, "spdx-exceptions": { "version": "2.2.0", @@ -6522,7 +11568,11 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } }, "spdx-license-ids": { "version": "3.0.5", @@ -6535,12 +11585,22 @@ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", "dev": true, + "requires": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -6555,12 +11615,23 @@ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, + "requires": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -6572,7 +11643,12 @@ "version": "3.4.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", - "dev": true + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } }, "safe-buffer": { "version": "5.2.0", @@ -6584,7 +11660,10 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.2.0" + } } } }, @@ -6592,13 +11671,19 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", - "dev": true + "dev": true, + "requires": { + "chalk": "^2.0.1" + } }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true + "dev": true, + "requires": { + "extend-shallow": "^3.0.0" + } }, "sprintf-js": { "version": "1.0.3", @@ -6609,25 +11694,46 @@ "sshpk": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==" + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "dev": true + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } }, "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, "dependencies": { "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } } } }, @@ -6641,6 +11747,10 @@ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, + "requires": { + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -6649,16 +11759,28 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -6666,13 +11788,24 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", - "dev": true + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" + } }, "stream-http": { "version": "2.8.3", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, + "requires": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -6681,16 +11814,28 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -6705,12 +11850,22 @@ "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", "dev": true, + "requires": { + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.14" + }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -6726,16 +11881,15 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, "dependencies": { "ansi-regex": { "version": "3.0.0", @@ -6747,15 +11901,46 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } } } }, + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } }, "strip-bom": { "version": "3.0.0", @@ -6775,22 +11960,54 @@ "integrity": "sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E=" }, "style-loader": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", - "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", - "dev": true + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.0.0.tgz", + "integrity": "sha512-B0dOCFwv7/eY31a5PCieNwMgMhVGFe9w+rh7s/Bx8kfFkrth9zfTZquoYvdw8URgiqxObQKcpW51Ugz1HjfdZw==", + "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "schema-utils": "^2.0.1" + }, + "dependencies": { + "schema-utils": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.1.tgz", + "integrity": "sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" + } + } + } }, "stylus": { "version": "0.54.5", "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, + "requires": { + "css-parse": "1.7.x", + "debug": "*", + "glob": "7.0.x", + "mkdirp": "0.5.x", + "sax": "0.5.x", + "source-map": "0.1.x" + }, "dependencies": { "glob": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } }, "sax": { "version": "0.5.8", @@ -6802,7 +12019,10 @@ "version": "0.1.43", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true + "dev": true, + "requires": { + "amdefine": ">=0.0.4" + } } } }, @@ -6810,13 +12030,21 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true + "dev": true, + "requires": { + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" + } }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } }, "symbol-observable": { "version": "1.2.0", @@ -6839,19 +12067,57 @@ "version": "4.4.10", "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "dev": true + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.3.5", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } }, "terser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz", - "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==", - "dev": true + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz", + "integrity": "sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + } }, "terser-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", - "dev": true + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", + "dev": true, + "requires": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^2.1.2", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" + }, + "dependencies": { + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + } + } }, "through": { "version": "2.3.8", @@ -6864,6 +12130,10 @@ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + }, "dependencies": { "isarray": { "version": "1.0.0", @@ -6875,33 +12145,51 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, "thunky": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", - "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, "timers-browserify": { "version": "2.0.11", "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", - "dev": true + "dev": true, + "requires": { + "setimmediate": "^1.0.4" + } }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true + "dev": true, + "requires": { + "os-tmpdir": "~1.0.2" + } }, "to-array": { "version": "0.1.4", @@ -6916,9 +12204,9 @@ "dev": true }, "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", "dev": true }, "to-object-path": { @@ -6926,12 +12214,18 @@ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, "dependencies": { "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } } } }, @@ -6939,13 +12233,22 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true + "dev": true, + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true + "dev": true, + "requires": { + "is-number": "^7.0.0" + } }, "toidentifier": { "version": "1.0.0", @@ -6955,7 +12258,11 @@ "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } }, "tr46": { "version": "0.0.3", @@ -6979,12 +12286,23 @@ "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.0.4.tgz", "integrity": "sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==", "dev": true, + "requires": { + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^4.0.0", + "semver": "^6.0.0" + }, "dependencies": { "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", - "dev": true + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } } } }, @@ -6992,7 +12310,14 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.3.0.tgz", "integrity": "sha512-dyNS/RqyVTDcmNM4NIBAeDMpsAdaQ+ojdf0GOLqE6nwJOgzEkdRNzJywhDfwnuvB10oa6NLVG1rUJQCpRN7qoQ==", - "dev": true + "dev": true, + "requires": { + "arg": "^4.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "source-map-support": "^0.5.6", + "yn": "^3.0.0" + } }, "tslib": { "version": "1.10.0", @@ -7004,6 +12329,21 @@ "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.18.0.tgz", "integrity": "sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w==", "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, "dependencies": { "diff": { "version": "3.5.0", @@ -7023,7 +12363,10 @@ "version": "2.29.0", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true + "dev": true, + "requires": { + "tslib": "^1.8.1" + } }, "tty-browserify": { "version": "0.0.0", @@ -7034,7 +12377,10 @@ "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=" + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "^5.0.1" + } }, "tweetnacl": { "version": "0.14.5", @@ -7044,12 +12390,19 @@ "type-check": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=" + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==" + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } }, "typedarray": { "version": "0.0.6", @@ -7068,7 +12421,11 @@ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", "dev": true, - "optional": true + "optional": true, + "requires": { + "commander": "~2.20.0", + "source-map": "~0.6.1" + } }, "ultron": { "version": "1.1.1", @@ -7076,6 +12433,34 @@ "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", "dev": true }, + "unicode-canonical-property-names-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", + "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", + "dev": true + }, + "unicode-match-property-ecmascript": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", + "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", + "dev": true, + "requires": { + "unicode-canonical-property-names-ecmascript": "^1.0.4", + "unicode-property-aliases-ecmascript": "^1.0.4" + } + }, + "unicode-match-property-value-ecmascript": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz", + "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==", + "dev": true + }, + "unicode-property-aliases-ecmascript": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz", + "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==", + "dev": true + }, "uninstall": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/uninstall/-/uninstall-0.0.0.tgz", @@ -7085,31 +12470,51 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" + } }, "unique-filename": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true + "dev": true, + "requires": { + "unique-slug": "^2.0.0" + } }, "unique-slug": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dev": true + "dev": true, + "requires": { + "imurmurhash": "^0.1.4" + } }, "universal-analytics": { "version": "0.4.20", "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==", "dev": true, + "requires": { + "debug": "^3.0.0", + "request": "^2.88.0", + "uuid": "^3.0.0" + }, "dependencies": { "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "ms": { "version": "2.1.2", @@ -7135,18 +12540,30 @@ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, "dependencies": { "has-value": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, "dependencies": { "isobject": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true + "dev": true, + "requires": { + "isarray": "1.0.0" + } } } }, @@ -7173,7 +12590,10 @@ "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==" + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" + } }, "urix": { "version": "0.1.0", @@ -7186,6 +12606,10 @@ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, "dependencies": { "punycode": { "version": "1.3.2", @@ -7199,7 +12623,11 @@ "version": "1.4.7", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "dev": true + "dev": true, + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } }, "use": { "version": "3.1.1", @@ -7212,12 +12640,20 @@ "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", "dev": true, + "requires": { + "lru-cache": "4.1.x", + "tmp": "0.0.x" + }, "dependencies": { "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } }, "yallist": { "version": "2.1.2", @@ -7231,7 +12667,10 @@ "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "dev": true + "dev": true, + "requires": { + "inherits": "2.0.3" + } }, "util-deprecate": { "version": "1.0.2", @@ -7243,7 +12682,10 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz", "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=", - "dev": true + "dev": true, + "requires": { + "object.getownpropertydescriptors": "^2.0.3" + } }, "utils-merge": { "version": "1.0.1", @@ -7265,13 +12707,20 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } }, "validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", - "dev": true + "dev": true, + "requires": { + "builtins": "^1.0.3" + } }, "vary": { "version": "1.1.2", @@ -7281,12 +12730,17 @@ "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=" + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } }, "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", "dev": true }, "void-elements": { @@ -7300,18 +12754,30 @@ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, + "requires": { + "chokidar": "^2.0.2", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" + }, "dependencies": { "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } } } }, @@ -7325,35 +12791,71 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + } }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "dev": true, "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "node-pre-gyp": "*" }, "dependencies": { "abbrev": { @@ -7401,7 +12903,7 @@ } }, "chownr": { - "version": "1.1.1", + "version": "1.1.3", "bundled": true, "dev": true, "optional": true @@ -7431,7 +12933,7 @@ "optional": true }, "debug": { - "version": "4.1.1", + "version": "3.2.6", "bundled": true, "dev": true, "optional": true, @@ -7458,12 +12960,12 @@ "optional": true }, "fs-minipass": { - "version": "1.2.5", + "version": "1.2.7", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" } }, "fs.realpath": { @@ -7489,7 +12991,7 @@ } }, "glob": { - "version": "7.1.3", + "version": "7.1.6", "bundled": true, "dev": true, "optional": true, @@ -7518,7 +13020,7 @@ } }, "ignore-walk": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "optional": true, @@ -7537,7 +13039,7 @@ } }, "inherits": { - "version": "2.0.3", + "version": "2.0.4", "bundled": true, "dev": true, "optional": true @@ -7579,7 +13081,7 @@ "optional": true }, "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "dev": true, "optional": true, @@ -7589,12 +13091,12 @@ } }, "minizlib": { - "version": "1.2.1", + "version": "1.3.3", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mkdirp": { @@ -7607,24 +13109,24 @@ } }, "ms": { - "version": "2.1.1", + "version": "2.1.2", "bundled": true, "dev": true, "optional": true }, "needle": { - "version": "2.3.0", + "version": "2.4.0", "bundled": true, "dev": true, "optional": true, "requires": { - "debug": "^4.1.0", + "debug": "^3.2.6", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } }, "node-pre-gyp": { - "version": "0.12.0", + "version": "0.14.0", "bundled": true, "dev": true, "optional": true, @@ -7638,7 +13140,7 @@ "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", - "tar": "^4" + "tar": "^4.4.2" } }, "nopt": { @@ -7652,13 +13154,22 @@ } }, "npm-bundled": { - "version": "1.0.6", + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.4.1", + "version": "1.4.7", "bundled": true, "dev": true, "optional": true, @@ -7729,7 +13240,7 @@ "optional": true }, "process-nextick-args": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "dev": true, "optional": true @@ -7770,7 +13281,7 @@ } }, "rimraf": { - "version": "2.6.3", + "version": "2.7.1", "bundled": true, "dev": true, "optional": true, @@ -7797,7 +13308,7 @@ "optional": true }, "semver": { - "version": "5.7.0", + "version": "5.7.1", "bundled": true, "dev": true, "optional": true @@ -7850,18 +13361,18 @@ "optional": true }, "tar": { - "version": "4.4.8", + "version": "4.4.13", "bundled": true, "dev": true, "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" } }, "util-deprecate": { @@ -7886,7 +13397,7 @@ "optional": true }, "yallist": { - "version": "3.0.3", + "version": "3.1.1", "bundled": true, "dev": true, "optional": true @@ -7897,13 +13408,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } }, "isarray": { "version": "1.0.0", @@ -7915,31 +13432,55 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } } } }, @@ -7947,13 +13488,20 @@ "version": "1.7.3", "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true + "dev": true, + "requires": { + "minimalistic-assert": "^1.0.0" + } }, "webdriver-js-extender": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz", "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==", - "dev": true + "dev": true, + "requires": { + "@types/selenium-webdriver": "^3.0.0", + "selenium-webdriver": "^3.0.1" + } }, "webidl-conversions": { "version": "4.0.2", @@ -7961,15 +13509,40 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { - "version": "4.38.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.38.0.tgz", - "integrity": "sha512-lbuFsVOq8PZY+1Ytz/mYOvYOo+d4IJ31hHk/7iyoeWtwN33V+5HYotSH+UIb9tq914ey0Hot7z6HugD+je3sWw==", - "dev": true, + "version": "4.39.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.39.2.tgz", + "integrity": "sha512-AKgTfz3xPSsEibH00JfZ9sHXGUwIQ6eZ9tLN8+VLzachk1Cw2LVmy+4R7ZiwTa9cZZ15tzySjeMui/UnSCAZhA==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/wasm-edit": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "acorn": "^6.2.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.1.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.1", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.1", + "watchpack": "^1.6.0", + "webpack-sources": "^1.4.1" + }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", "dev": true } } @@ -7979,6 +13552,19 @@ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.7.tgz", "integrity": "sha512-OhTUCttAsr+IZSMVwGROGRHvT+QAs8H6/mHIl4SvhAwYywjiylYjpwybGx7WQ9Hkb45FhjtsymkwiRRbGJ1SZQ==", "dev": true, + "requires": { + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "enhanced-resolve": "4.1.0", + "findup-sync": "3.0.0", + "global-modules": "2.0.0", + "import-local": "2.0.0", + "interpret": "1.2.0", + "loader-utils": "1.2.3", + "supports-color": "6.1.0", + "v8-compile-cache": "2.0.3", + "yargs": "13.2.4" + }, "dependencies": { "ansi-regex": { "version": "4.1.0", @@ -7990,7 +13576,12 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } }, "get-caller-file": { "version": "2.0.5", @@ -8008,37 +13599,70 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } }, "yargs": { "version": "13.2.4", "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", - "dev": true + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + } }, "yargs-parser": { "version": "13.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -8047,6 +13671,10 @@ "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz", "integrity": "sha1-/FcViMhVjad76e+23r3Fo7FyvcI=", "dev": true, + "requires": { + "source-list-map": "~0.1.7", + "source-map": "~0.4.1" + }, "dependencies": { "source-list-map": { "version": "0.1.8", @@ -8058,15 +13686,25 @@ "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true + "dev": true, + "requires": { + "amdefine": ">=0.0.4" + } } } }, "webpack-dev-middleware": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz", - "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz", + "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, + "requires": { + "memory-fs": "^0.4.1", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", + "range-parser": "^1.2.1", + "webpack-log": "^2.0.0" + }, "dependencies": { "mime": { "version": "2.4.4", @@ -8077,22 +13715,64 @@ } }, "webpack-dev-server": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz", - "integrity": "sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==", - "dev": true, + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz", + "integrity": "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==", + "dev": true, + "requires": { + "ansi-html": "0.0.7", + "bonjour": "^3.5.0", + "chokidar": "^2.1.8", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "debug": "^4.1.1", + "del": "^4.1.1", + "express": "^4.17.1", + "html-entities": "^1.2.1", + "http-proxy-middleware": "0.19.1", + "import-local": "^2.0.0", + "internal-ip": "^4.3.0", + "ip": "^1.1.5", + "is-absolute-url": "^3.0.3", + "killable": "^1.0.1", + "loglevel": "^1.6.4", + "opn": "^5.5.0", + "p-retry": "^3.0.1", + "portfinder": "^1.0.25", + "schema-utils": "^1.0.0", + "selfsigned": "^1.10.7", + "semver": "^6.3.0", + "serve-index": "^1.9.1", + "sockjs": "0.3.19", + "sockjs-client": "1.4.0", + "spdy": "^4.0.1", + "strip-ansi": "^3.0.1", + "supports-color": "^6.1.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^3.7.2", + "webpack-log": "^2.0.0", + "ws": "^6.2.1", + "yargs": "12.0.5" + }, "dependencies": { "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, "dependencies": { "normalize-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } } } }, @@ -8106,41 +13786,80 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", - "dev": true + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true + "dev": true, + "requires": { + "ms": "^2.1.1" + } }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + } }, "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "dev": true, "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "node-pre-gyp": "*" }, "dependencies": { "abbrev": { @@ -8188,7 +13907,7 @@ } }, "chownr": { - "version": "1.1.1", + "version": "1.1.3", "bundled": true, "dev": true, "optional": true @@ -8218,7 +13937,7 @@ "optional": true }, "debug": { - "version": "4.1.1", + "version": "3.2.6", "bundled": true, "dev": true, "optional": true, @@ -8245,12 +13964,12 @@ "optional": true }, "fs-minipass": { - "version": "1.2.5", + "version": "1.2.7", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" } }, "fs.realpath": { @@ -8276,7 +13995,7 @@ } }, "glob": { - "version": "7.1.3", + "version": "7.1.6", "bundled": true, "dev": true, "optional": true, @@ -8305,7 +14024,7 @@ } }, "ignore-walk": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "optional": true, @@ -8324,7 +14043,7 @@ } }, "inherits": { - "version": "2.0.3", + "version": "2.0.4", "bundled": true, "dev": true, "optional": true @@ -8366,7 +14085,7 @@ "optional": true }, "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "dev": true, "optional": true, @@ -8376,12 +14095,12 @@ } }, "minizlib": { - "version": "1.2.1", + "version": "1.3.3", "bundled": true, "dev": true, "optional": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mkdirp": { @@ -8394,24 +14113,24 @@ } }, "ms": { - "version": "2.1.1", + "version": "2.1.2", "bundled": true, "dev": true, "optional": true }, "needle": { - "version": "2.3.0", + "version": "2.4.0", "bundled": true, "dev": true, "optional": true, "requires": { - "debug": "^4.1.0", + "debug": "^3.2.6", "iconv-lite": "^0.4.4", "sax": "^1.2.4" } }, "node-pre-gyp": { - "version": "0.12.0", + "version": "0.14.0", "bundled": true, "dev": true, "optional": true, @@ -8425,7 +14144,7 @@ "rc": "^1.2.7", "rimraf": "^2.6.1", "semver": "^5.3.0", - "tar": "^4" + "tar": "^4.4.2" } }, "nopt": { @@ -8439,13 +14158,22 @@ } }, "npm-bundled": { - "version": "1.0.6", + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", "bundled": true, "dev": true, "optional": true }, "npm-packlist": { - "version": "1.4.1", + "version": "1.4.7", "bundled": true, "dev": true, "optional": true, @@ -8516,7 +14244,7 @@ "optional": true }, "process-nextick-args": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true, "dev": true, "optional": true @@ -8557,7 +14285,7 @@ } }, "rimraf": { - "version": "2.6.3", + "version": "2.7.1", "bundled": true, "dev": true, "optional": true, @@ -8584,7 +14312,7 @@ "optional": true }, "semver": { - "version": "5.7.0", + "version": "5.7.1", "bundled": true, "dev": true, "optional": true @@ -8637,18 +14365,18 @@ "optional": true }, "tar": { - "version": "4.4.8", + "version": "4.4.13", "bundled": true, "dev": true, "optional": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "yallist": "^3.0.3" } }, "util-deprecate": { @@ -8673,7 +14401,7 @@ "optional": true }, "yallist": { - "version": "3.0.3", + "version": "3.1.1", "bundled": true, "dev": true, "optional": true @@ -8684,13 +14412,19 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } }, "isarray": { "version": "1.0.0", @@ -8702,7 +14436,10 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } }, "ms": { "version": "2.1.2", @@ -8711,34 +14448,67 @@ "dev": true }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", - "dev": true + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } }, "supports-color": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, + "ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0" + } } } }, @@ -8746,31 +14516,50 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz", "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", - "dev": true + "dev": true, + "requires": { + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" + } }, "webpack-merge": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz", "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==", - "dev": true + "dev": true, + "requires": { + "lodash": "^4.17.5" + } }, "webpack-sources": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", - "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", - "dev": true + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } }, "webpack-subresource-integrity": { "version": "1.1.0-rc.6", "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz", "integrity": "sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==", - "dev": true + "dev": true, + "requires": { + "webpack-core": "^0.6.8" + } }, "websocket-driver": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz", "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==", - "dev": true + "dev": true, + "requires": { + "http-parser-js": ">=0.4.0 <0.4.11", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + } }, "websocket-extensions": { "version": "0.1.3", @@ -8781,12 +14570,19 @@ "whatwg-encoding": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", - "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==" + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "requires": { + "iconv-lite": "0.4.24" + } }, "whatwg-url": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz", "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + }, "dependencies": { "webidl-conversions": { "version": "3.0.1", @@ -8805,7 +14601,10 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true + "dev": true, + "requires": { + "isexe": "^2.0.0" + } }, "which-module": { "version": "2.0.0", @@ -8822,31 +14621,49 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "dev": true + "dev": true, + "requires": { + "errno": "~0.1.7" + } }, "worker-plugin": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.1.0.tgz", - "integrity": "sha512-iQ9KTTmmN5fhfc2KMR7CcDblvcrg1QQ4pXymqZ3cRZF8L0890YLBcEqlIsGPdxoFwghyN8RA1pCEhCKuTF4Lkw==", - "dev": true + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-3.2.0.tgz", + "integrity": "sha512-W5nRkw7+HlbsEt3qRP6MczwDDISjiRj2GYt9+bpe8A2La00TmJdwzG5bpdMXhRt1qcWmwAvl1TiKaHRa+XDS9Q==", + "dev": true, + "requires": { + "loader-utils": "^1.1.0" + } }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, "dependencies": { "is-fullwidth-code-point": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } }, "string-width": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } } } }, @@ -8859,7 +14676,12 @@ "version": "3.3.3", "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "dev": true + "dev": true, + "requires": { + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" + } }, "xhr2": { "version": "0.1.4", @@ -8875,7 +14697,11 @@ "version": "0.4.19", "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz", "integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==", - "dev": true + "dev": true, + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~9.0.1" + } }, "xmlbuilder": { "version": "9.0.7", @@ -8911,13 +14737,31 @@ "version": "12.0.5", "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "dev": true + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } }, "yargs-parser": { "version": "11.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } }, "yeast": { "version": "0.1.2", diff --git a/frontend/package.json b/frontend/package.json index 90aebe84..41d7d458 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -18,6 +18,7 @@ "private": true, "dependencies": { "@angular/animations": "^8.2.2", + "@angular/cdk": "^8.2.3", "@angular/common": "^8.2.2", "@angular/compiler": "^8.2.2", "@angular/core": "^8.2.2", @@ -42,7 +43,7 @@ "leaflet": "^1.5.1", "leaflet-fullscreen": "^1.0.2", "leaflet-gesture-handling": "^1.1.8", - "leaflet.locatecontrol": "^0.67.0", + "leaflet.locatecontrol": "^0.68.0", "leaflet.markercluster": "^1.4.1", "lodash": "^4.17.15", "mock-browser": "^0.92.14", @@ -52,7 +53,7 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@angular-devkit/build-angular": "^0.802.2", + "@angular-devkit/build-angular": "^0.803.21", "@angular/cli": "^8.2.2", "@angular/compiler-cli": "^8.2.2", "@angular/language-service": "^8.2.2", diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index fc163fd2..ac3079b0 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -48,7 +48,8 @@ import { AdminComponent } from "./auth/admin/admin.component"; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { ToastrModule } from 'ngx-toastr'; import { CommonModule } from '@angular/common'; -import { ConfirmEmailComponent } from './auth/confirm-email/confirm-email.component' +import { ConfirmEmailComponent } from './auth/confirm-email/confirm-email.component'; +import { LayoutModule } from '@angular/cdk/layout'; @NgModule({ imports: [ @@ -61,6 +62,7 @@ import { ConfirmEmailComponent } from './auth/confirm-email/confirm-email.compon NgxDatatableModule, CommonModule, BrowserAnimationsModule, + LayoutModule, ToastrModule.forRoot( { preventDuplicates: true, diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index cb88301d..0a947358 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -28,6 +28,7 @@ app-home .section:before { #welcome { background: url(../../assets/background.jpg) no-repeat; + width: 100%; background-size: cover; position: relative; height: calc(100vh - var(--router-outlet-margin-top)); diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 4aca28f7..e30caa06 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -1,5 +1,6 @@ -import * as L from 'leaflet'; -import { AppConfig } from '../../../../conf/app.config'; +import * as L from "leaflet"; +import { AppConfig } from "../../../../conf/app.config"; + import { Component, ComponentFactoryResolver, @@ -9,22 +10,20 @@ import { Injector, Input, OnChanges, - OnInit, Output, SimpleChanges, ViewChild, ViewEncapsulation - } from '@angular/core'; -import { Feature, FeatureCollection } from 'geojson'; -import { MAP_CONFIG } from '../../../../conf/map.config'; -import { MarkerClusterGroup } from 'leaflet'; -import 'leaflet.markercluster'; -import 'leaflet.locatecontrol'; -import 'leaflet-gesture-handling'; +} from "@angular/core"; +import { Feature, FeatureCollection } from "geojson"; +import { MAP_CONFIG } from "../../../../conf/map.config"; +import { MarkerClusterGroup } from "leaflet"; +import "leaflet.markercluster"; +import "leaflet.locatecontrol"; +import "leaflet-gesture-handling"; // import { AppConfig } from '../../../../conf/app.config'; - - +//const baseLayer = this.options.DEFAULT_BASE_MAP(); const conf = { MAP_ID: "obsMap", @@ -37,7 +36,7 @@ const conf = { maxZoom: baseLayer["maxZoom"], bounds: baseLayer["bounds"], apiKey: baseLayer["apiKey"], - layerName: baseLayer["layerName"], + layerName: baseLayer["layerName"] }; if (baseLayer["subdomains"]) { layerConf.subdomains = baseLayer["subdomains"]; @@ -123,8 +122,8 @@ const conf = { styleUrls: ["./map.component.css"], encapsulation: ViewEncapsulation.None }) -export class ObsMapComponent implements OnInit, OnChanges { - @ViewChild("map", {static: true}) map: ElementRef; +export class ObsMapComponent implements OnChanges { + @ViewChild("map", { static: true }) map: ElementRef; @Input("observations") observations: FeatureCollection; @Input("program") program: FeatureCollection; @Output() onClick: EventEmitter = new EventEmitter(); @@ -145,39 +144,26 @@ export class ObsMapComponent implements OnInit, OnChanges { constructor( private resolver: ComponentFactoryResolver, private injector: Injector - ) { } - - ngOnInit() { - this.initMap(conf); - } + ) {} ngOnChanges(changes: SimpleChanges) { - if ( - this.observationMap && - changes.program && - changes.program.currentValue - ) { - this.loadProgramArea(); - } - - if ( - this.observationMap && - changes.observations && - changes.observations.currentValue - ) { - this.loadObservations(); - - /* - // TODO: revisit fix for disappearing base layer when back in navigation history. - // update when switching layers from control. - // save configured map state (base_layer, center, zoom) in localStorage ? - let base_layer = this.observationMap.options.layers[0]; - this.observationMap.removeLayer(this.observationMap.options.layers[0]); - conf.BASE_LAYERS[base_layer["options"]["name"]].addTo( - this.observationMap - ); - this.observationMap.invalidateSize(); - */ + if (!this.observationMap) { + this.initMap(conf); + setTimeout(() => { + if (changes.program && changes.program.currentValue) { + this.loadProgramArea(); + } + if (changes.observations && changes.observations.currentValue) { + this.loadObservations(); + } + }, 400); + } else { + if (changes.program && changes.program.currentValue) { + this.loadProgramArea(); + } + if (changes.observations && changes.observations.currentValue) { + this.loadObservations(); + } } } @@ -206,7 +192,7 @@ export class ObsMapComponent implements OnInit, OnChanges { L.control .locate({ - icon: 'fa fa-compass', + icon: "fa fa-compass", position: this.options.GEOLOCATION_CONTROL_POSITION, getLocationBounds: locationEvent => locationEvent.bounds.extend(this.programMaxBounds), @@ -287,7 +273,6 @@ export class ObsMapComponent implements OnInit, OnChanges { return marker; } }; - this.observationLayer.addLayer( L.geoJSON(this.observations, layerOptions) ); @@ -327,7 +312,7 @@ export class ObsMapComponent implements OnInit, OnChanges { if (this.program) { if (this.programArea !== undefined) { this.observationMap.removeLayer(this.programArea); - }; + } this.programArea = L.geoJSON(this.program, { style: _feature => this.options.PROGRAM_AREA_STYLE(_feature) }).addTo(this.observationMap); @@ -358,7 +343,7 @@ export class ObsMapComponent implements OnInit, OnChanges { this.observationMap.getContainer(), "observation-zoom-statement-warning" ); - }, 2000); + }, 400); return; } // PROBLEM: if program area is a concave polygon: one can still put a marker in the cavities. @@ -376,8 +361,11 @@ export class ObsMapComponent implements OnInit, OnChanges { this.programMaxBounds = programBounds; } } - - canStart(): void { } + ngOnDestroy(): void { + this.observationMap.off(); + this.observationMap.remove(); + } + canStart(): void {} @HostListener("document:NewObservationEvent", ["$event"]) newObservationEventHandler(e: CustomEvent) { @@ -389,26 +377,39 @@ export class ObsMapComponent implements OnInit, OnChanges { selector: "popup", template: ` -

- {{ !!data.nom_francais ? data.nom_francais : data.taxref?.nom_vern }}
+ {{ + !!data.nom_francais ? data.nom_francais : data.taxref?.nom_vern + }} +
- - Observé par - {{ - data.observer && data.observer.username - ? data.observer.username - : "Anonyme" - }} -
+ + Observé par + {{ + data.observer && data.observer.username + ? data.observer.username + : "Anonyme" + }} +
le {{ data.date }} diff --git a/frontend/src/app/programs/observations/obs.component.html b/frontend/src/app/programs/observations/obs.component.html index 25affa7d..1662424b 100644 --- a/frontend/src/app/programs/observations/obs.component.html +++ b/frontend/src/app/programs/observations/obs.component.html @@ -1,17 +1,13 @@

-

+

Bienvenue
sur Geonature Citizen

{{ AppConfig.platform_participate[localeId] }} - Scrollez pour en voir plus ! + Scrollez pour en voir plus !
@@ -25,20 +21,19 @@

Le programme {{ program.title }}

- program image (fixme context) + program image (fixme context)

{{ program.title }}

{{ program.title }}

-
-

-
- -
+
+

+
+ +
@@ -49,67 +44,36 @@

{{ program.title }}

-
- - +
+ +
- --> +
-
- +
+ - - -
diff --git a/frontend/src/app/programs/observations/obs.component.ts b/frontend/src/app/programs/observations/obs.component.ts index 385e66c8..1c260cce 100644 --- a/frontend/src/app/programs/observations/obs.component.ts +++ b/frontend/src/app/programs/observations/obs.component.ts @@ -9,6 +9,7 @@ import { LOCALE_ID } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; +import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; import { forkJoin } from "rxjs"; import { FeatureCollection, Feature } from "geojson"; @@ -45,12 +46,15 @@ export class ObsComponent implements OnInit, AfterViewInit { selectedObs: Feature; public isCollapsed : boolean = true; + isMobile: boolean; + constructor( @Inject(LOCALE_ID) readonly localeId: string, private route: ActivatedRoute, private programService: GncProgramsService, public flowService: ModalFlowService, + public breakpointObserver: BreakpointObserver ) { this.route.params.subscribe(params => (this.program_id = params["id"])); @@ -60,6 +64,14 @@ export class ObsComponent implements OnInit, AfterViewInit { } ngOnInit() { + this.breakpointObserver.observe(['(min-width: 500px)']).subscribe((state: BreakpointState) => { + if (state.matches) { + this.isMobile = false; + } else { + this.isMobile = true; + } + }); + this.route.data.subscribe((data: { programs: Program[] }) => { this.programs = data.programs; this.program = this.programs.find(p => p.id_program == this.program_id); From 197125587a7970f6a83d1d881e14266fb839ca6e Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 7 Jan 2020 15:05:28 +0100 Subject: [PATCH 31/76] show the new added observation on the map #183 --- .../programs/observations/obs.component.html | 2 +- .../programs/observations/obs.component.ts | 41 ++++++++----------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/frontend/src/app/programs/observations/obs.component.html b/frontend/src/app/programs/observations/obs.component.html index 1662424b..586ac822 100644 --- a/frontend/src/app/programs/observations/obs.component.html +++ b/frontend/src/app/programs/observations/obs.component.html @@ -53,7 +53,7 @@

{{ program.title }}

-
diff --git a/frontend/src/app/programs/observations/obs.component.ts b/frontend/src/app/programs/observations/obs.component.ts index 1c260cce..5dc33efe 100644 --- a/frontend/src/app/programs/observations/obs.component.ts +++ b/frontend/src/app/programs/observations/obs.component.ts @@ -9,7 +9,7 @@ import { LOCALE_ID } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; -import { BreakpointObserver, BreakpointState } from '@angular/cdk/layout'; +import { BreakpointObserver, BreakpointState } from "@angular/cdk/layout"; import { forkJoin } from "rxjs"; import { FeatureCollection, Feature } from "geojson"; @@ -41,21 +41,19 @@ export class ObsComponent implements OnInit, AfterViewInit { observations: FeatureCollection; programFeature: FeatureCollection; surveySpecies: TaxonomyList; - @ViewChild(ObsMapComponent, {static: true}) obsMap: ObsMapComponent; - @ViewChild(ObsListComponent, {static: true}) obsList: ObsListComponent; + @ViewChild(ObsMapComponent, { static: true }) obsMap: ObsMapComponent; + @ViewChild(ObsListComponent, { static: true }) obsList: ObsListComponent; selectedObs: Feature; - public isCollapsed : boolean = true; + public isCollapsed: boolean = true; isMobile: boolean; - constructor( @Inject(LOCALE_ID) readonly localeId: string, private route: ActivatedRoute, private programService: GncProgramsService, public flowService: ModalFlowService, public breakpointObserver: BreakpointObserver - ) { this.route.params.subscribe(params => (this.program_id = params["id"])); this.route.fragment.subscribe(fragment => { @@ -64,14 +62,16 @@ export class ObsComponent implements OnInit, AfterViewInit { } ngOnInit() { - this.breakpointObserver.observe(['(min-width: 500px)']).subscribe((state: BreakpointState) => { - if (state.matches) { - this.isMobile = false; - } else { - this.isMobile = true; - } - }); - + this.breakpointObserver + .observe(["(min-width: 500px)"]) + .subscribe((state: BreakpointState) => { + if (state.matches) { + this.isMobile = false; + } else { + this.isMobile = true; + } + }); + this.route.data.subscribe((data: { programs: Program[] }) => { this.programs = data.programs; this.program = this.programs.find(p => p.id_program == this.program_id); @@ -103,22 +103,15 @@ export class ObsComponent implements OnInit, AfterViewInit { this.coords = p; } - toggleList() { - this.obsMap.observationMap.invalidateSize(); - } - @HostListener("document:NewObservationEvent", ["$event"]) newObservationEventHandler(e: CustomEvent) { e.stopPropagation(); + this.observations.features.unshift(e.detail); this.observations = { type: "FeatureCollection", features: this.observations.features }; - this.obsList.observations = { - type: "FeatureCollection", - features: this.observations.features - }; } @HostListener("document:ObservationFilterEvent", ["$event"]) @@ -131,6 +124,6 @@ export class ObsComponent implements OnInit, AfterViewInit { } ngOnDestroy(): void { - this.flowService.closeModal() + this.flowService.closeModal(); } -} \ No newline at end of file +} From 73cf4a3190c937b90044fb797dcf2376cc2e9d8e Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 7 Jan 2020 15:58:36 +0100 Subject: [PATCH 32/76] fix leflet dependencies #186 --- frontend/package-lock.json | 31 +++++++++---------- frontend/package.json | 4 +-- .../observations/map/map.component.ts | 8 ++--- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index feadd969..1b7a12fd 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2,7 +2,6 @@ "name": "frontend", "version": "0.0.0", "lockfileVersion": 1, - "requires": true, "dependencies": { "@angular-devkit/architect": { "version": "0.802.2", @@ -3652,16 +3651,6 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -8171,6 +8160,16 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -11881,6 +11880,11 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -11928,11 +11932,6 @@ "function-bind": "^1.1.1" } }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 41d7d458..ec1050b6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -61,8 +61,8 @@ "@types/jasminewd2": "~2.0.6", "@types/leaflet": "^1.5.1", "@types/leaflet.locatecontrol": "^0.60.7", - "@types/leaflet.markercluster": "^1.4.0", - "@types/node": "~12.7.2", + "@types/leaflet.markercluster": "^1.4.2", + "@types/node": "~13.1.4", "codelyzer": "~5.1.0", "jasmine-core": "~3.4.0", "jasmine-spec-reporter": "~4.2.1", diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index e30caa06..e36c5987 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -21,9 +21,9 @@ import { MarkerClusterGroup } from "leaflet"; import "leaflet.markercluster"; import "leaflet.locatecontrol"; import "leaflet-gesture-handling"; +import { GestureHandling } from "leaflet-gesture-handling"; +L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling); -// import { AppConfig } from '../../../../conf/app.config'; -//const baseLayer = this.options.DEFAULT_BASE_MAP(); const conf = { MAP_ID: "obsMap", @@ -168,6 +168,7 @@ export class ObsMapComponent implements OnChanges { } initMap(options: any, LeafletOptions: L.MapOptions = {}): void { + L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling); this.options = options; this.observationMap = L.map(this.map.nativeElement, { layers: [this.options.DEFAULT_BASE_MAP()], // TODO: add program overlay ? @@ -194,8 +195,6 @@ export class ObsMapComponent implements OnChanges { .locate({ icon: "fa fa-compass", position: this.options.GEOLOCATION_CONTROL_POSITION, - getLocationBounds: locationEvent => - locationEvent.bounds.extend(this.programMaxBounds), locateOptions: { enableHighAccuracy: this.options.GEOLOCATION_HIGH_ACCURACY } @@ -226,7 +225,6 @@ export class ObsMapComponent implements OnChanges { (gauge.innerHTML = "Zoom level: " + this.observationMap.getZoom()) ); container.appendChild(gauge); - return container; } }); From 970c8ac72fe4e647dcd1069f07ec2a46025add79 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 7 Jan 2020 16:51:06 +0100 Subject: [PATCH 33/76] fix leflet dependencies ts types #186 --- .../app/programs/observations/form/form.component.ts | 5 +++-- .../app/programs/observations/map/map.component.ts | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/programs/observations/form/form.component.ts b/frontend/src/app/programs/observations/form/form.component.ts index 318032e9..d4356d7a 100644 --- a/frontend/src/app/programs/observations/form/form.component.ts +++ b/frontend/src/app/programs/observations/form/form.component.ts @@ -2,6 +2,7 @@ import { FormGroup, FormBuilder, Validators } from "@angular/forms"; import { geometryValidator, ngbDateMaxIsToday } from "./formValidators"; import { MAP_CONFIG } from "./../../../../conf/map.config"; import * as L from "leaflet"; + import { AfterViewInit, Component, @@ -140,7 +141,7 @@ export class ObsFormComponent implements AfterViewInit { this.surveySpecies$.subscribe(); // build map control - const formMap = L.map("formMap", { gestureHandling: true }); + const formMap = L.map("formMap", { gestureHandling: true } as any); this.formMap = formMap; L.tileLayer("//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { @@ -169,7 +170,7 @@ export class ObsFormComponent implements AfterViewInit { locateOptions: { enableHighAccuracy: map_conf.GEOLOCATION_HIGH_ACCURACY } - }) + } as any ) .addTo(formMap); let ZoomViewer = L.Control.extend({ diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index e36c5987..0f093c02 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -21,9 +21,6 @@ import { MarkerClusterGroup } from "leaflet"; import "leaflet.markercluster"; import "leaflet.locatecontrol"; import "leaflet-gesture-handling"; -import { GestureHandling } from "leaflet-gesture-handling"; -L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling); - const conf = { MAP_ID: "obsMap", @@ -167,9 +164,9 @@ export class ObsMapComponent implements OnChanges { } } - initMap(options: any, LeafletOptions: L.MapOptions = {}): void { - L.Map.addInitHook("addHandler", "gestureHandling", GestureHandling); + initMap(options: any, LeafletOptions: any = {}): void { this.options = options; + this.observationMap = L.map(this.map.nativeElement, { layers: [this.options.DEFAULT_BASE_MAP()], // TODO: add program overlay ? gestureHandling: true, @@ -195,10 +192,12 @@ export class ObsMapComponent implements OnChanges { .locate({ icon: "fa fa-compass", position: this.options.GEOLOCATION_CONTROL_POSITION, + getLocationBounds: locationEvent => + locationEvent.bounds.extend(this.programMaxBounds), locateOptions: { enableHighAccuracy: this.options.GEOLOCATION_HIGH_ACCURACY } - }) + } as any) .addTo(this.observationMap); // this.observationMap.scrollWheelZoom.disable(); From ecfe7bcb034c2ad9a0880b5de84d2e0d9b19d320 Mon Sep 17 00:00:00 2001 From: lpofredc Date: Wed, 8 Jan 2020 15:30:42 +0100 Subject: [PATCH 34/76] Customizable footer --- .gitignore | 5 ++++ .../src/app/core/footer/footer.component.ts | 4 ++-- .../src/app/core/topbar/topbar.component.html | 2 +- .../footer/footer.css} | 0 .../src/custom/footer/footer.css.template | 24 +++++++++++++++++++ .../footer/footer.html} | 1 + .../src/custom/footer/footer.html.template | 10 ++++++++ 7 files changed, 43 insertions(+), 3 deletions(-) rename frontend/src/{app/core/footer/footer.component.css => custom/footer/footer.css} (100%) create mode 100644 frontend/src/custom/footer/footer.css.template rename frontend/src/{app/core/footer/footer.component.html => custom/footer/footer.html} (99%) create mode 100644 frontend/src/custom/footer/footer.html.template diff --git a/.gitignore b/.gitignore index 98b7801a..65757c02 100644 --- a/.gitignore +++ b/.gitignore @@ -244,6 +244,11 @@ contrib/gnc_* #FrontEnd config files frontend/src/conf/*.ts +#Frontend custom files +frontend/custom/**/*.css +frontend/custom/**/*.html +frontend/custom/**/*.ico + # pipenv: comment when migrating from traditional pip+v(irtual)env Pipfile Pipfile.lock diff --git a/frontend/src/app/core/footer/footer.component.ts b/frontend/src/app/core/footer/footer.component.ts index 67f13785..d3ddbb24 100644 --- a/frontend/src/app/core/footer/footer.component.ts +++ b/frontend/src/app/core/footer/footer.component.ts @@ -2,8 +2,8 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-footer', - templateUrl: './footer.component.html', - styleUrls: ['./footer.component.css'] + templateUrl: '../../../custom/footer/footer.html', + styleUrls: ['../../../custom/footer/footer.css'] }) export class FooterComponent implements OnInit { diff --git a/frontend/src/app/core/topbar/topbar.component.html b/frontend/src/app/core/topbar/topbar.component.html index 64bc3a3c..e0228e6a 100644 --- a/frontend/src/app/core/topbar/topbar.component.html +++ b/frontend/src/app/core/topbar/topbar.component.html @@ -1,6 +1,6 @@
diff --git a/frontend/src/custom/footer/footer.html.template b/frontend/src/custom/footer/footer.html.template new file mode 100644 index 00000000..8ecdadb9 --- /dev/null +++ b/frontend/src/custom/footer/footer.html.template @@ -0,0 +1,10 @@ +
+ + +

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

+ +
+ From ff24b1bfa60372760dd53ba8d86ad59e46e8983e Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 8 Jan 2020 16:19:59 +0100 Subject: [PATCH 35/76] update translate and fix ssr #120 --- frontend/package-lock.json | 479 ++++++++++-------- frontend/package.json | 2 +- .../user-dashboard.component.html | 6 +- .../user-dashboard.component.ts | 8 +- .../observations/list/list.component.html | 14 +- .../observations/list/list.component.ts | 2 +- .../observations/map/map.component.ts | 9 +- .../modalflow/modalflow.component.html | 2 +- .../modalflow/modalflow.service.ts | 2 +- .../steps/committed/committed.component.ts | 2 +- .../steps/congrats/congrats.component.ts | 2 +- .../steps/onboard/onboard.component.ts | 2 +- frontend/src/locale/_messages.en.xlf | 454 ++++++++++------- frontend/src/locale/_messages.fr.xlf | 454 ++++++++++------- frontend/src/locale/messages.en.xlf | 187 +++++++ frontend/src/locale/messages.fr.xlf | 181 ++++++- 16 files changed, 1213 insertions(+), 593 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1b7a12fd..ecadc1e8 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2,14 +2,15 @@ "name": "frontend", "version": "0.0.0", "lockfileVersion": 1, + "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.2.tgz", - "integrity": "sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==", + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.21.tgz", + "integrity": "sha512-E2K/YexIWVyKM/xmyxvDjkJf+wX9u4c8YYpNaK4htsRzA06juc7N1MhlL/jURZiRl5b/K9sapYeq3tMX76saxA==", "dev": true, "requires": { - "@angular-devkit/core": "8.2.2", + "@angular-devkit/core": "8.3.21", "rxjs": "6.4.0" }, "dependencies": { @@ -225,9 +226,9 @@ } }, "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.21.tgz", + "integrity": "sha512-BYyVbrbys535FplX0+GVOlYBg/cyk1U5SRhSxRRFZYi9epVlEBBPk8/6wV4cQPGb6EwXkVj7YtPWXjXcGfzWmA==", "dev": true, "requires": { "ajv": "6.10.2", @@ -255,12 +256,12 @@ } }, "@angular-devkit/schematics": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.2.2.tgz", - "integrity": "sha512-wAbP+IriWgTSLR4prezuFlLbxMZMGXiN0FNH2i/v8MfxNXCBiEvD4YtD/8s8YRsZs+IW7sp3bErSD/EIlS4DyQ==", + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.21.tgz", + "integrity": "sha512-+wH0362CRr/SijVX4w2baY2ANZ4scQ1k2xO8lT+NMeZQkw3IJQPOfwk1IaqiAs2xuBJZcSDH1Gn80+Jh4Dit7w==", "dev": true, "requires": { - "@angular-devkit/core": "8.2.2", + "@angular-devkit/core": "8.3.21", "rxjs": "6.4.0" }, "dependencies": { @@ -301,25 +302,27 @@ } }, "@angular/cli": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.2.2.tgz", - "integrity": "sha512-iQvNVbegNXvnuAo8Pal6hjwK8joGcaCTcIa3jh1GLZ9JT4fZk2p9D/8Kay8C0jLm2KytV3f4eSlPAuX5V6p/XQ==", + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.21.tgz", + "integrity": "sha512-ZZpA7mMfIobFT06rBNxm8vucAh8W2s0huJZ4iL0BPujnhIr71PL+gDwssySWDEz2q6i4CkH9QRH76DHhtL6VSQ==", "dev": true, "requires": { - "@angular-devkit/architect": "0.802.2", - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2", - "@schematics/angular": "8.2.2", - "@schematics/update": "0.802.2", + "@angular-devkit/architect": "0.803.21", + "@angular-devkit/core": "8.3.21", + "@angular-devkit/schematics": "8.3.21", + "@schematics/angular": "8.3.21", + "@schematics/update": "0.803.21", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", "debug": "^4.1.1", "ini": "1.3.5", - "inquirer": "6.5.0", + "inquirer": "6.5.1", "npm-package-arg": "6.1.0", + "npm-pick-manifest": "3.0.2", "open": "6.4.0", - "pacote": "9.5.4", + "pacote": "9.5.5", "read-package-tree": "5.3.1", + "rimraf": "3.0.0", "semver": "6.3.0", "symbol-observable": "1.2.0", "universal-analytics": "^0.4.20", @@ -346,6 +349,15 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "rimraf": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } } } }, @@ -3307,26 +3319,26 @@ "integrity": "sha512-vXFydMTPFRfGjmtdwtbNhl4Pmfg580Yit0vzlTeb3ZC1v+TJKR2GzaWYUileWxS60FrgNF4/tkOEL5ouDDx6Bw==" }, "@schematics/angular": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", - "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", + "version": "8.3.21", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.21.tgz", + "integrity": "sha512-KahQ+dHvTsGOZwY6IdzqJZLDEn0G89rrK3OY+7okZujoaLM+LXhxlPoznW1udnZJVTa3VNxYGx11fkgLtRJRqA==", "dev": true, "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2" + "@angular-devkit/core": "8.3.21", + "@angular-devkit/schematics": "8.3.21" } }, "@schematics/update": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz", - "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==", + "version": "0.803.21", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.21.tgz", + "integrity": "sha512-D3BRvEBF2cJEgogvFaNOfqtTFHHv/ctSRfOeAYWjUxILtb+2DpuZ9h5QYDFhN9MPgz/vRaOqFORa3sEZCRkX4g==", "dev": true, "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2", + "@angular-devkit/core": "8.3.21", + "@angular-devkit/schematics": "8.3.21", "@yarnpkg/lockfile": "1.1.0", "ini": "1.3.5", - "pacote": "9.5.4", + "pacote": "9.5.5", "rxjs": "6.4.0", "semver": "6.3.0", "semver-intersect": "1.4.0" @@ -3408,9 +3420,9 @@ } }, "@types/leaflet.markercluster": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.0.tgz", - "integrity": "sha512-ctCkUvknqzt+6eLOhZK7ta+G6WQ9wkTeFvOw1KhWYoPY/ZuzLD+QUg1Umnw7yzMNA+L00ne3cmTk/xmVNkRSLQ==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@types/leaflet.markercluster/-/leaflet.markercluster-1.4.2.tgz", + "integrity": "sha512-QQ//hevAxMH2dlRQdRre7V/1G+TbtuDtZnZF/75TNwVIgklrsQVCIcS/cvLsl7UUryfPJ6xmoYHfFzK5iGVgpg==", "dev": true, "requires": { "@types/leaflet": "*" @@ -3423,9 +3435,9 @@ "dev": true }, "@types/node": { - "version": "12.7.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz", - "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz", + "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==", "dev": true }, "@types/q": { @@ -3651,6 +3663,16 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, + "requires": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + } + }, "abab": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", @@ -3744,10 +3766,13 @@ "dev": true }, "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz", + "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } }, "ansi-html": { "version": "0.0.7", @@ -4809,12 +4834,12 @@ } }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "^3.1.0" } }, "cli-width": { @@ -6014,23 +6039,45 @@ } }, "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz", + "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + } } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { "is-callable": "^1.1.4", @@ -6391,9 +6438,9 @@ "dev": true }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", + "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", "dev": true, "requires": { "escape-string-regexp": "^1.0.5" @@ -6725,12 +6772,12 @@ } }, "fs-minipass": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", - "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" } }, "fs-write-stream-atomic": { @@ -7079,9 +7126,9 @@ } }, "hosted-git-info": { - "version": "2.8.4", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.4.tgz", - "integrity": "sha512-pzXIvANXEFrc5oFFXRMkbLPQ2rXRoDERwDLyrcUxGhaZhgP54BBSl9Oheh7Vv0T090cszWBxPjkQQ5Sq1PbBRQ==", + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==", "dev": true }, "hpack.js": { @@ -7307,9 +7354,9 @@ "dev": true }, "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "requires": { "minimatch": "^3.0.4" @@ -7405,32 +7452,66 @@ "dev": true }, "inquirer": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", - "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz", + "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", + "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", + "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } + } + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -7438,6 +7519,14 @@ "dev": true, "requires": { "ansi-regex": "^4.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + } } } } @@ -7544,9 +7633,9 @@ "dev": true }, "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", "dev": true }, "is-data-descriptor": { @@ -8160,16 +8249,6 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -8539,47 +8618,22 @@ "dev": true }, "make-fetch-happen": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz", - "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz", + "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==", "dev": true, "requires": { "agentkeepalive": "^3.4.1", "cacache": "^12.0.0", "http-cache-semantics": "^3.8.1", "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", + "https-proxy-agent": "^2.2.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "node-fetch-npm": "^2.0.2", "promise-retry": "^1.1.1", "socks-proxy-agent": "^4.0.0", "ssri": "^6.0.0" - }, - "dependencies": { - "cacache": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", - "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", - "dev": true, - "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - } } }, "mamacro": { @@ -8875,9 +8929,9 @@ "dev": true }, "minipass": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "dev": true, "requires": { "safe-buffer": "^5.1.2", @@ -8885,12 +8939,12 @@ } }, "minizlib": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mississippi": { @@ -8994,9 +9048,9 @@ "dev": true }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, "nan": { @@ -9209,9 +9263,18 @@ } }, "npm-bundled": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", - "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", "dev": true }, "npm-package-arg": { @@ -9235,9 +9298,9 @@ } }, "npm-packlist": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz", - "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==", + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz", + "integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==", "dev": true, "requires": { "ignore-walk": "^3.0.1", @@ -9245,9 +9308,9 @@ } }, "npm-pick-manifest": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", - "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-3.0.2.tgz", + "integrity": "sha512-wNprTNg+X5nf+tDi+hbjdHhM4bX+mKqv6XmPh7B5eG+QY9VARfQPfCEH013H5GqfNj6ee8Ij2fg8yk0mzps1Vw==", "dev": true, "requires": { "figgy-pudding": "^3.5.1", @@ -9264,9 +9327,9 @@ } }, "npm-registry-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz", - "integrity": "sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz", + "integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==", "dev": true, "requires": { "JSONStream": "^1.3.4", @@ -9274,7 +9337,16 @@ "figgy-pudding": "^3.4.1", "lru-cache": "^5.1.1", "make-fetch-happen": "^5.0.0", - "npm-package-arg": "^6.1.0" + "npm-package-arg": "^6.1.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "dev": true + } } }, "npm-run-path": { @@ -9391,13 +9463,13 @@ } }, "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "object.pick": { @@ -9438,20 +9510,12 @@ } }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" - }, - "dependencies": { - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - } + "mimic-fn": "^2.1.0" } }, "open": { @@ -9615,16 +9679,17 @@ "dev": true }, "pacote": { - "version": "9.5.4", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.4.tgz", - "integrity": "sha512-nWr0ari6E+apbdoN0hToTKZElO5h4y8DGFa2pyNA5GQIdcP0imC96bA0bbPw1gpeguVIiUgHHaAlq/6xfPp8Qw==", + "version": "9.5.5", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz", + "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==", "dev": true, "requires": { "bluebird": "^3.5.3", - "cacache": "^12.0.0", + "cacache": "^12.0.2", "figgy-pudding": "^3.5.1", "get-stream": "^4.1.0", "glob": "^7.1.3", + "infer-owner": "^1.0.4", "lru-cache": "^5.1.1", "make-fetch-happen": "^5.0.0", "minimatch": "^3.0.4", @@ -9649,27 +9714,15 @@ "which": "^1.3.1" }, "dependencies": { - "cacache": { - "version": "12.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", - "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", + "npm-pick-manifest": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz", + "integrity": "sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "npm-package-arg": "^6.0.0", + "semver": "^5.4.1" } }, "semver": { @@ -10433,16 +10486,16 @@ } }, "read-package-json": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", - "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz", + "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==", "dev": true, "requires": { "glob": "^7.1.1", "graceful-fs": "^4.1.2", "json-parse-better-errors": "^1.0.1", "normalize-package-data": "^2.0.0", - "slash": "^1.0.0" + "npm-normalize-package-bin": "^1.0.0" } }, "read-package-tree": { @@ -10778,12 +10831,12 @@ "dev": true }, "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "requires": { - "onetime": "^2.0.0", + "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, @@ -11179,9 +11232,9 @@ "dev": true }, "smart-buffer": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz", - "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", + "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", "dev": true }, "snapdragon": { @@ -11452,13 +11505,13 @@ } }, "socks": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", - "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz", + "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==", "dev": true, "requires": { - "ip": "^1.1.5", - "smart-buffer": "4.0.2" + "ip": "1.1.5", + "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { @@ -11880,11 +11933,6 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -11932,6 +11980,11 @@ "function-bind": "^1.1.1" } }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -12063,14 +12116,14 @@ "dev": true }, "tar": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", - "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", "dev": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", + "minipass": "^2.8.6", "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", @@ -12394,6 +12447,12 @@ "prelude-ls": "~1.1.2" } }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", diff --git a/frontend/package.json b/frontend/package.json index ec1050b6..06620f5d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -54,7 +54,7 @@ }, "devDependencies": { "@angular-devkit/build-angular": "^0.803.21", - "@angular/cli": "^8.2.2", + "@angular/cli": "^8.3.21", "@angular/compiler-cli": "^8.2.2", "@angular/language-service": "^8.2.2", "@types/jasmine": "~3.4.0", diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html index 642a4c87..b3169003 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.html +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.html @@ -47,21 +47,21 @@

Mes badges

Récompenses géneral
-
Récompenses par programmes
-
Récompenses d'identification d'espèces
-
diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index 1f0235bb..cd3a928b 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -9,9 +9,9 @@ import { UseService } from "./user.service.service"; import { saveAs } from "file-saver"; import * as _ from "lodash"; import { Point } from "leaflet"; -import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; import { FormBuilder, FormGroup, Validators } from "@angular/forms"; import { CustomFormValidator } from "./customFormValidator"; +import { ModalFlowService } from "../../programs/observations/modalflow/modalflow.service"; @Component({ selector: "app-user-dashboard", @@ -19,7 +19,7 @@ import { CustomFormValidator } from "./customFormValidator"; styleUrls: ["./user-dashboard.component.css"] }) export class UserDashboardComponent implements OnInit { - readonly AppConfig = AppConfig; + public appConfig = AppConfig; modalRef: NgbModalRef; modalRefDel: NgbModalRef; username: string = "not defined"; @@ -64,7 +64,7 @@ export class UserDashboardComponent implements OnInit { this.role_id = user["features"]["id_role"]; if (user["features"]["avatar"]) this.userAvatar = - AppConfig.API_ENDPOINT + + this.appConfig.API_ENDPOINT + "/media/" + user["features"]["avatar"]; // FIXME: source backend conf @@ -215,7 +215,7 @@ export class UserDashboardComponent implements OnInit { "programme", "denombrement", "commentaire", - "municipalite", + "commune", "coordonnee_x", "coordonnee_y" ]); diff --git a/frontend/src/app/programs/observations/list/list.component.html b/frontend/src/app/programs/observations/list/list.component.html index bce935e1..5267c775 100644 --- a/frontend/src/app/programs/observations/list/list.component.html +++ b/frontend/src/app/programs/observations/list/list.component.html @@ -3,7 +3,7 @@ @@ -17,7 +17,7 @@
-

+

{{ (features$ | async)?.length }} { +(features$ | async)?.length, plural, =0 { observation trouvée } =1 { observation trouvée !} other { observations trouvées !} }

@@ -27,16 +27,16 @@
- {{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properties.taxref?.nom_vern }} -

+ {{ !!o.properties.nom_francais ? o.properties.nom_francais : o.properties.taxref?.nom_vern }} +

Observé par {{ o.properties.observer?.username @@ -44,7 +44,7 @@ : "Anonyme" }}

-

+

le {{ o.properties.date }} à {{ o.properties.municipality?.name }} diff --git a/frontend/src/app/programs/observations/list/list.component.ts b/frontend/src/app/programs/observations/list/list.component.ts index 521c0100..60400d77 100644 --- a/frontend/src/app/programs/observations/list/list.component.ts +++ b/frontend/src/app/programs/observations/list/list.component.ts @@ -33,7 +33,7 @@ export class ObsListComponent implements OnChanges { observationList: Feature[] = []; program_id: number; taxa: any[]; - AppConfig = AppConfig; + public appConfig = AppConfig; selectedTaxon: TaxonomyListItem = null; selectedMunicipality: any = null; changes$ = new BehaviorSubject(null); diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 0f093c02..6437bd26 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -380,7 +380,7 @@ export class ObsMapComponent implements OnChanges { data.image ? data.image : data.medias && !!data.medias.length - ? AppConfig.API_TAXHUB + + ? appConfig.API_TAXHUB + '/tmedias/thumbnail/' + data.medias[0].id_media + '?h=80&v=80' @@ -390,16 +390,15 @@ export class ObsMapComponent implements OnChanges {

{{ !!data.nom_francais ? data.nom_francais : data.taxref?.nom_vern }}
- + Observé par {{ data.observer && data.observer.username @@ -417,5 +416,5 @@ export class ObsMapComponent implements OnChanges { }) export class MarkerPopupComponent { @Input() data; - AppConfig = AppConfig; + public appConfig = AppConfig; } diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.component.html b/frontend/src/app/programs/observations/modalflow/modalflow.component.html index 34be4f8c..721ddfe8 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.component.html +++ b/frontend/src/app/programs/observations/modalflow/modalflow.component.html @@ -3,7 +3,7 @@ {{ AppConfig.program_add_an_observation[localeId] }}

diff --git a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts index 155a0b3f..7dc0836f 100644 --- a/frontend/src/app/programs/observations/modalflow/modalflow.service.ts +++ b/frontend/src/app/programs/observations/modalflow/modalflow.service.ts @@ -1,5 +1,5 @@ import { Injectable } from "@angular/core"; -import { Observable, BehaviorSubject, Subscription } from "rxjs"; +import { Observable, BehaviorSubject } from "rxjs"; import { NgbModal, diff --git a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts index 69069e6c..6b0289bf 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/committed/committed.component.ts @@ -2,7 +2,7 @@ import { Component, Input, ViewChild, ViewEncapsulation } from "@angular/core"; import { IFlowComponent } from "../../flow/flow"; import { ObsFormComponent } from "../../../form/form.component"; import { ObservationFeature } from "../../../observation.model"; -import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; +import { ModalFlowService } from "../../modalflow.service"; @Component({ templateUrl: "./committed.component.html", styleUrls: ["./committed.component.css"], diff --git a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts index 492e4e0d..67d3965d 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/congrats/congrats.component.ts @@ -1,5 +1,5 @@ import { Component, Input, ViewEncapsulation } from "@angular/core"; -import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; +import { ModalFlowService } from "../../modalflow.service"; import { IFlowComponent } from "../../flow/flow"; import { AppConfig } from "../../../../../../conf/app.config"; diff --git a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts index a650427e..32597f89 100644 --- a/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts +++ b/frontend/src/app/programs/observations/modalflow/steps/onboard/onboard.component.ts @@ -9,7 +9,7 @@ import { import { ActivatedRoute } from "@angular/router"; import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap"; -import { ModalFlowService } from "src/app/programs/observations/modalflow/modalflow.service"; +import { ModalFlowService } from "../../modalflow.service"; import { IFlowComponent } from "../../flow/flow"; import { RegisterComponent } from "../../../../../auth/register/register.component"; import { LoginComponent } from "../../../../../auth/login/login.component"; diff --git a/frontend/src/locale/_messages.en.xlf b/frontend/src/locale/_messages.en.xlf index 0d573884..b0e48341 100644 --- a/frontend/src/locale/_messages.en.xlf +++ b/frontend/src/locale/_messages.en.xlf @@ -6,7 +6,7 @@ Close ../node_modules/@ng-bootstrap/ng-bootstrap/alert/alert.d.ts - 2 + 3 @@ -71,56 +71,56 @@ «« ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 7 + 2 - - First + + « ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 5 + 3 - - « + + » ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 15 + 4 - - Previous + + »» ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 13 + 5 - - » + + First ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 29 + 14 - - Next + + Previous ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 27 + 23 - - »» + + Next ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 36 + 41 Last ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 34 + 49 @@ -155,77 +155,84 @@ Decrement hours ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 19 + 21 Increment minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 28 + 30 MM ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 31 + 33 Minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 33 + 35 Decrement minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 38 + 42 Increment seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 47 + 51 SS ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 50 + 54 Seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 52 + 56 Decrement seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 57 + 63 - PM + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 65 + 71 - AM + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 66 + 72 + + + + Close + + ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts + 8 @@ -241,25 +248,21 @@ app/auth/register/register.component.html - 35 + 13 Votre nom d'utilisateur app/auth/register/register.component.html - 41 - - - app/auth/user-dashboard/user-dashboard.component.html - 84 + 31 Entrez votre nom d'utilisateur app/auth/register/register.component.html - 52 + 37 app/auth/login/login.component.html @@ -271,25 +274,21 @@ app/auth/user-dashboard/user-dashboard.component.html - 96 + 115 Votre email app/auth/register/register.component.html - 63 - - - app/auth/user-dashboard/user-dashboard.component.html - 107 + 44 Entrez votre email app/auth/register/register.component.html - 76 + 50 app/auth/login/login.component.html @@ -297,51 +296,43 @@ app/auth/user-dashboard/user-dashboard.component.html - 120 + 127 Votre prénom app/auth/register/register.component.html - 90 - - - app/auth/user-dashboard/user-dashboard.component.html - 134 + 60 Entrez votre prénom app/auth/register/register.component.html - 97 + 62 app/auth/user-dashboard/user-dashboard.component.html - 141 + 137 Votre nom app/auth/register/register.component.html - 107 - - - app/auth/user-dashboard/user-dashboard.component.html - 151 + 67 Entrez votre nom app/auth/register/register.component.html - 114 + 69 app/auth/user-dashboard/user-dashboard.component.html - 158 + 144 @@ -350,40 +341,32 @@ app/auth/register/register.component.html - 132 + 77 Votre mot de passe app/auth/register/register.component.html - 138 + 83 app/auth/register/register.component.html - 144 - - - app/auth/user-dashboard/user-dashboard.component.html - 180 + 85 Confirmez votre mot de passe app/auth/register/register.component.html - 158 + 91 Confirmez le mot de passe app/auth/register/register.component.html - 168 - - - app/auth/user-dashboard/user-dashboard.component.html - 210 + 93 @@ -392,14 +375,14 @@ app/auth/register/register.component.html - 176 + 99 conditions d'utilisation app/auth/register/register.component.html - 190 + 104 @@ -408,7 +391,7 @@ app/auth/register/register.component.html - 201 + 109 @@ -417,7 +400,7 @@ app/auth/register/register.component.html - 212 + 114 app/auth/login/login.component.html @@ -512,98 +495,98 @@ S'incrire et contribuer au site app/programs/observations/modalflow/steps/onboard/onboard.component.html - 12 + 15 Continuer sans s'enregistrer app/programs/observations/modalflow/steps/onboard/onboard.component.html - 20 + 23 Vous avez déjà un compte ? Connectez-vous ! app/programs/observations/modalflow/steps/onboard/onboard.component.html - 26 + 29 {VAR_SELECT, select, isOn {Rechercher une espèce} isOff {Sélectionnez une espèce} } app/programs/observations/form/form.component.html - 13 + 6 Nom latin ou vernaculaire ou cd_ref app/programs/observations/form/form.component.html - 79 + 43 Informations complémentaires app/programs/observations/form/form.component.html - 88 + 48 Date de l'observation app/programs/observations/form/form.component.html - 92 + 52 jj/mm/aaaa app/programs/observations/form/form.component.html - 98 + 54 Dénombrement app/programs/observations/form/form.component.html - 107 + 59 Nombre app/programs/observations/form/form.component.html - 112 + 60 Commentaire app/programs/observations/form/form.component.html - 123 + 66 Votre commentaire app/programs/observations/form/form.component.html - 126 + 67 Ajouter une photo app/programs/observations/form/form.component.html - 136 + 73 Où avez-vous observé cette espèce ? app/programs/observations/form/form.component.html - 152 + 81 @@ -613,23 +596,54 @@ app/programs/observations/form/form.component.html - 155 + 84 Veuillez zoomer pour localiser votre observation. app/programs/observations/form/form.component.html - 167 + 92 app/programs/observations/map/map.component.ts 6 + + E-mail de contact + + app/programs/observations/form/form.component.html + 106 + + + + E-Mail + + app/programs/observations/form/form.component.html + 107 + + + + MODIFIER L'OBSERVATION + + app/programs/observations/modalflow/steps/committed/committed.component.html + 4 + + Valider l'observation + + + app/programs/observations/modalflow/steps/committed/committed.component.html + 16 + + Valider l'observation + + + + Modifier l'observation app/programs/observations/modalflow/steps/committed/committed.component.html @@ -641,7 +655,7 @@ Félicitations ! app/programs/observations/modalflow/steps/congrats/congrats.component.html - 13 + 16 Félicitations ! Congrats @@ -652,7 +666,7 @@ app/programs/observations/modalflow/steps/congrats/congrats.component.html - 14 + 17 Votre observation a bien été ajoutée ! Congrats @@ -661,7 +675,7 @@ app/programs/observations/modalflow/steps/congrats/congrats.component.html - 17 + 20 @@ -669,14 +683,14 @@ le app/programs/observations/modalflow/steps/congrats/congrats.component.html - 19 + 22 Félicitations ! app/programs/observations/modalflow/steps/reward/reward.component.ts - 5 + 7 @@ -685,60 +699,61 @@ app/programs/observations/modalflow/steps/reward/reward.component.ts - 6 + 8 {VAR_PLURAL, plural, =1 {Vous venez d'obtenir ce badge } other {Vous venez d'obtenir ces badges } } app/programs/observations/modalflow/steps/reward/reward.component.ts - 7 + 9 - - + + app/programs/observations/map/map.component.ts - 13 + 22 - + - Observé par - - - le - + Observé par + + + app/programs/observations/map/map.component.ts - 14 + 28 Toutes espèces app/programs/observations/list/list.component.html - 9 + 5 - + - () + () app/programs/observations/list/list.component.html - 10 + 6 Toutes communes app/programs/observations/list/list.component.html - 24 + 13 @@ -747,21 +762,21 @@ app/programs/observations/list/list.component.html - 31 + 20 {VAR_PLURAL, plural, =0 {observation trouvée } =1 {observation trouvée !} other {observations trouvées !} } app/programs/observations/list/list.component.html - 32 + 21 - - + + app/programs/observations/list/list.component.html - 56 + 38 @@ -775,7 +790,7 @@ app/programs/observations/list/list.component.html - 57 + 39 @@ -786,7 +801,7 @@ app/programs/observations/list/list.component.html - 65 + 47 @@ -796,7 +811,7 @@ app/programs/observations/obs.component.html - 7 + 5 Bienvenue<br /> sur Geonature Citizen @@ -805,11 +820,11 @@ Scrollez pour en voir plus ! app/programs/observations/obs.component.html - 13 + 10 app/home/home.component.html - 7 + 6 Scrollez pour en voir plus ! @@ -819,14 +834,42 @@ app/programs/observations/obs.component.html - 24 + 20 + + + + Observations + + app/home/home.component.html + 17 + + + + Espèces + + app/home/home.component.html + 25 + + + + Observateurs + + app/home/home.component.html + 33 + + + + Programmes + + app/home/home.component.html + 41 Les programmes du moment app/home/home.component.html - 45 + 83 Les programmes du moment @@ -834,7 +877,7 @@ Précédent app/home/home.component.html - 77 + 99 ngb.carousel.previous @@ -842,16 +885,18 @@ Prochain app/home/home.component.html - 86 + 103 ngb.carousel.next - + - PROGRAMMES - + }}"/> + × + + app/programs/programs.component.html 3 @@ -859,15 +904,6 @@ PROGRAMMES Programs modal title - - Site de démo GeoNature-citizen (version en cours de développement) - - - GeoNature-citizen - - app/core/footer/footer.component.html - 4 - - Se déconnecter @@ -890,35 +926,37 @@ Accueil app/core/topbar/topbar.component.html - 45 + 17 Les programmes app/core/topbar/topbar.component.html - 54 + 20 - - A propos + + A + propos app/core/topbar/topbar.component.html - 64 + 23 - - Admin + + Admin + app/core/topbar/topbar.component.html - 74 + 27 Mon tableau de bord app/core/topbar/topbar.component.html - 86 + 34 @@ -927,7 +965,7 @@ app/core/topbar/topbar.component.html - 97 + 38 @@ -936,7 +974,7 @@ app/core/topbar/topbar.component.html - 102 + 43 @@ -945,21 +983,35 @@ app/core/topbar/topbar.component.html - 105 + 46 {VAR_PLURAL, plural, =0 {aucune observation} =1 {une observation} other { observations} } app/auth/user-dashboard/user-dashboard.component.html - 8 + 7 - - Vos badges + + Mes observations app/auth/user-dashboard/user-dashboard.component.html - 17 + 18 + + + + Mes badges + + app/auth/user-dashboard/user-dashboard.component.html + 46 + + + + Récompenses géneral + + app/auth/user-dashboard/user-dashboard.component.html + 48 @@ -968,7 +1020,16 @@ app/auth/user-dashboard/user-dashboard.component.html - 38 + 71 + + + + + Exporter mes observations + + + app/auth/user-dashboard/user-dashboard.component.html + 74 @@ -977,23 +1038,42 @@ app/auth/user-dashboard/user-dashboard.component.html - 45 + 77 Mettre à jour vos données personnelles app/auth/user-dashboard/user-dashboard.component.html - 54 + 87 - - - Impossible de valider votre email. - + + Votre nom d'utilisateur * app/auth/user-dashboard/user-dashboard.component.html - 77 + 109 + + + + Votre email * + + app/auth/user-dashboard/user-dashboard.component.html + 121 + + + + Votre prénom * + + app/auth/user-dashboard/user-dashboard.component.html + 135 + + + + Votre nom * + + app/auth/user-dashboard/user-dashboard.component.html + 142 @@ -1002,21 +1082,25 @@ app/auth/user-dashboard/user-dashboard.component.html - 174 + 150 Votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 186 + 156 + + + app/auth/user-dashboard/user-dashboard.component.html + 158 Confirmez votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 200 + 164 @@ -1025,7 +1109,23 @@ app/auth/user-dashboard/user-dashboard.component.html - 224 + 174 + + + + + + + + app/programs/observations/modalflow/modalflow.component.html + 6 + + + + vous allez être redirigé automatiquement sur la page d'accueil + + app/auth/confirm-email/confirm-email.component.html + 5 diff --git a/frontend/src/locale/_messages.fr.xlf b/frontend/src/locale/_messages.fr.xlf index d63f1af9..e294f210 100644 --- a/frontend/src/locale/_messages.fr.xlf +++ b/frontend/src/locale/_messages.fr.xlf @@ -6,7 +6,7 @@ Close ../node_modules/@ng-bootstrap/ng-bootstrap/alert/alert.d.ts - 2 + 3 @@ -71,56 +71,56 @@ «« ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 7 + 2 - - First + + « ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 5 + 3 - - « + + » ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 15 + 4 - - Previous + + »» ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 13 + 5 - - » + + First ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 29 + 14 - - Next + + Previous ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 27 + 23 - - »» + + Next ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 36 + 41 Last ../node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts - 34 + 49 @@ -155,77 +155,84 @@ Decrement hours ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 19 + 21 Increment minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 28 + 30 MM ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 31 + 33 Minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 33 + 35 Decrement minutes ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 38 + 42 Increment seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 47 + 51 SS ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 50 + 54 Seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 52 + 56 Decrement seconds ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 57 + 63 - PM + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 65 + 71 - AM + ../node_modules/@ng-bootstrap/ng-bootstrap/timepicker/timepicker.d.ts - 66 + 72 + + + + Close + + ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts + 8 @@ -241,25 +248,21 @@ app/auth/register/register.component.html - 35 + 13 Votre nom d'utilisateur app/auth/register/register.component.html - 41 - - - app/auth/user-dashboard/user-dashboard.component.html - 84 + 31 Entrez votre nom d'utilisateur app/auth/register/register.component.html - 52 + 37 app/auth/login/login.component.html @@ -271,25 +274,21 @@ app/auth/user-dashboard/user-dashboard.component.html - 96 + 115 Votre email app/auth/register/register.component.html - 63 - - - app/auth/user-dashboard/user-dashboard.component.html - 107 + 44 Entrez votre email app/auth/register/register.component.html - 76 + 50 app/auth/login/login.component.html @@ -297,51 +296,43 @@ app/auth/user-dashboard/user-dashboard.component.html - 120 + 127 Votre prénom app/auth/register/register.component.html - 90 - - - app/auth/user-dashboard/user-dashboard.component.html - 134 + 60 Entrez votre prénom app/auth/register/register.component.html - 97 + 62 app/auth/user-dashboard/user-dashboard.component.html - 141 + 137 Votre nom app/auth/register/register.component.html - 107 - - - app/auth/user-dashboard/user-dashboard.component.html - 151 + 67 Entrez votre nom app/auth/register/register.component.html - 114 + 69 app/auth/user-dashboard/user-dashboard.component.html - 158 + 144 @@ -350,40 +341,32 @@ app/auth/register/register.component.html - 132 + 77 Votre mot de passe app/auth/register/register.component.html - 138 + 83 app/auth/register/register.component.html - 144 - - - app/auth/user-dashboard/user-dashboard.component.html - 180 + 85 Confirmez votre mot de passe app/auth/register/register.component.html - 158 + 91 Confirmez le mot de passe app/auth/register/register.component.html - 168 - - - app/auth/user-dashboard/user-dashboard.component.html - 210 + 93 @@ -392,14 +375,14 @@ app/auth/register/register.component.html - 176 + 99 conditions d'utilisation app/auth/register/register.component.html - 190 + 104 @@ -408,7 +391,7 @@ app/auth/register/register.component.html - 201 + 109 @@ -417,7 +400,7 @@ app/auth/register/register.component.html - 212 + 114 app/auth/login/login.component.html @@ -512,98 +495,98 @@ S'incrire et contribuer au site app/programs/observations/modalflow/steps/onboard/onboard.component.html - 12 + 15 Continuer sans s'enregistrer app/programs/observations/modalflow/steps/onboard/onboard.component.html - 20 + 23 Vous avez déjà un compte ? Connectez-vous ! app/programs/observations/modalflow/steps/onboard/onboard.component.html - 26 + 29 {VAR_SELECT, select, isOn {Rechercher une espèce} isOff {Sélectionnez une espèce} } app/programs/observations/form/form.component.html - 13 + 6 Nom latin ou vernaculaire ou cd_ref app/programs/observations/form/form.component.html - 79 + 43 Informations complémentaires app/programs/observations/form/form.component.html - 88 + 48 Date de l'observation app/programs/observations/form/form.component.html - 92 + 52 jj/mm/aaaa app/programs/observations/form/form.component.html - 98 + 54 Dénombrement app/programs/observations/form/form.component.html - 107 + 59 Nombre app/programs/observations/form/form.component.html - 112 + 60 Commentaire app/programs/observations/form/form.component.html - 123 + 66 Votre commentaire app/programs/observations/form/form.component.html - 126 + 67 Ajouter une photo app/programs/observations/form/form.component.html - 136 + 73 Où avez-vous observé cette espèce ? app/programs/observations/form/form.component.html - 152 + 81 @@ -613,23 +596,54 @@ app/programs/observations/form/form.component.html - 155 + 84 Veuillez zoomer pour localiser votre observation. app/programs/observations/form/form.component.html - 167 + 92 app/programs/observations/map/map.component.ts 6 + + E-mail de contact + + app/programs/observations/form/form.component.html + 106 + + + + E-Mail + + app/programs/observations/form/form.component.html + 107 + + + + MODIFIER L'OBSERVATION + + app/programs/observations/modalflow/steps/committed/committed.component.html + 4 + + Valider l'observation + + + app/programs/observations/modalflow/steps/committed/committed.component.html + 16 + + Valider l'observation + + + + Modifier l'observation app/programs/observations/modalflow/steps/committed/committed.component.html @@ -641,7 +655,7 @@ Félicitations ! app/programs/observations/modalflow/steps/congrats/congrats.component.html - 13 + 16 Félicitations ! Congrats @@ -652,7 +666,7 @@ app/programs/observations/modalflow/steps/congrats/congrats.component.html - 14 + 17 Votre observation a bien été ajoutée ! Congrats @@ -661,7 +675,7 @@ app/programs/observations/modalflow/steps/congrats/congrats.component.html - 17 + 20 @@ -669,14 +683,14 @@ le app/programs/observations/modalflow/steps/congrats/congrats.component.html - 19 + 22 Félicitations ! app/programs/observations/modalflow/steps/reward/reward.component.ts - 5 + 7 @@ -685,60 +699,61 @@ app/programs/observations/modalflow/steps/reward/reward.component.ts - 6 + 8 {VAR_PLURAL, plural, =1 {Vous venez d'obtenir ce badge } other {Vous venez d'obtenir ces badges } } app/programs/observations/modalflow/steps/reward/reward.component.ts - 7 + 9 - - + + app/programs/observations/map/map.component.ts - 13 + 22 - + - Observé par - - - le - + Observé par + + + app/programs/observations/map/map.component.ts - 14 + 28 Toutes espèces app/programs/observations/list/list.component.html - 9 + 5 - + - () + () app/programs/observations/list/list.component.html - 10 + 6 Toutes communes app/programs/observations/list/list.component.html - 24 + 13 @@ -747,21 +762,21 @@ app/programs/observations/list/list.component.html - 31 + 20 {VAR_PLURAL, plural, =0 {observation trouvée } =1 {observation trouvée !} other {observations trouvées !} } app/programs/observations/list/list.component.html - 32 + 21 - - + + app/programs/observations/list/list.component.html - 56 + 38 @@ -775,7 +790,7 @@ app/programs/observations/list/list.component.html - 57 + 39 @@ -786,7 +801,7 @@ app/programs/observations/list/list.component.html - 65 + 47 @@ -796,7 +811,7 @@ app/programs/observations/obs.component.html - 7 + 5 Bienvenue<br /> sur Geonature Citizen @@ -805,11 +820,11 @@ Scrollez pour en voir plus ! app/programs/observations/obs.component.html - 13 + 10 app/home/home.component.html - 7 + 6 Scrollez pour en voir plus ! @@ -819,14 +834,42 @@ app/programs/observations/obs.component.html - 24 + 20 + + + + Observations + + app/home/home.component.html + 17 + + + + Espèces + + app/home/home.component.html + 25 + + + + Observateurs + + app/home/home.component.html + 33 + + + + Programmes + + app/home/home.component.html + 41 Les programmes du moment app/home/home.component.html - 45 + 83 Les programmes du moment @@ -834,7 +877,7 @@ Précédent app/home/home.component.html - 77 + 99 ngb.carousel.previous @@ -842,16 +885,18 @@ Prochain app/home/home.component.html - 86 + 103 ngb.carousel.next - + - PROGRAMMES - + }}"/> + × + + app/programs/programs.component.html 3 @@ -859,15 +904,6 @@ PROGRAMMES Programs modal title - - Site de démo GeoNature-citizen (version en cours de développement) - - - GeoNature-citizen - - app/core/footer/footer.component.html - 4 - - Se déconnecter @@ -890,35 +926,37 @@ Accueil app/core/topbar/topbar.component.html - 45 + 17 Les programmes app/core/topbar/topbar.component.html - 54 + 20 - - A propos + + A + propos app/core/topbar/topbar.component.html - 64 + 23 - - Admin + + Admin + app/core/topbar/topbar.component.html - 74 + 27 Mon tableau de bord app/core/topbar/topbar.component.html - 86 + 34 @@ -927,7 +965,7 @@ app/core/topbar/topbar.component.html - 97 + 38 @@ -936,7 +974,7 @@ app/core/topbar/topbar.component.html - 102 + 43 @@ -945,21 +983,35 @@ app/core/topbar/topbar.component.html - 105 + 46 {VAR_PLURAL, plural, =0 {aucune observation} =1 {une observation} other { observations} } app/auth/user-dashboard/user-dashboard.component.html - 8 + 7 - - Vos badges + + Mes observations app/auth/user-dashboard/user-dashboard.component.html - 17 + 18 + + + + Mes badges + + app/auth/user-dashboard/user-dashboard.component.html + 46 + + + + Récompenses géneral + + app/auth/user-dashboard/user-dashboard.component.html + 48 @@ -968,7 +1020,16 @@ app/auth/user-dashboard/user-dashboard.component.html - 38 + 71 + + + + + Exporter mes observations + + + app/auth/user-dashboard/user-dashboard.component.html + 74 @@ -977,23 +1038,42 @@ app/auth/user-dashboard/user-dashboard.component.html - 45 + 77 Mettre à jour vos données personnelles app/auth/user-dashboard/user-dashboard.component.html - 54 + 87 - - - Impossible de valider votre email. - + + Votre nom d'utilisateur * app/auth/user-dashboard/user-dashboard.component.html - 77 + 109 + + + + Votre email * + + app/auth/user-dashboard/user-dashboard.component.html + 121 + + + + Votre prénom * + + app/auth/user-dashboard/user-dashboard.component.html + 135 + + + + Votre nom * + + app/auth/user-dashboard/user-dashboard.component.html + 142 @@ -1002,21 +1082,25 @@ app/auth/user-dashboard/user-dashboard.component.html - 174 + 150 Votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 186 + 156 + + + app/auth/user-dashboard/user-dashboard.component.html + 158 Confirmez votre nouveau mot de passe app/auth/user-dashboard/user-dashboard.component.html - 200 + 164 @@ -1025,7 +1109,23 @@ app/auth/user-dashboard/user-dashboard.component.html - 224 + 174 + + + + + + + + app/programs/observations/modalflow/modalflow.component.html + 6 + + + + vous allez être redirigé automatiquement sur la page d'accueil + + app/auth/confirm-email/confirm-email.component.html + 5 diff --git a/frontend/src/locale/messages.en.xlf b/frontend/src/locale/messages.en.xlf index 5e170546..353138df 100644 --- a/frontend/src/locale/messages.en.xlf +++ b/frontend/src/locale/messages.en.xlf @@ -2,6 +2,14 @@ + + Close + Close + + ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts + 8 + + Close Close @@ -1217,6 +1225,185 @@ app/auth/user-dashboard/user-dashboard.component.html 224 + + + E-mail de contact + Contact E-mail + + app/programs/observations/form/form.component.html + 106 + + + + E-Mail + E-Mail + + app/programs/observations/form/form.component.html + 107 + + + + Observations + Observations + + app/home/home.component.html + 17 + + + + Espèces + Species + + app/home/home.component.html + 25 + + + + Observateurs + Observers + + app/home/home.component.html + 33 + + + + Programmes + Programs + + app/home/home.component.html + 41 + + + + + PROGRAMMES  + × + + + + app/programs/programs.component.html + 3 + + PROGRAMMES + Programs modal title + PROGRAMS + + + +  Se déconnecter + + + app/core/topbar/topbar.component.html + 38 + + Sign out + + + Mes observations + My observations + + app/auth/user-dashboard/user-dashboard.component.html + 18 + + + + Mes badges + My badges + + app/auth/user-dashboard/user-dashboard.component.html + 46 + + + + Récompenses géneral + General rewards + + app/auth/user-dashboard/user-dashboard.component.html + 48 + + + + + Exporter mes observations + + Export my observations + + app/auth/user-dashboard/user-dashboard.component.html + 74 + + + + Votre nom d'utilisateur * + Your username * + + app/auth/user-dashboard/user-dashboard.component.html + 109 + + + + Votre email * + Your email * + + app/auth/user-dashboard/user-dashboard.component.html + 121 + + + + Votre prénom * + Your first name * + + app/auth/user-dashboard/user-dashboard.component.html + 135 + + + + Votre nom * + Your last name * + + app/auth/user-dashboard/user-dashboard.component.html + 142 + + + + MODIFIER L'OBSERVATION + MODIFY THE OBSERVATION + + app/programs/observations/modalflow/steps/committed/committed.component.html + 4 + + + + + Modifier l'observation + + Modify the observation + + app/programs/observations/modalflow/steps/committed/committed.component.html + 20 + + Valider l'observation + + + vous allez être redirigé automatiquement sur la page d'accueil + you will be automatically redirected to the home page + + app/auth/confirm-email/confirm-email.component.html + 5 + + + + + Se connecter + + + Login + + + app/core/topbar/topbar.component.html + 86 + diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index 8bb02457..ea2707ff 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -2,12 +2,20 @@ - + + Close + Fermer + + ../node_modules/@ng-bootstrap/ng-bootstrap/toast/toast.d.ts + 8 + + + Close Fermer ../node_modules/@ng-bootstrap/ng-bootstrap/alert/alert.d.ts - 2 + 3 @@ -1074,7 +1082,7 @@ Admin - Admin + Admin app/core/topbar/topbar.component.html 25 @@ -1232,6 +1240,173 @@ 224 + + E-mail de contact + E-mail de contact + + app/programs/observations/form/form.component.html + 106 + + + + E-Mail + E-Mail + + app/programs/observations/form/form.component.html + 107 + + + + Observations + Observations + + app/home/home.component.html + 17 + + + + Espèces + Espèces + + app/home/home.component.html + 25 + + + + Observateurs + Observateurs + + app/home/home.component.html + 33 + + + + Programmes + Programmes + + app/home/home.component.html + 41 + + + + + PROGRAMMES  + × + + + + app/programs/programs.component.html + 3 + + PROGRAMMES + Programs modal title + PROGRAMMES + + + +  Se déconnecter + + + app/core/topbar/topbar.component.html + 38 + + Se déconnecter + + + Mes observations + Mes observations + + app/auth/user-dashboard/user-dashboard.component.html + 18 + + + + Mes badges + Mes badges + + app/auth/user-dashboard/user-dashboard.component.html + 46 + + + + Récompenses géneral + Récompenses géneral + + app/auth/user-dashboard/user-dashboard.component.html + 48 + + + + + Exporter mes observations + + Exporter mes observations + + app/auth/user-dashboard/user-dashboard.component.html + 74 + + + + Votre nom d'utilisateur * + Votre nom d'utilisateur * + + app/auth/user-dashboard/user-dashboard.component.html + 109 + + + + Votre email * + Votre email * + + app/auth/user-dashboard/user-dashboard.component.html + 121 + + + + Votre prénom * + Votre prénom * + + app/auth/user-dashboard/user-dashboard.component.html + 135 + + + + Votre nom * + Votre nom * + + app/auth/user-dashboard/user-dashboard.component.html + 142 + + + + MODIFIER L'OBSERVATION + MODIFIER L'OBSERVATION + + app/programs/observations/modalflow/steps/committed/committed.component.html + 4 + + + + + Modifier l'observation + + Modifier l'observation + + app/programs/observations/modalflow/steps/committed/committed.component.html + 20 + + Valider l'observation + + + vous allez être redirigé automatiquement sur la page d'accueil + vous allez être redirigé automatiquement sur la page d'accueil + + app/auth/confirm-email/confirm-email.component.html + 5 + + From 989907c51c7a71b7ae3ce9429457e4216f6c6a0b Mon Sep 17 00:00:00 2001 From: lpofredc Date: Thu, 9 Jan 2020 11:52:41 +0100 Subject: [PATCH 36/76] logo customizable without front rebuild --- frontend/src/app/core/topbar/topbar.component.ts | 2 ++ frontend/src/app/home/home.component.css | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/core/topbar/topbar.component.ts b/frontend/src/app/core/topbar/topbar.component.ts index 40b4b803..535ad491 100644 --- a/frontend/src/app/core/topbar/topbar.component.ts +++ b/frontend/src/app/core/topbar/topbar.component.ts @@ -30,6 +30,7 @@ export class TopbarComponent implements OnInit { canDisplayAbout: boolean = AppConfig.about; canSignup: boolean = AppConfig.signup; adminUrl: SafeUrl; + logoImage: String; constructor( private route: ActivatedRoute, @@ -41,6 +42,7 @@ export class TopbarComponent implements OnInit { ) { const tmp = localStorage.getItem("username"); this.username = tmp ? tmp.replace(/\"/g, "") : "Anonymous"; + this.logoImage = AppConfig.API_ENDPOINT + "/media/logo.png"; this.route.data .pipe( tap((data: { programs: Program[] }) => { diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index 0a947358..b87ca17e 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -27,9 +27,10 @@ app-home .section:before { } */ #welcome { - background: url(../../assets/background.jpg) no-repeat; + /* background: url(../../assets/background.jpg) no-repeat; */ width: 100%; background-size: cover; + background-repeat: no-repeat; position: relative; height: calc(100vh - var(--router-outlet-margin-top)); margin-top: var(--router-outlet-margin-top); From ea1fb70ec56976f8b19bcc666fd05a62c017bdca Mon Sep 17 00:00:00 2001 From: lpofredc Date: Thu, 9 Jan 2020 11:53:15 +0100 Subject: [PATCH 37/76] background image customizable without rebuild front --- frontend/src/app/home/home.component.html | 2 +- frontend/src/app/home/home.component.ts | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index 8f164712..e86ebfc8 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -1,5 +1,5 @@
-
+

diff --git a/frontend/src/app/home/home.component.ts b/frontend/src/app/home/home.component.ts index 97e35214..9b544d02 100644 --- a/frontend/src/app/home/home.component.ts +++ b/frontend/src/app/home/home.component.ts @@ -22,6 +22,7 @@ export class HomeComponent implements OnInit, AfterViewChecked { AppConfig = AppConfig; htmlContent: SafeHtml; stats: Object; + backgroundImage: String; constructor( @Inject(LOCALE_ID) readonly localeId: string, @@ -43,6 +44,8 @@ export class HomeComponent implements OnInit, AfterViewChecked { this.fragment = fragment; }); + + this.backgroundImage = AppConfig.API_ENDPOINT + "/media/background.jpg"; this.meta.updateTag({ name: "description", content: From d3600844cbb3238b077822170949670a59f6d2a9 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 9 Jan 2020 12:25:35 +0100 Subject: [PATCH 38/76] GeoNature typo --- frontend/src/app/core/topbar/topbar.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/core/topbar/topbar.component.html b/frontend/src/app/core/topbar/topbar.component.html index e0228e6a..89ab2f81 100644 --- a/frontend/src/app/core/topbar/topbar.component.html +++ b/frontend/src/app/core/topbar/topbar.component.html @@ -1,7 +1,7 @@
-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
- Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

- From 3e2e0fcc40f3ea4cc544b995bb83188fafb36b9e Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 22 Jan 2020 13:58:30 +0100 Subject: [PATCH 46/76] fix topbar bug #194 && add focus map on click --- .../programs/observations/map/map.component.ts | 16 +++++++++++----- .../app/programs/observations/obs.component.css | 4 ++-- frontend/src/styles.css | 6 +----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/frontend/src/app/programs/observations/map/map.component.ts b/frontend/src/app/programs/observations/map/map.component.ts index 6437bd26..5b369ed3 100644 --- a/frontend/src/app/programs/observations/map/map.component.ts +++ b/frontend/src/app/programs/observations/map/map.component.ts @@ -22,6 +22,7 @@ import "leaflet.markercluster"; import "leaflet.locatecontrol"; import "leaflet-gesture-handling"; + const conf = { MAP_ID: "obsMap", GEOLOCATION_HIGH_ACCURACY: false, @@ -218,11 +219,9 @@ export class ObsMapComponent implements OnChanges { container.style.background = "rgba(255,255,255,0.5)"; container.style.textAlign = "left"; container.className = "mb-0"; - this.observationMap.on( - "zoomstart zoom zoomend", - _e => - (gauge.innerHTML = "Zoom level: " + this.observationMap.getZoom()) - ); + this.observationMap.on("zoomstart zoom zoomend", _e => { + gauge.innerHTML = "Zoom level: " + this.observationMap.getZoom(); + }); container.appendChild(gauge); return container; } @@ -230,6 +229,13 @@ export class ObsMapComponent implements OnChanges { let zv = new ZoomViewer(); zv.addTo(this.observationMap); zv.setPosition("bottomright"); + + this.observationMap.on("click", () => { + let elemRect =this.observationMap.getContainer().getBoundingClientRect(); + let bodyRect = document.body.getBoundingClientRect(); + let offset = elemRect.top - bodyRect.top; + window.scrollTo(0,offset - 120) // 120 topBarre width with padding + }); } getPopupContent(feature): any { diff --git a/frontend/src/app/programs/observations/obs.component.css b/frontend/src/app/programs/observations/obs.component.css index 2e692a9c..d1f0cdf0 100644 --- a/frontend/src/app/programs/observations/obs.component.css +++ b/frontend/src/app/programs/observations/obs.component.css @@ -6,7 +6,7 @@ } .obs-section#slide{ - /*margin-top: 106px;*/ + margin-top: 106px; margin-bottom: 20px; } @@ -297,6 +297,6 @@ section .observations { } @media screen and (max-width: 576px) { section#slide{ - margin-top: 66px; + margin-top: 66px !important; } } \ No newline at end of file diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 5d37aa4c..2c189a69 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -1084,12 +1084,8 @@ input:checked~.toggle i { app-about .container{ margin-top: 106px !important; } - app-about .container h2{ - font-size: 20px; - font-weight: bold; - text-transform: uppercase; - } } + @media screen and (max-width: 576px) { .programs-modal .modal-dialog, .obs-modal .modal-dialog{ margin: 0px !important; From 7e2cc31273fe41b3768703c91dd2dbe98792b1c8 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 22 Jan 2020 14:45:11 +0100 Subject: [PATCH 47/76] remove username on reset password --- backend/gncitizen/core/users/routes.py | 4 +- frontend/src/app/auth/auth.interceptor.ts | 1 + .../src/app/auth/login/login.component.html | 165 +++--------------- .../src/app/auth/login/login.component.ts | 10 +- 4 files changed, 36 insertions(+), 144 deletions(-) diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index f424bfba..e28ff571 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -462,10 +462,10 @@ def delete_user(): def reset_user_password(): request_datas = dict(request.get_json()) email = request_datas["email"] - username = request_datas["username"] + #username = request_datas["username"] try: - user = UserModel.query.filter_by(username=username, email=email).one() + user = UserModel.query.filter_by(email=email).one() except Exception: return ( {"message": """L'email "{}" n'est pas enregistré.""".format( diff --git a/frontend/src/app/auth/auth.interceptor.ts b/frontend/src/app/auth/auth.interceptor.ts index 61dee34d..46e37bdc 100644 --- a/frontend/src/app/auth/auth.interceptor.ts +++ b/frontend/src/app/auth/auth.interceptor.ts @@ -104,6 +104,7 @@ export class AuthInterceptor implements HttpInterceptor { (request.url.match(AppConfig.API_ENDPOINT) && (request.url.includes("token_refresh") || request.url.includes("registration") || + request.url.includes("resetpasswd") || request.url.includes("login"))) || !request.url.match(AppConfig.API_ENDPOINT) ) { diff --git a/frontend/src/app/auth/login/login.component.html b/frontend/src/app/auth/login/login.component.html index 04acf31d..fd8ef643 100644 --- a/frontend/src/app/auth/login/login.component.html +++ b/frontend/src/app/auth/login/login.component.html @@ -1,177 +1,70 @@

Se connecter

-
- {{ errorMessage }} - {{ successMessage }} + {{ errorMessage }} + + {{ successMessage }} - -
- -
-
- -
- -
-
+
- + }">
- +
- -
+
- + }">
- +
- + }">
- +
- Mot de passe oublié ? -
-
diff --git a/frontend/src/app/auth/login/login.component.ts b/frontend/src/app/auth/login/login.component.ts index 2b3d1a00..fc17103b 100644 --- a/frontend/src/app/auth/login/login.component.ts +++ b/frontend/src/app/auth/login/login.component.ts @@ -69,9 +69,8 @@ export class LoginComponent { onRecoverPassword(): void { this.http .post(`${AppConfig.API_ENDPOINT}/user/resetpasswd`, this.recovery) - .pipe(catchError(error => this.handleError(error))) .subscribe( - response => { + (response) => { const message = response["message"]; this._success.subscribe(message => (this.successMessage = message)); this._success.pipe(debounceTime(5000)).subscribe(() => { @@ -79,11 +78,10 @@ export class LoginComponent { }); this.displaySuccessMessage(message); }, - errorMessage => { - console.error("error", errorMessage); + (errorMessage) => { this.successMessage = null; - this.errorMessage = errorMessage; - this.displayErrorMessage(errorMessage); + this.errorMessage = errorMessage.error.message; + this.displayErrorMessage(this.errorMessage); } ); } From 7901e2ed1d944e2e5cd5c243e54726de687289d0 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Wed, 22 Jan 2020 15:43:12 +0100 Subject: [PATCH 48/76] add user avatar to topbar --- backend/gncitizen/core/users/routes.py | 1 + frontend/src/app/auth/auth.service.ts | 1 + frontend/src/app/auth/login/login.component.css | 7 +------ frontend/src/app/auth/login/login.component.html | 5 ++++- frontend/src/app/auth/login/login.component.ts | 3 +-- .../app/auth/user-dashboard/user-dashboard.component.ts | 3 ++- frontend/src/app/core/topbar/topbar.component.html | 4 +++- frontend/src/app/core/topbar/topbar.component.ts | 8 +++++++- 8 files changed, 20 insertions(+), 12 deletions(-) diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index e28ff571..6582e945 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -227,6 +227,7 @@ def login(): { "message": """Connecté en tant que "{}".""".format(username), "username": username, + "userAvatar": current_user.as_secured_dict(True).get('avatar'), "access_token": access_token, "refresh_token": refresh_token, }, diff --git a/frontend/src/app/auth/auth.service.ts b/frontend/src/app/auth/auth.service.ts index 9e1dfea0..7d972011 100644 --- a/frontend/src/app/auth/auth.service.ts +++ b/frontend/src/app/auth/auth.service.ts @@ -63,6 +63,7 @@ export class AuthService { localStorage.setItem("refresh_token", user.refresh_token); this.authenticated$.next(true); localStorage.setItem("username", user.username); + localStorage.setItem("userAvatar", user.userAvatar); } logout(): Promise { diff --git a/frontend/src/app/auth/login/login.component.css b/frontend/src/app/auth/login/login.component.css index 770e3da3..30b8f728 100644 --- a/frontend/src/app/auth/login/login.component.css +++ b/frontend/src/app/auth/login/login.component.css @@ -23,12 +23,7 @@ } #recoverPassword { - text-align: right; - font-style: italic; - display: flex; - justify-content: flex-end; - margin-bottom: 15px; - transform: translateY(-15px); + cursor: pointer; } span.input-group-text { diff --git a/frontend/src/app/auth/login/login.component.html b/frontend/src/app/auth/login/login.component.html index fd8ef643..9340c3ff 100644 --- a/frontend/src/app/auth/login/login.component.html +++ b/frontend/src/app/auth/login/login.component.html @@ -57,7 +57,10 @@

Se connecter

autocomplete="current-password" required #password="ngModel" />
- Mot de passe oublié ? +
+ Mot de passe oublié ? +
+
From 90f7a878fd7c7954555c176c122f8ba9014cecc6 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 23 Jan 2020 15:47:46 +0100 Subject: [PATCH 51/76] fix mono program bug --- frontend/src/app/app.routing.ts | 2 -- frontend/src/app/home/home.component.html | 4 ++-- .../app/programs/observations/obs.component.html | 14 -------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/frontend/src/app/app.routing.ts b/frontend/src/app/app.routing.ts index 542c455e..d9d721cc 100644 --- a/frontend/src/app/app.routing.ts +++ b/frontend/src/app/app.routing.ts @@ -7,7 +7,6 @@ import { ObsComponent } from "./programs/observations/obs.component"; import { PageNotFoundComponent } from "./page-not-found/page-not-found.component"; import { ProgramsComponent } from "./programs/programs.component"; import { ProgramsResolve } from "./programs/programs-resolve.service"; -import { UniqueProgramGuard } from "./programs/default-program.guard"; import { UserDashboardComponent } from "./auth/user-dashboard/user-dashboard.component"; import { SpeciesComponent } from "./synthesis/species/species.component"; import { AuthGuard } from "./auth/auth.guard"; @@ -23,7 +22,6 @@ const appRoutes: Routes = [ { path: "home", component: HomeComponent, - canActivate: [UniqueProgramGuard], resolve: { programs: ProgramsResolve } }, { path: "about", component: AboutComponent }, diff --git a/frontend/src/app/home/home.component.html b/frontend/src/app/home/home.component.html index cd48db21..9b23b3d4 100644 --- a/frontend/src/app/home/home.component.html +++ b/frontend/src/app/home/home.component.html @@ -46,11 +46,11 @@

-
+
-
+
- -
-

- Bienvenue
- sur Geonature Citizen -

- {{ AppConfig.platform_participate[localeId] }} - Scrollez pour en voir plus ! - -
-
-
From ec28aab35a7c078a2a9be6abc9d8770afdbea3d6 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 23 Jan 2020 15:49:20 +0100 Subject: [PATCH 52/76] fix programs list css view bug --- frontend/src/app/home/home.component.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/home/home.component.css b/frontend/src/app/home/home.component.css index bb0466d5..49c90a80 100644 --- a/frontend/src/app/home/home.component.css +++ b/frontend/src/app/home/home.component.css @@ -98,6 +98,7 @@ app-home .section:before { display: flex; justify-content: center; min-height: inherit; + width: 100%; } #programs-cards { From 4373231faef90cc4bdd9d2e9f2243caee00c68fb Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 23 Jan 2020 15:50:42 +0100 Subject: [PATCH 53/76] fix topbar avatar bug --- .../src/app/core/topbar/topbar.component.css | 17 ++++++++++++++--- .../src/app/core/topbar/topbar.component.html | 4 ++-- .../src/app/core/topbar/topbar.component.ts | 1 + 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/core/topbar/topbar.component.css b/frontend/src/app/core/topbar/topbar.component.css index 25690572..3290621c 100644 --- a/frontend/src/app/core/topbar/topbar.component.css +++ b/frontend/src/app/core/topbar/topbar.component.css @@ -35,6 +35,7 @@ form { text-align: center; transition: all 0.1s ease-in-out; } + a::after { display: block; content: attr(title); @@ -86,6 +87,10 @@ div.btn-group a:first-child { font-weight: bold; } +.avatar-img { + box-shadow: 1px 1px 15px -5px black; +} + @media screen and (max-width: 992px) { /* FIXME: la nav bar ne se referme qu'à 768, pourquoi 912 ? */ /* .navbar-collapse form{ @@ -95,6 +100,7 @@ div.btn-group a:first-child { ul.btn-group { padding: 0px; } + ul.btn-group li { /* min-width: 120px !important; */ @@ -122,7 +128,7 @@ div.btn-group a:first-child { .navbar form ul li { min-width: none !important; max-width: none !important; - text-align : left; + text-align: left; } .navbar div.btn-group { @@ -140,13 +146,18 @@ div.btn-group a:first-child { .navbar { min-height: 65px !important; } + .navbar img { height: 40px; } - .programs-modal .modal-dialog, .obs-modal .modal-dialog{ + + .programs-modal .modal-dialog, + .obs-modal .modal-dialog { margin: 0px !important; } - .programs-modal .modal-content, .obs-modal .modal-content{ + + .programs-modal .modal-content, + .obs-modal .modal-content { max-height: inherit; height: 100vh; } diff --git a/frontend/src/app/core/topbar/topbar.component.html b/frontend/src/app/core/topbar/topbar.component.html index 84cb1d21..4b16e39e 100644 --- a/frontend/src/app/core/topbar/topbar.component.html +++ b/frontend/src/app/core/topbar/topbar.component.html @@ -16,7 +16,7 @@ Accueil -
  • +
  • Les programmes
  • @@ -34,7 +34,7 @@ - +  {{ username }} diff --git a/frontend/src/app/core/topbar/topbar.component.ts b/frontend/src/app/core/topbar/topbar.component.ts index c7e1c58e..c8fcac5a 100644 --- a/frontend/src/app/core/topbar/topbar.component.ts +++ b/frontend/src/app/core/topbar/topbar.component.ts @@ -71,6 +71,7 @@ export class TopbarComponent implements OnInit { AppConfig.API_ENDPOINT + "/media/" + localStorage.getItem("userAvatar"); + console.log('this.userAvatar',this.userAvatar); } return value; }) From 6f93d68dfae996ac9bf879ef6b216cefec6129f2 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 23 Jan 2020 15:52:03 +0100 Subject: [PATCH 54/76] add nom_complet to export data --- .../user-dashboard.component.ts | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts index fc95be57..9a030046 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.ts @@ -165,16 +165,17 @@ export class UserDashboardComponent implements OnInit { obsExport(obs) { this.obsToExport.push({ - id_observation: obs.properties.id_observation, - date: obs.properties.date, - programme: obs.properties.program_title, - denombrement: obs.properties.count, - commentaire: obs.properties.comment, - municipalite: obs.properties.municipality.name, - cd_nom: obs.properties.taxref.cd_nom, - espece: obs.properties.taxref.nom_vern, - coordonnee_x: obs.geometry.coordinates[0], - coordonnee_y: obs.geometry.coordinates[1] + "id_observation": obs.properties.id_observation, + "date": obs.properties.date, + "programme": obs.properties.program_title, + "denombrement": obs.properties.count, + "commentaire": obs.properties.comment, + "commune": obs.properties.municipality.name, + "cd_nom": obs.properties.taxref.cd_nom, + "espece": obs.properties.taxref.nom_vern, + "nom complet": obs.properties.taxref.nom_complet, + "coordonnee_x": obs.geometry.coordinates[0], + "coordonnee_y": obs.geometry.coordinates[1] }); } @@ -211,6 +212,7 @@ export class UserDashboardComponent implements OnInit { "id_observation", "espece", "cd_nom", + "nom complet", "date", "programme", "denombrement", From 5b97d5aef1f6231e7534782dd8629f0dfdf78645 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Thu, 23 Jan 2020 15:52:46 +0100 Subject: [PATCH 55/76] fix topBar --- frontend/src/app/auth/logout/logout.component.ts | 4 +--- frontend/src/styles.css | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/auth/logout/logout.component.ts b/frontend/src/app/auth/logout/logout.component.ts index ee71f41b..6a26e343 100644 --- a/frontend/src/app/auth/logout/logout.component.ts +++ b/frontend/src/app/auth/logout/logout.component.ts @@ -26,9 +26,7 @@ export class LogoutComponent { .catch(err => { console.log(err); }); - localStorage.removeItem("access_token"); - localStorage.removeItem("refresh_token"); - localStorage.removeItem("username"); + localStorage.clear(); this.router.navigate(["/"]); this.activeModal.close(); } diff --git a/frontend/src/styles.css b/frontend/src/styles.css index 02cf98b6..6a7e8deb 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -1117,10 +1117,10 @@ input:checked~.toggle i { text-align: center; } -@media screen and (max-width: 1200px){ - app-about .container{ - margin-top: 106px !important; - } +app-about .container{ + margin-top: 106px !important; + padding-top: 50px; + min-height: calc(100vh - 274px); } @media screen and (max-width: 576px) { From 93c5512051667429285b9ad08dfc237a5ea25cdf Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 24 Jan 2020 10:17:50 +0100 Subject: [PATCH 56/76] login with email instead of username --- backend/gncitizen/core/users/routes.py | 31 +++++++++---------- .../src/app/auth/login/login.component.html | 6 ++-- .../src/app/auth/login/login.component.ts | 2 +- frontend/src/app/auth/models.ts | 2 +- .../src/app/core/topbar/topbar.component.ts | 3 +- 5 files changed, 21 insertions(+), 23 deletions(-) diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index 6582e945..4af7d8cd 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -188,10 +188,10 @@ def login(): required: true schema: required: - - username + - email - password properties: - username: + email: type: string password: type: string @@ -201,18 +201,16 @@ def login(): """ try: request_datas = dict(request.get_json()) - username = request_datas["username"] + email = request_datas["email"] password = request_datas["password"] - current_user = UserModel.find_by_username(username) - if not current_user: + try: + current_user = UserModel.query.filter_by(email=email).one() + except Exception: return ( - { - "message": """L'utilisateur "{}" n'est pas enregistré.""".format( - username - ) - }, - 400, - ) + {"message": """L'email "{}" n'est pas enregistré.""".format( + email)}, + 400, + ) if not current_user.active: return ( { @@ -221,12 +219,13 @@ def login(): 400, ) if UserModel.verify_hash(password, current_user.password): - access_token = create_access_token(identity=username) - refresh_token = create_refresh_token(identity=username) + access_token = create_access_token(identity=email) + refresh_token = create_refresh_token(identity=email) return ( { - "message": """Connecté en tant que "{}".""".format(username), - "username": username, + "message": """Connecté en tant que "{}".""".format(email), + "email": email, + "username": current_user.as_secured_dict(True).get('username'), "userAvatar": current_user.as_secured_dict(True).get('avatar'), "access_token": access_token, "refresh_token": refresh_token, diff --git a/frontend/src/app/auth/login/login.component.html b/frontend/src/app/auth/login/login.component.html index 9340c3ff..88e5376b 100644 --- a/frontend/src/app/auth/login/login.component.html +++ b/frontend/src/app/auth/login/login.component.html @@ -32,15 +32,15 @@

    Se connecter

    - +
    -
    diff --git a/frontend/src/app/auth/login/login.component.ts b/frontend/src/app/auth/login/login.component.ts index 6722b113..253ff7de 100644 --- a/frontend/src/app/auth/login/login.component.ts +++ b/frontend/src/app/auth/login/login.component.ts @@ -21,7 +21,7 @@ export class LoginComponent { errorMessage: string; successMessage: string; staticAlertClosed = false; - user: LoginUser = { username: "", password: "" }; + user: LoginUser = { email: "", password: "" }; recovery = { username: "", email: "" }; recoverPassword = false; diff --git a/frontend/src/app/auth/models.ts b/frontend/src/app/auth/models.ts index a803ec2c..235d2e0c 100644 --- a/frontend/src/app/auth/models.ts +++ b/frontend/src/app/auth/models.ts @@ -11,7 +11,7 @@ export class RegisterUser { } export interface LoginUser { - username: string; + email: string; password: string; } diff --git a/frontend/src/app/core/topbar/topbar.component.ts b/frontend/src/app/core/topbar/topbar.component.ts index c8fcac5a..9c7436ab 100644 --- a/frontend/src/app/core/topbar/topbar.component.ts +++ b/frontend/src/app/core/topbar/topbar.component.ts @@ -66,12 +66,11 @@ export class TopbarComponent implements OnInit { map(value => { if (value === true) { this.username = localStorage.getItem("username"); - if (localStorage.getItem("userAvatar") != "null") + if (localStorage.getItem("userAvatar") && localStorage.getItem("userAvatar") != "null") this.userAvatar = AppConfig.API_ENDPOINT + "/media/" + localStorage.getItem("userAvatar"); - console.log('this.userAvatar',this.userAvatar); } return value; }) From 581cd9ea264d0aa713b8c90367443e8d7a20f49b Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Fri, 24 Jan 2020 10:54:22 +0100 Subject: [PATCH 57/76] Update index.rst --- docs/index.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/index.rst b/docs/index.rst index df4c03ab..38e02aa6 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -191,6 +191,13 @@ Enregistrement d’un programme exemple -URL_APPLICATION : 'https://ipserveur:4200/' -API_ENDPOINT : 'https://ipserveur:5002/api' -API_TAXHUB : 'http://ipserveur/taxhub/api/' + + - Pour configurer du serveur Smtp renseigner les différents paramètres de votre serveur + dans la partie [MAIL] ( MAIL_HOST,MAIL_PORT ..) + # La partie [RESET_PASSWD] correspond à la configuration du texte du mail a envoyé pour la restauration + du mot de passe oublié + # La partie [CONFIRM_EMAIL] correspond à la configuration du texte du mail a envoyé pour l’activation + du compte et la confirmation de l’adresse mail de l’utilisateur **Etape 5 : configuration du supervisor :** @@ -226,6 +233,8 @@ Editer la conf : cp src/conf*.ts.sample src/conf/ # ajuster la conf # copier le template css alternatif cp src/custom/custom.css.template src/custom/custom.css + # Pour configurer le lien externe de la fiche détaillée de l'espèce, éditer l'entrée suivante: + details_espece_url: "/cd_nom/" // !! garder bien le cd_nom/ dans l'url Lancer le front : From af4eaf6fe8a433c340dc69403cafe2fc7176f101 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 4 Feb 2020 15:13:56 +0100 Subject: [PATCH 58/76] replace username by email --- backend/gncitizen/core/commons/admin.py | 2 +- backend/gncitizen/core/observations/routes.py | 2 +- backend/gncitizen/core/users/routes.py | 8 ++++---- backend/gncitizen/utils/jwt.py | 4 ++-- frontend/src/app/auth/auth.service.ts | 2 -- frontend/src/app/auth/login/login.component.html | 2 +- frontend/src/app/auth/register/register.component.ts | 5 +---- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/backend/gncitizen/core/commons/admin.py b/backend/gncitizen/core/commons/admin.py index 02c5799d..179cc50c 100644 --- a/backend/gncitizen/core/commons/admin.py +++ b/backend/gncitizen/core/commons/admin.py @@ -85,7 +85,7 @@ def is_accessible(self): ctx_stack.top.jwt_user = user current_user = get_jwt_identity() - is_admin = UserModel.query.filter_by(username=current_user).one().admin + is_admin = UserModel.query.filter_by(email=current_user).one().admin return current_user and is_admin except Exception as e: current_app.logger.critical("FAULTY ADMIN UI ACCESS: %s", str(e)) diff --git a/backend/gncitizen/core/observations/routes.py b/backend/gncitizen/core/observations/routes.py index 3b66bd5a..64a949da 100644 --- a/backend/gncitizen/core/observations/routes.py +++ b/backend/gncitizen/core/observations/routes.py @@ -875,7 +875,7 @@ def delete_observation(idObs): try: observation = db.session.query(ObservationModel, UserModel).filter( ObservationModel.id_observation == idObs).join(UserModel, ObservationModel.id_role == UserModel.id_user, full=True).first() - if (current_user == observation.UserModel.username): + if (current_user == observation.UserModel.email): ObservationModel.query.filter_by(id_observation=idObs).delete() db.session.commit() return ('observation deleted successfully'), 200 diff --git a/backend/gncitizen/core/users/routes.py b/backend/gncitizen/core/users/routes.py index 4af7d8cd..e80dc2d7 100644 --- a/backend/gncitizen/core/users/routes.py +++ b/backend/gncitizen/core/users/routes.py @@ -336,7 +336,7 @@ def logged_user(): """ try: current_user = get_jwt_identity() - user = UserModel.query.filter_by(username=current_user).one() + user = UserModel.query.filter_by(email=current_user).one() if flask.request.method == "GET": # base stats, to enhance as we go result = user.as_secured_dict(True) @@ -360,7 +360,7 @@ def logged_user(): imgdata = base64.b64decode(request_data["avatar"].replace( 'data:image/'+extention+';base64,', '')) filename = 'avatar_' + \ - current_user + '.' + extention + user.username + '.' + extention request_data['avatar'] = filename if os.path.exists(os.path.join(str(MEDIA_DIR), str(user.as_secured_dict(True)["avatar"]))): os.remove(os.path.join(str(MEDIA_DIR), @@ -430,13 +430,13 @@ def delete_user(): current_app.logger.debug( "[delete_user] current user is {}".format(current_user) ) - user = UserModel.query.filter_by(username=current_user) + user = UserModel.query.filter_by(email=current_user) # get username username = user.one().username # delete user try: db.session.query(UserModel).filter( - UserModel.username == current_user + UserModel.username == username ).delete() db.session.commit() current_app.logger.debug( diff --git a/backend/gncitizen/utils/jwt.py b/backend/gncitizen/utils/jwt.py index e1794d6e..35e9981e 100644 --- a/backend/gncitizen/utils/jwt.py +++ b/backend/gncitizen/utils/jwt.py @@ -20,7 +20,7 @@ def get_id_role_if_exists(): if get_jwt_identity() is not None: current_user = get_jwt_identity() id_role = ( - UserModel.query.filter_by(username=current_user).first().id_user + UserModel.query.filter_by(email=current_user).first().id_user ) else: id_role = None @@ -42,7 +42,7 @@ def decorated_function(*args, **kwargs): current_user = get_jwt_identity() try: is_admin = ( - UserModel.query.filter_by(username=current_user).first().admin + UserModel.query.filter_by(email=current_user).first().admin ) if not is_admin: return {"message": "Special authorization required"}, 403 diff --git a/frontend/src/app/auth/auth.service.ts b/frontend/src/app/auth/auth.service.ts index 7d972011..e9149bd8 100644 --- a/frontend/src/app/auth/auth.service.ts +++ b/frontend/src/app/auth/auth.service.ts @@ -44,8 +44,6 @@ export class AuthService { } register(user: RegisterUser): Observable { - console.log('user',user); - let url: string = `${AppConfig.API_ENDPOINT}/registration`; return this.http.post(url, user).pipe( map(user => { diff --git a/frontend/src/app/auth/login/login.component.html b/frontend/src/app/auth/login/login.component.html index 88e5376b..8e95b998 100644 --- a/frontend/src/app/auth/login/login.component.html +++ b/frontend/src/app/auth/login/login.component.html @@ -39,7 +39,7 @@

    Se connecter

    'ng-invalid': username.invalid }">
    • -
    diff --git a/frontend/src/app/auth/register/register.component.ts b/frontend/src/app/auth/register/register.component.ts index ef22e902..1e0e5149 100644 --- a/frontend/src/app/auth/register/register.component.ts +++ b/frontend/src/app/auth/register/register.component.ts @@ -36,17 +36,14 @@ export class RegisterComponent { .register(this.user) .pipe( map(user => { - if (user) { - console.log('user',user); - let message = user.message; this._success.subscribe(message => (this.successMessage = message)); this._success.pipe(debounceTime(5000)).subscribe(() => { this.successMessage = null; this.activeModal.close(); }); - + this.displaySuccessMessage(message); // redirect ? if (this.auth.redirectUrl) { From 8cea3c1ce69ee2f3dfde9228f62b0dda5d1d75d5 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 4 Feb 2020 15:14:55 +0100 Subject: [PATCH 59/76] update translate files ssr bug --- frontend/src/locale/messages.en.xlf | 12 ++++++++++-- frontend/src/locale/messages.fr.xlf | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/frontend/src/locale/messages.en.xlf b/frontend/src/locale/messages.en.xlf index 353138df..aabd2345 100644 --- a/frontend/src/locale/messages.en.xlf +++ b/frontend/src/locale/messages.en.xlf @@ -500,9 +500,9 @@ login login - + Utilisateur - Username + Email app/auth/login/login.component.html 32 @@ -1404,6 +1404,14 @@ app/core/topbar/topbar.component.html 86 + + + Entrez votre adresse mail + Please, type in your email + + app/auth/login/login.component.html + 42 + diff --git a/frontend/src/locale/messages.fr.xlf b/frontend/src/locale/messages.fr.xlf index ea2707ff..04eb1aba 100644 --- a/frontend/src/locale/messages.fr.xlf +++ b/frontend/src/locale/messages.fr.xlf @@ -530,9 +530,9 @@ 91 - + Utilisateur - Utilisateur + Email app/auth/login/login.component.html 102 @@ -1407,6 +1407,14 @@ 5 + + Entrez votre adresse mail + Entrez votre adresse mail + + app/auth/login/login.component.html + 42 + + From f22890e535ffb685a69a8b9163b165e39d8c3f11 Mon Sep 17 00:00:00 2001 From: HamoudaAmine Date: Tue, 4 Feb 2020 15:15:32 +0100 Subject: [PATCH 60/76] fix css --- frontend/src/app/core/topbar/topbar.component.css | 2 +- frontend/src/app/core/topbar/topbar.component.html | 2 +- .../app/programs/observations/modalflow/modalflow.component.css | 1 + frontend/src/app/programs/observations/obs.component.ts | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/core/topbar/topbar.component.css b/frontend/src/app/core/topbar/topbar.component.css index 3290621c..0b1e4c55 100644 --- a/frontend/src/app/core/topbar/topbar.component.css +++ b/frontend/src/app/core/topbar/topbar.component.css @@ -147,7 +147,7 @@ div.btn-group a:first-child { min-height: 65px !important; } - .navbar img { + .navbar .logo { height: 40px; } diff --git a/frontend/src/app/core/topbar/topbar.component.html b/frontend/src/app/core/topbar/topbar.component.html index 4b16e39e..36a5c6f1 100644 --- a/frontend/src/app/core/topbar/topbar.component.html +++ b/frontend/src/app/core/topbar/topbar.component.html @@ -1,6 +1,6 @@
    +
    + +
    From d94f07e99276ffc6820e2343fd2bba6f133fcdec Mon Sep 17 00:00:00 2001 From: lpofredc Date: Tue, 11 Feb 2020 11:01:26 +0100 Subject: [PATCH 70/76] rename all templates into .template extension --- .../{default_config.toml.example => default_config.toml.template} | 0 .../src/conf/{app.config.ts.sample => app.config.ts.template} | 0 .../src/conf/{map.config.ts.sample => map.config.ts.template} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename config/{default_config.toml.example => default_config.toml.template} (100%) rename frontend/src/conf/{app.config.ts.sample => app.config.ts.template} (100%) rename frontend/src/conf/{map.config.ts.sample => map.config.ts.template} (100%) diff --git a/config/default_config.toml.example b/config/default_config.toml.template similarity index 100% rename from config/default_config.toml.example rename to config/default_config.toml.template diff --git a/frontend/src/conf/app.config.ts.sample b/frontend/src/conf/app.config.ts.template similarity index 100% rename from frontend/src/conf/app.config.ts.sample rename to frontend/src/conf/app.config.ts.template diff --git a/frontend/src/conf/map.config.ts.sample b/frontend/src/conf/map.config.ts.template similarity index 100% rename from frontend/src/conf/map.config.ts.sample rename to frontend/src/conf/map.config.ts.template From 41b5c43b00db8443f70df0b827123c9d70ce0235 Mon Sep 17 00:00:00 2001 From: lpofredc Date: Tue, 11 Feb 2020 11:44:00 +0100 Subject: [PATCH 71/76] restructuration de la doc --- docs/conf.py | 9 +- docs/devs/backend_functions.rst | 50 +++--- docs/devs/index.rst | 2 +- docs/index.rst | 263 +++----------------------------- docs/{devs => prod}/badges.rst | 0 docs/prod/index.rst | 253 ++++++++++++++++++++++++++++++ 6 files changed, 305 insertions(+), 272 deletions(-) rename docs/{devs => prod}/badges.rst (100%) create mode 100644 docs/prod/index.rst diff --git a/docs/conf.py b/docs/conf.py index 6ea642e3..2f9c1e15 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,6 +13,7 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # import os +from pathlib import Path import sys sys.path.insert(0, os.path.abspath('../backend')) @@ -20,11 +21,15 @@ # -- Project information ----------------------------------------------------- project = "GeoNature-citizen" -copyright = "2019, collectif" +copyright = "2020, collectif" author = "lpofredc" # The short X.Y version -version = "0.0" + +ROOT_DIR = Path(__file__).absolute().parent.parent +with open(str((ROOT_DIR / "VERSION"))) as v: + version = v.read() + # The full version, including alpha/beta/rc tags release = "dev" diff --git a/docs/devs/backend_functions.rst b/docs/devs/backend_functions.rst index d66e69cd..3bb9c08b 100644 --- a/docs/devs/backend_functions.rst +++ b/docs/devs/backend_functions.rst @@ -1,38 +1,38 @@ -****************************************************************************** -Fonctions génériques du backend de GeoNature-citizen (``./backend/gncitizen``) -****************************************************************************** +.. ****************************************************************************** +.. Fonctions génériques du backend de GeoNature-citizen (``./backend/gncitizen``) +.. ****************************************************************************** -utils -##### +.. utils +.. ##### -medias -****** +.. medias +.. ****** -.. automodule:: gncitizen.utils.media - :members: allowed_file,save_upload_files +.. .. automodule:: gncitizen.utils.media +.. :members: allowed_file,save_upload_files -geometry -******** +.. geometry +.. ******** -.. automodule:: gncitizen.utils.geometry - :members: geom_from_geojson +.. .. automodule:: gncitizen.utils.geometry +.. :members: geom_from_geojson -jwt -*** +.. jwt +.. *** -.. automodule:: gncitizen.utils.jwt - :members: get_id_role_if_exists, admin_required +.. .. automodule:: gncitizen.utils.jwt +.. :members: get_id_role_if_exists, admin_required -taxonomy -******** +.. taxonomy +.. ******** -.. automodule:: gncitizen.utils.taxonomy - :members: get_specie_from_cd_nom +.. .. automodule:: gncitizen.utils.taxonomy +.. :members: get_specie_from_cd_nom -toms -**** +.. toms +.. **** -.. automodule:: gncitizen.utils.toml - :members: load_toml \ No newline at end of file +.. .. automodule:: gncitizen.utils.toml +.. :members: load_toml \ No newline at end of file diff --git a/docs/devs/index.rst b/docs/devs/index.rst index 7c164fd8..c98ffb23 100644 --- a/docs/devs/index.rst +++ b/docs/devs/index.rst @@ -14,4 +14,4 @@ Installer GeoNature-citizen en mode développement init_launch_db init_launch_backend init_launch_frontend - backend_functions +.. backend_functions diff --git a/docs/index.rst b/docs/index.rst index 6cbdef71..7067d3a7 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,253 +1,28 @@ -==================================== -Installation de GeoNature-citizen -==================================== +.. GeoNature-citizen documentation master file, created by + sphinx-quickstart on Tue Jan 15 09:58:53 2019. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. +Documentation de GeoNature-citizen! +============================================= -Prérequis -========= +.. .. versionadded:: 2.5 +.. The *spam* parameter. -Application développée et installée sur un serveur Debian 9. +.. toctree:: + :maxdepth: 3 + :caption: Contenu: -Ce serveur doit aussi disposer de : + prod/index + prod/badges + devs/index -- sudo (``apt-get install sudo``) -- un utilisateur (``monuser`` dans cette documentation) appartenant au groupe ``sudo`` (pour pouvoir bénéficier des droits d'administrateur) -**1. Créer un utilisateur Debian :** -:: - adduser nom_utilisateur (geonatadmin) entrez un mot de passe (****) - usermod -aG sudo nom_utilisateur (geonatadmin) - su - nom_utilisateur (geonatadmin) +Sommaire +================== -**2. Vérifier que l’utilisateur est correctement créé :** - -:: - - sudo -l (entrez un mot de passe) : vérifier que ALL - sudo whoami : ok si on peut faire un sudo - -**3. Changer la locale en fr (il faut être root) :** - -:: - - sudo dpkg-reconfigure locales - - - -INSTALLATION DE TAXHUB -====================== - -Pour plus de détails, lien officiel pour l’installation de TaxHub : -https://taxhub.readthedocs.io/fr/latest/ - -Configurer le serveur : -https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-du-serveur - -Configurer PostgreSQL : -https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-de-posgresql - -Configuration et installation de l’application : -https://taxhub.readthedocs.io/fr/latest/installation.html - -:notes: - - Bien vérifier de ne pas être en ``root`` : - - :: - - su - nom_utilisateur (geonatadmin) - - - Pour avoir les caractéristiques de votre instance : - - :: - - lsb_release -a - uname -a - - -INSTALLATION DE GEONATURE-CITIZEN -================================= - -**Etape 1 : Configurer PostgreSQL :** - -:notes: - - - Cette étape n'est nécessaire que si TaxHub n’est pas installé - - voir init_launch_db.rst : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst - -:: - - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >>/etc/apt/sources.list.d/postgresql.list' - sudo wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - sudo apt update - sudo apt install postgresql-10 postgresql-10-postgis-2.5 postgresql-10-postgis-2.5-scripts git - sudo -u postgres createuser -e -E -P dbuser (geonatadmin) (Entrez le password) - sudo -u postgres createdb -e -E UTF8 -O dbuser (geonatadmin) dbname (geonature2db) - -:notes: - - - ls /etc/init.d/ : pour lister les services - - sudo service restart postgresql : vérification - -**Etape 2 : Installer python3, pip et virtualenv :** - -:: - - python3 -m pip install --upgrade --user virtualenv - sudo apt install python3-pip - -installer virtualenv : - -:: - - export PATH=/home/username/.local/bin:$PATH (username = geonatadmin) - echo $PATH - virtualenv -p /usr/bin/python3 venv - source venv/bin/activate - -**Etape 3 : Installation du backend et de la base des données :** - -:notes: - - - init_launch_backend.rst - - creation referentiel géo - - voir : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst - -Cloner le dépôt Github de GeoNature-citizen - -:: - - sudo apt install git - git clone name (citizen) - git checkout branch_name - cd citizen/backend - - -Création du référentiel des géométries communales : - -:: - - wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/public.sql -P /tmp - wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/ref_geo.sql -P /tmp - wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/ref_geo_municipalities.sql -P /tmp - - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/public.sql - sed 's/MYLOCALSRID/2154/g' /tmp/ref_geo.sql > /tmp/ref_geo_2154.sql - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/ref_geo_2154.sql - - -Pour restaurer en cas de besoin : - -:: - - psql -d geonature2db -h localhost -U geonatadmin -f ~/citizen_taxhub_l_areas_dump.sql - if [ ! -f '/tmp/communes_fr_admin_express_2019-01.zip' ] - then - wget --cache=off http://geonature.fr/data/ign/communes_fr_admin_express_2019-01.zip -P /tmp - else - echo "/tmp/communes_fr_admin_express_2019-01.zip already exist" - fi - unzip /tmp/communes_fr_admin_express_2019-01.zip -d /tmp/ - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/fr_municipalities.sql - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "ALTER TABLE ref_geo.temp_fr_municipalities - OWNER TO geonatadmin;" - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/ref_geo_municipalities.sql - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "DROP TABLE ref_geo.temp_fr_municipalities;" - -Lancement du backend pour générer les schémas : - -En mode debug : - -:: - - export FLASK_ENV=development; export FLASK_DEBUG=1; export FLASK_RUN_PORT=5002; export FLASK_APP=wsgi; - python -m flask run --host=0.0.0.0 - -Enregistrement du module principal : - -:: - - insert into gnc_core.t_modules values (1, 'main', 'main', 'main', NULL, false, '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933'); - -Enregistrement d’un programme exemple - -:: - - psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "INSERT INTO gnc_core.t_programs VALUES (1, 'Au 68', 'inventaire du 68', 'desc', NULL, NULL, 1, 1, 't', '0106000020E6100000010000000103000000010000000500000001000070947C154042CA401665A5454001000070EE7C15402235D7E667A54540010000D81C7D1540AFBA27365AA5454000000040C47C1540DD9BD74A58A5454001000070947C154042CA401665A54540', '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933');" - -**Etape 4 : éditer le fichier de config :** - -:notes: - - - voir : https://github.com/PnX-SI/GeoNature-citizen/blob/dev/docs/devs/config_files.rst - -:: - - cd ../config - editer les paramètres dans default_config.toml - - -SQLALCHEMY_DATABASE_URI :"postgresql+psycopg2://dbuser(geonatadmin):password(***)@127.0.0.1:5432/dbname(geonature2db)" - -URL_APPLICATION : 'https://ipserveur:4200/' - -API_ENDPOINT : 'https://ipserveur:5002/api' - -API_TAXHUB : 'http://ipserveur/taxhub/api/' - - - Pour configurer du serveur Smtp renseigner les différents paramètres de votre serveur - dans la partie [MAIL] ( MAIL_HOST,MAIL_PORT ..) - # La partie [RESET_PASSWD] correspond à la configuration du texte du mail a envoyé pour la restauration - du mot de passe oublié - # La partie [CONFIRM_EMAIL] correspond à la configuration du texte du mail a envoyé pour l’activation - du compte et la confirmation de l’adresse mail de l’utilisateur - -**Etape 5 : configuration des badges :** - -- voir : https://github.com/PnX-SI/GeoNature-citizen/blob/dev/docs/devs/badges.rst - -**Etape 6 : configuration du supervisor :** - -:: - - /etc/supervisor/conf.d/geonature-citizen-service.conf - [program:citizen] - command = /home/geonatadmin/citizen/backend/start_gunicorn.sh - autostart=true - autorestart=true - stdout_logfile = /var/log/supervisor/citizen.log - redirect_stderr = true - -**Etape 7 : Installation du frontend :** - -:notes: - - - voir : https://github.com/PnX-SI/GeoNature-citizen/tree/dev/docs/devs/init_launch_frontend.rst - -:: - - cd citizen/frontend/ - nvm use --lts # Now using node v10.16.0 (npm v6.9.0) - si pas installé : nvm install --lts (remplacer lts par la dernière version) - cp -v src/assets/badges_* ../media/ - - -Editer la conf : - -:: - - cp src/conf*.ts.sample src/conf/ # ajuster la conf - # copier le template css alternatif - cp src/custom/custom.css.template src/custom/custom.css - # Pour configurer le lien externe de la fiche détaillée de l'espèce, éditer l'entrée suivante: - details_espece_url: "/cd_nom/" // !! garder bien le cd_nom/ dans l'url - -Lancer le front : - -:: - - npm run start -- --host=0.0.0.0 - - -Ré-génération des locales après modification de l’UI : - -:: - - for lang in 'fr' 'en'; do npm run -- ng xi18n --output-path locale --out-file _messages.${lang}.xlf --i18n-locale ${lang}; done +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` \ No newline at end of file diff --git a/docs/devs/badges.rst b/docs/prod/badges.rst similarity index 100% rename from docs/devs/badges.rst rename to docs/prod/badges.rst diff --git a/docs/prod/index.rst b/docs/prod/index.rst new file mode 100644 index 00000000..6cbdef71 --- /dev/null +++ b/docs/prod/index.rst @@ -0,0 +1,253 @@ +==================================== +Installation de GeoNature-citizen +==================================== + + +Prérequis +========= + +Application développée et installée sur un serveur Debian 9. + +Ce serveur doit aussi disposer de : + +- sudo (``apt-get install sudo``) +- un utilisateur (``monuser`` dans cette documentation) appartenant au groupe ``sudo`` (pour pouvoir bénéficier des droits d'administrateur) + +**1. Créer un utilisateur Debian :** + +:: + + adduser nom_utilisateur (geonatadmin) entrez un mot de passe (****) + usermod -aG sudo nom_utilisateur (geonatadmin) + su - nom_utilisateur (geonatadmin) + +**2. Vérifier que l’utilisateur est correctement créé :** + +:: + + sudo -l (entrez un mot de passe) : vérifier que ALL + sudo whoami : ok si on peut faire un sudo + +**3. Changer la locale en fr (il faut être root) :** + +:: + + sudo dpkg-reconfigure locales + + + +INSTALLATION DE TAXHUB +====================== + +Pour plus de détails, lien officiel pour l’installation de TaxHub : +https://taxhub.readthedocs.io/fr/latest/ + +Configurer le serveur : +https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-du-serveur + +Configurer PostgreSQL : +https://taxhub.readthedocs.io/fr/latest/serveur.html#installation-et-configuration-de-posgresql + +Configuration et installation de l’application : +https://taxhub.readthedocs.io/fr/latest/installation.html + +:notes: + - Bien vérifier de ne pas être en ``root`` : + + :: + + su - nom_utilisateur (geonatadmin) + + - Pour avoir les caractéristiques de votre instance : + + :: + + lsb_release -a + uname -a + + +INSTALLATION DE GEONATURE-CITIZEN +================================= + +**Etape 1 : Configurer PostgreSQL :** + +:notes: + + - Cette étape n'est nécessaire que si TaxHub n’est pas installé + - voir init_launch_db.rst : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst + +:: + + sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" >>/etc/apt/sources.list.d/postgresql.list' + sudo wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add + sudo apt update + sudo apt install postgresql-10 postgresql-10-postgis-2.5 postgresql-10-postgis-2.5-scripts git + sudo -u postgres createuser -e -E -P dbuser (geonatadmin) (Entrez le password) + sudo -u postgres createdb -e -E UTF8 -O dbuser (geonatadmin) dbname (geonature2db) + +:notes: + + - ls /etc/init.d/ : pour lister les services + - sudo service restart postgresql : vérification + +**Etape 2 : Installer python3, pip et virtualenv :** + +:: + + python3 -m pip install --upgrade --user virtualenv + sudo apt install python3-pip + +installer virtualenv : + +:: + + export PATH=/home/username/.local/bin:$PATH (username = geonatadmin) + echo $PATH + virtualenv -p /usr/bin/python3 venv + source venv/bin/activate + +**Etape 3 : Installation du backend et de la base des données :** + +:notes: + + - init_launch_backend.rst + - creation referentiel géo + - voir : https://github.com/PnX-SI/GeoNature-citizen/blob/master/docs/devs/init_launch_db.rst + +Cloner le dépôt Github de GeoNature-citizen + +:: + + sudo apt install git + git clone name (citizen) + git checkout branch_name + cd citizen/backend + + +Création du référentiel des géométries communales : + +:: + + wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/public.sql -P /tmp + wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/ref_geo.sql -P /tmp + wget https://github.com/PnX-SI/GeoNature/raw/master/data/core/ref_geo_municipalities.sql -P /tmp + + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/public.sql + sed 's/MYLOCALSRID/2154/g' /tmp/ref_geo.sql > /tmp/ref_geo_2154.sql + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/ref_geo_2154.sql + + +Pour restaurer en cas de besoin : + +:: + + psql -d geonature2db -h localhost -U geonatadmin -f ~/citizen_taxhub_l_areas_dump.sql + if [ ! -f '/tmp/communes_fr_admin_express_2019-01.zip' ] + then + wget --cache=off http://geonature.fr/data/ign/communes_fr_admin_express_2019-01.zip -P /tmp + else + echo "/tmp/communes_fr_admin_express_2019-01.zip already exist" + fi + unzip /tmp/communes_fr_admin_express_2019-01.zip -d /tmp/ + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/fr_municipalities.sql + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "ALTER TABLE ref_geo.temp_fr_municipalities + OWNER TO geonatadmin;" + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -f /tmp/ref_geo_municipalities.sql + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "DROP TABLE ref_geo.temp_fr_municipalities;" + +Lancement du backend pour générer les schémas : + +En mode debug : + +:: + + export FLASK_ENV=development; export FLASK_DEBUG=1; export FLASK_RUN_PORT=5002; export FLASK_APP=wsgi; + python -m flask run --host=0.0.0.0 + +Enregistrement du module principal : + +:: + + insert into gnc_core.t_modules values (1, 'main', 'main', 'main', NULL, false, '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933'); + +Enregistrement d’un programme exemple + +:: + + psql -d geonature2db -h localhost -p 5432 -U geonatadmin -c "INSERT INTO gnc_core.t_programs VALUES (1, 'Au 68', 'inventaire du 68', 'desc', NULL, NULL, 1, 1, 't', '0106000020E6100000010000000103000000010000000500000001000070947C154042CA401665A5454001000070EE7C15402235D7E667A54540010000D81C7D1540AFBA27365AA5454000000040C47C1540DD9BD74A58A5454001000070947C154042CA401665A54540', '2019-05-26 09:38:39.389933', '2019-05-26 09:38:39.389933');" + +**Etape 4 : éditer le fichier de config :** + +:notes: + + - voir : https://github.com/PnX-SI/GeoNature-citizen/blob/dev/docs/devs/config_files.rst + +:: + + cd ../config + editer les paramètres dans default_config.toml + + -SQLALCHEMY_DATABASE_URI :"postgresql+psycopg2://dbuser(geonatadmin):password(***)@127.0.0.1:5432/dbname(geonature2db)" + -URL_APPLICATION : 'https://ipserveur:4200/' + -API_ENDPOINT : 'https://ipserveur:5002/api' + -API_TAXHUB : 'http://ipserveur/taxhub/api/' + + - Pour configurer du serveur Smtp renseigner les différents paramètres de votre serveur + dans la partie [MAIL] ( MAIL_HOST,MAIL_PORT ..) + # La partie [RESET_PASSWD] correspond à la configuration du texte du mail a envoyé pour la restauration + du mot de passe oublié + # La partie [CONFIRM_EMAIL] correspond à la configuration du texte du mail a envoyé pour l’activation + du compte et la confirmation de l’adresse mail de l’utilisateur + +**Etape 5 : configuration des badges :** + +- voir : https://github.com/PnX-SI/GeoNature-citizen/blob/dev/docs/devs/badges.rst + +**Etape 6 : configuration du supervisor :** + +:: + + /etc/supervisor/conf.d/geonature-citizen-service.conf + [program:citizen] + command = /home/geonatadmin/citizen/backend/start_gunicorn.sh + autostart=true + autorestart=true + stdout_logfile = /var/log/supervisor/citizen.log + redirect_stderr = true + +**Etape 7 : Installation du frontend :** + +:notes: + + - voir : https://github.com/PnX-SI/GeoNature-citizen/tree/dev/docs/devs/init_launch_frontend.rst + +:: + + cd citizen/frontend/ + nvm use --lts # Now using node v10.16.0 (npm v6.9.0) + si pas installé : nvm install --lts (remplacer lts par la dernière version) + cp -v src/assets/badges_* ../media/ + + +Editer la conf : + +:: + + cp src/conf*.ts.sample src/conf/ # ajuster la conf + # copier le template css alternatif + cp src/custom/custom.css.template src/custom/custom.css + # Pour configurer le lien externe de la fiche détaillée de l'espèce, éditer l'entrée suivante: + details_espece_url: "/cd_nom/" // !! garder bien le cd_nom/ dans l'url + +Lancer le front : + +:: + + npm run start -- --host=0.0.0.0 + + +Ré-génération des locales après modification de l’UI : + +:: + + for lang in 'fr' 'en'; do npm run -- ng xi18n --output-path locale --out-file _messages.${lang}.xlf --i18n-locale ${lang}; done From df92acfcfddf38524dece00fe51e547289f3aa2c Mon Sep 17 00:00:00 2001 From: lpofredc Date: Tue, 11 Feb 2020 11:54:19 +0100 Subject: [PATCH 72/76] some docs update --- frontend/src/index.html | 125 ---------------------------------------- 1 file changed, 125 deletions(-) diff --git a/frontend/src/index.html b/frontend/src/index.html index c0d4973d..51770df8 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -91,131 +91,6 @@ transform: rotate(360deg); } } - - .bubblingG { - text-align: center; - width: 78px; - height: 49px; - margin: auto; - } - - .bubblingG span { - display: inline-block; - vertical-align: middle; - width: 10px; - height: 10px; - margin: 24px auto; - background: rgb(0, 0, 0); - border-radius: 49px; - -o-border-radius: 49px; - -ms-border-radius: 49px; - -webkit-border-radius: 49px; - -moz-border-radius: 49px; - animation: bubblingG 1.5s infinite alternate; - -o-animation: bubblingG 1.5s infinite alternate; - -ms-animation: bubblingG 1.5s infinite alternate; - -webkit-animation: bubblingG 1.5s infinite alternate; - -moz-animation: bubblingG 1.5s infinite alternate; - } - - #bubblingG_1 { - animation-delay: 0s; - -o-animation-delay: 0s; - -ms-animation-delay: 0s; - -webkit-animation-delay: 0s; - -moz-animation-delay: 0s; - } - - #bubblingG_2 { - animation-delay: 0.45s; - -o-animation-delay: 0.45s; - -ms-animation-delay: 0.45s; - -webkit-animation-delay: 0.45s; - -moz-animation-delay: 0.45s; - } - - #bubblingG_3 { - animation-delay: 0.9s; - -o-animation-delay: 0.9s; - -ms-animation-delay: 0.9s; - -webkit-animation-delay: 0.9s; - -moz-animation-delay: 0.9s; - } - - @keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - transform: translateY(-20px); - } - } - - @-o-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -o-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -o-transform: translateY(-20px); - } - } - - @-ms-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -ms-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -ms-transform: translateY(-20px); - } - } - - @-webkit-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -webkit-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -webkit-transform: translateY(-20px); - } - } - - @-moz-keyframes bubblingG { - 0% { - width: 10px; - height: 10px; - background-color: rgb(0, 0, 0); - -moz-transform: translateY(0); - } - 100% { - width: 23px; - height: 23px; - background-color: rgb(255, 255, 255); - -moz-transform: translateY(-20px); - } - } From 1d35c094b8c5d87af0470937c304e025af43f0f8 Mon Sep 17 00:00:00 2001 From: lpofredc Date: Tue, 11 Feb 2020 12:12:18 +0100 Subject: [PATCH 73/76] some cleanups --- backend/gncitizen/utils/logs.py | 46 ----------------- .../frontend/about/custom.component.css | 0 .../frontend/about/custom.component.html | 29 ----------- .../custom/frontend/home/custom.component.css | 0 .../frontend/home/custom.component.html | 11 ----- config/default_config.toml.template | 34 ++----------- docs/devs/init_launch_frontend.rst | 49 ++----------------- 7 files changed, 7 insertions(+), 162 deletions(-) delete mode 100644 backend/gncitizen/utils/logs.py delete mode 100644 config/custom/frontend/about/custom.component.css delete mode 100644 config/custom/frontend/about/custom.component.html delete mode 100644 config/custom/frontend/home/custom.component.css delete mode 100644 config/custom/frontend/home/custom.component.html diff --git a/backend/gncitizen/utils/logs.py b/backend/gncitizen/utils/logs.py deleted file mode 100644 index ee4f56b3..00000000 --- a/backend/gncitizen/utils/logs.py +++ /dev/null @@ -1,46 +0,0 @@ -import logging -from logging.handlers import SMTPHandler -from flask import current_app - - -# custom class to send email in SSL and with non ascii character -class SSLSMTPHandler(SMTPHandler): - """ Custom class to emit email log with SSL """ - def emit(self, record): - """ - Emit a record. - """ - try: - from email.mime.text import MIMEText - from email.utils import formatdate - - port = self.mailport - if not port: - port = smtplib.SMTP_PORT - smtp = smtplib.SMTP_SSL(self.mailhost, port) - msg = self.format(record) - message = MIMEText(msg, _charset="utf-8") - - message.add_header("Subject", self.getSubject(record)) - message.add_header("From", self.fromaddr) - message.add_header("To", ",".join(self.toaddrs)) - message.add_header("Date", formatdate()) - - if self.username: - smtp.login(self.username, self.password) - smtp.sendmail(self.fromaddr, self.toaddrs, message.as_string()) - smtp.quit() - except (KeyboardInterrupt, SystemExit): - raise - except: - self.handleError(record) - -MAIL_CONFIG = current_app.config['MAILERROR'] -mail_handler = SSLSMTPHandler( - mailhost=(MAIL_CONFIG['MAIL_HOST'], MAIL_CONFIG['HOST_PORT']), - fromaddr=MAIL_CONFIG['MAIL_FROM'], - toaddrs=MAIL_CONFIG['MAIL_TO'], - subject='GeoNature error', - credentials=(MAIL_CONFIG['MAIL_USERNAME'], MAIL_CONFIG['MAIL_PASS'])) - -mail_handler.setLevel(logging.ERROR) \ No newline at end of file diff --git a/config/custom/frontend/about/custom.component.css b/config/custom/frontend/about/custom.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/config/custom/frontend/about/custom.component.html b/config/custom/frontend/about/custom.component.html deleted file mode 100644 index c7b7add9..00000000 --- a/config/custom/frontend/about/custom.component.html +++ /dev/null @@ -1,29 +0,0 @@ -

    GeoNature-citizen

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed feugiat posuere porttitor. Pellentesque tincidunt - pharetra sapien. Cras tincidunt ipsum scelerisque ante placerat, in ullamcorper ante tincidunt. Mauris nec - malesuada erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Vivamus eleifend faucibus scelerisque. Aliquam ut nisi sit amet sapien hendrerit imperdiet.

    -

    A propos du site

    -

    Morbi eget maximus lectus. In hac habitasse platea dictumst. Quisque ac leo non ipsum bibendum ornare sed molestie - quam. In magna tortor, condimentum nec neque et, convallis lobortis quam. Ut eu rhoncus urna. Quisque fringilla - turpis quis ipsum egestas, et tincidunt leo convallis. Sed porttitor aliquet euismod. Etiam imperdiet posuere est. - Integer volutpat semper ipsum, at ultricies elit hendrerit et. Fusce dapibus maximus velit quis luctus. - - In pellentesque odio in condimentum accumsan. Cras dignissim libero lacus, id pellentesque tellus rutrum non. - Suspendisse non pharetra lacus, vitae auctor arcu. Maecenas sit amet elit bibendum, commodo nibh ac, iaculis - lectus. Nunc nisi justo, semper eu accumsan eu, cursus sit amet velit. Cras mollis, libero nec porttitor feugiat, - leo neque vestibulum risus, eu tristique dui orci rhoncus arcu. Aenean sagittis, mauris vitae fringilla dapibus, - justo lectus fringilla nisi, in ornare nisl dolor eu dolor. Morbi sed tellus faucibus, sodales tortor id, bibendum - enim. - - Proin eget mi sem. Duis lobortis orci lorem, quis fermentum eros venenatis at. Curabitur tristique feugiat risus ut - ornare. Nunc at fermentum quam, et accumsan urna. Nunc vel felis sem. Aenean dictum urna ut purus gravida, eget - tristique augue cursus. Sed lectus est, molestie a erat non, hendrerit suscipit quam. Nullam elit tortor, porttitor - at dolor et, blandit eleifend lorem. Fusce at velit erat. Cras ante nisi, ullamcorper sed erat sed, pellentesque - lacinia nulla. Suspendisse in tincidunt lacus. In pulvinar venenatis arcu quis accumsan. Sed ut iaculis ex. In - tempus arcu ut turpis elementum, ut laoreet eros malesuada. Phasellus interdum cursus odio ut egestas. - - Phasellus vulputate, lacus quis tincidunt iaculis, purus turpis malesuada ante, vitae dapibus odio dui finibus - tellus. Aenean feugiat odio condimentum nulla consectetur vulputate eu et nunc. Donec maximus vehicula scelerisque. - Vivamus id eros lacus. Mauris eget eros nibh. Cras tristique placerat purus id mollis. Curabitur fermentum nunc sit - amet gravida pellentesque. Vivamus sed venenatis orci. Nam consequat mauris id rhoncus lobortis.

    \ No newline at end of file diff --git a/config/custom/frontend/home/custom.component.css b/config/custom/frontend/home/custom.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/config/custom/frontend/home/custom.component.html b/config/custom/frontend/home/custom.component.html deleted file mode 100644 index 43c6212c..00000000 --- a/config/custom/frontend/home/custom.component.html +++ /dev/null @@ -1,11 +0,0 @@ -

    Bienvenue sur le portail GeoNature-citizen

    -
    -
    -
    -

    - Autem dolores perferendis non nemo laborum. Sed vel repellendus ab. Tempora pariatur est ab corporis - consectetur qui voluptatem consequatur. Et qui velit rerum placeat sit. - Perferendis ab minima ullam. Voluptatem amet voluptatem praesentium. Rem quia porro quidem harum. -

    -
    -
    \ No newline at end of file diff --git a/config/default_config.toml.template b/config/default_config.toml.template index ebcbf9bc..abae7797 100644 --- a/config/default_config.toml.template +++ b/config/default_config.toml.template @@ -11,9 +11,7 @@ JWT_BLACKLIST_TOKEN_CHECKS = ['access', 'refresh'] appName = 'GeoNature-citizen' # Application name in the home page DEFAULT_LANGUAGE = 'fr' -# Nom du zonage du portail -PORTAL_AREA_NAME = 'zonage' - +# Debug DEBUG = true SQLALCHEMY_DEBUG_LEVEL = 'WARNING' @@ -30,26 +28,10 @@ DEFAULT_CENTER_LAT = 45 DEFAULT_CENTER_LONG = 5 - -SESSION_TYPE = 'filesystem' SECRET_KEY = 'MyS3cr3tK3y' CONFIRM_MAIL_SALT = 'your-secret-salt' # secret salt for corfirm mail token -COOKIE_EXPIRATION = 7200 -COOKIE_AUTORENEW = true -TRAP_ALL_EXCEPTIONS = false -HTTPS = false -MEDIA_FOLDER = 'media' -# File -# BASE_DIR = os.path.abspath(os.path.dirname(__file__)) -UPLOAD_FOLDER = 'static/medias' - -# Front end configuration -[FRONTEND] - PROD_MOD = true - # DISPLAY_HEADER = false - # DISPLAY_FOOTER = false - # MULTILINGUAL = false +MEDIA_FOLDER = 'media' [RESET_PASSWD] @@ -75,20 +57,12 @@ UPLOAD_FOLDER = 'static/medias' ''' [MAIL] + MAIL_USE_SSL = false + MAIL_STARTTLS = true MAIL_HOST = 'smtpd host' MAIL_PORT = 493 # mandatory SSL port MAIL_AUTH_LOGIN = 'smtpd/relay host username' MAIL_AUTH_PASSWD = 'smtpd/relay host password' - MAIL_STARTTLS = true - -[MAILERROR] - MAIL_ON_ERROR = false - MAIL_HOST = 'host mail' - HOST_PORT = 493 - MAIL_FROM = 'Email from' - MAIL_USERNAME = 'email username' - MAIL_PASS = 'email to' - MAIL_TO = 'email to' # API flasgger main config diff --git a/docs/devs/init_launch_frontend.rst b/docs/devs/init_launch_frontend.rst index 3e607a11..8417489a 100644 --- a/docs/devs/init_launch_frontend.rst +++ b/docs/devs/init_launch_frontend.rst @@ -12,59 +12,21 @@ Une fois l'environnement installé, installer la dernière version stable de ``n .. code:: sh - nvm install --lts + nvm install v10.16 Pour utiliser cette version: .. code:: sh - nvm use --lts + nvm use v10.16 Installer angular CLI (version LTS 6) et les dépendances requises: .. code:: sh - npm install -g @angular/cli@v6-lts + npm install -g @angular/cli@v8-lts npm install -Dans son incarnation actuelle, quelques fichiers de dépendances doivent être patchés pour passer l'étape de compilation. - -.. code:: diff - - --- frontend/node_modules/@types/leaflet.locatecontrol/index.d.ts.old 2019-03-07 08:47:03.475859400 +0100 - +++ frontend/node_modules/@types/leaflet.locatecontrol/index.d.ts 2019-03-07 08:47:23.460562933 +0100 - @@ -38,6 +38,7 @@ - onLocationOutsideMapBounds?: any; - showPopup?: boolean; - strings?: any; - + getLocationBounds?: Function; - locateOptions?: L.LocateOptions; - } - } - -.. code:: diff - - --- frontend/node_modules/@types/leaflet/index.d.ts.old 2019-04-10 09:02:08.012010439 +0200 - +++ frontend/node_modules/@types/leaflet/index.d.ts 2019-04-10 09:02:23.239901103 +0200 - @@ -495,7 +495,7 @@ - zoomReverse?: boolean; - detectRetina?: boolean; - crossOrigin?: boolean; - - // [name: string]: any; - + [name: string]: any; - // You are able add additional properties, but it makes this interface unchackable. - // See: https://github.com/DefinitelyTyped/DefinitelyTyped/issues/15313 - // Example: - @@ -1025,6 +1025,7 @@ - tapTolerance?: number; - touchZoom?: Zoom; - bounceAtZoomLimits?: boolean; - + gestureHandling?: boolean; - } - - export type ControlPosition = 'topleft' | 'topright' | 'bottomleft' | - 'bottomright'; - Lancer du frontend ################## @@ -123,11 +85,6 @@ Le transfert d'état s'effectue avec accesseur et mutateur: */ } -Le ``build`` et le démarrage du service sur le port ``4000`` s'effectue via le oneliner : - -.. code-block:: sh - - npm run build:ssr && npm run serve:ssr La redirection de port pourrait se faire au niveau du serveur web / reverse proxy, avec un filtre sur l'entête de requête ``User-Agent`` From 2c9c8d50035b5f3aee340413d7cdfc79990b8563 Mon Sep 17 00:00:00 2001 From: lpofredc Date: Tue, 11 Feb 2020 12:34:07 +0100 Subject: [PATCH 74/76] add home custom templates --- frontend/src/custom/home/home.css.template | 0 frontend/src/custom/home/home.html.template | 29 +++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 frontend/src/custom/home/home.css.template create mode 100644 frontend/src/custom/home/home.html.template diff --git a/frontend/src/custom/home/home.css.template b/frontend/src/custom/home/home.css.template new file mode 100644 index 00000000..e69de29b diff --git a/frontend/src/custom/home/home.html.template b/frontend/src/custom/home/home.html.template new file mode 100644 index 00000000..c7b7add9 --- /dev/null +++ b/frontend/src/custom/home/home.html.template @@ -0,0 +1,29 @@ +

    GeoNature-citizen

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed feugiat posuere porttitor. Pellentesque tincidunt + pharetra sapien. Cras tincidunt ipsum scelerisque ante placerat, in ullamcorper ante tincidunt. Mauris nec + malesuada erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. + Vivamus eleifend faucibus scelerisque. Aliquam ut nisi sit amet sapien hendrerit imperdiet.

    +

    A propos du site

    +

    Morbi eget maximus lectus. In hac habitasse platea dictumst. Quisque ac leo non ipsum bibendum ornare sed molestie + quam. In magna tortor, condimentum nec neque et, convallis lobortis quam. Ut eu rhoncus urna. Quisque fringilla + turpis quis ipsum egestas, et tincidunt leo convallis. Sed porttitor aliquet euismod. Etiam imperdiet posuere est. + Integer volutpat semper ipsum, at ultricies elit hendrerit et. Fusce dapibus maximus velit quis luctus. + + In pellentesque odio in condimentum accumsan. Cras dignissim libero lacus, id pellentesque tellus rutrum non. + Suspendisse non pharetra lacus, vitae auctor arcu. Maecenas sit amet elit bibendum, commodo nibh ac, iaculis + lectus. Nunc nisi justo, semper eu accumsan eu, cursus sit amet velit. Cras mollis, libero nec porttitor feugiat, + leo neque vestibulum risus, eu tristique dui orci rhoncus arcu. Aenean sagittis, mauris vitae fringilla dapibus, + justo lectus fringilla nisi, in ornare nisl dolor eu dolor. Morbi sed tellus faucibus, sodales tortor id, bibendum + enim. + + Proin eget mi sem. Duis lobortis orci lorem, quis fermentum eros venenatis at. Curabitur tristique feugiat risus ut + ornare. Nunc at fermentum quam, et accumsan urna. Nunc vel felis sem. Aenean dictum urna ut purus gravida, eget + tristique augue cursus. Sed lectus est, molestie a erat non, hendrerit suscipit quam. Nullam elit tortor, porttitor + at dolor et, blandit eleifend lorem. Fusce at velit erat. Cras ante nisi, ullamcorper sed erat sed, pellentesque + lacinia nulla. Suspendisse in tincidunt lacus. In pulvinar venenatis arcu quis accumsan. Sed ut iaculis ex. In + tempus arcu ut turpis elementum, ut laoreet eros malesuada. Phasellus interdum cursus odio ut egestas. + + Phasellus vulputate, lacus quis tincidunt iaculis, purus turpis malesuada ante, vitae dapibus odio dui finibus + tellus. Aenean feugiat odio condimentum nulla consectetur vulputate eu et nunc. Donec maximus vehicula scelerisque. + Vivamus id eros lacus. Mauris eget eros nibh. Cras tristique placerat purus id mollis. Curabitur fermentum nunc sit + amet gravida pellentesque. Vivamus sed venenatis orci. Nam consequat mauris id rhoncus lobortis.

    \ No newline at end of file From 29f30fb7f10489aafc79b6d4857e55f875085f3f Mon Sep 17 00:00:00 2001 From: lpofredc Date: Wed, 12 Feb 2020 09:47:47 +0100 Subject: [PATCH 75/76] add margin-top to dashboard component --- .../user-dashboard.component.css | 1 + frontend/src/custom/home/home.html.template | 29 ------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css index 895d3199..4fe5642a 100644 --- a/frontend/src/app/auth/user-dashboard/user-dashboard.component.css +++ b/frontend/src/app/auth/user-dashboard/user-dashboard.component.css @@ -1,5 +1,6 @@ .container-fluid, .col-lg-12 { + margin-top: 106px; padding: 0px !important; padding-right: 0px !important; padding-left: 0px; diff --git a/frontend/src/custom/home/home.html.template b/frontend/src/custom/home/home.html.template index c7b7add9..e69de29b 100644 --- a/frontend/src/custom/home/home.html.template +++ b/frontend/src/custom/home/home.html.template @@ -1,29 +0,0 @@ -

    GeoNature-citizen

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed feugiat posuere porttitor. Pellentesque tincidunt - pharetra sapien. Cras tincidunt ipsum scelerisque ante placerat, in ullamcorper ante tincidunt. Mauris nec - malesuada erat. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. - Vivamus eleifend faucibus scelerisque. Aliquam ut nisi sit amet sapien hendrerit imperdiet.

    -

    A propos du site

    -

    Morbi eget maximus lectus. In hac habitasse platea dictumst. Quisque ac leo non ipsum bibendum ornare sed molestie - quam. In magna tortor, condimentum nec neque et, convallis lobortis quam. Ut eu rhoncus urna. Quisque fringilla - turpis quis ipsum egestas, et tincidunt leo convallis. Sed porttitor aliquet euismod. Etiam imperdiet posuere est. - Integer volutpat semper ipsum, at ultricies elit hendrerit et. Fusce dapibus maximus velit quis luctus. - - In pellentesque odio in condimentum accumsan. Cras dignissim libero lacus, id pellentesque tellus rutrum non. - Suspendisse non pharetra lacus, vitae auctor arcu. Maecenas sit amet elit bibendum, commodo nibh ac, iaculis - lectus. Nunc nisi justo, semper eu accumsan eu, cursus sit amet velit. Cras mollis, libero nec porttitor feugiat, - leo neque vestibulum risus, eu tristique dui orci rhoncus arcu. Aenean sagittis, mauris vitae fringilla dapibus, - justo lectus fringilla nisi, in ornare nisl dolor eu dolor. Morbi sed tellus faucibus, sodales tortor id, bibendum - enim. - - Proin eget mi sem. Duis lobortis orci lorem, quis fermentum eros venenatis at. Curabitur tristique feugiat risus ut - ornare. Nunc at fermentum quam, et accumsan urna. Nunc vel felis sem. Aenean dictum urna ut purus gravida, eget - tristique augue cursus. Sed lectus est, molestie a erat non, hendrerit suscipit quam. Nullam elit tortor, porttitor - at dolor et, blandit eleifend lorem. Fusce at velit erat. Cras ante nisi, ullamcorper sed erat sed, pellentesque - lacinia nulla. Suspendisse in tincidunt lacus. In pulvinar venenatis arcu quis accumsan. Sed ut iaculis ex. In - tempus arcu ut turpis elementum, ut laoreet eros malesuada. Phasellus interdum cursus odio ut egestas. - - Phasellus vulputate, lacus quis tincidunt iaculis, purus turpis malesuada ante, vitae dapibus odio dui finibus - tellus. Aenean feugiat odio condimentum nulla consectetur vulputate eu et nunc. Donec maximus vehicula scelerisque. - Vivamus id eros lacus. Mauris eget eros nibh. Cras tristique placerat purus id mollis. Curabitur fermentum nunc sit - amet gravida pellentesque. Vivamus sed venenatis orci. Nam consequat mauris id rhoncus lobortis.

    \ No newline at end of file From c17656394e924ef19e843ac6fcdddf2d7434893a Mon Sep 17 00:00:00 2001 From: lpofredc Date: Wed, 12 Feb 2020 11:08:07 +0100 Subject: [PATCH 76/76] update VERSION to 0.3.0 for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 13668bbb..0d91a54c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.0.dev0 +0.3.0