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 000000000..c1c0653cf Binary files /dev/null and b/src/apple-touch-icon.png differ diff --git a/src/assets/images/833.svg b/src/assets/images/833.svg deleted file mode 100644 index c70f78d99..000000000 --- a/src/assets/images/833.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 113dc9885..000000000 Binary files a/src/assets/images/chosen-sprite.png and /dev/null differ diff --git a/src/assets/images/client-image-placeholder.png b/src/assets/images/client-image-placeholder.png deleted file mode 100644 index f9796d70e..000000000 Binary files a/src/assets/images/client-image-placeholder.png and /dev/null differ diff --git a/src/assets/images/cubic_loader.gif b/src/assets/images/cubic_loader.gif deleted file mode 100644 index ae7cfaa93..000000000 Binary files a/src/assets/images/cubic_loader.gif and /dev/null differ diff --git a/src/assets/images/favicon.ico b/src/assets/images/favicon.ico deleted file mode 100644 index 77eff08e4..000000000 Binary files a/src/assets/images/favicon.ico and /dev/null differ diff --git a/src/assets/images/loader.gif b/src/assets/images/loader.gif deleted file mode 100644 index 32143e10d..000000000 Binary files a/src/assets/images/loader.gif and /dev/null differ diff --git a/src/assets/images/logo.jpg b/src/assets/images/logo.jpg deleted file mode 100644 index f1817306d..000000000 Binary files a/src/assets/images/logo.jpg and /dev/null differ diff --git a/src/assets/images/ring.svg b/src/assets/images/ring.svg deleted file mode 100644 index 81781c4e9..000000000 --- a/src/assets/images/ring.svg +++ /dev/null @@ -1 +0,0 @@ - \ 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 bee2c431d..000000000 Binary files a/src/assets/images/small-loader.gif and /dev/null differ diff --git a/src/assets/images/user_new.png b/src/assets/images/user_new.png deleted file mode 100644 index 990c30959..000000000 Binary files a/src/assets/images/user_new.png and /dev/null differ diff --git a/src/assets/ngx-rocket-logo.png b/src/assets/ngx-rocket-logo.png deleted file mode 100644 index 4f17d9584..000000000 Binary files a/src/assets/ngx-rocket-logo.png and /dev/null differ 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 - - - + + + + - + + + + + + - - + + + + 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,