Index: Farmatiko/ClientApp/angular.json =================================================================== --- Farmatiko/ClientApp/angular.json (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/angular.json (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -21,6 +21,9 @@ "polyfills": "src/polyfills.ts", "tsConfig": "src/tsconfig.app.json", - "assets": ["src/assets"], + "assets": [ + "src/assets" + ], "styles": [ + "src/custom-theme.scss", "node_modules/bootstrap/dist/css/bootstrap.min.css", "src/styles.css" @@ -72,7 +75,11 @@ "tsConfig": "src/tsconfig.spec.json", "karmaConfig": "src/karma.conf.js", - "styles": ["src/styles.css"], + "styles": [ + "src/styles.css" + ], "scripts": [], - "assets": ["src/assets"] + "assets": [ + "src/assets" + ] } }, @@ -80,6 +87,11 @@ "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/**" + ] } }, @@ -127,5 +139,7 @@ "options": { "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": ["**/node_modules/**"] + "exclude": [ + "**/node_modules/**" + ] } } Index: Farmatiko/ClientApp/package-lock.json =================================================================== --- Farmatiko/ClientApp/package-lock.json (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/package-lock.json (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -270,21 +270,53 @@ }, "@angular-devkit/schematics": { - "version": "8.3.26", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.26.tgz", - "integrity": "sha512-IoZbXVFGLvVi5d0ozfssWDXuzot0/pMSKbQPzWIG8K7nCo7nNMVYpsMHrEVYUikA9EQEL5LqMCGohH36/zVPcA==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.3.26", - "rxjs": "6.4.0" + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.3.tgz", + "integrity": "sha512-TjA2ZSPCgUK9l4FiRTIQY7DceXMAvNzOMWffy9o3kv2HPtxG9kuBrQXk++Z99zpylK0cAsugV7t/5ANpUkrIiA==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.0.3", + "ora": "4.0.4", + "rxjs": "6.5.5" }, "dependencies": { + "@angular-devkit/core": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.3.tgz", + "integrity": "sha512-m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg==", + "dev": true, + "requires": { + "ajv": "6.12.2", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.5.5", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", "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 } } @@ -298,32 +330,84 @@ } }, + "@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.3.26", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-8.3.26.tgz", - "integrity": "sha512-/dZik0ALcMSNaZdzqeG5hnFqyezrPQlWv+NXPidp1l0VTIwdEmjWmL26QpSBBvZ9bqXjY5/5SZYb+zZlGu78Kg==", - "dev": true, - "requires": { - "@angular-devkit/architect": "0.803.26", - "@angular-devkit/core": "8.3.26", - "@angular-devkit/schematics": "8.3.26", - "@schematics/angular": "8.3.26", - "@schematics/update": "0.803.26", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-10.0.3.tgz", + "integrity": "sha512-ONK8YG20KuakQetY0lPKDAOA3uBoLurdpSfFspFkcECyDimwJYSEydi3FUnCxEexeoKvrQWcol+q+u9YPoHCyg==", + "dev": true, + "requires": { + "@angular-devkit/architect": "0.1000.3", + "@angular-devkit/core": "10.0.3", + "@angular-devkit/schematics": "10.0.3", + "@schematics/angular": "10.0.3", + "@schematics/update": "0.1000.3", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.1", - "debug": "^4.1.1", + "debug": "4.1.1", "ini": "1.3.5", - "inquirer": "6.5.1", - "npm-package-arg": "6.1.0", - "npm-pick-manifest": "3.0.2", - "open": "6.4.0", - "pacote": "9.5.5", + "inquirer": "7.1.0", + "npm-package-arg": "8.0.1", + "npm-pick-manifest": "6.1.0", + "open": "7.0.4", + "pacote": "9.5.12", "read-package-tree": "5.3.1", - "rimraf": "3.0.0", - "semver": "6.3.0", + "rimraf": "3.0.2", + "semver": "7.3.2", "symbol-observable": "1.2.0", - "universal-analytics": "^0.4.20", - "uuid": "^3.3.2" + "universal-analytics": "0.4.20", + "uuid": "8.1.0" }, "dependencies": { + "@angular-devkit/architect": { + "version": "0.1000.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.3.tgz", + "integrity": "sha512-8ZszTAkRvGGMXERFvyLT6SJPfJXjNNfHamA76uDPTBXy+EijJ1XVTUr1+SYEe73E4ovtxqxAnsApEFxS7/Ni5w==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.0.3", + "rxjs": "6.5.5" + } + }, + "@angular-devkit/core": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.3.tgz", + "integrity": "sha512-m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg==", + "dev": true, + "requires": { + "ajv": "6.12.2", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.5.5", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ansi-colors": { "version": "4.1.1", @@ -341,8 +425,27 @@ } }, + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "requires": { + "is-docker": "^2.0.0" + } + }, + "open": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/open/-/open-7.0.4.tgz", + "integrity": "sha512-brSA+/yq+b08Hsr4c8fsEW2CRzk1BmfN3SAK/5VCHQ9bdoZJ4qa/+AfR0xHjlbbZUyPkUHs1b8x1RqdyZdkVqQ==", + "dev": true, + "requires": { + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" + } + }, "rimraf": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.0.tgz", - "integrity": "sha512-NDGVxTsjqfunkds7CqsOiEnxln4Bo7Nddl3XhS4pXg5OzwkLqJ971ZVAAnB+DDLnF76N+VnDEiBHaVV8I06SUg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { @@ -350,8 +453,29 @@ } }, + "rxjs": { + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "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 + }, + "uuid": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.1.0.tgz", + "integrity": "sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg==", "dev": true } @@ -1278,4 +1402,12 @@ "integrity": "sha512-uXGVSC4ugkyBt7pYdI8qaKNV0TIxfjSWb3dWNuhD6b9riPtaa+xJFQrfMu7OX/tVX642aFxca4jkUHBLCyWptA==", "dev": true + }, + "@angular/material": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-8.2.3.tgz", + "integrity": "sha512-SOczkIaqes+r+9XF/UUiokidfFKBpHkOPIaFK857sFD0FBNPvPEpOr5oHKCG3feERRwAFqHS7Wo2ohVEWypb5A==", + "requires": { + "tslib": "^1.7.1" + } }, "@angular/platform-browser": { @@ -2597,33 +2729,101 @@ }, "@schematics/angular": { - "version": "8.3.26", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.26.tgz", - "integrity": "sha512-NJCykMxB9RKL+Tmr9xHftUevsivKGsQZQKjkub528wrSgwrCWoFCxGWV31iOXkT3TlBWmuibH6MZkrWbCLX4Sw==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.3.26", - "@angular-devkit/schematics": "8.3.26" + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.3.tgz", + "integrity": "sha512-Or2pCqjpPbAvmbxtfMosGwQbNbSL4xodK5Key7678ZAPGB+rcxrVkBI9yxEJ/qzF/LrmMoKqy0JCmVLK7Grpog==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.0.3", + "@angular-devkit/schematics": "10.0.3" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.3.tgz", + "integrity": "sha512-m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg==", + "dev": true, + "requires": { + "ajv": "6.12.2", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.5.5", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "rxjs": { + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", + "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 + } } }, "@schematics/update": { - "version": "0.803.26", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.803.26.tgz", - "integrity": "sha512-r284UN3HP/UgxK80SG3MDlbF4qPS6EitEqwdSBqXizUYRlV6ovG9vHMLpNruWE0B6vfYbSAn1YvvIwW/ORL1Cw==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.3.26", - "@angular-devkit/schematics": "8.3.26", + "version": "0.1000.3", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1000.3.tgz", + "integrity": "sha512-Nncdklmzi1tyzkoAh7GlSslxriRhftlmfqPVmFHrrPRttYACtT/QH5qcWsrPgTPpHGINYEHrPjpeljsMoMchBQ==", + "dev": true, + "requires": { + "@angular-devkit/core": "10.0.3", + "@angular-devkit/schematics": "10.0.3", "@yarnpkg/lockfile": "1.1.0", "ini": "1.3.5", - "pacote": "9.5.5", - "rxjs": "6.4.0", - "semver": "6.3.0", + "npm-package-arg": "^8.0.0", + "pacote": "9.5.12", + "rxjs": "6.5.5", + "semver": "7.3.2", "semver-intersect": "1.4.0" }, "dependencies": { + "@angular-devkit/core": { + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.3.tgz", + "integrity": "sha512-m27ogjq44j80x64RnEswSvy8UewUqeCVJBbEuY6fzrWoaiCf12sgPlrSCwjwfhtQrLgl1e/i9zYA7U6ulGRXyg==", + "dev": true, + "requires": { + "ajv": "6.12.2", + "fast-json-stable-stringify": "2.1.0", + "magic-string": "0.25.7", + "rxjs": "6.5.5", + "source-map": "0.7.3" + } + }, + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "version": "6.5.5", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz", + "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==", "dev": true, "requires": { @@ -2632,7 +2832,13 @@ }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "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 } @@ -4005,4 +4211,10 @@ } }, + "cli-spinners": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.4.0.tgz", + "integrity": "sha512-sJAofoarcm76ZGpuooaO0eDy8saEy+YoZBLjC4h8srt4jeBnkYeOgqxgsJQTpyt2LjI5PTfLJHSL+41Yu4fEJA==", + "dev": true + }, "cli-width": { "version": "2.2.1", @@ -4740,4 +4952,21 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "dev": true, + "requires": { + "clone": "^1.0.2" + }, + "dependencies": { + "clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true } @@ -6555,11 +6784,11 @@ }, "inquirer": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz", - "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", + "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", "dev": true, "requires": { "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", + "chalk": "^3.0.0", "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", @@ -6568,8 +6797,8 @@ "lodash": "^4.17.15", "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", + "run-async": "^2.4.0", + "rxjs": "^6.5.3", "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", + "strip-ansi": "^6.0.0", "through": "^2.3.6" }, @@ -6582,22 +6811,43 @@ }, "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "chalk": { - "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" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true }, "is-fullwidth-code-point": { @@ -6616,41 +6866,22 @@ "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", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "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 - } + "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" } }, "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" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" } } @@ -6808,4 +7039,10 @@ "dev": true }, + "is-docker": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", + "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==", + "dev": true + }, "is-extendable": { "version": "0.1.1", @@ -6842,4 +7079,10 @@ "is-extglob": "^2.1.1" } + }, + "is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "dev": true }, "is-number": { @@ -7749,4 +7992,44 @@ "dev": true }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "chalk": { + "version": "2.4.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" + } + }, + "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" + } + } + } + }, "log4js": { "version": "4.5.1", @@ -8516,4 +8799,21 @@ } }, + "npm-install-checks": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-4.0.0.tgz", + "integrity": "sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==", + "dev": true, + "requires": { + "semver": "^7.1.1" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } + } + }, "npm-normalize-package-bin": { "version": "1.0.1", @@ -8523,13 +8823,44 @@ }, "npm-package-arg": { - "version": "6.1.0", - "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", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.0.1.tgz", + "integrity": "sha512-/h5Fm6a/exByzFSTm7jAyHbgOqErl9qSNJDQF32Si/ZzgwT2TERVxRxn3Jurw1wflgyVVAxnFR4fRHPM7y1ClQ==", + "dev": true, + "requires": { + "hosted-git-info": "^3.0.2", + "semver": "^7.0.0", "validate-npm-package-name": "^3.0.0" + }, + "dependencies": { + "hosted-git-info": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.5.tgz", + "integrity": "sha512-i4dpK6xj9BIpVOTboXIlKG9+8HMKggcrMX7WA24xZtKwX0TPelq/rbaS5rCKeNX8sJXZJGdSxpnEGtta+wismQ==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + } } }, @@ -8546,18 +8877,26 @@ }, "npm-pick-manifest": { - "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", - "npm-package-arg": "^6.0.0", - "semver": "^5.4.1" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz", + "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==", + "dev": true, + "requires": { + "npm-install-checks": "^4.0.0", + "npm-package-arg": "^8.0.0", + "semver": "^7.0.0" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } } }, "npm-registry-fetch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz", - "integrity": "sha512-6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz", + "integrity": "sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==", "dev": true, "requires": { @@ -8580,8 +8919,20 @@ } }, + "npm-package-arg": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", + "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", + "dev": true, + "requires": { + "hosted-git-info": "^2.7.1", + "osenv": "^0.1.5", + "semver": "^5.6.0", + "validate-npm-package-name": "^3.0.0" + } + }, "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, @@ -8848,4 +9199,87 @@ } }, + "ora": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz", + "integrity": "sha512-77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww==", + "dev": true, + "requires": { + "chalk": "^3.0.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.2.0", + "is-interactive": "^1.0.0", + "log-symbols": "^3.0.0", + "mute-stream": "0.0.8", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "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" + } + }, + "supports-color": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", + "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "original": { "version": "1.0.2", @@ -8949,11 +9383,12 @@ }, "pacote": { - "version": "9.5.5", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.5.tgz", - "integrity": "sha512-jAEP+Nqj4kyMWyNpfTU/Whx1jA7jEc5cCOlurm0/0oL+v8TAp1QSsK83N7bYe+2bEdFzMAtPG5TBebjzzGV0cA==", + "version": "9.5.12", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-9.5.12.tgz", + "integrity": "sha512-BUIj/4kKbwWg4RtnBncXPJd15piFSVNpTzY0rysSr3VnMowTYgkGKcaHrbReepAkjTr8lH2CVWRi58Spg2CicQ==", "dev": true, "requires": { "bluebird": "^3.5.3", "cacache": "^12.0.2", + "chownr": "^1.1.2", "figgy-pudding": "^3.5.1", "get-stream": "^4.1.0", @@ -8967,7 +9402,8 @@ "mkdirp": "^0.5.1", "normalize-package-data": "^2.4.0", + "npm-normalize-package-bin": "^1.0.0", "npm-package-arg": "^6.1.0", "npm-packlist": "^1.1.12", - "npm-pick-manifest": "^2.2.3", + "npm-pick-manifest": "^3.0.0", "npm-registry-fetch": "^4.0.0", "osenv": "^0.1.5", @@ -8979,5 +9415,5 @@ "semver": "^5.6.0", "ssri": "^6.0.1", - "tar": "^4.4.8", + "tar": "^4.4.10", "unique-filename": "^1.1.1", "which": "^1.3.1" @@ -8993,8 +9429,20 @@ } }, + "npm-package-arg": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", + "integrity": "sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==", + "dev": true, + "requires": { + "hosted-git-info": "^2.7.1", + "osenv": "^0.1.5", + "semver": "^5.6.0", + "validate-npm-package-name": "^3.0.0" + } + }, "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": { @@ -12575,4 +13023,13 @@ "requires": { "minimalistic-assert": "^1.0.0" + } + }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "dev": true, + "requires": { + "defaults": "^1.0.3" } }, Index: Farmatiko/ClientApp/package.json =================================================================== --- Farmatiko/ClientApp/package.json (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/package.json (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -14,8 +14,10 @@ "dependencies": { "@angular/animations": "8.2.12", + "@angular/cdk": "~8.2.3", "@angular/common": "8.2.12", "@angular/compiler": "8.2.12", "@angular/core": "8.2.12", "@angular/forms": "8.2.12", + "@angular/material": "^8.2.3", "@angular/platform-browser": "8.2.12", "@angular/platform-browser-dynamic": "8.2.12", @@ -34,5 +36,5 @@ "devDependencies": { "@angular-devkit/build-angular": "^0.803.26", - "@angular/cli": "^8.3.26", + "@angular/cli": "^10.0.3", "@angular/compiler-cli": "^8.2.14", "@angular/language-service": "^8.2.12", Index: Farmatiko/ClientApp/src/app/app.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/app.component.ts (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/app.component.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -1,3 +1,4 @@ import { Component } from '@angular/core'; +import { MaterialModule } from './shared/material.module' @Component({ Index: Farmatiko/ClientApp/src/app/app.module.ts =================================================================== --- Farmatiko/ClientApp/src/app/app.module.ts (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/app.module.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -10,4 +10,6 @@ import { CounterComponent } from './counter/counter.component'; import { FetchDataComponent } from './fetch-data/fetch-data.component'; +import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { KoronaComponent } from './korona/korona.component'; @NgModule({ @@ -17,5 +19,6 @@ HomeComponent, CounterComponent, - FetchDataComponent + FetchDataComponent, + KoronaComponent ], imports: [ @@ -25,7 +28,9 @@ RouterModule.forRoot([ { path: '', component: HomeComponent, pathMatch: 'full' }, - { path: 'counter', component: CounterComponent }, + { path: 'mapa', component: CounterComponent }, { path: 'fetch-data', component: FetchDataComponent }, - ]) + { path: 'koronavirus', component: KoronaComponent } + ]), + BrowserAnimationsModule ], providers: [], Index: Farmatiko/ClientApp/src/app/counter/counter.component.css =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/counter/counter.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,13 @@ +.wrapper { + display: flex; + justify-content: space-around; + padding-top: 50px; +} + +nav { + float: right; +} + +table { + margin-top: 25px; +} Index: Farmatiko/ClientApp/src/app/counter/counter.component.html =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.html (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/counter/counter.component.html (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -6,2 +6,88 @@ + + +
+
+

Здравствени установи

+ + + + + + + + + + + + + + + + + + +
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
+ +
+
+

Здравствени работници

+ + + + + + + + + + + + + + + + + + +
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
+ +
+
Index: Farmatiko/ClientApp/src/app/counter/counter.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/counter/counter.component.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -3,5 +3,6 @@ @Component({ selector: 'app-counter-component', - templateUrl: './counter.component.html' + templateUrl: './counter.component.html', + styleUrls: ['./counter.component.css'] }) export class CounterComponent { Index: Farmatiko/ClientApp/src/app/home/home.component.css =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/home/home.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,13 @@ +.wrapper { + display: flex; + justify-content: space-around; + padding-top: 50px; +} + +nav { + float: right; +} + +table { + margin-top: 25px; +} Index: Farmatiko/ClientApp/src/app/home/home.component.html =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.html (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/home/home.component.html (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -1,14 +1,84 @@ -

Hello, world!

-

Welcome to your new single-page application, built with:

- -

To help you get started, we've also set up:

- -

The ClientApp subdirectory is a standard Angular CLI application. If you open a command prompt in that directory, you can run any ng command (e.g., ng test), or use npm to install extra packages into it.

+
+
+

Лекови

+ + + + + + + + + + + + + + + + + + +
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
+ +
+
+

Аптеки

+ + + + + + + + + + + + + + + + + + +
Placeholder1Placeholder2Placeholder3Placeholder4
data1data2data3data4
+ +
+
Index: Farmatiko/ClientApp/src/app/home/home.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/home/home.component.ts (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/home/home.component.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -1,7 +1,9 @@ -import { Component } from '@angular/core'; +import { Component, OnInit, Input, ViewChild } from '@angular/core'; +import { MaterialModule } from '../shared/material.module'; @Component({ selector: 'app-home', templateUrl: './home.component.html', + styleUrls: ['./home.component.css'] }) export class HomeComponent { Index: Farmatiko/ClientApp/src/app/korona/korona.component.css =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/korona/korona.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,28 @@ +.counter { + background-color:#f5f5f5; + padding: 20px 0; + border-radius: 5px; +} + +.count-title { + font-size: 40px; + font-weight: normal; + margin-top: 10px; + margin-bottom: 0; + text-align: center; +} + +.count-text { + font-size: 13px; + font-weight: normal; + margin-top: 10px; + margin-bottom: 0; + text-align: center; +} + +.fa-2x { + margin: 0 auto; + float: none; + display: table; + color: #4ad1e5; +} Index: Farmatiko/ClientApp/src/app/korona/korona.component.html =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.html (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/korona/korona.component.html (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,41 @@ +
+
+
+
+

Коронавирус

+

статистика

+
+ + + +
+
+
+
+ 0 +

+

Placeholder1

+
+
+
+
+ 0 +

+

Placeholder2

+
+
+
+
+ 0 +

+

Placeholder3

+
+
+
+ 0 +

+

Placeholder4

+
+
+
+
Index: Farmatiko/ClientApp/src/app/korona/korona.component.spec.ts =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.spec.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/korona/korona.component.spec.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { KoronaComponent } from './korona.component'; + +describe('KoronaComponent', () => { + let component: KoronaComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ KoronaComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(KoronaComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-korona', + templateUrl: './korona.component.html', + styleUrls: ['./korona.component.css'] +}) +export class KoronaComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} Index: Farmatiko/ClientApp/src/app/models/HealthFacilities.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/HealthFacilities.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/HealthFacilities.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,8 @@ +export class HealthFacilities { + Name: string; + Municipality: string; + Address: string; + Type: string; + Email: string; + Phone: string; +} Index: Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/HealthcareWorkers.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,8 @@ +import { HealthFacilities } from "./HealthFacilities"; + +export class HealthcareWorkers { + Name: string; + Branch: Date; + Facility: HealthFacilities; + Title: string; +} Index: Farmatiko/ClientApp/src/app/models/Medicine.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Medicine.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/Medicine.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,9 @@ +export class Medicine { + Name: string; + Strength: string; + Form: string; + WayOfIssuing: string; + Manufacturer: string; + Price: Float32Array; + Packaging: string; +} Index: Farmatiko/ClientApp/src/app/models/MedicineList.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/MedicineList.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/MedicineList.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,6 @@ +import { Medicine } from "./Medicine"; + +export class MedicineList { + Medicines: Medicine[]; + HasMedicine: boolean[]; +} Index: Farmatiko/ClientApp/src/app/models/Pandemic.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Pandemic.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/Pandemic.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,10 @@ +export class Pandemic { + Name: string; + TotalMK: BigInt; + ActiveMK: BigInt; + DeathsMK: BigInt; + NewMK: BigInt; + TotalGlobal: BigInt; + DeathsGlobal: BigInt; + ActiveGlobal: BigInt; +} Index: Farmatiko/ClientApp/src/app/models/Pharmacy.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/Pharmacy.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/Pharmacy.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,6 @@ +export class Pharmacy { + Name: string; + Location: string; + Address: string; + WorkAllTime: boolean; +} Index: Farmatiko/ClientApp/src/app/models/PharmacyHead.ts =================================================================== --- Farmatiko/ClientApp/src/app/models/PharmacyHead.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) +++ Farmatiko/ClientApp/src/app/models/PharmacyHead.ts (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -0,0 +1,10 @@ +import { MedicineList } from "./MedicineList"; +import { Pharmacy } from "./Pharmacy"; + +export class PharmacyHead { + PharmacyMedicines: MedicineList; + Pharmacy: Pharmacy[]; + Email: string; + Passwd: string; + Name: string; +} Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css =================================================================== --- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.css (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -3,4 +3,8 @@ text-align: center; word-break: break-all; +} + +a.navbar-brand img { + width: 200px; } Index: Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html =================================================================== --- Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision 92a1f414076288b31a650f1874ee627ded338094) +++ Farmatiko/ClientApp/src/app/nav-menu/nav-menu.component.html (revision c352b2d209b6faf850e68fab3bcdd70162b052e8) @@ -4,5 +4,5 @@ >
- Farmatiko +