From b1c2d6d98e3d95833267084c0fde159c1b696179 Mon Sep 17 00:00:00 2001 From: abhay_1806 Date: Sat, 23 Jun 2018 14:09:12 +0530 Subject: [PATCH] build: update dependencies Update dependencies and configure the app for angular material and flex layout. Fixes #44 --- .travis.yml | 2 +- CNAME | 1 - angular.json | 23 +- package-lock.json | 1457 ++++++----------- package.json | 91 +- src/app/about/about-routing.module.ts | 2 +- src/app/about/about.component.ts | 2 +- .../accounting/accounting-routing.module.ts | 2 +- src/app/app.component.ts | 5 +- src/app/app.module.ts | 10 +- src/app/clients/clients-routing.module.ts | 2 +- src/app/clients/clients.component.ts | 2 +- src/app/clients/clients.module.ts | 5 +- src/app/core/core.module.ts | 2 - src/app/core/http/api-prefix.interceptor.ts | 2 +- .../core/http/error-handler.interceptor.ts | 2 +- src/app/home/home-routing.module.ts | 2 +- src/app/home/home.module.ts | 4 +- src/app/login/login-routing.module.ts | 2 +- src/app/login/login.component.scss | 50 +- src/app/login/login.component.ts | 4 +- src/app/login/login.module.ts | 2 - .../navigation/navigation-routing.module.ts | 2 +- src/app/navigation/navigation.component.html | 24 +- src/app/navigation/navigation.module.ts | 2 - .../create-user/create-user.component.html | 8 +- .../self-service-routing.module.ts | 2 +- src/app/self-service/self-service.module.ts | 7 +- .../user-management.component.html | 22 +- src/apple-touch-icon.png | Bin 0 -> 1551 bytes src/assets/images/833.svg | 1 - src/assets/images/chosen-sprite.png | Bin 559 -> 0 bytes .../images/client-image-placeholder.png | Bin 8026 -> 0 bytes src/assets/images/cubic_loader.gif | Bin 7371 -> 0 bytes src/assets/images/favicon.ico | Bin 318 -> 0 bytes src/assets/images/loader.gif | Bin 80595 -> 0 bytes src/assets/images/logo.jpg | Bin 26946 -> 0 bytes src/assets/images/ring.svg | 1 - src/assets/images/small-loader.gif | Bin 5213 -> 0 bytes src/assets/images/user_new.png | Bin 2013 -> 0 bytes src/assets/ngx-rocket-logo.png | Bin 17141 -> 0 bytes src/{ => assets}/styles/_loader.scss | 27 +- src/environments/.env.ts | 2 +- src/index.html | 33 +- src/main.scss | 14 +- src/main.ts | 4 +- src/manifest.json | 23 +- .../bootstrap-material/_bootswatch.scss | 666 -------- src/styles/bootstrap-material/_variables.scss | 129 -- src/theme/theme-variables.scss | 55 - src/translations/en-US.json | 3 +- src/translations/fr-FR.json | 3 +- tsconfig.json | 8 +- tslint.json | 4 +- 54 files changed, 711 insertions(+), 2003 deletions(-) delete mode 100644 CNAME create mode 100644 src/apple-touch-icon.png delete mode 100644 src/assets/images/833.svg delete mode 100644 src/assets/images/chosen-sprite.png delete mode 100644 src/assets/images/client-image-placeholder.png delete mode 100644 src/assets/images/cubic_loader.gif delete mode 100644 src/assets/images/favicon.ico delete mode 100644 src/assets/images/loader.gif delete mode 100644 src/assets/images/logo.jpg delete mode 100644 src/assets/images/ring.svg delete mode 100644 src/assets/images/small-loader.gif delete mode 100644 src/assets/images/user_new.png delete mode 100644 src/assets/ngx-rocket-logo.png rename src/{ => assets}/styles/_loader.scss (87%) delete mode 100644 src/styles/bootstrap-material/_bootswatch.scss delete mode 100644 src/styles/bootstrap-material/_variables.scss delete mode 100644 src/theme/theme-variables.scss diff --git a/.travis.yml b/.travis.yml index 9f73a321b..d637722bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ script: deploy: provider: pages skip-cleanup: true - local-dir: dist + local-dir: dist/web-app github-token: $GITHUB_TOKEN keep-history: true on: diff --git a/CNAME b/CNAME deleted file mode 100644 index 8b1378917..000000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ - diff --git a/angular.json b/angular.json index 89e9d3b1d..c6a1cd1f1 100644 --- a/angular.json +++ b/angular.json @@ -3,11 +3,11 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "ng-x-rocket": { + "mifosx-web-app": { "root": "", "sourceRoot": "src", "projectType": "application", - "prefix": "app", + "prefix": "mifosx", "schematics": { "@schematics/angular:component": { "styleext": "scss" @@ -17,7 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist", + "outputPath": "dist/web-app", "index": "src/index.html", "main": "src/main.ts", "tsConfig": "src/tsconfig.app.json", @@ -57,18 +57,18 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "ng-x-rocket:build" + "browserTarget": "mifosx-web-app:build" }, "configurations": { "production": { - "browserTarget": "ng-x-rocket:build:production" + "browserTarget": "mifosx-web-app:build:production" } } }, "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "browserTarget": "ng-x-rocket:build" + "browserTarget": "mifosx-web-app:build" } }, "test": { @@ -104,7 +104,7 @@ } } }, - "ng-x-rocket-e2e": { + "mifosx-web-app-e2e": { "root": "e2e", "projectType": "application", "architect": { @@ -112,7 +112,12 @@ "builder": "@angular-devkit/build-angular:protractor", "options": { "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "ng-x-rocket:serve" + "devServerTarget": "mifosx-web-app:serve" + }, + "configurations": { + "production": { + "devServerTarget": "mifosx-web-app:serve:production" + } } }, "lint": { @@ -129,5 +134,5 @@ } } }, - "defaultProject": "ng-x-rocket" + "defaultProject": "mifosx-web-app" } diff --git a/package-lock.json b/package-lock.json index 79423eadb..5ed762012 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,29 +1,29 @@ { - "name": "ng-x-rocket", - "version": "1.0.0", + "name": "mifosx-web-app", + "version": "0.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@angular-devkit/architect": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.3.tgz", - "integrity": "sha512-w9tK3VACU+CnOQQZT6o7QO2brn/OVNDf2Y11rI+ZQH7UIn6N0ZFoMl9WyFB//K2Gkoa7hAobykhRTtP8lrTF1g==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.8.tgz", + "integrity": "sha512-ZKTm/zC61iY9IBHOEAKoMSzZpvhkmv+1O/HHzpHEuR551jCzu6vSyCmMY9Z7GBcccscCV+hjeSMwgFrFRcqlkw==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.3", - "rxjs": "6.1.0" + "@angular-devkit/core": "0.6.8", + "rxjs": "6.2.1" } }, "@angular-devkit/build-angular": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.6.3.tgz", - "integrity": "sha512-ce+uAXQXyuMy6IxSnsGKeHlLVjsI77DblNvkcO1NilP7iYxujEJx6qDq/Hrf1uhuqRpm+8pt5zY6QD90gQrDcg==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.6.8.tgz", + "integrity": "sha512-VGqYAk8jpISraz2UHfsDre270NOUmV0CTSZw2p9sm5g/XIr5m+IHetFZz3gpoAr9+If2aFTs8Rt3sGdCRzwBqA==", "dev": true, "requires": { - "@angular-devkit/architect": "0.6.3", - "@angular-devkit/build-optimizer": "0.6.3", - "@angular-devkit/core": "0.6.3", - "@ngtools/webpack": "6.0.3", + "@angular-devkit/architect": "0.6.8", + "@angular-devkit/build-optimizer": "0.6.8", + "@angular-devkit/core": "0.6.8", + "@ngtools/webpack": "6.0.8", "ajv": "6.4.0", "autoprefixer": "8.5.0", "cache-loader": "1.2.2", @@ -54,8 +54,8 @@ "postcss-url": "7.3.2", "raw-loader": "0.5.1", "resolve": "1.7.1", - "rxjs": "6.1.0", - "sass-loader": "7.0.1", + "rxjs": "6.2.1", + "sass-loader": "7.0.3", "silent-error": "1.1.0", "source-map-support": "0.5.6", "stats-webpack-plugin": "0.6.2", @@ -68,81 +68,125 @@ "webpack": "4.8.3", "webpack-dev-middleware": "3.1.3", "webpack-dev-server": "3.1.4", - "webpack-merge": "4.1.2", + "webpack-merge": "4.1.3", "webpack-sources": "1.1.0", "webpack-subresource-integrity": "1.1.0-rc.4" } }, "@angular-devkit/build-optimizer": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.6.3.tgz", - "integrity": "sha512-C0LGWh7+rYjpE1T1guaq9EMovwhEJ1QR25qjJxUoYvN+sM+MfVpMhoa6ruqnxh+eQCfRiMdIsnbOboiZxNHTQw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.6.8.tgz", + "integrity": "sha512-of5syQbv3uNPp4AQkfRecfnp8AE8kvffbfYi+FFPZ6OGr7e59T1fGwk6+Zgb2qQFQg8HO2tzWI/uygtLIqmbmw==", "dev": true, "requires": { "loader-utils": "1.1.0", "source-map": "0.5.7", - "typescript": "2.7.2", + "typescript": "2.9.2", "webpack-sources": "1.1.0" + }, + "dependencies": { + "typescript": { + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", + "dev": true + } } }, "@angular-devkit/core": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.3.tgz", - "integrity": "sha512-97hFVW6in8oYJUEqjmUP0Tb/mPlTG3sc0THpe5MCGEkDPjlp2cObt9rUCAVOjugBlScV8rzTpVQ+95PT60Py8A==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", + "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==", "dev": true, "requires": { "ajv": "6.4.0", "chokidar": "2.0.3", - "rxjs": "6.1.0", + "rxjs": "6.2.1", "source-map": "0.5.7" } }, "@angular-devkit/schematics": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.3.tgz", - "integrity": "sha512-dXlyVNuFRhiOnhAk0NojEUThLrZBpVZmWvEQ4h/pnyHS0P9CfnHqJ8DCcCrjOwYkzdBwBrYchXOCYfo8zuxYGw==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.8.tgz", + "integrity": "sha512-R4YqAUdo62wtrhX/5HSRGSKXNTWqfQb66ZE6m8jj6GEJNFKdNXMdxOchxr07LCiKTxfh1w6G3nGzxIsu/+D4KA==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.3", - "rxjs": "6.1.0" + "@angular-devkit/core": "0.6.8", + "rxjs": "6.2.1" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", + "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==", + "dev": true, + "requires": { + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.2.1", + "source-map": "0.5.7" + } + } } }, "@angular/animations": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.3.tgz", - "integrity": "sha512-X8ey0dvh2ielxPCJOCcdNPAmKW5toCpzHdbjdZqlR9o6uP1UmzEKHd7Un7jVIINRtq9ZB7vnFWIJl0BA7C8U0g==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.6.tgz", + "integrity": "sha512-mJvWn0GuYARJfV9/KNUn5qUc5iNJKMSSNm//pRtUB8n829KnJHLnGpNsr95dzARH5wI3Om/t6hG3M0XCLbIfNQ==", "requires": { "tslib": "1.9.1" } }, "@angular/cdk": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.1.0.tgz", - "integrity": "sha512-IrM+cjeUW0TmFIZb7nMtARa9dKOVU9vXlwzllcwcBYHJNb9YcnLPaWqB2LqDQFuH/JQyt+oAG+VyfMmU+yk9uw==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.3.0.tgz", + "integrity": "sha512-L1NM2hU8xvb35mDKIw+SR9UZGZtbSQl6fmd9X/tedaNYjIvyQ7SIX7iDJ+LqD0xUQopB+SeuhDL7D6IwGMV2bQ==", "requires": { "tslib": "1.9.1" } }, "@angular/cli": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.3.tgz", - "integrity": "sha512-G8jfgJublsRjveX1P+F5awHvpC07mKAF7f5lebowIs+QAHSOD6HxQ/JhMbJTwz/aj20iWgZOygA5LhkP0Wr+UQ==", + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.8.tgz", + "integrity": "sha512-DhH1Zq5Yonthw6zh6W07fhf+9XrAZbD1fcQ0MrmbxlieCfLlTAdBqyK2LavFCKwSZkUMLF6UHM3+jiNRVZSSIg==", "dev": true, "requires": { - "@angular-devkit/architect": "0.6.3", - "@angular-devkit/core": "0.6.3", - "@angular-devkit/schematics": "0.6.3", - "@schematics/angular": "0.6.3", - "@schematics/update": "0.6.3", + "@angular-devkit/architect": "0.6.8", + "@angular-devkit/core": "0.6.8", + "@angular-devkit/schematics": "0.6.8", + "@schematics/angular": "0.6.8", + "@schematics/update": "0.6.8", "opn": "5.3.0", "resolve": "1.7.1", - "rxjs": "6.1.0", + "rxjs": "6.2.1", "semver": "5.5.0", "silent-error": "1.1.0", "symbol-observable": "1.2.0", "yargs-parser": "10.0.0" }, "dependencies": { + "@angular-devkit/architect": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.8.tgz", + "integrity": "sha512-ZKTm/zC61iY9IBHOEAKoMSzZpvhkmv+1O/HHzpHEuR551jCzu6vSyCmMY9Z7GBcccscCV+hjeSMwgFrFRcqlkw==", + "dev": true, + "requires": { + "@angular-devkit/core": "0.6.8", + "rxjs": "6.2.1" + } + }, + "@angular-devkit/core": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", + "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==", + "dev": true, + "requires": { + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.2.1", + "source-map": "0.5.7" + } + }, "camelcase": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", @@ -161,31 +205,31 @@ } }, "@angular/common": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.2.tgz", - "integrity": "sha512-Yc3NnLGs1ltnDhUCOoMCQMRSkJv/sCv+jKx3uSdrvd8Y55APl2boZhZUK4WphPfWIkpvC7odpiLXAmnVgP6vcw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.6.tgz", + "integrity": "sha512-SjCrrGNJSeRMtNLv/ug5HpyRUexdNl11TrWCWMeu3ye3ss4k6EnuM9jGB196B0PIm0IbjO0KrpQ8bqBx0/2vqw==", "requires": { "tslib": "1.9.1" } }, "@angular/compiler": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.2.tgz", - "integrity": "sha512-uKuM7dcTWwcElklT4E/tckp5fnGNUq4wDna3gZWO6fvc7FQK0SUU4l+A6C1d5YdCRgAsv6gxIrk3MxbSF9UwEw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.6.tgz", + "integrity": "sha512-lcDNfkYLOWzOOqdD2Kspxwjk3xGs8kVLbq/8uk/aJ96ty8aA9j8Nbf3h53SCY9LuGoJMjOaaUpgwZCszFzqQyA==", "requires": { "tslib": "1.9.1" } }, "@angular/compiler-cli": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.2.tgz", - "integrity": "sha512-6hupeihL+MKYbP0xvHZiaVpYVF1XAlLpI1aTVLUhpzgnR8vgXCwni9iJlr7BZFyicVgApn6l7Oh2xIvMWftYhw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.6.tgz", + "integrity": "sha512-vWJK+X6B63+kdAN2s7Az1NHF4gAbECf1fkB+zkO6pP706teW4VlN2xdXeHLXgvK39iDJbhbctTnDfhqIaPmyjw==", "dev": true, "requires": { "chokidar": "1.7.0", "minimist": "1.2.0", "reflect-metadata": "0.1.12", - "tsickle": "0.27.5" + "tsickle": "0.29.0" }, "dependencies": { "anymatch": { @@ -232,7 +276,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.2.4", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -322,71 +365,79 @@ } }, "@angular/core": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.2.tgz", - "integrity": "sha512-+ahJofKZFyaq0kLhKUOCa3Fo4WQ4mkMmYRqwFjKgjPupzPgMh0FkBsojuP1WiBd5KTIkv7U8B4sTziUxRDrKgg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.6.tgz", + "integrity": "sha512-7J4wuQ5Bss2GmCptyXSfmgWk/IbCFK/MJwaXOpADLB9iWOkOIvKRSTntb4l6j3OVd9boCbs6Z/xW/HT964iMvw==", + "requires": { + "tslib": "1.9.1" + } + }, + "@angular/flex-layout": { + "version": "6.0.0-beta.15", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-6.0.0-beta.15.tgz", + "integrity": "sha512-Tu3BMzxAJppLnHicII8gUS2dnkSfAEy5/rxI6eSo6CH9z5uz+h/Q2gj2j7V53y9IyqTgIugvKzPa9/3jB+R8/w==", "requires": { "tslib": "1.9.1" } }, "@angular/forms": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.2.tgz", - "integrity": "sha512-Oc234cLjTj1tx2gF/nS/TIC3Auc+LCyC8H6GYqTxXQUyZQeGHqUptvDQz3KwM9Num3EKFUr9J2yzGPnz6lZVmQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.6.tgz", + "integrity": "sha512-uVcvUz8JzO/R6HtxIUtefjK55nf4gJt9WjVdnjmA66pQe1+aQYscyQu9QFykGfGqta/0luhVSU7J+5g0rIRr/g==", "requires": { "tslib": "1.9.1" } }, "@angular/http": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.2.tgz", - "integrity": "sha512-BONrdNMKOaQdXiWnrCAaUiP1akf/nuUG6xm/PJe684SrgcqWHN4JJuwgMhGRGIZZCIKEWcIEaZSp+DbWqnj1kg==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.6.tgz", + "integrity": "sha512-ZyY7JS3lQM0HnKfoCJl+S9ZHeQVdG+FefjYE2s7pBKUufaoMo9DTIfQe5ZgSQeXRAFKjuUyJDf1EZlPVVvQzIw==", "requires": { "tslib": "1.9.1" } }, "@angular/language-service": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.2.tgz", - "integrity": "sha512-EznIei5QGv4Hv+RtfCnI8TQPW7gLZBw7LrGPXSbwV/CXfY11ziEsd/h1lBfN3Wch3soIOXs3Qqk3zx//MrBG/Q==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.6.tgz", + "integrity": "sha512-6zRuKreMPlLQkLGS7KaJ4xehwirPbst+S6tQZltcSHjgIKrZBu3acL7/tUo5G5jQW6OnPXWK9UYs2kCffPS3AQ==", "dev": true }, "@angular/material": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.1.0.tgz", - "integrity": "sha512-9FLWjVnHFzAoGSWU5dz8X/QYeBtZGijMJIp1k94QDYz+2xA10IbesEgnv8I5Ri3EPnjV/gCspeSkt1ClLc95CA==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.3.0.tgz", + "integrity": "sha512-asSzdfLkDDbQEyM/GKUxrlvuj8OvO5DqrNJ3e3uvi0OmZDpaO50yubQvrJ26nbqgwgRo+qwiGNN6XcFwYTRVPQ==", "requires": { "tslib": "1.9.1" } }, "@angular/platform-browser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.2.tgz", - "integrity": "sha512-iMBHckhknJ8Wfw9ZVloiw0WPZDtzQFLE2e7D42of7SgXuHloStXUchb0qLr6ZTZwTY0oBPSvDKgJJVmEjZUZvw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.6.tgz", + "integrity": "sha512-c+2c4Ba8IeIt9CnF1RmJVf/0xwljT9GSIJUC61SLrX01NMwRxDq/LC+tatcBGLzZ6rc1eYmsd1exTHOGfENOxw==", "requires": { "tslib": "1.9.1" } }, "@angular/platform-browser-dynamic": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.2.tgz", - "integrity": "sha512-g1EC0wIWd4OhcEvUnisTfp3y0eMAXgXbACdtgsrozG//xzyqiRFUnBTYTAP4ecninCEltyZYK7EBGfzp8KwQjw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.6.tgz", + "integrity": "sha512-t5+dvfcwVaDa5H8qsVnPAvmNJa0rDwJMu1T6kfz8sAxzgiw6tOvIQShJX0Ka94+nPpd4mg7gv43VV705z6ryMA==", "requires": { "tslib": "1.9.1" } }, "@angular/router": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.2.tgz", - "integrity": "sha512-XqTtfs/UzT2k2MeVQG1pOP+wR1zcH8V71S6kmWIwFcfyKUgZfIm45sNsZyBZPwY2RUqwCeZYQFjPlVW8wD1PBw==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.6.tgz", + "integrity": "sha512-R49Gh/ate//AloPGjtQ2Nl3HNMT21pumcUoWZEZtYw8UyTbxSKLMc40yzdsldGrKZ/G/CafFTaS1hpZD7MF5/w==", "requires": { "tslib": "1.9.1" } }, "@angular/service-worker": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-6.0.2.tgz", - "integrity": "sha512-vJ9QGi2O0Ft3tEYwVXm0Y3hV721iqByemYoptVxwGvxyi4fcoeMImrvmc8Z4UCHDRIaziXhLHKOvAgH9ao+VGQ==", + "version": "6.0.6", + "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-6.0.6.tgz", + "integrity": "sha512-zLZnPS6mC+1iEypKVHOs4VFQq/5yucwFDEJBwfQR4TdrXHHXRGvp2AFY4lyTOkMk7ZDkivktonECYCTJky98XQ==", "requires": { "tslib": "1.9.1" } @@ -613,11 +664,6 @@ } } }, - "@fortawesome/fontawesome-free-webfonts": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz", - "integrity": "sha512-nLgl6b6a+tXaoJJnSRw0hjN8cWM/Q5DhxKAwI9Xr0AiC43lQ2F98vQ1KLA6kw5OoYeAyisGGqmlwtBj0WqOI5Q==" - }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -628,18 +674,13 @@ "glob-to-regexp": "0.3.0" } }, - "@ng-bootstrap/ng-bootstrap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-2.0.0.tgz", - "integrity": "sha512-t4QZ3es/u/yB6QchmyJemJbdtrVH4FtenlKgHJZ8095IOeKy8YVXgUwBqyLLZdU2JAwkOESmEns5ESciJHR18Q==" - }, "@ngtools/webpack": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.3.tgz", - "integrity": "sha512-wrhSFItcZp4Yzp6lgSuy23YdhaUs9D+KdGZPjwzzXtJIJCSzGkWuXzwlCwyKSFRQ6thyH/T3nffpHNaS3dWn2A==", + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.8.tgz", + "integrity": "sha512-jorGpTd82ILbyUwg4JQekovHFaYwSMlZan4f7x+sd3+2WgyL3Z1+ZbVSGKvXZWKS/mAVx7eLkRikzJkuC4FgHw==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.3", + "@angular-devkit/core": "0.6.8", "tree-kill": "1.2.0", "webpack-sources": "1.1.0" } @@ -685,9 +726,9 @@ } }, "@ngx-translate/core": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.1.tgz", - "integrity": "sha1-nzo+0HfoR90NKVGmZNpu40igbSI=", + "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-10.0.2.tgz", + "integrity": "sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==", "requires": { "tslib": "1.9.1" } @@ -699,34 +740,62 @@ "dev": true }, "@schematics/angular": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.3.tgz", - "integrity": "sha512-YhldE1K6x/8D0PxFusjtB32iOAayyD1PSxPCx/q7I7T6x/lG7l35ZDV6ZZE6bDvIaxQBsjhIm8ACy2n+xwFxTA==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.8.tgz", + "integrity": "sha512-9kRphqTYG5Df/I8fvnT1zMsw0YNDPO9tl18tQZXj4am4raT7l9UCr+WkwJdlBoA5pwG6baWE9sL0iGWV/bzF/g==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.3", - "@angular-devkit/schematics": "0.6.3", + "@angular-devkit/core": "0.6.8", + "@angular-devkit/schematics": "0.6.8", "typescript": "2.7.2" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", + "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==", + "dev": true, + "requires": { + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.2.1", + "source-map": "0.5.7" + } + } } }, "@schematics/update": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.6.3.tgz", - "integrity": "sha512-UsKrg02+jwdsz9BdMVxDMeAZCF+c+dvHRWww4D2RcNzWdCTVWeBqRAmlreJJ0TGE54r7PEBnmQe0t5mS4F3d4w==", + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.6.8.tgz", + "integrity": "sha512-1Uq7LYnwL2wBwGVCgNz76QAR13ghAk+2vDDHOi+VX5+usHManxydrpoMGeX66OBPd+y5D3D2MFb+8mYHE7mygg==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.3", - "@angular-devkit/schematics": "0.6.3", + "@angular-devkit/core": "0.6.8", + "@angular-devkit/schematics": "0.6.8", "npm-registry-client": "8.5.1", - "rxjs": "6.1.0", + "rxjs": "6.2.1", "semver": "5.5.0", "semver-intersect": "1.3.1" + }, + "dependencies": { + "@angular-devkit/core": { + "version": "0.6.8", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.8.tgz", + "integrity": "sha512-rkIa1OSVWTt4g9leLSK/PsqOj3HZbDKHbZjqlslyfVa3AyCeiumFoOgViOVXlYgPX3HHDbE5uH24nyUWSD8uww==", + "dev": true, + "requires": { + "ajv": "6.4.0", + "chokidar": "2.0.3", + "rxjs": "6.2.1", + "source-map": "0.5.7" + } + } } }, "@swimlane/ngx-charts": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-8.0.2.tgz", - "integrity": "sha512-6n5YzsmDrS6d2Aqdo/5ZJ068P8ENBGKyYDq11Be6Ned/TQg1yE5YhoDICmZEKbbKs4fmRZf2ipVFsclCkRWrIg==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-8.1.0.tgz", + "integrity": "sha512-jjcIwt5uQXoBaQwCgHPqpzSoNJj68PiKItMYg6RVyqLua67vZ90ZdxzuYPsYpRtDIXJiV5/gXuDtD3ZrjtdQCA==", "requires": { "d3-array": "1.2.1", "d3-brush": "1.0.4", @@ -757,9 +826,9 @@ } }, "@types/jasmine": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.7.tgz", - "integrity": "sha512-RdbrPcW1aD78UmdLiDa9ZCKrbR5Go8PXh6GCpb4oIOkWVEusubSJJDrP4c5RYOu8m/CBz+ygZpicj6Pgms5a4Q==", + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.8.tgz", + "integrity": "sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==", "dev": true }, "@types/jasminewd2": { @@ -768,25 +837,19 @@ "integrity": "sha512-hYDVmQZT5VA2kigd4H4bv7vl/OhlympwREUemqBdOqtrYTo5Ytm12a5W5/nGgGYdanGVxj0x/VhZ7J3hOg/YKg==", "dev": true, "requires": { - "@types/jasmine": "2.8.7" + "@types/jasmine": "2.8.8" } }, - "@types/jquery": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.2.tgz", - "integrity": "sha512-ByZwKSEqteAta4VrIalqGJZmMq9lWPD3H3f5Xs6RR8B7zQRDPGUtjoKBYNtKTz/7LgBEQMdlxVbbjQfUaEIItA==", - "dev": true - }, "@types/lodash": { - "version": "4.14.109", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.109.tgz", - "integrity": "sha512-hop8SdPUEzbcJm6aTsmuwjIYQo1tqLseKCM+s2bBqTU2gErwI4fE+aqUVOlscPSQbKHKgtMMPoC+h4AIGOJYvw==", + "version": "4.14.110", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.110.tgz", + "integrity": "sha512-iXYLa6olt4tnsCA+ZXeP6eEW3tk1SulWeYyP/yooWfAtXjozqXgtX4+XUtMuOCfYjKGz3F34++qUc3Q+TJuIIw==", "dev": true }, "@types/node": { - "version": "8.10.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.17.tgz", - "integrity": "sha512-3N3FRd/rA1v5glXjb90YdYUa+sOB7WrkU2rAhKZnF4TKD86Cym9swtulGuH0p9nxo7fP5woRNa8b0oFTpCO1bg==", + "version": "8.10.20", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.20.tgz", + "integrity": "sha512-M7x8+5D1k/CuA6jhiwuSCmE8sbUWJF0wYsjcig9WrXvwUI5ArEoUBdOXpV4JcEMrLp02/QbDjw+kI+vQeKyQgg==", "dev": true }, "@types/q": { @@ -1037,9 +1100,9 @@ "dev": true }, "acorn": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz", - "integrity": "sha512-jd5MkIUlbbmb07nXH0DT3y7rDVtkzDi4XZOUVWAer8ajmF/DTSSbl5oNFyDOl/OXA33Bl79+ypHhl2pN20VeOQ==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", + "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", "dev": true }, "acorn-dynamic-import": { @@ -1048,7 +1111,7 @@ "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", "dev": true, "requires": { - "acorn": "5.5.3" + "acorn": "5.7.1" } }, "acorn-globals": { @@ -1307,7 +1370,7 @@ "dev": true, "requires": { "define-properties": "1.1.2", - "es-abstract": "1.11.0" + "es-abstract": "1.12.0" } }, "array-iterate": { @@ -1400,9 +1463,9 @@ "dev": true }, "ast-types": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.4.tgz", - "integrity": "sha512-RbY3UMcOcGhc3pOfQ6sliVjt3lqGib9lRjfH1UXJ8YfBFWbcWSJ8jr/VB2W6ulCzTSO/DSnCASqsHYuqa8O7yw==", + "version": "0.11.5", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz", + "integrity": "sha512-oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==", "dev": true, "optional": true }, @@ -1560,7 +1623,7 @@ "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "core-js": "2.5.6", + "core-js": "2.5.7", "regenerator-runtime": "0.11.1" } }, @@ -1891,11 +1954,6 @@ "hoek": "4.2.1" } }, - "bootstrap": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.1.tgz", - "integrity": "sha512-SpiDSOcbg4J/PjVSt4ny5eY6j74VbVSjROY4Fb/WIUXBV9cnb5luyR4KnPvNoXuGnBK1T+nJIWqRsvU3yP8Mcg==" - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -2028,7 +2086,7 @@ "dev": true, "requires": { "base64-js": "1.3.0", - "ieee754": "1.1.11", + "ieee754": "1.1.12", "isarray": "1.0.0" } }, @@ -2369,7 +2427,7 @@ "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", "dev": true, "requires": { - "@types/node": "8.10.17" + "@types/node": "8.10.20" } } } @@ -2383,7 +2441,6 @@ "anymatch": "2.0.0", "async-each": "1.0.1", "braces": "2.3.2", - "fsevents": "1.2.4", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -2663,12 +2720,20 @@ "dev": true }, "compressible": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.13.tgz", - "integrity": "sha1-DRAgq5JLL9tNYnmHXH1tq6a6p6k=", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz", + "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", "dev": true, "requires": { - "mime-db": "1.33.0" + "mime-db": "1.34.0" + }, + "dependencies": { + "mime-db": { + "version": "1.34.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz", + "integrity": "sha1-RS0Oz/XDA0am3B5kseruDTcZ/5o=", + "dev": true + } } }, "compression": { @@ -2679,7 +2744,7 @@ "requires": { "accepts": "1.3.5", "bytes": "3.0.0", - "compressible": "2.0.13", + "compressible": "2.0.14", "debug": "2.6.9", "on-headers": "1.0.1", "safe-buffer": "5.1.1", @@ -2853,9 +2918,9 @@ } }, "core-js": { - "version": "2.5.6", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz", - "integrity": "sha512-lQUVfQi0aLix2xpyjrrJEvfuYCqPc/HwmTKsC/VNf8q0zsjX7SQZtp4+oRONN5Tsur9GDETPjj+Ub2iDiGZfSQ==" + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" }, "core-util-is": { "version": "1.0.2", @@ -3065,7 +3130,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.42" + "es5-ext": "0.10.45" } }, "d3": { @@ -3377,7 +3442,7 @@ "dev": true, "optional": true, "requires": { - "ast-types": "0.11.4", + "ast-types": "0.11.5", "escodegen": "1.8.1", "esprima": "3.1.3" }, @@ -3731,7 +3796,7 @@ "requires": { "bn.js": "4.11.8", "brorand": "1.1.0", - "hash.js": "1.1.3", + "hash.js": "1.1.4", "hmac-drbg": "1.0.1", "inherits": "2.0.3", "minimalistic-assert": "1.0.1", @@ -3879,9 +3944,9 @@ } }, "es-abstract": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz", - "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", + "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", "dev": true, "requires": { "es-to-primitive": "1.1.1", @@ -3903,9 +3968,9 @@ } }, "es5-ext": { - "version": "0.10.42", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.42.tgz", - "integrity": "sha512-AJxO1rmPe1bDEfSR6TJ/FgMFYuTBhR5R57KW58iCkYACMyFbrkqVyzXSurYoScDGvgyMpk7uRF/lPUPPTmsRSA==", + "version": "0.10.45", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", + "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", "dev": true, "requires": { "es6-iterator": "2.0.3", @@ -3920,7 +3985,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.42", + "es5-ext": "0.10.45", "es6-symbol": "3.1.1" } }, @@ -3946,7 +4011,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.42" + "es5-ext": "0.10.45" } }, "escape-html": { @@ -4406,37 +4471,15 @@ } }, "extract-zip": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.6.tgz", - "integrity": "sha1-EpDt6NINCHK0Kf0/NRyhKOxe+Fw=", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", "dev": true, "requires": { - "concat-stream": "1.6.0", + "concat-stream": "1.6.2", "debug": "2.6.9", - "mkdirp": "0.5.0", + "mkdirp": "0.5.1", "yauzl": "2.4.1" - }, - "dependencies": { - "concat-stream": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", - "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" - } - }, - "mkdirp": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz", - "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - } } }, "extsprintf": { @@ -4815,535 +4858,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "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.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -5419,13 +4933,13 @@ } }, "gaze": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz", - "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "optional": true, "requires": { - "globule": "1.2.0" + "globule": "1.2.1" } }, "generate-function": { @@ -5606,9 +5120,9 @@ "dev": true }, "globule": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", - "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", "dev": true, "optional": true, "requires": { @@ -5875,9 +5389,9 @@ } }, "hash.js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", - "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz", + "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==", "dev": true, "requires": { "inherits": "2.0.3", @@ -5925,7 +5439,7 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.3", + "hash.js": "1.1.4", "minimalistic-assert": "1.0.1", "minimalistic-crypto-utils": "1.0.1" } @@ -5961,9 +5475,9 @@ "dev": true }, "html-minifier": { - "version": "3.5.15", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz", - "integrity": "sha512-OZa4rfb6tZOZ3Z8Xf0jKxXkiDcFWldQePGYFDcgKqES2sXeWaEv9y6QQvWUtX3ySI3feApQi5uCsHLINQ6NoAw==", + "version": "3.5.16", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.16.tgz", + "integrity": "sha512-zP5EfLSpiLRp0aAgud4CQXPQZm9kXwWjR/cF0PfdOj+jjWnOaCgeZcll4kYXSvIBPeUMmyaSc7mM4IDtA+kboA==", "dev": true, "requires": { "camel-case": "3.0.0", @@ -5972,7 +5486,7 @@ "he": "1.1.1", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.3.25" + "uglify-js": "3.3.28" } }, "html-tags": { @@ -5987,7 +5501,7 @@ "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", "dev": true, "requires": { - "html-minifier": "3.5.15", + "html-minifier": "3.5.16", "loader-utils": "0.2.17", "lodash": "4.17.10", "pretty-error": "2.1.1", @@ -6120,9 +5634,9 @@ } }, "http-parser-js": { - "version": "0.4.12", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz", - "integrity": "sha1-uc+/Sizybw/DSxDKFImid3HjR08=", + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz", + "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=", "dev": true }, "http-proxy": { @@ -6230,9 +5744,9 @@ "dev": true }, "ieee754": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz", - "integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", + "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", "dev": true }, "iferr": { @@ -7079,11 +6593,6 @@ "integrity": "sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=", "dev": true }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, "js-base64": { "version": "2.4.5", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", @@ -7236,6 +6745,16 @@ "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", "dev": true }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -7263,6 +6782,13 @@ "graceful-fs": "4.1.11" } }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true, + "optional": true + }, "jsonpointer": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", @@ -7346,18 +6872,18 @@ } }, "karma": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz", - "integrity": "sha1-TS25QChQpmVR+nhLAWT7CCTtjEs=", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.4.tgz", + "integrity": "sha512-32yhTwoi6BZgJZhR78GwhzyFABbYG/1WwQqYgY7Vh96Demvua2jM3+FyRltIMTUH/Kd5xaQvDw2L7jTvkYFeXg==", "dev": true, "requires": { "bluebird": "3.5.1", "body-parser": "1.18.2", - "chokidar": "1.7.0", - "colors": "1.2.5", + "chokidar": "2.0.3", + "colors": "1.3.0", "combine-lists": "1.0.1", "connect": "3.6.6", - "core-js": "2.5.6", + "core-js": "2.5.7", "di": "0.0.1", "dom-serialize": "2.2.1", "expand-braces": "0.1.2", @@ -7366,7 +6892,7 @@ "http-proxy": "1.17.0", "isbinaryfile": "3.0.2", "lodash": "4.17.10", - "log4js": "2.6.1", + "log4js": "2.9.0", "mime": "1.6.0", "minimatch": "3.0.4", "optimist": "0.6.1", @@ -7380,137 +6906,12 @@ "useragent": "2.2.1" }, "dependencies": { - "anymatch": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, - "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" - } - }, - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "chokidar": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", - "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, - "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" - } - }, "colors": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", - "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", + "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", "dev": true }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - }, - "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.6" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -7796,9 +7197,9 @@ } }, "log4js": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.6.1.tgz", - "integrity": "sha512-BOoWTr8gxJ9XRkQr/f68KUciHR6qnLESgbXuoD7VAhtu/aMq5kD1WD7IFMMaKjCDKLUHsjwT3V2cw34ENiJKig==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.9.0.tgz", + "integrity": "sha512-pptn4+5Q3ysOW6Jgm9lzhDUCFEYv7FLrazEzPQQlxgSP+IVl5HMPgT8hm2DyRqGY4GUiVjZz4XXRvTZ9BELQyw==", "dev": true, "requires": { "amqplib": "0.5.2", @@ -7808,7 +7209,7 @@ "debug": "3.1.0", "hipchat-notifier": "1.1.0", "loggly": "1.1.1", - "mailgun-js": "0.18.0", + "mailgun-js": "0.18.1", "nodemailer": "2.7.2", "redis": "2.8.0", "semver": "5.5.0", @@ -8107,13 +7508,13 @@ } }, "mailgun-js": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.0.tgz", - "integrity": "sha512-o0P6jjZlx5CQj12tvVgDTbgjTqVN0+5h6/6P1+3c6xmozVKBwniQ6Qt3MkCSF0+ueVTbobAfWyGpWRZMJu8t1g==", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.1.tgz", + "integrity": "sha512-lvuMP14u24HS2uBsJEnzSyPMxzU2b99tQsIx1o6QNjqxjk8b3WvR+vq5oG1mjqz/IBYo+5gF+uSoDS0RkMVHmg==", "dev": true, "optional": true, "requires": { - "async": "2.6.0", + "async": "2.6.1", "debug": "3.1.0", "form-data": "2.3.2", "inflection": "1.12.0", @@ -8125,9 +7526,9 @@ }, "dependencies": { "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "optional": true, "requires": { @@ -8604,11 +8005,6 @@ "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", "dev": true }, - "ngx-bootstrap": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-3.0.0.tgz", - "integrity": "sha512-Zu3m5Nwp6ISaqjrFeb1evFoaMn8EDR//RHoKeuLelvFOJjKHaCsbOdkWrAAtpTSapdc892mfZfWdTmSuaN2t5A==" - }, "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", @@ -8625,33 +8021,192 @@ "dev": true }, "node-gyp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", - "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.7.0.tgz", + "integrity": "sha512-qDQE/Ft9xXP6zphwx4sD0t+VhwV7yFaloMpfbL2QnnDZcyaiakWlLdtFGGQfTAwpFHdpbRhRxVhIHN1OKAjgbg==", "dev": true, "optional": true, "requires": { "fstream": "1.0.11", "glob": "7.1.2", "graceful-fs": "4.1.11", - "minimatch": "3.0.4", "mkdirp": "0.5.1", "nopt": "3.0.6", "npmlog": "4.1.2", "osenv": "0.1.5", - "request": "2.86.0", + "request": "2.81.0", "rimraf": "2.6.2", "semver": "5.3.0", "tar": "2.2.1", "which": "1.3.0" }, "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true, + "optional": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1" + } + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.6", + "mime-types": "2.1.18" + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=", + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "dev": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.14.1" + } + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=", + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=", + "dev": true, + "optional": true + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.7.0", + "caseless": "0.12.0", + "combined-stream": "1.0.6", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.18", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.2", + "stringstream": "0.0.6", + "tough-cookie": "2.3.4", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + } + }, "semver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true, "optional": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "optional": true, + "requires": { + "hoek": "2.16.3" + } } } }, @@ -8677,7 +8232,7 @@ "querystring-es3": "0.2.1", "readable-stream": "2.3.6", "stream-browserify": "2.0.1", - "stream-http": "2.8.2", + "stream-http": "2.8.3", "string_decoder": "1.1.1", "timers-browserify": "2.0.10", "tty-browserify": "0.0.0", @@ -8704,7 +8259,7 @@ "async-foreach": "0.1.3", "chalk": "1.1.3", "cross-spawn": "3.0.1", - "gaze": "1.1.2", + "gaze": "1.1.3", "get-stdin": "4.0.1", "glob": "7.1.2", "in-publish": "2.0.0", @@ -8714,7 +8269,7 @@ "meow": "3.7.0", "mkdirp": "0.5.1", "nan": "2.10.0", - "node-gyp": "3.6.2", + "node-gyp": "3.7.0", "npmlog": "4.1.2", "request": "2.79.0", "sass-graph": "2.2.4", @@ -9188,7 +8743,7 @@ "dev": true, "requires": { "define-properties": "1.1.2", - "es-abstract": "1.11.0" + "es-abstract": "1.12.0" } }, "object.omit": { @@ -9316,7 +8871,7 @@ "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==", "dev": true, "requires": { - "url-parse": "1.4.0" + "url-parse": "1.4.1" } }, "os-browserify": { @@ -10443,19 +9998,19 @@ "dev": true }, "puppeteer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.4.0.tgz", - "integrity": "sha512-WDnC1FSHTedvRSS8BZB73tPAx2svUCWFdcxVjrybw8pbKOAB1v5S/pW0EamkqQoL1mXiBc+v8lyYjhhzMHIk1Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.5.0.tgz", + "integrity": "sha512-eELwFtFxL+uhmg4jPZOZXzSrPEYy4CaYQNbcchBbfxY+KjMpnv6XGf/aYWaQG49OTpfi2/DMziXtDM8XuJgoUA==", "dev": true, "requires": { "debug": "3.1.0", - "extract-zip": "1.6.6", + "extract-zip": "1.6.7", "https-proxy-agent": "2.2.1", "mime": "2.3.1", "progress": "2.0.0", "proxy-from-env": "1.0.0", "rimraf": "2.6.2", - "ws": "3.3.3" + "ws": "5.2.0" }, "dependencies": { "debug": { @@ -10472,6 +10027,15 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz", "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg==", "dev": true + }, + "ws": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.0.tgz", + "integrity": "sha512-c18dMeW+PEQdDFzkhDsnBAlS4Z8KGStBQQUcQ5mf7Nf689jyGk0594L+i9RaQuf4gog6SvWLJorz2NfSaqxZ7w==", + "dev": true, + "requires": { + "async-limiter": "1.0.0" + } } } }, @@ -11103,9 +10667,9 @@ } }, "rxjs": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.1.0.tgz", - "integrity": "sha512-lMZdl6xbHJCSb5lmnb6nOhsoBVCyoDC5LDJQK9WWyq+tsI7KnlDIZ0r0AZAlBpRPLbwQA9kzSBAZwNIZEZ+hcw==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.1.tgz", + "integrity": "sha512-OwMxHxmnmHTUpgO+V7dZChf3Tixf4ih95cmXjzzadULziVl/FKhHScGLj4goEw9weePVOH2Q0+GcCBUhKCZc/g==", "requires": { "tslib": "1.9.1" } @@ -11189,9 +10753,9 @@ } }, "sass-loader": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.1.tgz", - "integrity": "sha512-MeVVJFejJELlAbA7jrRchi88PGP6U9yIfqyiG+bBC4a9s2PX+ulJB9h8bbEohtPBfZmlLhNZ0opQM9hovRXvlw==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.0.3.tgz", + "integrity": "sha512-iaSFtQcGo4SSgDw5Aes5p4VTrA5jCGSA7sGmhPIcOloBlgI1VktM2MUrk2IHHjbNagckXlPz+HWq1vAAPrcYxA==", "dev": true, "requires": { "clone-deep": "2.0.2", @@ -11758,7 +11322,7 @@ "faye-websocket": "0.11.1", "inherits": "2.0.3", "json3": "3.3.2", - "url-parse": "1.4.0" + "url-parse": "1.4.1" }, "dependencies": { "faye-websocket": { @@ -12021,9 +11585,9 @@ } }, "stream-http": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz", - "integrity": "sha512-QllfrBhqF1DPcz46WxKTs6Mz1Bpc+8Qm6vbqOpVav5odAXwbyzwnEczoWqtxrsmlO+cJqtPrp/8gWKWjaKLLlA==", + "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", @@ -12119,8 +11683,7 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==", - "dev": true, - "optional": true + "dev": true }, "strip-ansi": { "version": "3.0.1", @@ -12559,9 +12122,9 @@ } }, "stylelint-scss": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.1.0.tgz", - "integrity": "sha512-R8M4j4MBpqE3ZHy26pdb3OkuunGZ6KZ1eBacobByMOqcAB+HfXqNhO+AcE73eWbyWoTOE/rzOThgWJGOHbWCRw==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.1.3.tgz", + "integrity": "sha512-a2MPkpQrbRVHu6+Wbk5w/CQKUtAgRikk0shSmiO8eMcHu8rPMqbJTkraBu0Tpo7C6bs2I8cnlB1p+AivnPuWbw==", "dev": true, "requires": { "lodash": "4.17.10", @@ -12941,9 +12504,9 @@ } }, "ts-node": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-6.0.3.tgz", - "integrity": "sha512-ARaOMNFEPKg2ZuC1qJddFvHxHNFVckR0g9xLxMIoMqSSIkDc8iS4/LoV53EdDWWNq2FGwqcEf0bVVGJIWpsznw==", + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-6.0.5.tgz", + "integrity": "sha512-iNhWu2hli9/1p9PGLJ/4OZS+NR0IVEVk63KCrH3qa7jJZxXa+oPheBj5JyM8tuQM9RkBpw1PrNUEUPJR9wTGDw==", "dev": true, "requires": { "arrify": "1.0.1", @@ -12976,9 +12539,9 @@ } }, "tsickle": { - "version": "0.27.5", - "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.27.5.tgz", - "integrity": "sha512-NP+CjM1EXza/M8mOXBLH3vkFEJiu1zfEAlC5WdJxHPn8l96QPz5eooP6uAgYtw1CcKfuSyIiheNUdKxtDWCNeg==", + "version": "0.29.0", + "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.29.0.tgz", + "integrity": "sha512-JpID0Lv8/irRtPmqJJxb5fCwfZhjZeKmav9Zna7UjqVuJoSbI49Wue/c2PPybX1SbRrjl7bbI/JsCl0dSUJygA==", "dev": true, "requires": { "minimist": "1.2.0", @@ -13109,9 +12672,9 @@ "dev": true }, "uglify-js": { - "version": "3.3.25", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz", - "integrity": "sha512-hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA==", + "version": "3.3.28", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.28.tgz", + "integrity": "sha512-68Rc/aA6cswiaQ5SrE979UJcXX+ADA1z33/ZsPd+fbAiVdjZ16OXdbtGO+rJUUBgK6qdf3SOPhQf3K/ybF5Miw==", "dev": true, "requires": { "commander": "2.15.1", @@ -13439,9 +13002,9 @@ } }, "url-parse": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", - "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz", + "integrity": "sha512-x95Td74QcvICAA0+qERaVkRpTGKyBHHYdwL2LXZm5t/gBtCB9KQSO/0zQgSTYEV1p0WcvSg79TLNPSvd5IDJMQ==", "dev": true, "requires": { "querystringify": "2.0.0", @@ -13716,7 +13279,7 @@ "@webassemblyjs/ast": "1.4.3", "@webassemblyjs/wasm-edit": "1.4.3", "@webassemblyjs/wasm-parser": "1.4.3", - "acorn": "5.5.3", + "acorn": "5.7.1", "acorn-dynamic-import": "3.0.0", "ajv": "6.4.0", "ajv-keywords": "3.2.0", @@ -13960,9 +13523,9 @@ } }, "webpack-merge": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.2.tgz", - "integrity": "sha512-/0QYwW/H1N/CdXYA2PNPVbsxO3u2Fpz34vs72xm03SRfg6bMNGfMJIQEpQjKRvkG2JvT6oRJFpDtSrwbX8Jzvw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz", + "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==", "dev": true, "requires": { "lodash": "4.17.10" @@ -14001,7 +13564,7 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.12", + "http-parser-js": "0.4.13", "websocket-extensions": "0.1.3" } }, diff --git a/package.json b/package.json index 6ed8e543b..b9b38177c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,15 @@ { - "name": "ng-x-rocket", - "version": "1.0.0", - "private": true, + "name": "mifosx-web-app", + "version": "0.0.0", + "description": "MifosX Web App is the default web application built on top of the Fineract platform for the Mifos user community leveraging the popular Angular framework.", + "keywords": [ + "mifos", + "openmf", + "fineract", + "angular" + ], + "homepage": "https://github.com/openMF/web-app", + "license": "MPL-2.0", "scripts": { "ng": "ng", "build": "npm run env -s && ng build --prod", @@ -13,68 +21,73 @@ "e2e": "npm run env -s && ng e2e", "translations:extract": "ngx-translate-extract --input ./src --output ./src/translations/template.json --format=json --clean -sort --marker extract", "docs": "hads ./docs -o", - "env": "ngx-scripts env npm_package_version", - "generate": "ng generate" + "env": "ngx-scripts env npm_package_version" }, "dependencies": { - "@angular/animations": "^6.0.3", - "@angular/cdk": "^6.1.0", - "@angular/common": "^6.0.1", - "@angular/compiler": "^6.0.1", - "@angular/core": "^6.0.1", - "@angular/forms": "^6.0.1", - "@angular/http": "^6.0.1", - "@angular/material": "^6.1.0", - "@angular/platform-browser": "^6.0.1", - "@angular/platform-browser-dynamic": "^6.0.1", - "@angular/router": "^6.0.1", - "@angular/service-worker": "^6.0.1", - "@fortawesome/fontawesome-free-webfonts": "^1.0.9", - "@ng-bootstrap/ng-bootstrap": "^2.0.0", - "@ngx-translate/core": "^10.0.1", - "@swimlane/ngx-charts": "^8.0.2", + "@angular/animations": "^6.0.6", + "@angular/cdk": "^6.3.0", + "@angular/common": "^6.0.3", + "@angular/compiler": "^6.0.6", + "@angular/core": "^6.0.6", + "@angular/flex-layout": "^6.0.0-beta.15", + "@angular/forms": "^6.0.3", + "@angular/http": "^6.0.3", + "@angular/material": "^6.2.1", + "@angular/platform-browser": "^6.0.6", + "@angular/platform-browser-dynamic": "^6.0.6", + "@angular/router": "^6.0.6", + "@angular/service-worker": "^6.0.6", + "@ngx-translate/core": "^10.0.2", + "@swimlane/ngx-charts": "^8.1.0", "angular-archwizard": "^3.0.0", - "bootstrap": "^4.1.1", - "core-js": "^2.5.6", + "core-js": "^2.5.7", "hammerjs": "^2.0.8", - "jquery": "^3.3.1", "lodash": "^4.17.10", - "ngx-bootstrap": "^3.0.0", - "rxjs": "^6.1.0", + "rxjs": "^6.2.1", "zone.js": "^0.8.26" }, "devDependencies": { - "@angular-devkit/build-angular": "~0.6.0", - "@angular/cli": "~6.0.1", - "@angular/compiler-cli": "^6.0.1", - "@angular/language-service": "^6.0.1", + "@angular-devkit/build-angular": "~0.6.6", + "@angular/cli": "~6.0.7", + "@angular/compiler-cli": "^6.0.6", + "@angular/language-service": "^6.0.6", "@biesbjerg/ngx-translate-extract": "^2.3.4", "@ngx-rocket/scripts": "^2.1.0", - "@types/jasmine": "^2.8.7", - "@types/jasminewd2": "^2.0.2", - "@types/jquery": "^3.3.2", - "@types/lodash": "^4.14.108", - "@types/node": "^8.10.13", + "@types/jasmine": "^2.8.8", + "@types/jasminewd2": "^2.0.3", + "@types/lodash": "^4.14.110", + "@types/node": "^8.10.20", "codelyzer": "^4.3.0", "hads": "^1.3.4", "htmlhint": "^0.9.13", "https-proxy-agent": "^2.0.0", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "^4.1.0", - "karma": "~2.0.0", + "karma": "^2.0.4", "karma-chrome-launcher": "^2.2.0", "karma-cli": "~1.0.1", "karma-coverage-istanbul-reporter": "^1.2.1", "karma-jasmine": "^1.1.2", "karma-junit-reporter": "^1.2.0", "protractor": "~5.3.0", - "puppeteer": "^1.4.0", + "puppeteer": "^1.5.0", "stylelint": "~9.2.0", "stylelint-config-recommended-scss": "~3.2.0", "stylelint-config-standard": "~18.2.0", - "stylelint-scss": "~3.1.0", - "ts-node": "~6.0.3", + "stylelint-scss": "^3.1.3", + "ts-node": "^6.0.5", "tslint": "~5.10.0", "typescript": "~2.7.2" + }, + "repository": { + "type": "git", + "url": "https://github.com/openMF/web-app.git" + }, + "bugs": { + "url": "https://github.com/openMF/web-app/issues" + }, + "engines": { + "node": ">= 8.0.0", + "npm": ">= 5.0.0" } } diff --git a/src/app/about/about-routing.module.ts b/src/app/about/about-routing.module.ts index 5cf7a3aa0..a799c3557 100644 --- a/src/app/about/about-routing.module.ts +++ b/src/app/about/about-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { AboutComponent } from './about.component'; const routes: Routes = [ diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index 9bf8421f8..218a47539 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; -import { environment } from '@env/environment'; +import { environment } from '../../environments/environment'; @Component({ selector: 'app-about', diff --git a/src/app/accounting/accounting-routing.module.ts b/src/app/accounting/accounting-routing.module.ts index 93a09454f..ee1328f14 100644 --- a/src/app/accounting/accounting-routing.module.ts +++ b/src/app/accounting/accounting-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { AccountingComponent } from './accounting.component'; const routes: Routes = [ diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 8f659a213..83822d620 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -5,9 +5,8 @@ import { TranslateService } from '@ngx-translate/core'; import { merge } from 'rxjs'; import { filter, map, mergeMap } from 'rxjs/operators'; -import { environment } from '@env/environment'; -import { Logger, I18nService } from '@app/core'; -import * as $ from 'jquery'; +import { environment } from '../environments/environment'; +import { Logger, I18nService } from '../app/core'; const log = new Logger('App'); @Component({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4c0137f8b..7c307b51b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,13 +4,11 @@ import { FormsModule } from '@angular/forms'; import { HttpClientModule } from '@angular/common/http'; import { ServiceWorkerModule } from '@angular/service-worker'; import { TranslateModule } from '@ngx-translate/core'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; -import { AlertModule } from 'ngx-bootstrap'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { environment } from '@env/environment'; -import { CoreModule } from '@app/core'; -import { SharedModule } from '@app/shared'; +import { environment } from '../environments/environment'; +import { CoreModule } from '../app/core'; +import { SharedModule } from '../app/shared'; import { HomeModule } from './home/home.module'; import { AboutModule } from './about/about.module'; import { ClientsModule} from './clients/clients.module'; @@ -28,8 +26,6 @@ import { SelfServiceModule } from './self-service/self-service.module'; FormsModule, HttpClientModule, TranslateModule.forRoot(), - NgbModule.forRoot(), - AlertModule.forRoot(), NgxChartsModule, CoreModule, SharedModule, diff --git a/src/app/clients/clients-routing.module.ts b/src/app/clients/clients-routing.module.ts index 8fe176c62..ea03b4ac3 100644 --- a/src/app/clients/clients-routing.module.ts +++ b/src/app/clients/clients-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { ClientsComponent } from './clients.component'; import { CreateClientComponent} from './create-client/create-client.component'; import { ViewClientComponent } from './view-client/view-client.component'; diff --git a/src/app/clients/clients.component.ts b/src/app/clients/clients.component.ts index 1f31beda7..23ee657aa 100644 --- a/src/app/clients/clients.component.ts +++ b/src/app/clients/clients.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { environment } from '@env/environment'; +import { environment } from '../../environments/environment'; import { HeaderComponent } from '../core/shell/header/header.component'; diff --git a/src/app/clients/clients.module.ts b/src/app/clients/clients.module.ts index b649fe181..2e1919a9d 100644 --- a/src/app/clients/clients.module.ts +++ b/src/app/clients/clients.module.ts @@ -1,7 +1,6 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ArchwizardModule } from 'angular-archwizard'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ClientsComponent } from './clients.component'; import { CreateClientComponent} from './create-client/create-client.component'; @@ -15,9 +14,7 @@ import { ViewLoanComponent } from './view-loan/view-loan.component'; CoreModule, CommonModule, ClientsRoutingModule, - ArchwizardModule, - NgbModule - + ArchwizardModule ], declarations: [ ClientsComponent, diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts index a3e1cf5af..d7bb5c983 100644 --- a/src/app/core/core.module.ts +++ b/src/app/core/core.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule } from '@angular/common/http'; import { RouteReuseStrategy, RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ShellComponent } from './shell/shell.component'; import { HeaderComponent } from './shell/header/header.component'; @@ -22,7 +21,6 @@ import { CacheInterceptor } from './http/cache.interceptor'; CommonModule, HttpClientModule, TranslateModule, - NgbModule, RouterModule ], diff --git a/src/app/core/http/api-prefix.interceptor.ts b/src/app/core/http/api-prefix.interceptor.ts index 8b3499904..7b0d19f5f 100644 --- a/src/app/core/http/api-prefix.interceptor.ts +++ b/src/app/core/http/api-prefix.interceptor.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { environment } from '@env/environment'; +import { environment } from '../../../environments/environment'; /** * Prefixes all requests with `environment.serverUrl`. diff --git a/src/app/core/http/error-handler.interceptor.ts b/src/app/core/http/error-handler.interceptor.ts index 252722338..733fd970b 100644 --- a/src/app/core/http/error-handler.interceptor.ts +++ b/src/app/core/http/error-handler.interceptor.ts @@ -3,7 +3,7 @@ import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest } from '@angular/c import { Observable } from 'rxjs'; import { catchError } from 'rxjs/operators'; -import { environment } from '@env/environment'; +import { environment } from '../../../environments/environment'; import { Logger } from '../logger.service'; const log = new Logger('ErrorHandlerInterceptor'); diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 8e329fad9..03c994fd1 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { HomeComponent } from './home.component'; import { DashboardComponent } from './dashboard/dashboard.component'; diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index 5366024f6..f810ce91d 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -3,8 +3,8 @@ import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; import { NgxChartsModule } from '@swimlane/ngx-charts'; -import { CoreModule } from '@app/core'; -import { SharedModule } from '@app/shared'; +import { CoreModule } from '../../app/core'; +import { SharedModule } from '../../app/shared'; import { HomeRoutingModule } from './home-routing.module'; import { HomeComponent } from './home.component'; import { QuoteService } from './quote.service'; diff --git a/src/app/login/login-routing.module.ts b/src/app/login/login-routing.module.ts index 24b872618..289fb14f1 100644 --- a/src/app/login/login-routing.module.ts +++ b/src/app/login/login-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { extract } from '@app/core'; +import { extract } from '../../app/core'; import { LoginComponent } from './login.component'; const routes: Routes = [ diff --git a/src/app/login/login.component.scss b/src/app/login/login.component.scss index a682adf83..5803df952 100644 --- a/src/app/login/login.component.scss +++ b/src/app/login/login.component.scss @@ -1,29 +1,29 @@ -@import "../../theme/theme-variables"; -@import "~bootstrap/scss/mixins/_breakpoints"; +// @import "../../theme/theme-variables"; +// @import "~bootstrap/scss/mixins/_breakpoints"; -.login-container { - position: absolute; - top: 0; - bottom: 0; - left: 0; - right: 0; -} +// .login-container { +// position: absolute; +// top: 0; +// bottom: 0; +// left: 0; +// right: 0; +// } -.login-box { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - width: 100%; - min-height: 100%; -} +// .login-box { +// display: flex; +// flex-direction: column; +// justify-content: center; +// align-items: center; +// width: 100%; +// min-height: 100%; +// } -.ng-invalid.ng-touched:not(form) { - border-left: 4px solid theme-color("danger"); -} +// .ng-invalid.ng-touched:not(form) { +// border-left: 4px solid theme-color("danger"); +// } -@include media-breakpoint-down(xs) { - .container { - width: 100%; - } -} +// @include media-breakpoint-down(xs) { +// .container { +// width: 100%; +// } +// } diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts index 83d03a354..affb32861 100644 --- a/src/app/login/login.component.ts +++ b/src/app/login/login.component.ts @@ -3,8 +3,8 @@ import { Router } from '@angular/router'; import { FormGroup, FormBuilder, Validators } from '@angular/forms'; import { finalize } from 'rxjs/operators'; -import { environment } from '@env/environment'; -import { Logger, I18nService, AuthenticationService } from '@app/core'; +import { environment } from '../../environments/environment'; +import { Logger, I18nService, AuthenticationService } from '../../app/core'; const log = new Logger('Login'); diff --git a/src/app/login/login.module.ts b/src/app/login/login.module.ts index 803dde1a3..735b340d0 100644 --- a/src/app/login/login.module.ts +++ b/src/app/login/login.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { LoginRoutingModule } from './login-routing.module'; import { LoginComponent } from './login.component'; @@ -12,7 +11,6 @@ import { LoginComponent } from './login.component'; CommonModule, ReactiveFormsModule, TranslateModule, - NgbModule, LoginRoutingModule ], declarations: [ diff --git a/src/app/navigation/navigation-routing.module.ts b/src/app/navigation/navigation-routing.module.ts index 60067e028..8dfe831ec 100644 --- a/src/app/navigation/navigation-routing.module.ts +++ b/src/app/navigation/navigation-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { NavigationComponent } from './navigation.component'; const routes: Routes = [ diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 4ac5be50f..01f184421 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -10,9 +10,9 @@ - - - +
+
+
@@ -85,11 +85,11 @@
- - - +
+
+ Loan - +
@@ -147,9 +147,9 @@
- - - +
+
+

Sed commodo, leo at suscipit dictum, quam est porttitor sapien, eget sodales nibh elit id diam. Nulla facilisi. Donec egestas ligula vitae odio interdum aliquet. Duis lectus turpis, luctus eget tincidunt eu, congue et odio. Duis pharetra et nisl at faucibus. Quisque luctus pulvinar arcu, et molestie lectus ultrices et. Sed @@ -158,7 +158,7 @@ penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris aliquet odio ac lorem aliquet ultricies in eget neque. Phasellus nec tortor vel tellus pulvinar feugiat.

 - - +
+
diff --git a/src/app/navigation/navigation.module.ts b/src/app/navigation/navigation.module.ts index a2b6d308d..48c074dc3 100644 --- a/src/app/navigation/navigation.module.ts +++ b/src/app/navigation/navigation.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { CoreModule } from '../core/core.module'; import { NavigationComponent } from './navigation.component'; @@ -11,7 +10,6 @@ import { NavigationRoutingModule } from './navigation-routing.module'; imports: [ CoreModule, CommonModule, - NgbModule, NavigationRoutingModule ], declarations: [NavigationComponent] diff --git a/src/app/self-service/create-user/create-user.component.html b/src/app/self-service/create-user/create-user.component.html index 2d589b5f2..bb34ec742 100644 --- a/src/app/self-service/create-user/create-user.component.html +++ b/src/app/self-service/create-user/create-user.component.html @@ -9,17 +9,17 @@
- +
- +
-
+
diff --git a/src/app/self-service/self-service-routing.module.ts b/src/app/self-service/self-service-routing.module.ts index 7847ac191..15f704bd8 100644 --- a/src/app/self-service/self-service-routing.module.ts +++ b/src/app/self-service/self-service-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { Route, extract } from '@app/core'; +import { Route, extract } from '../../app/core'; import { UserManagementComponent } from './user-management/user-management.component'; import { CreateUserComponent } from './create-user/create-user.component'; import { ViewUserComponent } from './view-user/view-user.component'; diff --git a/src/app/self-service/self-service.module.ts b/src/app/self-service/self-service.module.ts index a3da8f512..5d69bae3e 100644 --- a/src/app/self-service/self-service.module.ts +++ b/src/app/self-service/self-service.module.ts @@ -1,11 +1,9 @@ import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; - import { UserManagementComponent } from './user-management/user-management.component'; import { SelfServiceRoutingModule } from './self-service-routing.module'; -import { CoreModule } from '@app/core'; +import { CoreModule } from '../../app/core'; import { CreateUserComponent } from './create-user/create-user.component'; import { ViewUserComponent } from './view-user/view-user.component'; @@ -13,8 +11,7 @@ import { ViewUserComponent } from './view-user/view-user.component'; imports: [ CommonModule, CoreModule, - SelfServiceRoutingModule, - NgbModule + SelfServiceRoutingModule ], declarations: [ UserManagementComponent, diff --git a/src/app/self-service/user-management/user-management.component.html b/src/app/self-service/user-management/user-management.component.html index 7894be377..30373029f 100644 --- a/src/app/self-service/user-management/user-management.component.html +++ b/src/app/self-service/user-management/user-management.component.html @@ -6,11 +6,11 @@
-
+
-
@@ -22,7 +22,7 @@
-
+
@@ -52,7 +52,7 @@
-
@@ -94,7 +94,7 @@ Data Data - + Data Data @@ -108,7 +108,7 @@ Data Data - + Data Data @@ -122,7 +122,7 @@ Data Data - + Data Data @@ -136,7 +136,7 @@ Data Data - + Data Data @@ -150,7 +150,7 @@ Data Data - + Data Data @@ -164,7 +164,7 @@ Data Data - + Data Data @@ -177,6 +177,6 @@
- +
diff --git a/src/apple-touch-icon.png b/src/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c1c0653cf3c0426c5b3f9510f86b1bdd665f021a GIT binary patch literal 1551 zcmXX`2~<-@6n)kW@dQh&Rf&kzDz3D)2C7jM4+b~FB0`%8VnMLq5Wqkp#C-t~!36~+ z#3+%#CqxKHSR#v+AW8{PKaf>W79}Q8t0dM4_IuiU-prkMXSru)&UtD6R3C!9lRW?s zwrute#94;7YP<1xpY+`j1*ZwoUcO!c((_Y4?wN?^<5+<{8{xKc&M-c9^4}h`$tQ06 zr4BzR!^0mE8iCPtxh(*g_b;~lfiwV0{UEjx#INuL7dt-3C0vhd1eWl#Uj80e;F9w5 z-cxdj698(0*aqO1Lh&mo7=r6hAoU&`EQX7J0+SEd)R3nK;UJv83&$!Us{_t8LrxFG zHGrTO%0{5#15|!I-{y}iS)Ejnjp8R?>cG=R;Aw!bhx~p>SA2Fna}Nrh!-ZDJY=Kj? zaBB#1)sWK-#b&tj7hLa!!eKa40XO>K<}*NzaJ&i*m4f7ND0vMj^-%f_q*ln&K{f_= zY;d^~Soy#fK~f3C^5Gx~oT99i6T|T*BP9e^)i*}ol5n#Q#Cj^xP(uwXU-UxfPX>Y7H_YhgBp|eSHJ0dzC8WZ zt8t=2-#jD1dsBRfw^x&6kiR-$vf|SxkH~Xr6GU?APJXH9_79SJgV@z|UC!fuSl9np z_+sCa>$BCa+^|R^_O$uv3z?WzyUuWkDOi)E6)XEKVpjER!$A)pXHyg!p}!FgJuMlmis( zig7t}b7-5guNnJ-tRoaJWS0>GsyNih)Y`p?a(zIRc0RcyqlnYOk7QpZYHA4;Cv{Gw zCWrWR1JNWoI$1hiSDw6|GmBh9N1semr|Gwn?y_lBC1aI^;>F~f^x)W6glJb55j$JC zqsA}Y;9`4RmR0SGIFpalgTLo&dmxf898s8&6+ELmQxd&HpP$S~N|L@r)%muK(@axm z)0b~+7u7f$7LMl)u#0^6vv5Cj{@1)d3YI>2KEuSe$--#05fNm4Smia-fmTCsB3pLf z6kJ7P%hW51ORECQGnn3Wi}4{qPETD{d{n<+}HTQzcrCy8q{ z{Cm#TWEs>-~~j5C>vhx?za!J4g1Bzqx_J&sBV*$0SLN9Qi)w zQlZqDS(j{a%ZOnUvF)MN7nAz`g zu2XH#Svl6_Bp}Gs-z2f7sBUP5*Ij%YQ*>^LPVRkf&Ck~s?D6xQfsG1TlP??=?WWnf zTkb`)8ZvDK!s!feQ-W)F1R~(IQ@Wh3BGMXS2v^6DQS|W*G^i#E_q?mU0r3uYK5!I$DW~ zUFc#_O(>%-cOdL_S?Mh74A)C}Plm2$lC{O6>NbWv_h~&Nl8YU)X>ttb7y`{JnY0e6 z(l%Mdj#k^*<%|@~uzT5RL_lwkLPMD(USWz(toLh;Dt5FY*2|3B8e>?ewEbe&8Eyf6 zsr&Ajgwp-0B^agZ1fN2vb}>f_Qq?H#dN}q6GGEh|(nCevtG(DX(!di{;yiMtQ+%w^ z;kUw&W%>?{BT_&Ne^4~ex`065DmjpD{F(G@%;J&ejHc*_N2%ctir>_U)t!hc^kHU* z(7crGK \ No newline at end of file diff --git a/src/assets/images/chosen-sprite.png b/src/assets/images/chosen-sprite.png deleted file mode 100644 index 113dc9885a6b864ac154b266f024b4597f5c6ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 559 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 diff --git a/src/assets/images/cubic_loader.gif b/src/assets/images/cubic_loader.gif deleted file mode 100644 index ae7cfaa93c4a77ba66762ca91c584eb997b8d28c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7371 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 k@lpqmWD;d)Kin-`gh#^K66+p^jPp4}E!P!vFvP diff --git a/src/assets/images/favicon.ico b/src/assets/images/favicon.ico deleted file mode 100644 index 77eff08e4e9a214e8bf53b3bb27aa0609f5b0c01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmYk0F>3-r5QV?Z8RQ^~R|Qf8j;m50q_XoT_!ImIS_M*xDHH@TAj+ZT3+r;Y z`rcUQU@+*GoFsASS0CDv3&;F!WiHF8G%R73jcFlQG2lk|S%j~mfNd3yHQDJFCUqFe U?)@D+efn0dp1x^DvpS=*XP@asqW}N^ diff --git a/src/assets/images/loader.gif b/src/assets/images/loader.gif deleted file mode 100644 index 32143e10d09922749391942a61acbce3a8c2f8b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 80595 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

BT#zP^ruO%NFpa))*hw=p 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 diff --git a/src/assets/images/logo.jpg b/src/assets/images/logo.jpg deleted file mode 100644 index f1817306d1cc13ea8ab151a27a7a2366adc6a0b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26946 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 \ No newline at end of file diff --git a/src/assets/images/small-loader.gif b/src/assets/images/small-loader.gif deleted file mode 100644 index bee2c431d75817aaf5d8e08fcc9fb590259c99a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5213 zcmbVPc{r5o-ydV&_w3FX$&6)~F*Gxl%vc(0_N}Nf#=ee`B`IXziHL+kwiHU%5D}3? zc3CpEw4g$zcRJ^Ee*N*D_j>z1*K`F7=(=RL{y%2WzH>fGN|{0RRBnl%0tgNS8n%(B2xyLi`CtFA@dhOmg$^ z)dat5c?br1xM+fHRZWyl{B=m~9{4aa$ui8;iWufaM7w~GX@N9CFd;tvJ|qeO6yoFU z8;A+f1QT5RoJknk_{X#o81$zJ#Y+>6{qY0zBd3lZnFLaWsVEYa;c$?e8Vrt9Ra1j2 zfDp=XgpxAtR#Su{F{)}9#8J@S7nqif?Ba^C(AEDt7wt`tNhW0aJFgM(qgDlk8? zn-Uz2M*oO`Kq%5I6azzjDTEM3-$3b~5p+p`M6!oJ#lz1R^dlm{*)NEq38q#0*AjgE z{|W0G2>Ww6FruH2QV79c2@X^Kv811dCMN&4sgKV;)`1iY(tqmxUjqkPh5D0}EJ%TV zL1ZF{W-k3Bl|M#@Od?SH$X0%S-ak<^bN8e81-kqBgLEv_KoDCGUl+gNK!;S{11ZhwCBGx=5rRQbkXh209$2qW9BR*N+(F zL-M8k^mX}%;qZZ#Um; ztgo%EP?ujXEiTNznwy=Oo|>E(e>pb#V&wVov!TJK1N~3>dLQ?6KkDl2c-Y?7+S1(g zpz;2_hWfg@cWQ6fR9972+$t|Cy?LXgxafM}wSxSsdAV0|vM*<4W~8U3rX(jNCd9|Z z#$1YyioAFs;(YkIu+Wg;vq6+Va)7^|uaCEvr-!?nE6IiEOgMAe$??=l2YWkP8*3{| z3v;s*rY6Qlh6ecK`g*!LIIQ+DElmw|3>tM*O%AOwZa zy)1lLc4U=BD4;L6?&UI_T?1-lFE2pY9>=zLKVihqzHXDPQ%>1m9w(OH$ljWgX{Y@ z(#Zy&PpRPPfc(h`U!an2O37fp)hch=MIoMpJ!k(%GRRC&6fk5kP4c|%`SouZUCKjO z(!1+e?jZaNqg8mVxrSHCbjC1~y7chQOtvGscP!dpKY3AlUy+?CR}uN_)<~&wKIS}| zYUOB!RaF<{zXFz_P8iVaGyL%y?pdM98m~o~D$ZU!yp{9H zY8T(CaF_mS@R;6-F|zenRAYBiMa$*DSeLk1=36~(`nRGVU~}B~Ao`1zYK!%%e4lf% zk8D4;T#(ap3c8)HndL2|Ft|56Qa!}uuGFj`Hy?qMNE>Rk zX^meVDeE>@c<9OQ z5&R?TTC?Tm7-#OHd=~5_@9yo=n`+~H&WCM?$%oFpcPYS*LhY{Pw%Og=t55MXsEz|h ztz9{s{4&J6?W$&yTFulw@9F0A>_>0UG*ONV{1@00Kr8?dL*4OLT1C;rz)r`mPuqfG z_((V}{vap$6+dtGTtON&GAB#w-YI5OZqJjEku4Vv0k0)N)JNUJq7(f_Qz>qZM-Rnj z^a2}WWXSqmB&oBN=Vj$1-qC@b*`$`jsUDYf{81u0ClpP%KB<^0BZdoz*QN z%TFAgC^wHzQN315g6K|kw%4A!eURGbbh>LA1yMcL{buqP>^G*`k{WSzzb7iVPO%0O z2%rY)bN2t-bWrip7Y>R$+WIY7)Meyxbt})%Ys7vLGznK_1cLNe-v1+y#T$o>M%BrB)vE7Q%F6vA1!7!EIzL`ay9Yifr=$zOxHgEsC+McrLTHa5!|5Rb9D$_RPs7L`&F?L$Y^VW8T+g;^98RwA!Z`_bKNA zad?~K{xri7AGFO*agKsMKA9X)J{QrvB2jBrDn>46jY`Q(pknhAJ$8@qSa!x179!Zx zjc?ebO=rbd?=PRE)*3x>aQ1{Dkbrm7DLk|O_Fn`BZl-MVv&hq>k{wH)XzqXImU7P5M|xc$#r6t_^B+b zcff)hDUYa3VV-vM{hQtAB0@AbdKZlqVy-CbjH{L1w_dHg!2<5pnZSQ|LE1W!M|X*g z#x;q=Cw$lnuCsX(91xGA$RUUg{Z!%g#AUp}mw>TK_~UbY*6RRwwe~bQOkJ9q=c5;Euco$zarieiNT3*B?Mi$J1{4WNyjxiO-=tNFKpyk%mh| znHYS4wq8DjElD({e?n@$JMnNYWEoSo=Ej%a9}zj<*D3W5T3C)4oWY_mzEH1lOlC8Y z$~GKM^Q#0R*FP))!Itfne@hOH_Fj#@t2(~?3|-=oErn4(K|uR;ot+4+Sr}OQfJ;ZF zBZPv?#zgW9$Jo^Z9|h&99!`p_vHbiohI#3R z0*`uaY~4fdvD|p@n4;eVr-q2Yb?)cU3GIn2jF$4L0LydgWSY&dj<|?Mt+0WOMqI>3 zZlL$s!=I~f@GT`h-$mS$U$|+kTR@mZ2&Qnf5g#Wv1c}SnYetG1I~9t-=u(HK+qkxu z&SyR~UzsbOGXK8#^zK*0E2X$LZd7%idc5)zZ4MpR^x;EB3D_`SyAMm*%#1g!+}M?N zvAcjF-E?Dz3;|&6(vb`~JqWH`jz>nj-N`0Okco#!8u==`c$;)cO6}CegTu|{)<)bO zfK_O}yKHHhb5y4KVg5Db88~m~B;FKiD97wKe1~v$?a42yWBdDxFTm2Fz~CqREbRPA zbcaeGrA1OkyI_*Z0KCX-C(5l;(lI=0o<9y%`@+bbZeIas=W%TrD+?Yj6Dewt38R9K zub4oQeUx#&#vS@y9^3BBTg6vga=eV<_01{1s?Ib*+vO%iJ&a5P$LtFU^cQ{H->f693{rLt~q@W?3_f*)eE|89dcioY^2=ibFq?c)PRmLXimC7pFh48t$-i8Y=YBPde~+_VVoBc_z-JE8ed$E_`o z67fUOeF0As3AC!_B2I9|+)Sh9Q$5wq+txGZB`o}}4u&Qt?6-ecPGE-^{DkBq0e~ot z)7aZfoDm%bcVwl2jB$&62Ayb<;mX3139Qfvcr1^|b!}==(R~#dy8d2R;jDF!^{k+R zSM6z^IT3&4rK}z%*Y2Y+#lfp1fsZ0nzz}AP`=bVlfjxM zh+@8(Ifl)?XKT4;{Do5rs=)Q4!mGV#@2lgi*6e0YJHFXiiTn6NmxtVpY)Vd7&mBa0 zY?lM@+Pv(lc*CP$Lml>uEX|p?t_fJOuk_`?DEA}*TttyJ(|FKlQQ#=iLkr@x#3G-o{k3F`) z^PV0N67_m>_nc(*K=C|iP$X5i5`0p_iPL`b;-pm+x4Uex_nViCOL0hvxVn&wJ9$Uo zS(n{|wtPrueTdS^eR_^}GzZmd{K+G3nBJLp%Y5PANohW`Kk>5@j5=pJ8h+SvzdDSZ^*=$8$XN&f2X! z-NWdfs62;@E}z#wW252f{V_7_p*xr641Cm65^5`7co)8VW(5+BmA9Gpi3pK z1b)wSVHqC|NM*G0iDBXN0?FAr4=WLrZSd`GtI`f9KB3&aQX8@z>hvx=G_W4gvMcaX?gU z)3m69LZu=Fl_wB9As(WtLR5e#AL0S=z(b@;rAP=Q8i6Vy9w@D#YD)tMse~$tO6A0{ zYsYP}{)p}MdcWr59v)_P?NlIDZC<#$qq#fx+;-Mf8S$A9^+8)5V4JEHk%-j%jR&@VR~bllW(4+z0v+F4xiGm zX=pyQa}nVv&q`75JAUXm*=&}@aGvSPSxy{0!HJ0zTv|TMGV}E0vm8Ho94W}X1e_8P zaX)nUPw_E?FP8htxCNK1!92Y#tk;&iCL6U`{J|PqK(5E7d{dcstM7iECmDA|Bm*1< zvLA#1zRR~5L-GT8-f7P>l!1%`^~SZXQM0*-r9oSv1{AzJ^x+ZnV;49)JNNeQ2Zu_# zK`;V{klX~3#E%FFfDw`pgi*-&sr@VsFEO(+!|K%q%Gn+UJ)wCugohIV^V659)~>Q1 zDp%VLmUaiAK*&)S$PNsac6*+SBSPviadusw)NL|X02^CsrUn7%CFR-^t^Z2XYmaYU z_q+I0f&IWLIX4XoBf_7~ue~qcKXKoXQEdfh;V;Bdz;fTm*}eAw#w1nS3N3N0^bZcR|Lp^;ge%~I9DsZthI0_+w*wg& zhk=8j4QMps?TwUy1umIR{E`B2j3A!rtV zog@v_Em+%vr7hUB+W^*p#cJ~W-6{lO>h*b^Hys8*a3r}zp|8Kl1D}1E!}mNuEIwD3 zR&i1rP17Kb!(9{iaNE|M;6nsdHWDW*@iu_v2`9v9D@S1a&UPa76Z8HlrVZqSZKkU zt569*cfp?e7~kvvA;6}A#PQA)xQ@$GyMRV5G!8iP)*=&oM{!+)V}wH1p^!C1L4%F8 zRrZwk^7zWPxpn1M$b%h$nhO;luH;}j13?MgqRU4sxAV=dA93gHhXJBQgd&JBT@gA) zi2Dz6dG>F3J-et>Eu)$3aTHu5j12YD*Wb^TwKn$_2N|E+%WG#};g!-W%#<(EwgH}T zaYK*McW&WW7>__bhDsxhJupG8&`Z|yFeD|K05D0N z8-eEZzsddUH07wq#_L&jsc^r6OAGT{92{fc{l`$NsI}a2$DL#{8Mc}MS68<%j!SjC*W-_==8mwcs0Z6I=Hm))J!n3#=>$JiE$M^AlpN8*qb3V_$ zp&tHl`tKas{}5J{bLY-duh$7RL$e*=x*mQuOFknwSb``-t)*Bj5=Sv%9Ffgt85`S= z)g26Uwx8hT7cm>_1VKnJJBQ=@7~jXq`WQb$e|ePA+6-1dgSE=k)Dh~fn6-MuX0=Mb zPy{T^dY#^$3`4tesbmyYC5l2?%~ryoCL4tS$Kp7C)!NR6kKeTMqqISe7AFe zNm2+(5Gu{kCg9Um1UP!vk!=8b_UvV}JlZwtoRp22j)YK!C`xkQVTF_#YZWAUCL*|w z(*+vDmc`X3VH79xtkRP)lm`=mnhxBK4mtvQ@r6Hrr%>pbEEMvSy@kSLv9~b!^JkuZ zI$6Y`HgRls2u~1xbL!V8OG5*brP9FUaA{!j=G{Y+7v6a72d*(_tf&Rg*lrbUi_j(# zPoftddE}7`s(Lmp4Mar7$Hy@f v6@lA3Z0~3-;EfyhZumjlhkiBtzX$LiMw8pKLp$Ub00000NkvXXu0mjf+#$Ag diff --git a/src/assets/ngx-rocket-logo.png b/src/assets/ngx-rocket-logo.png deleted file mode 100644 index 4f17d9584a7b26977cacd5296b8040f7fa45d1e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17141 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 OkCB0ievzI-#Qy`hVh^hT diff --git a/src/styles/_loader.scss b/src/assets/styles/_loader.scss similarity index 87% rename from src/styles/_loader.scss rename to src/assets/styles/_loader.scss index f8c16cb92..9ccddaeb7 100644 --- a/src/styles/_loader.scss +++ b/src/assets/styles/_loader.scss @@ -1,49 +1,48 @@ .wrapper { - margin: 50px auto; - height: 250px; - width: 240px; - position: relative; - - .triangle { + margin: 50px auto; + height: 250px; + width: 240px; + position: relative; + + .triangle { width: 0; height: 0; border-style: solid; position: absolute; animation: rotate 0.7s infinite 1s; } - + .bottom { border-width: 0 100px 100px 100px; border-color: transparent transparent #1fb050 transparent; bottom: 10px; left: calc(50% - 100px); } - + .top { border-width: 100px 100px 0 100px; border-color: #b4d575 transparent transparent transparent; top: 10px; left: calc(50% - 100px); } - + .left { border-width: 100px 0 100px 100px; border-color: transparent transparent transparent #1074b9; top: calc(50% - 100px); left: 10px; } - + .right { border-width: 100px 100px 100px 0; border-color: transparent #1daeec transparent transparent; top: calc(50% - 100px); right: 10px; } - + @keyframes rotate { from { transform: rotate(0deg); } to { transform: rotate(360deg); } - } } - - \ No newline at end of file + +} diff --git a/src/environments/.env.ts b/src/environments/.env.ts index a6047f93a..6256dff56 100644 --- a/src/environments/.env.ts +++ b/src/environments/.env.ts @@ -1,3 +1,3 @@ export default { - 'npm_package_version': '1.0.0' + 'npm_package_version': '0.0.0' }; diff --git a/src/index.html b/src/index.html index e95a2c047..527e89ec3 100644 --- a/src/index.html +++ b/src/index.html @@ -4,27 +4,40 @@ MifosX - - - + + + + - + + + + + +

This page requires JavaScript to work properly. Please enable JavaScript in your browser.

- - + + + + Loading... + diff --git a/src/main.scss b/src/main.scss index 1e5d422d4..9e8376d29 100644 --- a/src/main.scss +++ b/src/main.scss @@ -3,20 +3,8 @@ * Component-specific style should not go here and be included directly as part of the components. */ - // Theme customization -@import "styles/bootstrap-material/_variables.scss"; -@import "~bootstrap/scss/bootstrap"; -@import "styles/bootstrap-material/_bootswatch.scss"; - -// Theme variables, must be included before the libraries to allow overriding defaults -@import "theme/theme-variables"; // 3rd party libraries -@import "~@fortawesome/fontawesome-free-webfonts/scss/fontawesome.scss"; -@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-brands.scss"; -@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-regular.scss"; -@import "~@fortawesome/fontawesome-free-webfonts/scss/fa-solid.scss"; -//other scss imports -@import "styles/_loader.scss" +// Other imports diff --git a/src/main.ts b/src/main.ts index d511e4a6c..63060767f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,8 +7,8 @@ import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { AppModule } from '@app/app.module'; -import { environment } from '@env/environment'; +import { AppModule } from './app/app.module'; +import { environment } from './environments/environment'; if (environment.production) { enableProdMode(); diff --git a/src/manifest.json b/src/manifest.json index 5e0fd639c..1cc01cd43 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,14 +1,17 @@ { - "name": "MifosX", - "short_name": "Mifosx", - "theme_color": "#488aff", - "background_color": "#488aff", - "scope": "/", + "short_name": "MifosX", + "name": "MifosX Web App", "start_url": "/", + "scope": "/", + "theme_color": "#fff", + "background_color": "#fff", "display": "standalone", - "icons": [{ - "src": "assets/ngx-rocket-logo.png", - "sizes": "512x512", - "type": "image/png" - }], + "description": "MifosX Web App is the default web application built on top of the Fineract platform for the Mifos user community leveraging the popular Angular framework.", + "icons": [ + { + "src": "assets/images/MifosX_logo.png", + "sizes": "182x184", + "type": "image/png" + } + ] } diff --git a/src/styles/bootstrap-material/_bootswatch.scss b/src/styles/bootstrap-material/_bootswatch.scss deleted file mode 100644 index bab08601e..000000000 --- a/src/styles/bootstrap-material/_bootswatch.scss +++ /dev/null @@ -1,666 +0,0 @@ -// Materia 4.1.1 -// Bootswatch - - -// Variables =================================================================== - -$web-font-path: "https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" !default; -@import url($web-font-path); - -// Effects ===================================================================== - -@mixin ripple($color){ - position: relative; - - &:after { - content: ""; - display: block; - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - margin-left: 0; - @include gradient-radial($color 10%, transparent 10.01%); - background-size: 1000% 1000%; - background-position: 50%; - border: none; - opacity: 0; - pointer-events: none; - transition: background .5s, opacity 1s; - } - - &:active:after { - background-size: 0 0; - opacity: .2; - transition: 0s; - } - - &.disabled, - &[disabled] { - &:after { - display: none; - } - } -} - -// Navbar ====================================================================== - -.navbar { - border: none; - box-shadow: 0 1px 2px rgba(0,0,0,.3); - - &-brand { - font-size: 24px; - } - - &-nav .nav-link { - padding-top: 0.9rem; - padding-bottom: 0.9rem; - } - - &.bg-dark, - &.bg-primary { - - input[type=text], - input[type=password] { - color: #fff; - box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5); - - &:focus { - box-shadow: inset 0 -2px 0 #fff; - } - - &::placeholder { - color: rgba(255, 255, 255, 0.5); - } - } - } -} - -// Buttons ===================================================================== - -@mixin btn($class,$bg,$color){ - .btn-#{$class} { - &:focus { - background-color: $bg; - box-shadow: 0 0 0 2px rgba(204, 204, 204, 0.5); - } - - &:hover, - &:active:hover { - background-color: darken($bg, 6%); - } - - &:active { - box-shadow: 2px 2px 4px rgba(0,0,0,.4); - } - - @include ripple($color); - } - - .btn-outline-#{$class} { - @include ripple($color); - } -} - -@include btn(primary,$primary,$white); -@include btn(secondary,$secondary,$gray-500); -@include btn(success,$success,$white); -@include btn(info,$info,$white); -@include btn(warning,$warning,$white); -@include btn(danger,$danger,$white); -@include btn(dark,$dark,$white); -@include btn(light,$light,$white); - -.btn { - text-transform: uppercase; - border: none; - box-shadow: 0 1px 4px rgba(0,0,0,.4); - transition: all 0.4s; - - &-link { - box-shadow: none; - color: $link-color; - - &:hover, - &:focus { - box-shadow: none; - color: $link-hover-color; - text-decoration: $link-hover-decoration; - } - - &.disabled, // Although btn-link is intended for buttons, which want to look like link, I include here a.disable for the sake of consistency - &[disabled], - fieldset[disabled] & { - &:hover, - &:active:hover { - color: $btn-link-disabled-color; - text-decoration: none; - } - } - } - - &-secondary { - &.disabled, - &[disabled], - fieldset[disabled] & { - background-color: rgba(0, 0, 0, 0.1); - color: rgba(0, 0, 0, 0.4); - opacity: 1; - - &:hover, - &:focus { - background-color: rgba(0, 0, 0, 0.1); - } - } - } - - &-outline-secondary { - border-color: $gray-200; - color: $gray-300; - } - - &-warning { - color: $white; - } - - &.dropdown-toggle::before { - display: inline-block; - width: 0; - height: 0; - margin-left: 0.3em; - vertical-align: middle; - content: ""; - border-top: 0.3em solid; - border-right: 0.3em solid transparent; - border-left: 0.3em solid transparent; - } -} - -.btn-group { - .btn + .btn, - .btn + .btn-group, - .btn-group + .btn, - .btn-group + .btn-group { - margin-left: 0; - } - - &-vertical { - > .btn + .btn, - > .btn + .btn-group, - > .btn-group + .btn, - > .btn-group + .btn-group { - margin-top: 0; - } - } -} - -.border-secondary { - border: 1px solid #dfdfdf !important; -} - -// Typography ================================================================== - -body, -input, -button { - -webkit-font-smoothing: antialiased; - letter-spacing: .1px; -} - -p { - margin: 0 0 1em; -} - -a { - transition: all 0.2s; -} - -// Tables ====================================================================== - -.table-hover { - > tbody > tr, - > tbody > tr > th, - > tbody > tr > td { - transition: all 0.2s; - } -} - -.thead-inverse th { - background-color: $primary; - color: $white; -} - -// Forms ======================================================================= - -.col-form-label { - font-size: 16px; - - &-sm { - font-size: $font-size-sm; - } - - &-lg { - font-size: $font-size-lg; - } -} - -textarea, -textarea.form-control, -input.form-control, -input[type=text], -input[type=password], -input[type=email], -input[type=number], -[type=text].form-control, -[type=password].form-control, -[type=email].form-control, -[type=tel].form-control, -[contenteditable].form-control { - font-size: 1rem; - box-shadow: inset 0 -1px 0 #ddd; - transition: all 0.2s; - - &:focus { - box-shadow: inset 0 -2px 0 $primary; - } - - &[disabled], - &[readonly] { - box-shadow: none; - border-bottom: 1px dotted #ddd; - } - - &:not(textarea) { - height: $input-height; - } - - &.form-control { - &-sm { - height: $input-height-sm; - font-size: $font-size-sm; - } - - &-lg { - height: $input-height-lg; - font-size: $font-size-lg; - } - } - - &::-ms-clear { - display: none; - } -} - -select, -select.form-control { - appearance: none; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAAJ1BMVEVmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmaP/QSjAAAADHRSTlMAAgMJC0uWpKa6wMxMdjkoAAAANUlEQVR4AeXJyQEAERAAsNl7Hf3X6xt0QL6JpZWq30pdvdadme+0PMdzvHm8YThHcT1H7K0BtOMDniZhWOgAAAAASUVORK5CYII=); - background-size: 13px; - background-repeat: no-repeat; - background-position: right center; - box-shadow: inset 0 -1px 0 #ddd; - - &::-ms-expand { - display: none; - } - - &.input { - &-sm { - font-size: $font-size-sm; - } - - &-lg { - font-size: $font-size-lg; - } - } - - &:focus { - box-shadow: inset 0 -2px 0 $primary; - background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAMAAACelLz8AAAAJ1BMVEUhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISEhISF8S9ewAAAADHRSTlMAAgMJC0uWpKa6wMxMdjkoAAAANUlEQVR4AeXJyQEAERAAsNl7Hf3X6xt0QL6JpZWq30pdvdadme+0PMdzvHm8YThHcT1H7K0BtOMDniZhWOgAAAAASUVORK5CYII=); - } - - &[multiple] { - background: none; - } -} - -.custom-control-label { - &::before { - top: 0; - border: 2px solid $gray-400; - } - &::after { - top: 0; - } - - .custom-control-input:checked ~ &::before { - border-color: $primary; - } -} - -.custom-checkbox .custom-control-input:checked { - ~ .custom-control-label::after { - transform: scale(1.5); - } -} - -.custom-radio .custom-control-input { - &:checked { - ~ .custom-control-label::before { - background-color: $white; - } - ~ .custom-control-label::after { - transform: scale(1.125); - transition: 240ms; - } - } - & { - ~ .custom-control-label::after { - transform: scale(.75); - } - } -} - -.has-warning { - input:not([type=checkbox]), - .form-control, - input.form-control[readonly], - input[type=text][readonly], - [type=text].form-control[readonly], - input:not([type=checkbox]):focus, - .form-control:focus { - border-bottom: none; - box-shadow: inset 0 -2px 0 $warning; - } -} - -.has-danger { - input:not([type=checkbox]), - .form-control, - input.form-control[readonly], - input[type=text][readonly], - [type=text].form-control[readonly], - input:not([type=checkbox]):focus, - .form-control:focus { - border-bottom: none; - box-shadow: inset 0 -2px 0 $danger; - } -} - -.has-success { - input:not([type=checkbox]), - .form-control, - input.form-control[readonly], - input[type=text][readonly], - [type=text].form-control[readonly], - input:not([type=checkbox]):focus, - .form-control:focus { - border-bottom: none; - box-shadow: inset 0 -2px 0 $success; - } -} - -// Remove the Bootstrap feedback styles for input addons -.input-group-addon { - .has-warning &, .has-danger &, .has-success & { - color: $input-color; - border-color: $input-group-addon-border-color; - background-color: $input-group-addon-bg; - } -} - -.input-group { - - > .input-group-prepend > .input-group-text { - padding-right: 0.25rem; - } - - > .input-group-append > .input-group-text { - padding-left: 0.25rem; - } - - .form-control { - padding-left: 0.25rem; - padding-right: 0.25rem; - } -} - -.input-group-sm { - - > .input-group-prepend > .btn, - > .input-group-append > .btn { - padding: $input-btn-padding-y-sm $input-btn-padding-x-sm; - } - - > .input-group-prepend > .input-group-text { - padding: $input-btn-padding-y-sm $input-btn-padding-x-sm $input-btn-padding-y-sm 0; - } - - > .input-group-append > .input-group-text { - padding: $input-btn-padding-y-sm 0 $input-btn-padding-y-sm $input-btn-padding-x-sm; - } - - > .input-group-prepend > .btn { - border-top-left-radius: $btn-border-radius-sm; - border-bottom-left-radius: $btn-border-radius-sm; - } - - > .input-group-append > .btn { - border-top-right-radius: $btn-border-radius-sm; - border-bottom-right-radius: $btn-border-radius-sm; - } -} - -.input-group-lg { - - > .input-group-prepend > .btn, - > .input-group-append > .btn { - padding: $input-btn-padding-y-lg $input-btn-padding-x-lg; - } - - > .input-group-prepend > .input-group-text { - padding: $input-btn-padding-y-lg $input-btn-padding-x-lg $input-btn-padding-y-lg 0; - } - - > .input-group-append > .input-group-text { - padding: $input-btn-padding-y-lg 0 $input-btn-padding-y-lg $input-btn-padding-x-lg; - } - - > .input-group-prepend > .btn { - border-top-left-radius: $btn-border-radius-lg; - border-bottom-left-radius: $btn-border-radius-lg; - } - - > .input-group-append > .btn { - border-top-right-radius: $btn-border-radius-lg; - border-bottom-right-radius: $btn-border-radius-lg; - } -} - - -.form-group-lg { - select, - select.form-control { - line-height: 1.5; - } -} - -// Navs ======================================================================== - -.nav-tabs { - .nav-item + .nav-item { - margin-left: 0; - } - - .nav-link, - .nav-link:focus { - margin-right: 0; - background-color: transparent; - border: none; - color: $body-color; - box-shadow: inset 0 -1px 0 #ddd; - transition: all 0.2s; - - &:hover { - background-color: transparent; - box-shadow: inset 0 -2px 0 $primary; - color: $primary; - } - } - - .nav-link.active, - .nav-link.active:focus { - border: none; - box-shadow: inset 0 -2px 0 $primary; - color: $primary; - - &:hover { - border: none; - color: $primary; - } - } - - .nav-link.disabled { - box-shadow: inset 0 -1px 0 #ddd; - } - - &.nav-justified { - - .nav-link, - .nav-link:hover, - .nav-link:focus, - .nav-link.active, - .nav-link.active:hover, - .nav-link.active:focus { - border: none; - } - } - - .dropdown-menu { - margin-top: 0; - } -} - -.dropdown-menu { - margin-top: 0; - border: none; - box-shadow: 0 1px 4px rgba(0,0,0,.3); -} - -// Indicators ================================================================== - -.alert { - padding-right: 2.5rem; - - &, h1, h2, h3, h4, h5, h6 { - color: #fff; - } - - @each $color, $value in $theme-colors { - &-#{$color} { - background-color: $value; - } - } - - a:not(.btn), - .alert-link { - color: #fff; - font-weight: bold; - } - - .close { - color: #fff; - } - - &-secondary, - &-light { - &, - & a:not(.btn), - & .alert-link { - color: $body-color; - } - } -} - -.badge { - - &-secondary { - background-color: $gray-500; - color: $white; - } - - &-light { - background-color: $gray-200; - } - - &-warning { - color: $white; - } -} - -.tag { - padding: 4px 6px 4px; -} - -// Progress bars =============================================================== - -// Containers ================================================================== - -.close { - line-height: 0.5; - opacity: 0.6; - transition: all 0.2s; - - &:hover { - opacity: 1; - } -} - -.card { - box-shadow: 0 1px 4px rgba(0,0,0,.4); - - &.border-primary, - &.border-secondary, - &.border-success, - &.border-info, - &.border-warning, - &.border-danger, - &.border-light, - &.border-dark { - border-width: 1px; - } -} - -.alert-dismissible { - .close { - padding: 0.5rem 0.75rem; - } -} - -.list-group { - &-item-action.active { - h1, h2, h3, h4, h5, h6 { - color: $white; - } - } -} - -.modal-content { - border-radius: 0.2rem; - box-shadow: 0 6px 36px rgba(0,0,0,.3); -} - -.popover { - border: none; - box-shadow: 0 1px 4px rgba(0,0,0,.3); -} - -.carousel { - &-caption { - h1, h2, h3, h4, h5, h6 { - color: inherit; - } - } -} diff --git a/src/styles/bootstrap-material/_variables.scss b/src/styles/bootstrap-material/_variables.scss deleted file mode 100644 index 2e51bcb21..000000000 --- a/src/styles/bootstrap-material/_variables.scss +++ /dev/null @@ -1,129 +0,0 @@ -// Materia 4.1.1 -// Bootswatch - -// -// Color system -// - -$white: #fff !default; -$gray-100: #f8f9fa !default; -$gray-200: #eee !default; -$gray-300: #dee2e6 !default; -$gray-400: #ced4da !default; -$gray-500: #bbb !default; -$gray-600: #666 !default; -$gray-700: #444 !default; -$gray-800: #222 !default; -$gray-900: #212121 !default; -$black: #000 !default; - -$blue: #2196F3 !default; -$indigo: #6610f2 !default; -$purple: #6f42c1 !default; -$pink: #e83e8c !default; -$red: #e51c23 !default; -$orange: #fd7e14 !default; -$yellow: #ff9800 !default; -$green: #4CAF50 !default; -$teal: #20c997 !default; -$cyan: #9C27B0 !default; - -$primary: $blue !default; -$secondary: $white !default; -$success: $green !default; -$info: $cyan !default; -$warning: $yellow !default; -$danger: $red !default; -$light: $white !default; -$dark: $gray-800 !default; - -// Body - -$body-color: $gray-700 !default; - -// Fonts - -$font-family-sans-serif: "Roboto", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; - -$font-size-base: 0.8125rem !default; - -$font-weight-base: 400 !default; - -// Buttons - -$input-btn-padding-y: 1rem !default; -$input-btn-padding-x: 1rem !default; - -// Forms - -$input-padding-y: 1rem !default; -$input-padding-x: 0 !default; - -$input-padding-y-sm: $font-size-base !default; -$input-padding-x-sm: 0 !default; - -$input-padding-y-lg: ($font-size-base * 1.25) !default; -$input-padding-x-lg: 0 !default; - -$input-bg: transparent !default; -$input-disabled-bg: transparent !default; - -$input-color: $gray-600 !default; -$input-border-color: transparent !default; -$input-border-width: 0rem !default; - -$input-border-radius: 0 !default; -$input-border-radius-lg: 0 !default; -$input-border-radius-sm: 0 !default; - -$input-placeholder-color: rgba(0,0,0,0.4) !default; - -$input-group-addon-bg: transparent !default; - -$custom-control-gutter: 1.75rem !default; - -$custom-control-indicator-focus-box-shadow: 0 !default; - -$custom-control-indicator-size: 1.25rem !default; -$custom-control-indicator-bg: $white; -$custom-checkbox-indicator-border-radius: 2px !default; - -$custom-control-indicator-disabled-bg: $gray-100 !default; - -$custom-radio-indicator-icon-checked: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='4' fill='%232196F3'/%3E%3C/svg%3E") !default; - -// Navs - -$nav-link-disabled-color: $gray-500 !default; - -$nav-tabs-border-color: transparent !default; - -// Navbar - -$navbar-padding-y: 1rem !default; - -$navbar-dark-color: rgba($white,.75) !default; -$navbar-dark-hover-color: $white !default; - -// Cards - -$card-border-width: 0; -$card-border-color: transparent; - -// Tooltips - -$tooltip-bg: $gray-700 !default; - -// Modals - -$modal-content-border-color: transparent !default; - -// Progress bars - -$progress-height: 0.375rem !default; -$progress-border-radius: 0 !default; - -// Close - -$close-font-size: 2.125rem !default; -$close-font-weight: 300 !default; diff --git a/src/theme/theme-variables.scss b/src/theme/theme-variables.scss deleted file mode 100644 index 61dcae04a..000000000 --- a/src/theme/theme-variables.scss +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Application global variables. - */ - -// Set Font Awesome font path -$fa-font-path: "~@fortawesome/fontawesome-free-webfonts/webfonts"; - -// --------------------------------------------------------------------------- -// Bootstrap variables -// -// Override Bootstrap variables here to suite your theme. -// Copy variables you want to customize from node_modules/bootstrap/scss/_variables.scss - -// -// Color system -// - -$white: #fff; -$gray-100: #f8f9fa; -$gray-200: #e9ecef; -$gray-300: #dee2e6; -$gray-400: #ced4da; -$gray-500: #adb5bd; -$gray-600: #868e96; -$gray-700: #495057; -$gray-800: #343a40; -$gray-900: #212529; -$black: #000; - -$blue: #0073dd; -$indigo: #6610f2; -$purple: #6f42c1; -$pink: #e83e8c; -$red: #dc3545; -$orange: #fd7e14; -$yellow: #ffc107; -$green: #28a745; -$teal: #20c997; -$cyan: #17a2b8; - -$theme-colors: ( - primary: $blue, - secondary: $gray-600, - success: $green, - info: $cyan, - warning: $yellow, - danger: $red, - light: $gray-100, - dark: $gray-800 -); - -// Use Bootstrap defaults for other variables, imported here so we can access all app variables in one place when used -// in components. -@import "~bootstrap/scss/_functions"; -@import "~bootstrap/scss/_variables"; diff --git a/src/translations/en-US.json b/src/translations/en-US.json index e7973bd8f..74a98e2f5 100644 --- a/src/translations/en-US.json +++ b/src/translations/en-US.json @@ -1,7 +1,6 @@ { "APP_NAME": "MifosX", "About": "About", - "Hello world !": "Hello world !", "Home": "Home", "Logged in as": "Logged in as", "Login": "Login", @@ -10,7 +9,7 @@ "Password is required": "Password is required", "Username": "Username", "Username is required": "Username is required", - "Username or password incorrect.": "Username or password incorrect.", + "Username or password incorrect.": "Username or password incorrect", "Remember me": "Remember me", "Version": "Version" } diff --git a/src/translations/fr-FR.json b/src/translations/fr-FR.json index 6a2a0469b..d235f82e4 100644 --- a/src/translations/fr-FR.json +++ b/src/translations/fr-FR.json @@ -1,7 +1,6 @@ { "APP_NAME": "MifosX", "About": "A propos", - "Hello world !": "Bonjour le monde !", "Home": "Accueil", "Logged in as": "Connecté en tant que", "Login": "Connexion", @@ -10,7 +9,7 @@ "Password is required": "Mot de passe requis", "Username": "Identifiant", "Username is required": "Identifiant requis", - "Username or password incorrect.": "Identifiant ou mot de passe incorrect.", + "Username or password incorrect.": "Identifiant ou mot de passe incorrect", "Remember me": "Rester connecté", "Version": "Version" } diff --git a/tsconfig.json b/tsconfig.json index 50db1178f..3e3e9c251 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "compileOnSave": false, "compilerOptions": { + "baseUrl": "src", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -16,11 +17,6 @@ "lib": [ "es2017", "dom" - ], - "baseUrl": "src", - "paths": { - "@app/*": ["app/*"], - "@env/*": ["environments/*"] - } + ] } } diff --git a/tslint.json b/tslint.json index f4dedc500..c7ab4d809 100644 --- a/tslint.json +++ b/tslint.json @@ -129,13 +129,13 @@ "directive-selector": [ true, "attribute", - "app", + "mifosx", "camelCase" ], "component-selector": [ true, "element", - "app", + "mifosx", "kebab-case" ], "no-output-on-prefix": true,