From 07341c5ffa3bab49abe0996ad27d5536431a34a4 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Wed, 23 May 2018 12:35:08 +0300 Subject: [PATCH] Improving the codebase (99% completed) Updated Angular, Angular Material and couple other packages --- angular.json | 4 +- package-lock.json | 645 +++++++++++++----- package.json | 48 +- .../material-color-picker.component.ts | 143 +++- .../material-color-picker.module.ts | 1 - .../shortcuts/shortcuts.component.ts | 5 +- src/@fuse/scss/partials/_print.scss | 2 +- src/app/app.component.ts | 2 +- src/app/app.module.ts | 6 +- src/app/{fuse-fake-db => fake-db}/academy.ts | 0 src/app/{fuse-fake-db => fake-db}/calendar.ts | 0 src/app/{fuse-fake-db => fake-db}/chat.ts | 0 src/app/{fuse-fake-db => fake-db}/contacts.ts | 0 .../dashboard-analytics.ts | 0 .../dashboard-project.ts | 0 .../{fuse-fake-db => fake-db}/e-commerce.ts | 0 .../fake-db.service.ts} | 40 +- src/app/{fuse-fake-db => fake-db}/faq.ts | 0 .../{fuse-fake-db => fake-db}/file-manager.ts | 0 src/app/{fuse-fake-db => fake-db}/icons.ts | 0 src/app/{fuse-fake-db => fake-db}/invoice.ts | 0 .../knowledge-base.ts | 0 src/app/{fuse-fake-db => fake-db}/mail.ts | 0 src/app/{fuse-fake-db => fake-db}/profile.ts | 0 .../{fuse-fake-db => fake-db}/quick-panel.ts | 0 .../{fuse-fake-db => fake-db}/scrumboard.ts | 0 src/app/{fuse-fake-db => fake-db}/search.ts | 0 src/app/{fuse-fake-db => fake-db}/todo.ts | 0 src/app/main/apps/apps.module.ts | 6 +- src/app/main/apps/mail-ngrx/mail.module.ts | 2 +- .../main/apps/scrumboard/scrumboard.module.ts | 2 +- src/app/main/apps/todo/todo.module.ts | 2 +- .../components-third-party.module.ts | 8 +- .../datatable/ngx-datatable.component.ts | 52 +- .../google-maps/google-maps.component.ts | 15 +- .../google-maps/google-maps.module.ts | 6 +- .../angular-material.component.html | 2 +- .../angular-material.component.ts | 51 +- .../angular-material.module.ts | 12 +- .../example-viewer/example-viewer.scss | 2 +- .../example-viewer/example-viewer.ts | 148 ++-- .../main/components/cards/cards.component.ts | 385 ++++++----- src/app/main/components/components.module.ts | 62 +- .../countdown/countdown.component.ts | 7 +- .../highlight/highlight.component.ts | 7 +- .../material-color-picker.component.ts | 7 +- .../multi-language.component.html | 2 +- .../multi-language.component.ts | 7 +- .../navigation/navigation.component.ts | 35 +- .../search-bar/search-bar.component.ts | 7 +- .../shortcuts/shortcuts.component.ts | 7 +- .../components/sidebar/sidebar.component.ts | 7 +- .../components/widget/widget.component.ts | 7 +- .../mail-confirm/mail-confirm.component.ts | 2 +- .../pages/errors/404/error-404.component.ts | 2 +- .../main/pages/profile/profile.component.html | 2 +- src/app/main/pages/profile/profile.module.ts | 4 +- .../tabs/timeline/timeline.component.ts | 4 +- .../main/services/config/config.component.ts | 7 +- src/app/main/services/services.module.ts | 12 +- .../splash-screen/splash-screen.component.ts | 7 +- src/app/main/ui/colors/colors.component.ts | 31 +- src/app/main/ui/colors/colors.module.ts | 7 +- src/app/main/ui/forms/forms.component.ts | 131 +++- src/app/main/ui/forms/forms.module.ts | 7 +- .../helper-classes.component.html | 4 +- .../helper-classes.component.ts | 7 +- .../helper-classes/helper-classes.module.ts | 15 +- .../padding-margin.component.ts | 8 +- .../width-height/width-height.component.ts | 8 +- src/app/main/ui/icons/icons.component.ts | 60 +- src/app/main/ui/icons/icons.module.ts | 7 +- .../ui/page-layouts/blank/blank.component.ts | 7 +- .../fullwidth-2/fullwidth-2.component.ts | 7 +- .../carded/fullwidth/fullwidth.component.ts | 7 +- .../left-sidenav-2-tabbed.component.ts | 7 +- .../left-sidenav-2.component.ts | 7 +- .../left-sidenav-tabbed.component.ts | 7 +- .../left-sidenav/left-sidenav.component.ts | 7 +- .../right-sidenav-2-tabbed.component.ts | 7 +- .../right-sidenav-2.component.ts | 7 +- .../right-sidenav-tabbed.component.ts | 7 +- .../right-sidenav/right-sidenav.component.ts | 7 +- .../ui/page-layouts/page-layouts.module.ts | 115 ++-- .../simple/fullwidth/fullwidth.component.ts | 7 +- .../left-sidenav-2.component.ts | 7 +- .../left-sidenav-3.component.ts | 7 +- .../left-sidenav/left-sidenav.component.ts | 7 +- .../right-sidenav-2.component.ts | 7 +- .../right-sidenav-3.component.ts | 7 +- .../right-sidenav/right-sidenav.component.ts | 7 +- .../simple/tabbed/tabbed.component.ts | 7 +- .../blockquotes-lists.component.ts | 8 +- .../tabs/headings/headings.component.ts | 8 +- .../tabs/helpers/helpers.component.ts | 8 +- .../inline-text-elements.component.ts | 8 +- .../ui/typography/typography.component.html | 8 +- .../ui/typography/typography.component.ts | 7 +- .../main/ui/typography/typography.module.ts | 23 +- src/app/main/ui/ui.module.ts | 2 +- src/index.html | 2 +- 101 files changed, 1564 insertions(+), 827 deletions(-) rename src/app/{fuse-fake-db => fake-db}/academy.ts (100%) rename src/app/{fuse-fake-db => fake-db}/calendar.ts (100%) rename src/app/{fuse-fake-db => fake-db}/chat.ts (100%) rename src/app/{fuse-fake-db => fake-db}/contacts.ts (100%) rename src/app/{fuse-fake-db => fake-db}/dashboard-analytics.ts (100%) rename src/app/{fuse-fake-db => fake-db}/dashboard-project.ts (100%) rename src/app/{fuse-fake-db => fake-db}/e-commerce.ts (100%) rename src/app/{fuse-fake-db/fuse-fake-db.service.ts => fake-db/fake-db.service.ts} (69%) rename src/app/{fuse-fake-db => fake-db}/faq.ts (100%) rename src/app/{fuse-fake-db => fake-db}/file-manager.ts (100%) rename src/app/{fuse-fake-db => fake-db}/icons.ts (100%) rename src/app/{fuse-fake-db => fake-db}/invoice.ts (100%) rename src/app/{fuse-fake-db => fake-db}/knowledge-base.ts (100%) rename src/app/{fuse-fake-db => fake-db}/mail.ts (100%) rename src/app/{fuse-fake-db => fake-db}/profile.ts (100%) rename src/app/{fuse-fake-db => fake-db}/quick-panel.ts (100%) rename src/app/{fuse-fake-db => fake-db}/scrumboard.ts (100%) rename src/app/{fuse-fake-db => fake-db}/search.ts (100%) rename src/app/{fuse-fake-db => fake-db}/todo.ts (100%) diff --git a/angular.json b/angular.json index aa359a2c..4f9ad3dc 100644 --- a/angular.json +++ b/angular.json @@ -104,7 +104,7 @@ ], "exclude": [ "**/node_modules/**", - "**/src/app/fuse-fake-db/**/*", + "**/src/app/fake-db/**/*", "**/src/assets/angular-material-examples/**/*" ] } @@ -128,7 +128,7 @@ "tsConfig": "e2e/tsconfig.e2e.json", "exclude": [ "**/node_modules/**", - "**/src/app/fuse-fake-db/**/*", + "**/src/app/fake-db/**/*", "**/src/assets/angular-material-examples/**/*" ] } diff --git a/package-lock.json b/package-lock.json index a830dc31..25c63050 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,27 +10,27 @@ "integrity": "sha512-3bdfvkWDmJszpj/F6Fzgv7sks0cs/cUEQPfs37tcJFz3jc62SsXy4TGb/WJT8FpH2nSGE6DonP8lXuFxB0lblQ==" }, "@angular-devkit/architect": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.1.tgz", - "integrity": "sha512-sYoqm3d7UlCsGJLL/UIanxctNl6JP/QK89mCcBClU4AO6hbpdKydov+A159Zg082RUJoy1JYplh1uUx0HstrJg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.6.3.tgz", + "integrity": "sha512-w9tK3VACU+CnOQQZT6o7QO2brn/OVNDf2Y11rI+ZQH7UIn6N0ZFoMl9WyFB//K2Gkoa7hAobykhRTtP8lrTF1g==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.1", + "@angular-devkit/core": "0.6.3", "rxjs": "^6.0.0" } }, "@angular-devkit/build-angular": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.6.1.tgz", - "integrity": "sha512-pXMjwdWkhEDAt3JVmwdpzwj+4KELsH6htP9W55vkjVHzPnq4Ps/w0mDzDifLsiV9u3FILTacu+X6foMfDJylzw==", + "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==", "dev": true, "requires": { - "@angular-devkit/architect": "0.6.1", - "@angular-devkit/build-optimizer": "0.6.1", - "@angular-devkit/core": "0.6.1", - "@ngtools/webpack": "6.0.1", + "@angular-devkit/architect": "0.6.3", + "@angular-devkit/build-optimizer": "0.6.3", + "@angular-devkit/core": "0.6.3", + "@ngtools/webpack": "6.0.3", "ajv": "~6.4.0", - "autoprefixer": "^8.1.0", + "autoprefixer": "^8.4.1", "cache-loader": "^1.2.2", "chalk": "~2.2.2", "circular-dependency-plugin": "^5.0.2", @@ -42,21 +42,21 @@ "istanbul": "^0.4.5", "istanbul-instrumenter-loader": "^3.0.1", "karma-source-map-support": "^1.2.0", - "less": "^3.0.2", + "less": "^3.0.4", "less-loader": "^4.1.0", "license-webpack-plugin": "^1.3.1", "lodash": "^4.17.4", "memory-fs": "^0.4.1", "mini-css-extract-plugin": "~0.4.0", "minimatch": "^3.0.4", - "node-sass": "^4.8.3", + "node-sass": "^4.9.0", "opn": "^5.1.0", "parse5": "^4.0.0", "portfinder": "^1.0.13", - "postcss": "^6.0.19", + "postcss": "^6.0.22", "postcss-import": "^11.1.0", - "postcss-loader": "^2.1.4", - "postcss-url": "^7.3.1", + "postcss-loader": "^2.1.5", + "postcss-url": "^7.3.2", "raw-loader": "^0.5.1", "resolve": "^1.5.0", "rxjs": "^6.0.0", @@ -70,7 +70,7 @@ "tree-kill": "^1.2.0", "uglifyjs-webpack-plugin": "^1.2.5", "url-loader": "^1.0.1", - "webpack": "~4.6.0", + "webpack": "~4.8.1", "webpack-dev-middleware": "^3.1.3", "webpack-dev-server": "^3.1.4", "webpack-merge": "^4.1.2", @@ -79,9 +79,9 @@ } }, "@angular-devkit/build-optimizer": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.6.1.tgz", - "integrity": "sha512-7jfSrjMkEArTtHEStxQQYaApAigQh4PlKy0+utH/6AYEt1F9+ENSksKSb2Q5E0wSq2CMHBtrpHjyYHNpASl0ng==", + "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==", "dev": true, "requires": { "loader-utils": "^1.1.0", @@ -91,9 +91,9 @@ } }, "@angular-devkit/core": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.1.tgz", - "integrity": "sha512-wRsuc1zuW57IQdx7dVOut7AUgAMIxnmIk3DKzLeNhLEKpMaGbwpznULbQWJtEZetwPbZ7pMeKT0nkXMIsQ92Gg==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.6.3.tgz", + "integrity": "sha512-97hFVW6in8oYJUEqjmUP0Tb/mPlTG3sc0THpe5MCGEkDPjlp2cObt9rUCAVOjugBlScV8rzTpVQ+95PT60Py8A==", "dev": true, "requires": { "ajv": "~6.4.0", @@ -103,42 +103,42 @@ } }, "@angular-devkit/schematics": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.1.tgz", - "integrity": "sha512-SF+S+T446u/outrRzsSd6rh5gxGIx2Zpu21msDJCxa1AKuN06QRtuvP0Hlb+34XKXzui4HkRBgLdKjoJgvFtrw==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.6.3.tgz", + "integrity": "sha512-dXlyVNuFRhiOnhAk0NojEUThLrZBpVZmWvEQ4h/pnyHS0P9CfnHqJ8DCcCrjOwYkzdBwBrYchXOCYfo8zuxYGw==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.1", + "@angular-devkit/core": "0.6.3", "rxjs": "^6.0.0" } }, "@angular/animations": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.1.tgz", - "integrity": "sha512-L/8v0j50VPKX08gvdHpzYnkKzqvBJ/RDH74aqOGV637Nsa3hxe0yyq7FNg0t7pRsGk3k0b6RXeBlosKo7Sj7rA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.0.3.tgz", + "integrity": "sha512-X8ey0dvh2ielxPCJOCcdNPAmKW5toCpzHdbjdZqlR9o6uP1UmzEKHd7Un7jVIINRtq9ZB7vnFWIJl0BA7C8U0g==", "requires": { "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.0.2.tgz", - "integrity": "sha512-UY+S0FZkyDoxn5aaj5Ue3fGlOQKEnNBJXasaUQbSYKZiUkyFJkgmcSHRJlJuCAunJAtW3IIOhPSFxLZIj7lCHA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-6.1.0.tgz", + "integrity": "sha512-IrM+cjeUW0TmFIZb7nMtARa9dKOVU9vXlwzllcwcBYHJNb9YcnLPaWqB2LqDQFuH/JQyt+oAG+VyfMmU+yk9uw==", "requires": { "tslib": "^1.7.1" } }, "@angular/cli": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.1.tgz", - "integrity": "sha512-jS2CZl5Kk2tFvEzU7BJjOqTrMt4ogjxuvB7rxwl/TMHVhCpvlSg5FtJtc2pVw+3HAH9nwMSkjKL75HSXcg7eDg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-6.0.3.tgz", + "integrity": "sha512-G8jfgJublsRjveX1P+F5awHvpC07mKAF7f5lebowIs+QAHSOD6HxQ/JhMbJTwz/aj20iWgZOygA5LhkP0Wr+UQ==", "dev": true, "requires": { - "@angular-devkit/architect": "0.6.1", - "@angular-devkit/core": "0.6.1", - "@angular-devkit/schematics": "0.6.1", - "@schematics/angular": "0.6.1", - "@schematics/update": "0.6.1", + "@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", "opn": "~5.3.0", "resolve": "^1.1.7", "rxjs": "^6.0.0", @@ -166,25 +166,25 @@ } }, "@angular/common": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.1.tgz", - "integrity": "sha512-okxtOHE05Eaa7w6YCL2idXUHPTwrea5CEVXjA36zSZ9qtlB/IYcjYI9Opo5l8SE5Qy/eqpDdoanax1NM6xbtqw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.0.3.tgz", + "integrity": "sha512-tqEYeEXoaw2kzSUfTrmC3ruJ87trS61SHayIf56f/jtEVn+4pbgJDTNvLSnB6QEaMTn7sX6QBroauMWmdTVSvA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.1.tgz", - "integrity": "sha512-yGucUdNo/8gWIWScpMu9gDYh9wOse+OXJapqBR7JtUowW24PWgICTslWbre4d0PAcueaWhLQo4YqqF689UDfhQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.0.3.tgz", + "integrity": "sha512-nS65UI6f7grs2k+ggtkwXSBUQ1D/LVSFfXjWR5olxATx25QbIKABec90JphPE4FfhhVm1uonQ/vaSVCjh83Euw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.1.tgz", - "integrity": "sha512-P34AwBlnIIwreWhoi8CpEtM3Rxo/eiPKKszF9FRFDihbKZamXQP7mITONSW5Pj6lVqnfP0fiFXTwnfmnxXDUIg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.0.3.tgz", + "integrity": "sha512-n7L/g2leGSl1LffZ3ZuB5bY4sJoZWjkG5tg9IafXQ8nAIUtKPl+ovoiNUhAaA4CvlUlgYHMcbezKpc9285LnyQ==", "dev": true, "requires": { "chokidar": "^1.4.2", @@ -327,9 +327,9 @@ } }, "@angular/core": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.1.tgz", - "integrity": "sha512-w9fYaWSk0WrtdvKOvH5KDoRaZ3FhleKVgbbJ0skMsgmro1vrO5j2iIO88AJdbT7k+FAyC+eTtNS8Koqd4ranQg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.0.3.tgz", + "integrity": "sha512-YJk0kS/V9C2JFKMHfiw6TNxmfkYWGW4HzqGOm/VoPkvj9O4Erkz/OtOOc8hYGmXFmQz1UpOAByzY2XIlEi72XQ==", "requires": { "tslib": "^1.9.0" } @@ -343,63 +343,63 @@ } }, "@angular/forms": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.1.tgz", - "integrity": "sha512-YCKTxWh1HmYhXXyFYR/V+pxMqD+02Q5TjDOlzBond5uQUSxC+oJEfhUWUuCYi4QmnTsfWnaI0RKwKsBQvmDzIA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.0.3.tgz", + "integrity": "sha512-YAjRMERggkzb3cIo8iKOz1xB89Ko4fSh4A1suqrv9o2Xu41Qxs6LwrWVW+6x+N5kBzvbKFZyADqSz1otMQP83Q==", "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.1.tgz", - "integrity": "sha512-h60MgZg8/m6Rh0X9NTqwzBVDArXwoEOxz79FvQ29tppZejAHPdv0fQyck+3U6I+wOEGvJq03z8unl1Szji2rXg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.0.3.tgz", + "integrity": "sha512-9GF4hEsm/mK/kk+skn1y54IpsSGcgGnFxHctEFSSyUKTub9gFirkbuLOx9T9fXIKtXqCxnXolHCE7ncfOfS7GA==", "requires": { "tslib": "^1.9.0" } }, "@angular/language-service": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.1.tgz", - "integrity": "sha512-T8FcxeD5nOaIWa23CJVR3tUzapiiHWHttA9PD1Jl/OwFSibxCtPyuTN/H+sHzxXwPNBz/TI3gES5Pcn6FzMt4w==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.0.3.tgz", + "integrity": "sha512-yeEMS8GwEhyMKD4nlzg/0Ug56k5Zb58uShjVlh+kr6WWHMRzAtecvNHePlakPjxyWzf/EIDWnMJV31HGOGQYZg==", "dev": true }, "@angular/material": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.0.2.tgz", - "integrity": "sha512-928g7cnnRIJJx9/pC5GWqypcxrKkfijTCrCC6yeypvcgab1pmsk7m+1uE8VSFGIsUb6x8W3CF5nJUT1viuBIZg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-6.1.0.tgz", + "integrity": "sha512-9FLWjVnHFzAoGSWU5dz8X/QYeBtZGijMJIp1k94QDYz+2xA10IbesEgnv8I5Ri3EPnjV/gCspeSkt1ClLc95CA==", "requires": { "tslib": "^1.7.1" } }, "@angular/material-moment-adapter": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.0.2.tgz", - "integrity": "sha512-tOWQcnio4Yk5hs83mZEdvz85fK3QbGHGzpR5YjcHFFybs6KSKi/BXkHoDC5bC1pcLE6sn2/btq9+Jt1tknGhiw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-6.1.0.tgz", + "integrity": "sha512-36PDeYk8h1ZQAtpj92ehPLQmtphOwTIuSzSb17vuS4Gm2meD+NC2ARcdv2fsNbwnKSO7l+LMY5rB8g4/VwWOkA==", "requires": { "tslib": "^1.7.1" } }, "@angular/platform-browser": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.1.tgz", - "integrity": "sha512-F5eu2kHBtd7CqEuYI8CArEY8qYVBIQIYxEAmczyNOv3CLqxdEq23GLVFMDiVT7RpzaZPIxFoGvhEhnUhDeaVDw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.0.3.tgz", + "integrity": "sha512-OTgOE6WzytV9fnnCwvoyyXI4Avzmfu9RbBUhVRVontov6LlN9XL8BrzLidT7/lPAEQmHuoRCuNrSSY8TokPJCA==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.1.tgz", - "integrity": "sha512-eKZRua98kEC0THSEeGXSk7j9wGn3AtrvElsY59bt7gnWWU4nY6y7Dem6kVjXb+MDkH9ESPyC0uavARdUq2kYuw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.3.tgz", + "integrity": "sha512-OSaBiog3jH52c+pJhG6qsZjVipzw3ThTcFaymetlBwdRkZ9ch7eIQFhlIXPe4oM3wJt39LTG7peRymWPbnx4uw==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.1.tgz", - "integrity": "sha512-NcVCLCEhV+999/RvED/JwKjAVi288V3wF5SNS/E4NiLU13FCDy6jO32+BhVRgJt/XLNY4IxnXUISukkMBGPI8Q==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.0.3.tgz", + "integrity": "sha512-7pQYu5DnNXwZ8nZrKtTpBo3HQoirKSP2hGAoHA0rPsqZvavBfuhUzsksYVvKvFEtoPmBe69uEYydhr115MTTNQ==", "requires": { "tslib": "^1.9.0" } @@ -431,43 +431,43 @@ "integrity": "sha512-KwmMELWY+WA1fL/myhQGiqM1uvRIjQ7yUaViVwknhRf7UsBPlWTMrSiFqUIb3QkwGYnVdqRjdYVQrJTIdJpolQ==" }, "@ngtools/webpack": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.1.tgz", - "integrity": "sha512-PV3UNQINVxHZA1kkWaVds4GJaNXjMCJep0otkHP6ODZ3NNMnrKS8RS9HeqFUxQ+r4GnKj4qctbsdm3awRr1DsA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-6.0.3.tgz", + "integrity": "sha512-wrhSFItcZp4Yzp6lgSuy23YdhaUs9D+KdGZPjwzzXtJIJCSzGkWuXzwlCwyKSFRQ6thyH/T3nffpHNaS3dWn2A==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.1", + "@angular-devkit/core": "0.6.3", "tree-kill": "^1.0.0", "webpack-sources": "^1.1.0" } }, "@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.0" } }, "@schematics/angular": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.1.tgz", - "integrity": "sha512-onvYJtpqwwaqDlqrJ6RPNN2uj5Y1DzRhYQeLHEUFYROHXC/JYrIRf1f1pV4VAPYVqsPq8ELa9Ts431/HdTjCEA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-0.6.3.tgz", + "integrity": "sha512-YhldE1K6x/8D0PxFusjtB32iOAayyD1PSxPCx/q7I7T6x/lG7l35ZDV6ZZE6bDvIaxQBsjhIm8ACy2n+xwFxTA==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.1", - "@angular-devkit/schematics": "0.6.1", + "@angular-devkit/core": "0.6.3", + "@angular-devkit/schematics": "0.6.3", "typescript": ">=2.6.2 <2.8" } }, "@schematics/update": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.6.1.tgz", - "integrity": "sha512-hywO6GmvjhubNkZqMweUER0IIKkauEQpVBg3TTUG9mR5sDa95dp/wsuU98wVGXYcO/dD6cw8MrwQYNV3YtqCUw==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.6.3.tgz", + "integrity": "sha512-UsKrg02+jwdsz9BdMVxDMeAZCF+c+dvHRWww4D2RcNzWdCTVWeBqRAmlreJJ0TGE54r7PEBnmQe0t5mS4F3d4w==", "dev": true, "requires": { - "@angular-devkit/core": "0.6.1", - "@angular-devkit/schematics": "0.6.1", + "@angular-devkit/core": "0.6.3", + "@angular-devkit/schematics": "0.6.3", "npm-registry-client": "^8.5.1", "rxjs": "^6.0.0", "semver": "^5.3.0", @@ -484,9 +484,9 @@ } }, "@swimlane/ngx-charts": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-8.0.0.tgz", - "integrity": "sha512-6MfHXlnE2mHZsSGhSchY6vV4gshgZ2y3RImys2GWporao7ZRh8+kDFo9osdYMyOwleCGRA1LQOW8XNXzDTey7g==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-charts/-/ngx-charts-8.0.1.tgz", + "integrity": "sha512-YiCKol5JiOZ8o6IuQxJ9FRlbjkeKVrdLc8QEQqYANpXbV72H9n59qNeZBwLsEvxl3bkmXDWY0G4xW00NnWCN8w==", "requires": { "d3-array": "^1.2.1", "d3-brush": "^1.0.4", @@ -502,9 +502,9 @@ } }, "@swimlane/ngx-datatable": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-12.0.0.tgz", - "integrity": "sha512-JT7fxtzvUP5gVYlP1VHxgtGVrn/0UlW8TzzFjAc9w25Yc9RppJ1Xsdzg8eyBb8H/e+Qa+Y0p2y6LvMUNFNJjsw==" + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-13.0.0.tgz", + "integrity": "sha512-77iNYReNBsPg/cbXxSaOP6JkG3hcuETn/pW/Gy62PlMxH9Oxgs+Gv3oSUQ5nVY3ePBP44JyidG/iP1CMaICGOA==" }, "@swimlane/ngx-dnd": { "version": "4.0.1", @@ -536,9 +536,9 @@ } }, "@types/lodash": { - "version": "4.14.108", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.108.tgz", - "integrity": "sha512-WD2vUOKfBBVHxWUV9iMR9RMfpuf8HquxWeAq2yqGVL7Nc4JW2+sQama0pREMqzNI3Tutj0PyxYUJwuoxxvX+xA==", + "version": "4.14.109", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.109.tgz", + "integrity": "sha512-hop8SdPUEzbcJm6aTsmuwjIYQo1tqLseKCM+s2bBqTU2gErwI4fE+aqUVOlscPSQbKHKgtMMPoC+h4AIGOJYvw==", "dev": true }, "@types/node": { @@ -564,6 +564,219 @@ "integrity": "sha512-UBYHWph6P3tutkbXpW6XYg9ZPbTKjw/YC2hGG1/GEvWwTbvezBUv3h+mmUFw79T3RFPnmedpiXdOBbXX+4l0jg==", "dev": true }, + "@webassemblyjs/ast": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz", + "integrity": "sha512-S6npYhPcTHDYe9nlsKa9CyWByFi8Vj8HovcAgtmMAQZUOczOZbQ8CnwMYKYC5HEZzxEE+oY0jfQk4cVlI3J59Q==", + "dev": true, + "requires": { + "@webassemblyjs/helper-wasm-bytecode": "1.4.3", + "@webassemblyjs/wast-parser": "1.4.3", + "debug": "^3.1.0", + "webassemblyjs": "1.4.3" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz", + "integrity": "sha512-3zTkSFswwZOPNHnzkP9ONq4bjJSeKVMcuahGXubrlLmZP8fmTIJ58dW7h/zOVWiFSuG2em3/HH3BlCN7wyu9Rw==", + "dev": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz", + "integrity": "sha512-e8+KZHh+RV8MUvoSRtuT1sFXskFnWG9vbDy47Oa166xX+l0dD5sERJ21g5/tcH8Yo95e9IN3u7Jc3NbhnUcSkw==", + "dev": true, + "requires": { + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "@webassemblyjs/helper-code-frame": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz", + "integrity": "sha512-9FgHEtNsZQYaKrGCtsjswBil48Qp1agrzRcPzCbQloCoaTbOXLJ9IRmqT+uEZbenpULLRNFugz3I4uw18hJM8w==", + "dev": true, + "requires": { + "@webassemblyjs/wast-printer": "1.4.3" + } + }, + "@webassemblyjs/helper-fsm": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz", + "integrity": "sha512-JINY76U+702IRf7ePukOt037RwmtH59JHvcdWbTTyHi18ixmQ+uOuNhcdCcQHTquDAH35/QgFlp3Y9KqtyJsCQ==", + "dev": true + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz", + "integrity": "sha512-I7bS+HaO0K07Io89qhJv+z1QipTpuramGwUSDkwEaficbSvCcL92CUZEtgykfNtk5wb0CoLQwWlmXTwGbNZUeQ==", + "dev": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz", + "integrity": "sha512-p0yeeO/h2r30PyjnJX9xXSR6EDcvJd/jC6xa/Pxg4lpfcNi7JUswOpqDToZQ55HMMVhXDih/yqkaywHWGLxqyQ==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/helper-buffer": "1.4.3", + "@webassemblyjs/helper-wasm-bytecode": "1.4.3", + "@webassemblyjs/wasm-gen": "1.4.3", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "@webassemblyjs/leb128": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz", + "integrity": "sha512-4u0LJLSPzuRDWHwdqsrThYn+WqMFVqbI2ltNrHvZZkzFPO8XOZ0HFQ5eVc4jY/TNHgXcnwrHjONhPGYuuf//KQ==", + "dev": true, + "requires": { + "leb": "^0.3.0" + } + }, + "@webassemblyjs/validation": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz", + "integrity": "sha512-R+rRMKfhd9mq0rj2mhU9A9NKI2l/Rw65vIYzz4lui7eTKPcCu1l7iZNi4b9Gen8D42Sqh/KGiaQNk/x5Tn/iBQ==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3" + } + }, + "@webassemblyjs/wasm-edit": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz", + "integrity": "sha512-qzuwUn771PV6/LilqkXcS0ozJYAeY/OKbXIWU3a8gexuqb6De2p4ya/baBeH5JQ2WJdfhWhSvSbu86Vienttpw==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/helper-buffer": "1.4.3", + "@webassemblyjs/helper-wasm-bytecode": "1.4.3", + "@webassemblyjs/helper-wasm-section": "1.4.3", + "@webassemblyjs/wasm-gen": "1.4.3", + "@webassemblyjs/wasm-opt": "1.4.3", + "@webassemblyjs/wasm-parser": "1.4.3", + "@webassemblyjs/wast-printer": "1.4.3", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz", + "integrity": "sha512-eR394T8dHZfpLJ7U/Z5pFSvxl1L63JdREebpv9gYc55zLhzzdJPAuxjBYT4XqevUdW67qU2s0nNA3kBuNJHbaQ==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/helper-wasm-bytecode": "1.4.3", + "@webassemblyjs/leb128": "1.4.3" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz", + "integrity": "sha512-7Gp+nschuKiDuAL1xmp4Xz0rgEbxioFXw4nCFYEmy+ytynhBnTeGc9W9cB1XRu1w8pqRU2lbj2VBBA4cL5Z2Kw==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/helper-buffer": "1.4.3", + "@webassemblyjs/wasm-gen": "1.4.3", + "@webassemblyjs/wasm-parser": "1.4.3", + "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz", + "integrity": "sha512-KXBjtlwA3BVukR/yWHC9GF+SCzBcgj0a7lm92kTOaa4cbjaTaa47bCjXw6cX4SGQpkncB9PU2hHGYVyyI7wFRg==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/helper-wasm-bytecode": "1.4.3", + "@webassemblyjs/leb128": "1.4.3", + "@webassemblyjs/wasm-parser": "1.4.3", + "webassemblyjs": "1.4.3" + } + }, + "@webassemblyjs/wast-parser": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz", + "integrity": "sha512-QhCsQzqV0CpsEkRYyTzQDilCNUZ+5j92f+g35bHHNqS22FppNTywNFfHPq8ZWZfYCgbectc+PoghD+xfzVFh1Q==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/floating-point-hex-parser": "1.4.3", + "@webassemblyjs/helper-code-frame": "1.4.3", + "@webassemblyjs/helper-fsm": "1.4.3", + "long": "^3.2.0", + "webassemblyjs": "1.4.3" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz", + "integrity": "sha512-EgXk4anf8jKmuZJsqD8qy5bz2frEQhBvZruv+bqwNoLWUItjNSFygk8ywL3JTEz9KtxTlAmqTXNrdD1d9gNDtg==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/wast-parser": "1.4.3", + "long": "^3.2.0" + } + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -918,7 +1131,8 @@ "version": "0.1.3", "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", - "dev": true + "dev": true, + "optional": true }, "async-limiter": { "version": "1.0.0", @@ -1234,6 +1448,7 @@ "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, + "optional": true, "requires": { "inherits": "~2.0.0" } @@ -1444,13 +1659,13 @@ } }, "browserslist": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz", - "integrity": "sha512-oYVLxFVqpX9uMhOIQBLtZL+CX4uY8ZpWcjNTaxyWl5rO8yA9SSNikFnAfvk8J3P/7z3BZwNmEqFKaJoYltj3MQ==", + "version": "3.2.8", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", + "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000835", - "electron-to-chromium": "^1.3.45" + "caniuse-lite": "^1.0.30000844", + "electron-to-chromium": "^1.3.47" } }, "buffer": { @@ -1603,9 +1818,9 @@ } }, "caniuse-lite": { - "version": "1.0.30000840", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000840.tgz", - "integrity": "sha512-Lw6AaouV6lh7TgIdQtLiUFKKO2mtDnZFkzCq5/V6tqs4ZI0OGVSDCEt1uegZ3OOBEBUYuVw3Hhr9DQSbgVofFA==", + "version": "1.0.30000844", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000844.tgz", + "integrity": "sha512-UpKQE7y6dLHhlv75UyBCRiun34Q+bmxyX3zS+ve9M07YG52tRafOvop9N9d5jC+sikKuG7UMweJKJNts4FVehA==", "dev": true }, "caseless": { @@ -1902,9 +2117,9 @@ "dev": true }, "compare-versions": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.1.0.tgz", - "integrity": "sha512-4hAxDSBypT/yp2ySFD346So6Ragw5xmBn/e/agIGl3bZr6DLUqnoRZPusxKrXdYRZpgexO9daejmIenlq/wrIQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.2.1.tgz", + "integrity": "sha512-2y2nHcopMG/NAyk6vWXlLs86XeM9sik4jmx1tKIgzMi9/RQ2eo758RGpxQO3ErihHmg0RlQITPqgz73y6s7quA==", "dev": true }, "component-bind": { @@ -2188,6 +2403,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, + "optional": true, "requires": { "lru-cache": "^4.0.1", "which": "^1.2.9" @@ -2992,9 +3208,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.45", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz", - "integrity": "sha1-RYrBscXHYM6IEaFtK/vZfsMLr7g=", + "version": "1.3.48", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz", + "integrity": "sha1-07DYWTgUBE4JLs4hCPw6ya6kuQA=", "dev": true }, "elliptic": { @@ -4503,10 +4719,11 @@ } }, "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.0.0" } @@ -4515,13 +4732,15 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", - "dev": true + "dev": true, + "optional": true }, "generate-object-property": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, + "optional": true, "requires": { "is-property": "^1.0.0" } @@ -4655,6 +4874,7 @@ "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.0.tgz", "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", "dev": true, + "optional": true, "requires": { "glob": "~7.1.1", "lodash": "~4.17.4", @@ -4942,9 +5162,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.x", @@ -5051,9 +5271,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": { @@ -5176,7 +5396,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", - "dev": true + "dev": true, + "optional": true }, "indent-string": { "version": "2.1.0", @@ -5416,13 +5637,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", - "dev": true + "dev": true, + "optional": true }, "is-my-json-valid": { "version": "2.17.2", "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "dev": true, + "optional": true, "requires": { "generate-function": "^2.0.0", "generate-object-property": "^1.1.0", @@ -5517,7 +5740,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true + "dev": true, + "optional": true }, "is-regex": { "version": "1.0.4", @@ -5673,12 +5897,12 @@ }, "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, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" } } } @@ -5851,10 +6075,11 @@ "dev": true }, "js-base64": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", - "integrity": "sha512-H7ErYLM34CvDMto3GbD6xD0JLUGYXR3QTcH6B/tr4Hi/QpSThnCsIp+Sy5FRTw3B0d6py4HcNkW7nO/wdtGWEw==", - "dev": true + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", + "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==", + "dev": true, + "optional": true }, "js-tokens": { "version": "3.0.2", @@ -5927,7 +6152,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", - "dev": true + "dev": true, + "optional": true }, "jsprim": { "version": "1.4.1", @@ -6173,12 +6399,12 @@ } }, "karma-coverage-istanbul-reporter": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.2.tgz", - "integrity": "sha512-sQHexslLF+QHzaKfK8+onTYMyvSwv+p5cDayVxhpEELGa3z0QuB+l0IMsicIkkBNMOJKQaqueiRoW7iuo7lsog==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-1.4.3.tgz", + "integrity": "sha1-O13/RmT6W41RlrmInj9hwforgNk=", "dev": true, "requires": { - "istanbul-api": "^1.1.14", + "istanbul-api": "^1.3.1", "minimatch": "^3.0.4" } }, @@ -6234,6 +6460,12 @@ "invert-kv": "^1.0.0" } }, + "leb": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz", + "integrity": "sha1-Mr7p+tFoMo1q6oUi2DP0GA7tHaM=", + "dev": true + }, "less": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/less/-/less-3.0.4.tgz", @@ -6355,7 +6587,8 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true + "dev": true, + "optional": true }, "lodash.clonedeep": { "version": "4.5.0", @@ -6367,7 +6600,8 @@ "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", - "dev": true + "dev": true, + "optional": true }, "lodash.tail": { "version": "4.1.1", @@ -6442,6 +6676,12 @@ "object.assign": "^4.1.0" } }, + "long": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz", + "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=", + "dev": true + }, "longest": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", @@ -6804,7 +7044,8 @@ "version": "2.10.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.9", @@ -6853,17 +7094,17 @@ } }, "ngrx-store-freeze": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/ngrx-store-freeze/-/ngrx-store-freeze-0.2.2.tgz", - "integrity": "sha512-t3e6yanpqFv+nsLulh9vz0WBSefjjKtv9ZPd0CylW+mTmylBQgAb+VRWPrbmp78HCsKU0d0lZNbYD8Qd6edcGA==", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/ngrx-store-freeze/-/ngrx-store-freeze-0.2.3.tgz", + "integrity": "sha512-IO2zBWMAyAWZgK6zbPhmR3tNRgW+jfi/Z+Xkvaa42w6eYNQ8bEwYv7uxZo/3MQJ5RglxZ+6KsDLXPzjN+ZUEZw==", "requires": { "deep-freeze-strict": "^1.1.1" } }, "ngx-color-picker": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-6.1.0.tgz", - "integrity": "sha512-qt7dczjKRSNZbFwBP7NAoX/bSsOTX5soOHTk+YHLaFEp0s51hb1GnWUBtNQ4foFUTAloG3MZsSqsraoVeDHRUg==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ngx-color-picker/-/ngx-color-picker-6.2.0.tgz", + "integrity": "sha512-Rm7rhr9I4LvjbtZLLvWgGlY0yFAcc5VCaGhd9TZr24NFtQhGgxmqmQNr3YD4UEdojSMh2kJm22Flenjb5TYQYw==" }, "ngx-cookie-service": { "version": "1.0.10", @@ -6890,6 +7131,7 @@ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", "dev": true, + "optional": true, "requires": { "fstream": "^1.0.0", "glob": "^7.0.3", @@ -6910,7 +7152,8 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", - "dev": true + "dev": true, + "optional": true } } }, @@ -6958,6 +7201,7 @@ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.9.0.tgz", "integrity": "sha512-QFHfrZl6lqRU3csypwviz2XLgGNOoWQbo2GOvtsfQqOfL4cy1BtWnhx/XUeAO9LT3ahBzSRXcEO6DdvAH9DzSg==", "dev": true, + "optional": true, "requires": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", @@ -6990,13 +7234,15 @@ "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 + "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 + "dev": true, + "optional": true }, "boom": { "version": "2.10.1", @@ -7011,7 +7257,8 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", - "dev": true + "dev": true, + "optional": true }, "chalk": { "version": "1.1.3", @@ -7031,6 +7278,7 @@ "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "dev": true, + "optional": true, "requires": { "boom": "2.x.x" } @@ -7040,6 +7288,7 @@ "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.5", @@ -7051,6 +7300,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "dev": true, + "optional": true, "requires": { "chalk": "^1.1.1", "commander": "^2.9.0", @@ -7063,6 +7313,7 @@ "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", "dev": true, + "optional": true, "requires": { "boom": "2.x.x", "cryptiles": "2.x.x", @@ -7081,6 +7332,7 @@ "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.2.2", @@ -7091,13 +7343,15 @@ "version": "6.3.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", - "dev": true + "dev": true, + "optional": true }, "request": { "version": "2.79.0", "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", "dev": true, + "optional": true, "requires": { "aws-sign2": "~0.6.0", "aws4": "^1.2.1", @@ -7126,6 +7380,7 @@ "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "dev": true, + "optional": true, "requires": { "hoek": "2.x.x" } @@ -7140,7 +7395,8 @@ "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", - "dev": true + "dev": true, + "optional": true } } }, @@ -7485,6 +7741,7 @@ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, + "optional": true, "requires": { "lcid": "^1.0.0" } @@ -8136,9 +8393,9 @@ } }, "pumpify": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz", - "integrity": "sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", + "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { "duplexify": "^3.6.0", @@ -8662,9 +8919,9 @@ "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" }, "rxjs": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.1.0.tgz", - "integrity": "sha512-lMZdl6xbHJCSb5lmnb6nOhsoBVCyoDC5LDJQK9WWyq+tsI7KnlDIZ0r0AZAlBpRPLbwQA9kzSBAZwNIZEZ+hcw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.0.tgz", + "integrity": "sha512-qBzf5uu6eOKiCZuAE0SgZ0/Qp+l54oeVxFfC2t+mJ2SFI6IB8gmMdJHs5DUMu5kqifqcCtsKS2XHjhZu6RKvAw==", "requires": { "tslib": "^1.9.0" } @@ -8699,6 +8956,7 @@ "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, + "optional": true, "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", @@ -8710,13 +8968,15 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true + "dev": true, + "optional": true }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, + "optional": true, "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1", @@ -8727,13 +8987,15 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true + "dev": true, + "optional": true }, "yargs": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, + "optional": true, "requires": { "camelcase": "^3.0.0", "cliui": "^3.2.0", @@ -8795,6 +9057,7 @@ "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, + "optional": true, "requires": { "js-base64": "^2.1.8", "source-map": "^0.4.2" @@ -8805,6 +9068,7 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, + "optional": true, "requires": { "amdefine": ">=0.0.4" } @@ -9543,6 +9807,7 @@ "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.0.tgz", "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", "dev": true, + "optional": true, "requires": { "readable-stream": "^2.0.1" } @@ -9731,6 +9996,7 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, + "optional": true, "requires": { "block-stream": "*", "fstream": "^1.0.2", @@ -9894,6 +10160,7 @@ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.2.tgz", "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, + "optional": true, "requires": { "glob": "^6.0.4" }, @@ -9903,6 +10170,7 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "dev": true, + "optional": true, "requires": { "inflight": "^1.0.4", "inherits": "2", @@ -10081,9 +10349,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.27", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.27.tgz", + "integrity": "sha512-O94wxMSb3td/TlofkITYvYIlvIVdldvNXDVRekzK13CQZuL37ua4nrdXX0Ro7MapfUVzglRHs0/+imPRUdOghg==", "dev": true, "requires": { "commander": "~2.15.0", @@ -10251,9 +10519,9 @@ } }, "upath": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz", - "integrity": "sha512-qbKn90aDQ0YEwvXoLqj0oiuUYroLX2lVHZ+b+xwjozFasAOC4GneDq5+OaIG5Zj+jFmbz/uO+f7a9qxjktJQww==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", + "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", "dev": true }, "upper-case": { @@ -10476,6 +10744,19 @@ "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.1.tgz", "integrity": "sha1-Om2bwVGWN3qQ+OKAP6UmIWWwRRA=" }, + "webassemblyjs": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz", + "integrity": "sha512-4lOV1Lv6olz0PJkDGQEp82HempAn147e6BXijWDzz9g7/2nSebVP9GVg62Fz5ZAs55mxq13GA0XLyvY8XkyDjg==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/validation": "1.4.3", + "@webassemblyjs/wasm-parser": "1.4.3", + "@webassemblyjs/wast-parser": "1.4.3", + "long": "^3.2.0" + } + }, "webdriver-js-extender": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-1.0.0.tgz", @@ -10524,11 +10805,14 @@ } }, "webpack": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.6.0.tgz", - "integrity": "sha512-Fu/k/3fZeGtIhuFkiYpIy1UDHhMiGKjG4FFPVuvG+5Os2lWA1ttWpmi9Qnn6AgfZqj9MvhZW/rmj/ip+nHr06g==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz", + "integrity": "sha512-/hfAjBISycdK597lxONjKEFX7dSIU1PsYwC3XlXUXoykWBlv9QV5HnO+ql3HvrrgfBJ7WXdnjO9iGPR2aAc5sw==", "dev": true, "requires": { + "@webassemblyjs/ast": "1.4.3", + "@webassemblyjs/wasm-edit": "1.4.3", + "@webassemblyjs/wasm-parser": "1.4.3", "acorn": "^5.0.0", "acorn-dynamic-import": "^3.0.0", "ajv": "^6.1.0", @@ -10886,7 +11170,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true + "dev": true, + "optional": true }, "wide-align": { "version": "1.1.2", @@ -11026,6 +11311,7 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, + "optional": true, "requires": { "camelcase": "^3.0.0" }, @@ -11034,7 +11320,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true + "dev": true, + "optional": true } } }, diff --git a/package.json b/package.json index c0a44ef7..a0aab823 100644 --- a/package.json +++ b/package.json @@ -19,26 +19,26 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "6.0.1", - "@angular/cdk": "6.0.2", - "@angular/common": "6.0.1", - "@angular/compiler": "6.0.1", - "@angular/core": "6.0.1", + "@angular/animations": "6.0.3", + "@angular/cdk": "6.1.0", + "@angular/common": "6.0.3", + "@angular/compiler": "6.0.3", + "@angular/core": "6.0.3", "@angular/flex-layout": "6.0.0-beta.15", - "@angular/forms": "6.0.1", - "@angular/http": "6.0.1", - "@angular/material": "6.0.2", - "@angular/material-moment-adapter": "6.0.2", - "@angular/platform-browser": "6.0.1", - "@angular/platform-browser-dynamic": "6.0.1", - "@angular/router": "6.0.1", + "@angular/forms": "6.0.3", + "@angular/http": "6.0.3", + "@angular/material": "6.1.0", + "@angular/material-moment-adapter": "6.1.0", + "@angular/platform-browser": "6.0.3", + "@angular/platform-browser-dynamic": "6.0.3", + "@angular/router": "6.0.3", "@ngrx/effects": "6.0.0-beta.3", "@ngrx/router-store": "6.0.0-beta.3", "@ngrx/store": "6.0.0-beta.3", "@ngrx/store-devtools": "6.0.0-beta.3", - "@ngx-translate/core": "10.0.1", - "@swimlane/ngx-charts": "8.0.0", - "@swimlane/ngx-datatable": "12.0.0", + "@ngx-translate/core": "10.0.2", + "@swimlane/ngx-charts": "8.0.1", + "@swimlane/ngx-datatable": "13.0.0", "@swimlane/ngx-dnd": "4.0.1", "@types/prismjs": "1.9.0", "angular-calendar": "0.25.2", @@ -51,32 +51,32 @@ "lodash": "4.17.10", "moment": "2.22.1", "ng2-charts": "1.6.0", - "ngrx-store-freeze": "0.2.2", - "ngx-color-picker": "6.1.0", + "ngrx-store-freeze": "0.2.3", + "ngx-color-picker": "6.2.0", "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.3.0", "prismjs": "1.14.0", - "rxjs": "6.1.0", + "rxjs": "6.2.0", "rxjs-compat": "6.1.0", "web-animations-js": "2.3.1", "zone.js": "0.8.26" }, "devDependencies": { - "@angular/cli": "6.0.1", - "@angular/compiler-cli": "6.0.1", - "@angular/language-service": "6.0.1", - "@angular-devkit/build-angular": "0.6.1", + "@angular/cli": "6.0.3", + "@angular/compiler-cli": "6.0.3", + "@angular/language-service": "6.0.3", + "@angular-devkit/build-angular": "0.6.3", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.7", "@types/jasminewd2": "2.0.3", - "@types/lodash": "4.14.108", + "@types/lodash": "4.14.109", "@types/node": "8.9.5", "codelyzer": "4.2.1", "jasmine-core": "2.99.1", "jasmine-spec-reporter": "4.2.1", "karma": "1.7.1", "karma-chrome-launcher": "2.2.0", - "karma-coverage-istanbul-reporter": "1.4.2", + "karma-coverage-istanbul-reporter": "1.4.3", "karma-jasmine": "1.1.2", "karma-jasmine-html-reporter": "0.2.2", "protractor": "5.3.2", diff --git a/src/@fuse/components/material-color-picker/material-color-picker.component.ts b/src/@fuse/components/material-color-picker/material-color-picker.component.ts index 08671cdb..f914fa4e 100644 --- a/src/@fuse/components/material-color-picker/material-color-picker.component.ts +++ b/src/@fuse/components/material-color-picker/material-color-picker.component.ts @@ -13,22 +13,78 @@ import { MatColors } from '@fuse/mat-colors'; export class FuseMaterialColorPickerComponent implements OnChanges { colors: any; - selectedColor: any; hues: string[]; - view = 'palettes'; + selectedColor: any; + view: string; - @Input() selectedPalette = ''; - @Input() selectedHue = ''; - @Input() selectedFg = ''; - @Input() value: any; - @Output() onValueChange = new EventEmitter(); - @Output() selectedPaletteChange = new EventEmitter(); - @Output() selectedHueChange = new EventEmitter(); - @Output() selectedClassChange = new EventEmitter(); - @Output() selectedBgChange = new EventEmitter(); - @Output() selectedFgChange = new EventEmitter(); + @Input() + selectedPalette: string; - _selectedClass = ''; + @Input() + selectedHue: string; + + @Input() + selectedFg: string; + + @Input() + value: any; + + @Output() + onValueChange: EventEmitter; + + @Output() + selectedPaletteChange: EventEmitter; + + @Output() + selectedHueChange: EventEmitter; + + @Output() + selectedClassChange: EventEmitter; + + @Output() + selectedBgChange: EventEmitter; + + @Output() + selectedFgChange: EventEmitter; + + // Private + _selectedClass: string; + _selectedBg: string; + + /** + * Constructor + */ + constructor() + { + // Set the defaults + this.colors = MatColors.all; + this.hues = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900', 'A100', 'A200', 'A400', 'A700']; + this.selectedFg = ''; + this.selectedHue = ''; + this.selectedPalette = ''; + this.view = 'palettes'; + + this.onValueChange = new EventEmitter(); + this.selectedPaletteChange = new EventEmitter(); + this.selectedHueChange = new EventEmitter(); + this.selectedClassChange = new EventEmitter(); + this.selectedBgChange = new EventEmitter(); + this.selectedFgChange = new EventEmitter(); + + // Set the private defaults + this._selectedClass = ''; + this._selectedBg = ''; + } + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Selected class + * + * @param value + */ @Input() set selectedClass(value) { @@ -54,7 +110,11 @@ export class FuseMaterialColorPickerComponent implements OnChanges return this._selectedClass; } - _selectedBg = ''; + /** + * Selected bg + * + * @param value + */ @Input() set selectedBg(value) { @@ -86,13 +146,16 @@ export class FuseMaterialColorPickerComponent implements OnChanges return this._selectedBg; } - constructor() - { - this.colors = MatColors.all; - this.hues = ['50', '100', '200', '300', '400', '500', '600', '700', '800', '900', 'A100', 'A200', 'A400', 'A700']; - } + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- - ngOnChanges(changes: any) + /** + * On changes + * + * @param changes + */ + ngOnChanges(changes: any): void { if ( changes.selectedBg && changes.selectedBg.currentValue === '' || changes.selectedClass && changes.selectedClass.currentValue === '' || @@ -106,21 +169,38 @@ export class FuseMaterialColorPickerComponent implements OnChanges this.updateSelectedColor(); } } - - selectPalette(palette) + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Select palette + * + * @param palette + */ + selectPalette(palette): void { this.selectedPalette = palette; this.updateSelectedColor(); this.view = 'hues'; } - selectHue(hue) + /** + * Select hue + * + * @param hue + */ + selectHue(hue): void { this.selectedHue = hue; this.updateSelectedColor(); } - removeColor() + /** + * Remove color + */ + removeColor(): void { this.selectedPalette = ''; this.selectedHue = ''; @@ -128,7 +208,10 @@ export class FuseMaterialColorPickerComponent implements OnChanges this.view = 'palettes'; } - updateSelectedColor() + /** + * Update selected color + */ + updateSelectedColor(): void { setTimeout(() => { @@ -168,12 +251,18 @@ export class FuseMaterialColorPickerComponent implements OnChanges }); } - backToPaletteSelection() + /** + * Go back to palette selection + */ + backToPaletteSelection(): void { this.view = 'palettes'; } - onMenuOpen() + /** + * On menu open + */ + onMenuOpen(): void { if ( this.selectedPalette === '' ) { diff --git a/src/@fuse/components/material-color-picker/material-color-picker.module.ts b/src/@fuse/components/material-color-picker/material-color-picker.module.ts index 94db7875..6562e678 100644 --- a/src/@fuse/components/material-color-picker/material-color-picker.module.ts +++ b/src/@fuse/components/material-color-picker/material-color-picker.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FlexLayoutModule } from '@angular/flex-layout'; - import { MatButtonModule, MatIconModule, MatMenuModule, MatRippleModule } from '@angular/material'; import { FusePipesModule } from '@fuse/pipes/pipes.module'; diff --git a/src/@fuse/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts index 42db3bcb..5e001980 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -1,8 +1,8 @@ import { Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; import { ObservableMedia } from '@angular/flex-layout'; -import { Subject, Subscription } from 'rxjs'; -import { takeUntil } from 'rxjs/operators'; import { CookieService } from 'ngx-cookie-service'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; import { FuseMatchMediaService } from '@fuse/services/match-media.service'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; @@ -68,6 +68,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy { // Subscribe to config changes this._fuseConfigService.config + .pipe(takeUntil(this._unsubscribeAll)) .subscribe( (config) => { this.toolbarColor = config.colorClasses.toolbar; diff --git a/src/@fuse/scss/partials/_print.scss b/src/@fuse/scss/partials/_print.scss index 4e81f02c..14517e4f 100644 --- a/src/@fuse/scss/partials/_print.scss +++ b/src/@fuse/scss/partials/_print.scss @@ -34,7 +34,7 @@ } /* General styles */ - fuse-root { + app { fuse-navbar-vertical, fuse-navbar-horizontal, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 06408631..4deed6b7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -10,7 +10,7 @@ import { locale as navigationEnglish } from 'app/navigation/i18n/en'; import { locale as navigationTurkish } from 'app/navigation/i18n/tr'; @Component({ - selector : 'fuse-root', + selector : 'app', templateUrl: './app.component.html', styleUrls : ['./app.component.scss'] }) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b664f2fb..b7cc2196 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,7 +13,7 @@ import { FuseSharedModule } from '@fuse/shared.module'; import { fuseConfig } from 'app/fuse-config'; -import { FuseFakeDbService } from 'app/fuse-fake-db/fuse-fake-db.service'; +import { FakeDbService } from 'app/fake-db/fake-db.service'; import { AppComponent } from 'app/app.component'; import { AppStoreModule } from 'app/store/store.module'; import { LayoutModule } from 'app/layout/layout.module'; @@ -29,7 +29,7 @@ const appRoutes: Routes = [ }, { path : 'ui', - loadChildren: './main/ui/ui.module#FuseUIModule' + loadChildren: './main/ui/ui.module#UIModule' }, { path : 'services', @@ -60,7 +60,7 @@ const appRoutes: Routes = [ RouterModule.forRoot(appRoutes), TranslateModule.forRoot(), - InMemoryWebApiModule.forRoot(FuseFakeDbService, { + InMemoryWebApiModule.forRoot(FakeDbService, { delay : 0, passThruUnknownUrl: true }), diff --git a/src/app/fuse-fake-db/academy.ts b/src/app/fake-db/academy.ts similarity index 100% rename from src/app/fuse-fake-db/academy.ts rename to src/app/fake-db/academy.ts diff --git a/src/app/fuse-fake-db/calendar.ts b/src/app/fake-db/calendar.ts similarity index 100% rename from src/app/fuse-fake-db/calendar.ts rename to src/app/fake-db/calendar.ts diff --git a/src/app/fuse-fake-db/chat.ts b/src/app/fake-db/chat.ts similarity index 100% rename from src/app/fuse-fake-db/chat.ts rename to src/app/fake-db/chat.ts diff --git a/src/app/fuse-fake-db/contacts.ts b/src/app/fake-db/contacts.ts similarity index 100% rename from src/app/fuse-fake-db/contacts.ts rename to src/app/fake-db/contacts.ts diff --git a/src/app/fuse-fake-db/dashboard-analytics.ts b/src/app/fake-db/dashboard-analytics.ts similarity index 100% rename from src/app/fuse-fake-db/dashboard-analytics.ts rename to src/app/fake-db/dashboard-analytics.ts diff --git a/src/app/fuse-fake-db/dashboard-project.ts b/src/app/fake-db/dashboard-project.ts similarity index 100% rename from src/app/fuse-fake-db/dashboard-project.ts rename to src/app/fake-db/dashboard-project.ts diff --git a/src/app/fuse-fake-db/e-commerce.ts b/src/app/fake-db/e-commerce.ts similarity index 100% rename from src/app/fuse-fake-db/e-commerce.ts rename to src/app/fake-db/e-commerce.ts diff --git a/src/app/fuse-fake-db/fuse-fake-db.service.ts b/src/app/fake-db/fake-db.service.ts similarity index 69% rename from src/app/fuse-fake-db/fuse-fake-db.service.ts rename to src/app/fake-db/fake-db.service.ts index e54dd9bc..32027ba6 100644 --- a/src/app/fuse-fake-db/fuse-fake-db.service.ts +++ b/src/app/fake-db/fake-db.service.ts @@ -1,27 +1,27 @@ import { InMemoryDbService } from 'angular-in-memory-web-api'; -import { ProjectDashboardDb } from './dashboard-project'; -import { AnalyticsDashboardDb } from './dashboard-analytics'; -import { CalendarFakeDb } from './calendar'; -import { ECommerceFakeDb } from './e-commerce'; -import { AcademyFakeDb } from './academy'; -import { MailFakeDb } from './mail'; -import { ChatFakeDb } from './chat'; -import { FileManagerFakeDb } from './file-manager'; -import { ContactsFakeDb } from './contacts'; -import { TodoFakeDb } from './todo'; -import { ScrumboardFakeDb } from './scrumboard'; -import { InvoiceFakeDb } from './invoice'; -import { ProfileFakeDb } from './profile'; -import { SearchFakeDb } from './search'; -import { FaqFakeDb } from './faq'; -import { KnowledgeBaseFakeDb } from './knowledge-base'; -import { IconsFakeDb } from './icons'; -import { QuickPanelFakeDb } from './quick-panel'; +import { ProjectDashboardDb } from 'app/fake-db/dashboard-project'; +import { AnalyticsDashboardDb } from 'app/fake-db/dashboard-analytics'; +import { CalendarFakeDb } from 'app/fake-db/calendar'; +import { ECommerceFakeDb } from 'app/fake-db/e-commerce'; +import { AcademyFakeDb } from 'app/fake-db/academy'; +import { MailFakeDb } from 'app/fake-db/mail'; +import { ChatFakeDb } from 'app/fake-db/chat'; +import { FileManagerFakeDb } from 'app/fake-db/file-manager'; +import { ContactsFakeDb } from 'app/fake-db/contacts'; +import { TodoFakeDb } from 'app/fake-db/todo'; +import { ScrumboardFakeDb } from 'app/fake-db/scrumboard'; +import { InvoiceFakeDb } from 'app/fake-db/invoice'; +import { ProfileFakeDb } from 'app/fake-db/profile'; +import { SearchFakeDb } from 'app/fake-db/search'; +import { FaqFakeDb } from 'app/fake-db/faq'; +import { KnowledgeBaseFakeDb } from 'app/fake-db/knowledge-base'; +import { IconsFakeDb } from 'app/fake-db/icons'; +import { QuickPanelFakeDb } from 'app/fake-db/quick-panel'; -export class FuseFakeDbService implements InMemoryDbService +export class FakeDbService implements InMemoryDbService { - createDb() + createDb(): any { return { // Dashboards diff --git a/src/app/fuse-fake-db/faq.ts b/src/app/fake-db/faq.ts similarity index 100% rename from src/app/fuse-fake-db/faq.ts rename to src/app/fake-db/faq.ts diff --git a/src/app/fuse-fake-db/file-manager.ts b/src/app/fake-db/file-manager.ts similarity index 100% rename from src/app/fuse-fake-db/file-manager.ts rename to src/app/fake-db/file-manager.ts diff --git a/src/app/fuse-fake-db/icons.ts b/src/app/fake-db/icons.ts similarity index 100% rename from src/app/fuse-fake-db/icons.ts rename to src/app/fake-db/icons.ts diff --git a/src/app/fuse-fake-db/invoice.ts b/src/app/fake-db/invoice.ts similarity index 100% rename from src/app/fuse-fake-db/invoice.ts rename to src/app/fake-db/invoice.ts diff --git a/src/app/fuse-fake-db/knowledge-base.ts b/src/app/fake-db/knowledge-base.ts similarity index 100% rename from src/app/fuse-fake-db/knowledge-base.ts rename to src/app/fake-db/knowledge-base.ts diff --git a/src/app/fuse-fake-db/mail.ts b/src/app/fake-db/mail.ts similarity index 100% rename from src/app/fuse-fake-db/mail.ts rename to src/app/fake-db/mail.ts diff --git a/src/app/fuse-fake-db/profile.ts b/src/app/fake-db/profile.ts similarity index 100% rename from src/app/fuse-fake-db/profile.ts rename to src/app/fake-db/profile.ts diff --git a/src/app/fuse-fake-db/quick-panel.ts b/src/app/fake-db/quick-panel.ts similarity index 100% rename from src/app/fuse-fake-db/quick-panel.ts rename to src/app/fake-db/quick-panel.ts diff --git a/src/app/fuse-fake-db/scrumboard.ts b/src/app/fake-db/scrumboard.ts similarity index 100% rename from src/app/fuse-fake-db/scrumboard.ts rename to src/app/fake-db/scrumboard.ts diff --git a/src/app/fuse-fake-db/search.ts b/src/app/fake-db/search.ts similarity index 100% rename from src/app/fuse-fake-db/search.ts rename to src/app/fake-db/search.ts diff --git a/src/app/fuse-fake-db/todo.ts b/src/app/fake-db/todo.ts similarity index 100% rename from src/app/fuse-fake-db/todo.ts rename to src/app/fake-db/todo.ts diff --git a/src/app/main/apps/apps.module.ts b/src/app/main/apps/apps.module.ts index 8ead8245..37e4ea28 100644 --- a/src/app/main/apps/apps.module.ts +++ b/src/app/main/apps/apps.module.ts @@ -18,7 +18,7 @@ const routes = [ }, { path : 'mail-ngrx', - loadChildren: './mail-ngrx/mail.module#FuseMailNgrxModule' + loadChildren: './mail-ngrx/mail.module#MailNgrxModule' }, { path : 'chat', @@ -38,7 +38,7 @@ const routes = [ }, { path : 'todo', - loadChildren: './todo/todo.module#FuseTodoModule' + loadChildren: './todo/todo.module#TodoModule' }, { path : 'file-manager', @@ -50,7 +50,7 @@ const routes = [ }, { path : 'scrumboard', - loadChildren: './scrumboard/scrumboard.module#FuseScrumboardModule' + loadChildren: './scrumboard/scrumboard.module#ScrumboardModule' } ]; diff --git a/src/app/main/apps/mail-ngrx/mail.module.ts b/src/app/main/apps/mail-ngrx/mail.module.ts index 78ca98e7..9651d7f0 100644 --- a/src/app/main/apps/mail-ngrx/mail.module.ts +++ b/src/app/main/apps/mail-ngrx/mail.module.ts @@ -88,6 +88,6 @@ const routes: Routes = [ ], entryComponents: [MailNgrxComposeDialogComponent] }) -export class FuseMailNgrxModule +export class MailNgrxModule { } diff --git a/src/app/main/apps/scrumboard/scrumboard.module.ts b/src/app/main/apps/scrumboard/scrumboard.module.ts index eb495b35..eba8e392 100644 --- a/src/app/main/apps/scrumboard/scrumboard.module.ts +++ b/src/app/main/apps/scrumboard/scrumboard.module.ts @@ -87,6 +87,6 @@ const routes: Routes = [ ], entryComponents: [ScrumboardCardDialogComponent] }) -export class FuseScrumboardModule +export class ScrumboardModule { } diff --git a/src/app/main/apps/todo/todo.module.ts b/src/app/main/apps/todo/todo.module.ts index 5a704c09..adb404f2 100644 --- a/src/app/main/apps/todo/todo.module.ts +++ b/src/app/main/apps/todo/todo.module.ts @@ -91,6 +91,6 @@ const routes: Routes = [ TodoService ] }) -export class FuseTodoModule +export class TodoModule { } diff --git a/src/app/main/components-third-party/components-third-party.module.ts b/src/app/main/components-third-party/components-third-party.module.ts index 0b9ae8c9..028e8771 100644 --- a/src/app/main/components-third-party/components-third-party.module.ts +++ b/src/app/main/components-third-party/components-third-party.module.ts @@ -6,18 +6,18 @@ import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { FuseSharedModule } from '@fuse/shared.module'; import { GoogleMapsModule } from 'app/main/components-third-party/google-maps/google-maps.module'; -import { FuseNgxDatatableComponent } from 'app/main/components-third-party/datatable/ngx-datatable.component'; +import { NgxDatatableDocsComponent } from 'app/main/components-third-party/datatable/ngx-datatable.component'; const routes = [ { path : 'datatables/ngx-datatable', - component: FuseNgxDatatableComponent + component: NgxDatatableDocsComponent } ]; @NgModule({ declarations: [ - FuseNgxDatatableComponent + NgxDatatableDocsComponent ], imports : [ RouterModule.forChild(routes), @@ -31,7 +31,7 @@ const routes = [ FuseSharedModule, GoogleMapsModule - ], + ] }) export class ComponentsThirdPartyModule { diff --git a/src/app/main/components-third-party/datatable/ngx-datatable.component.ts b/src/app/main/components-third-party/datatable/ngx-datatable.component.ts index 003dbc7f..80a3b3ae 100644 --- a/src/app/main/components-third-party/datatable/ngx-datatable.component.ts +++ b/src/app/main/components-third-party/datatable/ngx-datatable.component.ts @@ -1,27 +1,63 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; @Component({ - selector : 'fuse-ngx-datatable', + selector : 'ngx-datatable-docs', templateUrl: './ngx-datatable.component.html', styleUrls : ['./ngx-datatable.component.scss'] }) -export class FuseNgxDatatableComponent implements OnInit +export class NgxDatatableDocsComponent implements OnInit, OnDestroy { rows: any[]; - loadingIndicator = true; - reorderable = true; + loadingIndicator: boolean; + reorderable: boolean; - constructor(private http: HttpClient) + // Private + private _unsubscribeAll: Subject; + + /** + * Constructor + * + * @param {HttpClient} _httpClient + */ + constructor( + private _httpClient: HttpClient + ) { + // Set the defaults + this.loadingIndicator = true; + this.reorderable = true; + + // Set the private defaults + this._unsubscribeAll = new Subject(); } - ngOnInit() + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { - this.http.get('api/contacts-contacts') + this._httpClient.get('api/contacts-contacts') + .pipe(takeUntil(this._unsubscribeAll)) .subscribe((contacts: any) => { this.rows = contacts; this.loadingIndicator = false; }); } + + /** + * On destroy + */ + ngOnDestroy(): void + { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(); + this._unsubscribeAll.complete(); + } } diff --git a/src/app/main/components-third-party/google-maps/google-maps.component.ts b/src/app/main/components-third-party/google-maps/google-maps.component.ts index 2425f0ab..8f31a0ef 100644 --- a/src/app/main/components-third-party/google-maps/google-maps.component.ts +++ b/src/app/main/components-third-party/google-maps/google-maps.component.ts @@ -1,17 +1,22 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-google-maps-docs', + selector : 'google-maps-docs', templateUrl: './google-maps.component.html', styleUrls : ['./google-maps.component.scss'] }) -export class FuseGoogleMapsDocsComponent +export class GoogleMapsDocsComponent { - lat = -34.397; - lng = 150.644; + lat: number; + lng: number; + /** + * Constructor + */ constructor() { - + // Set the defaults + this.lat = -34.397; + this.lng = 150.644; } } diff --git a/src/app/main/components-third-party/google-maps/google-maps.module.ts b/src/app/main/components-third-party/google-maps/google-maps.module.ts index 92a7b60b..a47d10d3 100644 --- a/src/app/main/components-third-party/google-maps/google-maps.module.ts +++ b/src/app/main/components-third-party/google-maps/google-maps.module.ts @@ -8,18 +8,18 @@ import { AgmCoreModule } from '@agm/core'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHighlightModule } from '@fuse/components'; -import { FuseGoogleMapsDocsComponent } from './google-maps.component'; +import { GoogleMapsDocsComponent } from './google-maps.component'; const routes = [ { path : 'google-maps', - component: FuseGoogleMapsDocsComponent + component: GoogleMapsDocsComponent } ]; @NgModule({ declarations: [ - FuseGoogleMapsDocsComponent + GoogleMapsDocsComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/components/angular-material/angular-material.component.html b/src/app/main/components/angular-material/angular-material.component.html index 65a705dd..2339f025 100644 --- a/src/app/main/components/angular-material/angular-material.component.html +++ b/src/app/main/components/angular-material/angular-material.component.html @@ -24,7 +24,7 @@
- +
diff --git a/src/app/main/components/angular-material/angular-material.component.ts b/src/app/main/components/angular-material/angular-material.component.ts index 6f511c5a..4e56c1f2 100644 --- a/src/app/main/components/angular-material/angular-material.component.ts +++ b/src/app/main/components/angular-material/angular-material.component.ts @@ -1,33 +1,60 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; -import { COMPONENT_MAP } from './example-components'; +import { COMPONENT_MAP } from 'app/main/components/angular-material/example-components'; @Component({ - selector : 'fuse-angular-material', + selector : 'angular-material', templateUrl: './angular-material.component.html', styleUrls : ['./angular-material.component.scss'] }) -export class FuseAngularMaterialComponent implements OnInit +export class AngularMaterialComponent implements OnInit, OnDestroy { id: string; title: string; examples: any; + // Private + private _unsubscribeAll: Subject; + + /** + * Constructor + * + * @param {ActivatedRoute} _activatedRoute + */ constructor( - private route: ActivatedRoute + private _activatedRoute: ActivatedRoute ) { + // Set the private defaults + this._unsubscribeAll = new Subject(); } - ngOnInit() + /** + * On init + */ + ngOnInit(): void { - this.route.params.subscribe(params => { - this.id = params['id']; - const _title = this.id.replace('-', ' '); - this.title = _title.charAt(0).toUpperCase() + _title.substring(1); - this.examples = COMPONENT_MAP[this.id]; - }); + this._activatedRoute.params + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(params => { + this.id = params['id']; + const _title = this.id.replace('-', ' '); + this.title = _title.charAt(0).toUpperCase() + _title.substring(1); + this.examples = COMPONENT_MAP[this.id]; + }); + } + + /** + * On destroy + */ + ngOnDestroy(): void + { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(); + this._unsubscribeAll.complete(); } } diff --git a/src/app/main/components/angular-material/angular-material.module.ts b/src/app/main/components/angular-material/angular-material.module.ts index 2d7420d3..c82a0729 100644 --- a/src/app/main/components/angular-material/angular-material.module.ts +++ b/src/app/main/components/angular-material/angular-material.module.ts @@ -7,8 +7,8 @@ import { FuseWidgetModule } from '@fuse/components/widget/widget.module'; import { MaterialModule } from 'app/main/components/angular-material/material.module'; import { EXAMPLE_LIST } from 'app/main/components/angular-material/example-components'; -import { FuseAngularMaterialComponent } from 'app/main/components/angular-material/angular-material.component'; -import { FuseExampleViewerComponent } from 'app/main/components/angular-material/example-viewer/example-viewer'; +import { AngularMaterialComponent } from 'app/main/components/angular-material/angular-material.component'; +import { ExampleViewerComponent } from 'app/main/components/angular-material/example-viewer/example-viewer'; const routes: Routes = [ { @@ -16,7 +16,7 @@ const routes: Routes = [ children: [ { path : ':id', - component: FuseAngularMaterialComponent + component: AngularMaterialComponent } ] } @@ -25,8 +25,8 @@ const routes: Routes = [ @NgModule({ declarations : [ [...EXAMPLE_LIST], - FuseAngularMaterialComponent, - FuseExampleViewerComponent + AngularMaterialComponent, + ExampleViewerComponent ], imports : [ RouterModule.forChild(routes), @@ -39,7 +39,7 @@ const routes: Routes = [ ], entryComponents: EXAMPLE_LIST, }) -export class FuseAngularMaterialModule +export class AngularMaterialModule { } diff --git a/src/app/main/components/angular-material/example-viewer/example-viewer.scss b/src/app/main/components/angular-material/example-viewer/example-viewer.scss index 90324b70..244aed9c 100644 --- a/src/app/main/components/angular-material/example-viewer/example-viewer.scss +++ b/src/app/main/components/angular-material/example-viewer/example-viewer.scss @@ -1,6 +1,6 @@ @import "src/@fuse/scss/fuse"; -fuse-example-viewer { +example-viewer { display: block; padding: 24px 0; diff --git a/src/app/main/components/angular-material/example-viewer/example-viewer.ts b/src/app/main/components/angular-material/example-viewer/example-viewer.ts index 1ba7cda1..8bbfac1c 100644 --- a/src/app/main/components/angular-material/example-viewer/example-viewer.ts +++ b/src/app/main/components/angular-material/example-viewer/example-viewer.ts @@ -1,14 +1,13 @@ import { AfterViewInit, Component, ComponentFactoryResolver, ComponentRef, Input, OnDestroy, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core'; import { MatSnackBar } from '@angular/material'; - import 'prismjs/components/prism-scss'; import 'prismjs/components/prism-typescript'; -import { EXAMPLE_COMPONENTS } from '../example-components'; - import { fuseAnimations } from '@fuse/animations'; import { FuseCopierService } from '@fuse/services/copier.service'; +import { EXAMPLE_COMPONENTS } from 'app/main/components/angular-material/example-components'; + export interface LiveExample { title: string; @@ -18,65 +17,65 @@ export interface LiveExample } @Component({ - selector : 'fuse-example-viewer', + selector : 'example-viewer', templateUrl : './example-viewer.html', styleUrls : ['./example-viewer.scss'], encapsulation: ViewEncapsulation.None, animations : fuseAnimations }) -export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy +export class ExampleViewerComponent implements AfterViewInit, OnDestroy { + _example: string; + exampleData: LiveExample; + showSource: boolean; previewRef: ComponentRef; - selectedIndex = 0; + selectedIndex: number; + + @ViewChild('previewContainer', {read: ViewContainerRef}) + private _previewContainer: ViewContainerRef; + + /** + * Constructor + * + * @param {MatSnackBar} _matSnackBar + * @param {FuseCopierService} _fuseCopierService + * @param {ComponentFactoryResolver} _componentFactoryResolver + */ + constructor( + private _matSnackBar: MatSnackBar, + private _fuseCopierService: FuseCopierService, + private _componentFactoryResolver: ComponentFactoryResolver + ) + { + // Set the defaults + this.selectedIndex = 0; + this.showSource = false; + } + + // ----------------------------------------------------------------------------------------------------- + // @ Accessors + // ----------------------------------------------------------------------------------------------------- + + /** + * Container + * + * @param {ViewContainerRef} value + */ + set container(value: ViewContainerRef) + { + this._previewContainer = value; + } get container(): ViewContainerRef { return this._previewContainer; } - set container(value: ViewContainerRef) - { - this._previewContainer = value; - } - - @ViewChild('previewContainer', {read: ViewContainerRef}) private _previewContainer: ViewContainerRef; - - /** String key of the currently displayed example. */ - _example: string; - exampleData: LiveExample; - - /** Whether the source for the example is being displayed. */ - showSource = false; - - constructor( - private snackbar: MatSnackBar, - private copier: FuseCopierService, - private _resolver: ComponentFactoryResolver - ) - { - } - - ngAfterViewInit() - { - setTimeout(() => { - const cmpFactory = this._resolver.resolveComponentFactory(this.exampleData.component); - this.previewRef = this._previewContainer.createComponent(cmpFactory); - }, 0); - } - - ngOnDestroy() - { - if ( this.previewRef ) - { - this.previewRef.destroy(); - } - } - - get example() - { - return this._example; - } - + /** + * Example + * + * @param {string} example + */ @Input() set example(example: string) { @@ -91,20 +90,63 @@ export class FuseExampleViewerComponent implements AfterViewInit, OnDestroy } } + get example(): string + { + return this._example; + } + + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * After view init + */ + ngAfterViewInit(): void + { + setTimeout(() => { + const cmpFactory = this._componentFactoryResolver.resolveComponentFactory(this.exampleData.component); + this.previewRef = this._previewContainer.createComponent(cmpFactory); + }, 0); + } + + /** + * On destroy + */ + ngOnDestroy(): void + { + if ( this.previewRef ) + { + this.previewRef.destroy(); + } + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Toggle source view + */ toggleSourceView(): void { this.showSource = !this.showSource; } - copySource(text: string) + /** + * Copy the source + * + * @param {string} text + */ + copySource(text: string): void { - if ( this.copier.copyText(text) ) + if ( this._fuseCopierService.copyText(text) ) { - this.snackbar.open('Code copied', '', {duration: 2500}); + this._matSnackBar.open('Code copied', '', {duration: 2500}); } else { - this.snackbar.open('Copy failed. Please try again!', '', {duration: 2500}); + this._matSnackBar.open('Copy failed. Please try again!', '', {duration: 2500}); } } } diff --git a/src/app/main/components/cards/cards.component.ts b/src/app/main/components/cards/cards.component.ts index 4fe7bd7b..4f0578b9 100644 --- a/src/app/main/components/cards/cards.component.ts +++ b/src/app/main/components/cards/cards.component.ts @@ -4,206 +4,213 @@ import * as shape from 'd3-shape'; import { fuseAnimations } from '@fuse/animations'; @Component({ - selector : 'fuse-cards-docs', + selector : 'cards-docs', templateUrl: './cards.component.html', styleUrls : ['./cards.component.scss'], animations : fuseAnimations }) -export class FuseCardsDocsComponent +export class CardsDocsComponent { - view = 'preview'; - - // Card 9 - card9Expanded = false; - - // Card 10 - card10Expanded = false; - - // Card 19 - card19 = { - scheme: { - domain: ['#5c84f1'] - }, - data : [ - { - 'name' : 'GOOG', - 'series': [ - { - 'name' : 'Jan 1', - 'value': 540.2 - }, - { - 'name' : 'Jan 2', - 'value': 539.4 - }, - { - 'name' : 'Jan 3', - 'value': 538.9 - }, - { - 'name' : 'Jan 4', - 'value': 539.6 - }, - { - 'name' : 'Jan 5', - 'value': 540 - }, - { - 'name' : 'Jan 6', - 'value': 540.2 - }, - { - 'name' : 'Jan 7', - 'value': 540.48 - } - ] - } - ], - curve : shape.curveBasis - }; - - // Card 24 - card24 = { - scheme : { - domain: ['#4867d2', '#5c84f1', '#89a9f4'] - }, - devices: [ - { - 'name' : 'Desktop', - 'value' : 92.8, - 'change': -0.6 - }, - { - 'name' : 'Mobile', - 'value' : 6.1, - 'change': 0.7 - }, - { - 'name' : 'Tablet', - 'value' : 1.1, - 'change': 0.1 - } - ] - }; - - // Card 25 - card25 = { - scheme: { - domain: ['#5c84f1'] - }, - data : [ - { - 'name' : 'Monday', - 'value': 221 - }, - { - 'name' : 'Tuesday', - 'value': 428 - }, - { - 'name' : 'Wednesday', - 'value': 492 - }, - { - 'name' : 'Thursday', - 'value': 471 - }, - { - 'name' : 'Friday', - 'value': 413 - }, - { - 'name' : 'Saturday', - 'value': 344 - }, - { - 'name' : 'Sunday', - 'value': 294 - } - ] - }; - - // Card 26 - card26 = { - scheme: { - domain: ['#5c84f1'] - }, - data : [ - { - 'name' : 'Impressions', - 'series': [ - { - 'name' : 'Jan 1', - 'value': 670000 - }, - { - 'name' : 'Jan 2', - 'value': 540000 - }, - { - 'name' : 'Jan 3', - 'value': 820000 - }, - { - 'name' : 'Jan 4', - 'value': 570000 - }, - { - 'name' : 'Jan 5', - 'value': 720000 - }, - { - 'name' : 'Jan 6', - 'value': 570000 - }, - { - 'name' : 'Jan 7', - 'value': 870000 - }, - { - 'name' : 'Jan 8', - 'value': 720000 - }, - { - 'name' : 'Jan 9', - 'value': 890000 - }, - { - 'name' : 'Jan 10', - 'value': 987000 - }, - { - 'name' : 'Jan 11', - 'value': 1120000 - }, - { - 'name' : 'Jan 12', - 'value': 1360000 - }, - { - 'name' : 'Jan 13', - 'value': 1100000 - }, - { - 'name' : 'Jan 14', - 'value': 1490000 - }, - { - 'name' : 'Jan 15', - 'value': 980000 - } - ] - } - ], - curve : shape.curveBasis - }; + view: string; + card9Expanded: boolean; + card10Expanded: boolean; + card19: any; + card24: any; + card25: any; + card26: any; constructor() { + // Set the defaults + this.view = 'preview'; + + this.card9Expanded = false; + this.card10Expanded = false; + this.card19 = { + scheme: { + domain: ['#5c84f1'] + }, + data : [ + { + 'name' : 'GOOG', + 'series': [ + { + 'name' : 'Jan 1', + 'value': 540.2 + }, + { + 'name' : 'Jan 2', + 'value': 539.4 + }, + { + 'name' : 'Jan 3', + 'value': 538.9 + }, + { + 'name' : 'Jan 4', + 'value': 539.6 + }, + { + 'name' : 'Jan 5', + 'value': 540 + }, + { + 'name' : 'Jan 6', + 'value': 540.2 + }, + { + 'name' : 'Jan 7', + 'value': 540.48 + } + ] + } + ], + curve : shape.curveBasis + }; + + this.card24 = { + scheme : { + domain: ['#4867d2', '#5c84f1', '#89a9f4'] + }, + devices: [ + { + 'name' : 'Desktop', + 'value' : 92.8, + 'change': -0.6 + }, + { + 'name' : 'Mobile', + 'value' : 6.1, + 'change': 0.7 + }, + { + 'name' : 'Tablet', + 'value' : 1.1, + 'change': 0.1 + } + ] + }; + + this.card25 = { + scheme: { + domain: ['#5c84f1'] + }, + data : [ + { + 'name' : 'Monday', + 'value': 221 + }, + { + 'name' : 'Tuesday', + 'value': 428 + }, + { + 'name' : 'Wednesday', + 'value': 492 + }, + { + 'name' : 'Thursday', + 'value': 471 + }, + { + 'name' : 'Friday', + 'value': 413 + }, + { + 'name' : 'Saturday', + 'value': 344 + }, + { + 'name' : 'Sunday', + 'value': 294 + } + ] + }; + + this.card26 = { + scheme: { + domain: ['#5c84f1'] + }, + data : [ + { + 'name' : 'Impressions', + 'series': [ + { + 'name' : 'Jan 1', + 'value': 670000 + }, + { + 'name' : 'Jan 2', + 'value': 540000 + }, + { + 'name' : 'Jan 3', + 'value': 820000 + }, + { + 'name' : 'Jan 4', + 'value': 570000 + }, + { + 'name' : 'Jan 5', + 'value': 720000 + }, + { + 'name' : 'Jan 6', + 'value': 570000 + }, + { + 'name' : 'Jan 7', + 'value': 870000 + }, + { + 'name' : 'Jan 8', + 'value': 720000 + }, + { + 'name' : 'Jan 9', + 'value': 890000 + }, + { + 'name' : 'Jan 10', + 'value': 987000 + }, + { + 'name' : 'Jan 11', + 'value': 1120000 + }, + { + 'name' : 'Jan 12', + 'value': 1360000 + }, + { + 'name' : 'Jan 13', + 'value': 1100000 + }, + { + 'name' : 'Jan 14', + 'value': 1490000 + }, + { + 'name' : 'Jan 15', + 'value': 980000 + } + ] + } + ], + curve : shape.curveBasis + }; } - toggleView() + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Toggle the view + */ + toggleView(): void { if ( this.view === 'preview' ) { diff --git a/src/app/main/components/components.module.ts b/src/app/main/components/components.module.ts index 89eb62f7..0a53c9a7 100644 --- a/src/app/main/components/components.module.ts +++ b/src/app/main/components/components.module.ts @@ -4,73 +4,74 @@ import { MatButtonModule, MatButtonToggleModule, MatFormFieldModule, MatIconModu import { NgxChartsModule } from '@swimlane/ngx-charts'; import { FuseSharedModule } from '@fuse/shared.module'; + import { FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, FuseWidgetModule } from '@fuse/components'; -import { FuseCardsDocsComponent } from 'app/main/components/cards/cards.component'; -import { FuseCountdownDocsComponent } from 'app/main/components/countdown/countdown.component'; -import { FuseHighlightDocsComponent } from 'app/main/components/highlight/highlight.component'; -import { FuseMaterialColorPickerDocsComponent } from 'app/main/components/material-color-picker/material-color-picker.component'; -import { FuseMultiLanguageDocsComponent } from 'app/main/components/multi-language/multi-language.component'; -import { FuseNavigationDocsComponent } from 'app/main/components/navigation/navigation.component'; -import { FuseSearchBarDocsComponent } from 'app/main/components/search-bar/search-bar.component'; -import { FuseSidebarDocsComponent } from 'app/main/components/sidebar/sidebar.component'; -import { FuseShortcutsDocsComponent } from 'app/main/components/shortcuts/shortcuts.component'; -import { FuseWidgetDocsComponent } from 'app/main/components/widget/widget.component'; +import { CardsDocsComponent } from 'app/main/components/cards/cards.component'; +import { CountdownDocsComponent } from 'app/main/components/countdown/countdown.component'; +import { HighlightDocsComponent } from 'app/main/components/highlight/highlight.component'; +import { MaterialColorPickerDocsComponent } from 'app/main/components/material-color-picker/material-color-picker.component'; +import { MultiLanguageDocsComponent } from 'app/main/components/multi-language/multi-language.component'; +import { NavigationDocsComponent } from 'app/main/components/navigation/navigation.component'; +import { SearchBarDocsComponent } from 'app/main/components/search-bar/search-bar.component'; +import { SidebarDocsComponent } from 'app/main/components/sidebar/sidebar.component'; +import { ShortcutsDocsComponent } from 'app/main/components/shortcuts/shortcuts.component'; +import { WidgetDocsComponent } from 'app/main/components/widget/widget.component'; const routes = [ { path : 'cards', - component: FuseCardsDocsComponent + component: CardsDocsComponent }, { path : 'countdown', - component: FuseCountdownDocsComponent + component: CountdownDocsComponent }, { path : 'highlight', - component: FuseHighlightDocsComponent + component: HighlightDocsComponent }, { path : 'material-color-picker', - component: FuseMaterialColorPickerDocsComponent + component: MaterialColorPickerDocsComponent }, { path : 'multi-language', - component: FuseMultiLanguageDocsComponent + component: MultiLanguageDocsComponent }, { path : 'navigation', - component: FuseNavigationDocsComponent + component: NavigationDocsComponent }, { path : 'search-bar', - component: FuseSearchBarDocsComponent + component: SearchBarDocsComponent }, { path : 'sidebar', - component: FuseSidebarDocsComponent + component: SidebarDocsComponent }, { path : 'shortcuts', - component: FuseShortcutsDocsComponent + component: ShortcutsDocsComponent }, { path : 'widget', - component: FuseWidgetDocsComponent + component: WidgetDocsComponent } ]; @NgModule({ declarations: [ - FuseCardsDocsComponent, - FuseCountdownDocsComponent, - FuseHighlightDocsComponent, - FuseMaterialColorPickerDocsComponent, - FuseMultiLanguageDocsComponent, - FuseNavigationDocsComponent, - FuseSearchBarDocsComponent, - FuseSidebarDocsComponent, - FuseShortcutsDocsComponent, - FuseWidgetDocsComponent + CardsDocsComponent, + CountdownDocsComponent, + HighlightDocsComponent, + MaterialColorPickerDocsComponent, + MultiLanguageDocsComponent, + NavigationDocsComponent, + SearchBarDocsComponent, + SidebarDocsComponent, + ShortcutsDocsComponent, + WidgetDocsComponent ], imports : [ RouterModule.forChild(routes), @@ -88,6 +89,7 @@ const routes = [ NgxChartsModule, FuseSharedModule, + FuseCountdownModule, FuseHighlightModule, FuseMaterialColorPickerModule, diff --git a/src/app/main/components/countdown/countdown.component.ts b/src/app/main/components/countdown/countdown.component.ts index 94378858..6c525efa 100644 --- a/src/app/main/components/countdown/countdown.component.ts +++ b/src/app/main/components/countdown/countdown.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-countdown-docs', + selector : 'countdown-docs', templateUrl: './countdown.component.html', styleUrls : ['./countdown.component.scss'] }) -export class FuseCountdownDocsComponent +export class CountdownDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/components/highlight/highlight.component.ts b/src/app/main/components/highlight/highlight.component.ts index 46b3f84e..d78b0004 100644 --- a/src/app/main/components/highlight/highlight.component.ts +++ b/src/app/main/components/highlight/highlight.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-highlight-docs', + selector : 'highlight-docs', templateUrl: './highlight.component.html', styleUrls : ['./highlight.component.scss'] }) -export class FuseHighlightDocsComponent +export class HighlightDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/components/material-color-picker/material-color-picker.component.ts b/src/app/main/components/material-color-picker/material-color-picker.component.ts index cdfdfe5a..11fd9d1d 100644 --- a/src/app/main/components/material-color-picker/material-color-picker.component.ts +++ b/src/app/main/components/material-color-picker/material-color-picker.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-material-color-picker-docs', + selector : 'material-color-picker-docs', templateUrl: './material-color-picker.component.html', styleUrls : ['./material-color-picker.component.scss'] }) -export class FuseMaterialColorPickerDocsComponent +export class MaterialColorPickerDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/components/multi-language/multi-language.component.html b/src/app/main/components/multi-language/multi-language.component.html index 7b7c2f51..5032fe83 100644 --- a/src/app/main/components/multi-language/multi-language.component.html +++ b/src/app/main/components/multi-language/multi-language.component.html @@ -86,7 +86,7 @@ import { locale as turkish } from './i18n/tr'; @Component({ - selector : 'fuse-mail', + selector : 'mail', templateUrl: './mail.component.html', styleUrls : ['./mail.component.scss'] }) diff --git a/src/app/main/components/multi-language/multi-language.component.ts b/src/app/main/components/multi-language/multi-language.component.ts index fc9385a4..f12c82e7 100644 --- a/src/app/main/components/multi-language/multi-language.component.ts +++ b/src/app/main/components/multi-language/multi-language.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-multi-language-docs', + selector : 'multi-language-docs', templateUrl: './multi-language.component.html', styleUrls : ['./multi-language.component.scss'] }) -export class FuseMultiLanguageDocsComponent +export class MultiLanguageDocsComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/components/navigation/navigation.component.ts b/src/app/main/components/navigation/navigation.component.ts index 7a1181f9..2f34bbd1 100644 --- a/src/app/main/components/navigation/navigation.component.ts +++ b/src/app/main/components/navigation/navigation.component.ts @@ -3,21 +3,33 @@ import { Component } from '@angular/core'; import { navigation } from 'app/navigation/navigation'; @Component({ - selector : 'fuse-navigation-docs', + selector : 'navigation-docs', templateUrl: './navigation.component.html', styleUrls : ['./navigation.component.scss'] }) -export class FuseNavigationDocsComponent +export class NavigationDocsComponent { navigation: any; - hidden = false; + hidden: boolean; + /** + * Constructor + */ constructor() { + // Set the defaults this.navigation = navigation; + this.hidden = false; } - showHideCalendarMenuItem() + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Show/hide calendar menu item + */ + showHideCalendarMenuItem(): void { // Get the calendar item from the navigation const calendarNavItem = this.navigation[0].children[1]; @@ -27,7 +39,10 @@ export class FuseNavigationDocsComponent calendarNavItem.hidden = this.hidden; } - updateMailBadge() + /** + * Update mail badge + */ + updateMailBadge(): void { // Get the mail nav item const mailNavItem = this.navigation[0].children[4]; @@ -36,7 +51,10 @@ export class FuseNavigationDocsComponent mailNavItem.badge.title = 35; } - addSubitemToCalendar() + /** + * Add subitem to the calendar + */ + addSubitemToCalendar(): void { // Prepare the new nav item const newNavItem = { @@ -59,7 +77,10 @@ export class FuseNavigationDocsComponent calendarNavItem.children.push(newNavItem); } - addNavItemWithCustomFunction() + /** + * Add a nav item with custom function + */ + addNavItemWithCustomFunction(): void { // Prepare the new nav item const newNavItem = { diff --git a/src/app/main/components/search-bar/search-bar.component.ts b/src/app/main/components/search-bar/search-bar.component.ts index f9856b2e..130f179f 100644 --- a/src/app/main/components/search-bar/search-bar.component.ts +++ b/src/app/main/components/search-bar/search-bar.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-search-bar-docs', + selector : 'search-bar-docs', templateUrl: './search-bar.component.html', styleUrls : ['./search-bar.component.scss'] }) -export class FuseSearchBarDocsComponent +export class SearchBarDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/components/shortcuts/shortcuts.component.ts b/src/app/main/components/shortcuts/shortcuts.component.ts index 69cc9890..d34619a6 100644 --- a/src/app/main/components/shortcuts/shortcuts.component.ts +++ b/src/app/main/components/shortcuts/shortcuts.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-shortcuts-docs', + selector : 'shortcuts-docs', templateUrl: './shortcuts.component.html', styleUrls : ['./shortcuts.component.scss'] }) -export class FuseShortcutsDocsComponent +export class ShortcutsDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/components/sidebar/sidebar.component.ts b/src/app/main/components/sidebar/sidebar.component.ts index ed91b597..0eeda631 100644 --- a/src/app/main/components/sidebar/sidebar.component.ts +++ b/src/app/main/components/sidebar/sidebar.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-sidebar-docs', + selector : 'sidebar-docs', templateUrl: './sidebar.component.html', styleUrls : ['./sidebar.component.scss'] }) -export class FuseSidebarDocsComponent +export class SidebarDocsComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/components/widget/widget.component.ts b/src/app/main/components/widget/widget.component.ts index 3fbb3bd2..b581012e 100644 --- a/src/app/main/components/widget/widget.component.ts +++ b/src/app/main/components/widget/widget.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-widget-docs', + selector : 'widget-docs', templateUrl: './widget.component.html', styleUrls : ['./widget.component.scss'] }) -export class FuseWidgetDocsComponent +export class WidgetDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts index 56b6788e..35495d64 100644 --- a/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts +++ b/src/app/main/pages/authentication/mail-confirm/mail-confirm.component.ts @@ -4,7 +4,7 @@ import { FuseConfigService } from '@fuse/services/config.service'; import { fuseAnimations } from '@fuse/animations'; @Component({ - selector : 'fuse-mail-confirm', + selector : 'mail-confirm', templateUrl: './mail-confirm.component.html', styleUrls : ['./mail-confirm.component.scss'], animations : fuseAnimations diff --git a/src/app/main/pages/errors/404/error-404.component.ts b/src/app/main/pages/errors/404/error-404.component.ts index 3544b2a9..04c0048b 100644 --- a/src/app/main/pages/errors/404/error-404.component.ts +++ b/src/app/main/pages/errors/404/error-404.component.ts @@ -3,7 +3,7 @@ import { Component } from '@angular/core'; import { FuseConfigService } from '@fuse/services/config.service'; @Component({ - selector : 'fuse-error-404', + selector : 'error-404', templateUrl: './error-404.component.html', styleUrls : ['./error-404.component.scss'] }) diff --git a/src/app/main/pages/profile/profile.component.html b/src/app/main/pages/profile/profile.component.html index 8be37f77..35f630bc 100644 --- a/src/app/main/pages/profile/profile.component.html +++ b/src/app/main/pages/profile/profile.component.html @@ -27,7 +27,7 @@ - + diff --git a/src/app/main/pages/profile/profile.module.ts b/src/app/main/pages/profile/profile.module.ts index 6cb704d3..7d0a35fd 100644 --- a/src/app/main/pages/profile/profile.module.ts +++ b/src/app/main/pages/profile/profile.module.ts @@ -6,7 +6,7 @@ import { FuseSharedModule } from '@fuse/shared.module'; import { ProfileService } from 'app/main/pages/profile/profile.service'; import { ProfileComponent } from 'app/main/pages/profile/profile.component'; -import { FuseProfileTimelineComponent } from 'app/main/pages/profile/tabs/timeline/timeline.component'; +import { ProfileTimelineComponent } from 'app/main/pages/profile/tabs/timeline/timeline.component'; import { ProfileAboutComponent } from 'app/main/pages/profile/tabs/about/about.component'; import { ProfilePhotosVideosComponent } from 'app/main/pages/profile/tabs/photos-videos/photos-videos.component'; @@ -24,7 +24,7 @@ const routes = [ @NgModule({ declarations: [ ProfileComponent, - FuseProfileTimelineComponent, + ProfileTimelineComponent, ProfileAboutComponent, ProfilePhotosVideosComponent ], diff --git a/src/app/main/pages/profile/tabs/timeline/timeline.component.ts b/src/app/main/pages/profile/tabs/timeline/timeline.component.ts index 886b24ed..9c905b66 100644 --- a/src/app/main/pages/profile/tabs/timeline/timeline.component.ts +++ b/src/app/main/pages/profile/tabs/timeline/timeline.component.ts @@ -7,12 +7,12 @@ import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @Component({ - selector : 'fuse-profile-timeline', + selector : 'profile-timeline', templateUrl: './timeline.component.html', styleUrls : ['./timeline.component.scss'], animations : fuseAnimations }) -export class FuseProfileTimelineComponent implements OnInit, OnDestroy +export class ProfileTimelineComponent implements OnInit, OnDestroy { timeline: any; diff --git a/src/app/main/services/config/config.component.ts b/src/app/main/services/config/config.component.ts index 8eea59a5..d2fe116a 100644 --- a/src/app/main/services/config/config.component.ts +++ b/src/app/main/services/config/config.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-config-service-docs', + selector : 'config-service-docs', templateUrl: './config.component.html', styleUrls : ['./config.component.scss'] }) -export class FuseConfigServiceDocsComponent +export class ConfigServiceDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/services/services.module.ts b/src/app/main/services/services.module.ts index 202d3b15..d4a4d036 100644 --- a/src/app/main/services/services.module.ts +++ b/src/app/main/services/services.module.ts @@ -5,24 +5,24 @@ import { MatIconModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHighlightModule } from '@fuse/components'; -import { FuseConfigServiceDocsComponent } from 'app/main/services/config/config.component'; -import { FuseSplashScreenServiceDocsComponent } from 'app/main/services/splash-screen/splash-screen.component'; +import { ConfigServiceDocsComponent } from 'app/main/services/config/config.component'; +import { SplashScreenServiceDocsComponent } from 'app/main/services/splash-screen/splash-screen.component'; const routes = [ { path : 'config', - component: FuseConfigServiceDocsComponent + component: ConfigServiceDocsComponent }, { path : 'splash-screen', - component: FuseSplashScreenServiceDocsComponent + component: SplashScreenServiceDocsComponent } ]; @NgModule({ declarations: [ - FuseConfigServiceDocsComponent, - FuseSplashScreenServiceDocsComponent + ConfigServiceDocsComponent, + SplashScreenServiceDocsComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/services/splash-screen/splash-screen.component.ts b/src/app/main/services/splash-screen/splash-screen.component.ts index d28b2d01..cefe9e52 100644 --- a/src/app/main/services/splash-screen/splash-screen.component.ts +++ b/src/app/main/services/splash-screen/splash-screen.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-splash-screen-service-docs', + selector : 'splash-screen-service-docs', templateUrl: './splash-screen.component.html', styleUrls : ['./splash-screen.component.scss'] }) -export class FuseSplashScreenServiceDocsComponent +export class SplashScreenServiceDocsComponent { + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/colors/colors.component.ts b/src/app/main/ui/colors/colors.component.ts index 65a38fe9..f336f69d 100644 --- a/src/app/main/ui/colors/colors.component.ts +++ b/src/app/main/ui/colors/colors.component.ts @@ -3,28 +3,47 @@ import { Component, OnInit } from '@angular/core'; import { MatColors } from '@fuse/mat-colors'; @Component({ - selector : 'fuse-colors', + selector : 'colors', templateUrl: './colors.component.html', styleUrls : ['./colors.component.scss'] }) -export class FuseColorsComponent +export class ColorsComponent { colors: {}; selectedColor: string; selectedColorDefaultValue: string; + /** + * Constructor + */ constructor() { + // Set the defaults this.colors = MatColors.all; - this.updateSelectedColor('primary'); + this._updateSelectedColor('primary'); } - selectColor(selected) + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Select color + * + * @param selected + */ + selectColor(selected): void { - this.updateSelectedColor(selected.tab.textLabel); + this._updateSelectedColor(selected.tab.textLabel); } - private updateSelectedColor(colorName) + /** + * Update selected color + * + * @param colorName + * @private + */ + private _updateSelectedColor(colorName): void { this.selectedColor = colorName; this.selectedColorDefaultValue = MatColors.getColor(this.selectedColor)[500]; diff --git a/src/app/main/ui/colors/colors.module.ts b/src/app/main/ui/colors/colors.module.ts index 2c8a6379..72f377ae 100644 --- a/src/app/main/ui/colors/colors.module.ts +++ b/src/app/main/ui/colors/colors.module.ts @@ -1,23 +1,22 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatButtonModule, MatIconModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; -import { FuseColorsComponent } from './colors.component'; +import { ColorsComponent } from 'app/main/ui/colors/colors.component'; const routes: Routes = [ { path : 'colors', - component: FuseColorsComponent + component: ColorsComponent } ]; @NgModule({ declarations: [ - FuseColorsComponent + ColorsComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/forms/forms.component.ts b/src/app/main/ui/forms/forms.component.ts index 297701ed..ca09a013 100644 --- a/src/app/main/ui/forms/forms.component.ts +++ b/src/app/main/ui/forms/forms.component.ts @@ -1,12 +1,14 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; @Component({ - selector : 'fuse-forms', + selector : 'forms', templateUrl: './forms.component.html', styleUrls : ['./forms.component.scss'] }) -export class FuseFormsComponent implements OnInit +export class FormsComponent implements OnInit, OnDestroy { form: FormGroup; formErrors: any; @@ -27,7 +29,17 @@ export class FuseFormsComponent implements OnInit verticalStepperStep2Errors: any; verticalStepperStep3Errors: any; - constructor(private formBuilder: FormBuilder) + // Private + private _unsubscribeAll: Subject; + + /** + * Constructor + * + * @param {FormBuilder} _formBuilder + */ + constructor( + private _formBuilder: FormBuilder + ) { // Reactive form errors this.formErrors = { @@ -73,12 +85,22 @@ export class FuseFormsComponent implements OnInit state : {}, postalCode: {} }; + + // Set the private defaults + this._unsubscribeAll = new Subject(); } - ngOnInit() + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { // Reactive Form - this.form = this.formBuilder.group({ + this.form = this._formBuilder.group({ company : [ { value : 'Google', @@ -95,68 +117,99 @@ export class FuseFormsComponent implements OnInit country : ['', Validators.required] }); - this.form.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.form.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); // Horizontal Stepper form steps - this.horizontalStepperStep1 = this.formBuilder.group({ + this.horizontalStepperStep1 = this._formBuilder.group({ firstName: ['', Validators.required], lastName : ['', Validators.required] }); - this.horizontalStepperStep2 = this.formBuilder.group({ + this.horizontalStepperStep2 = this._formBuilder.group({ address: ['', Validators.required] }); - this.horizontalStepperStep3 = this.formBuilder.group({ + this.horizontalStepperStep3 = this._formBuilder.group({ city : ['', Validators.required], state : ['', Validators.required], postalCode: ['', [Validators.required, Validators.maxLength(5)]] }); - this.horizontalStepperStep1.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.horizontalStepperStep1.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); - this.horizontalStepperStep2.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.horizontalStepperStep2.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); - this.horizontalStepperStep3.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.horizontalStepperStep3.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); // Vertical Stepper form stepper - this.verticalStepperStep1 = this.formBuilder.group({ + this.verticalStepperStep1 = this._formBuilder.group({ firstName: ['', Validators.required], lastName : ['', Validators.required] }); - this.verticalStepperStep2 = this.formBuilder.group({ + this.verticalStepperStep2 = this._formBuilder.group({ address: ['', Validators.required] }); - this.verticalStepperStep3 = this.formBuilder.group({ + this.verticalStepperStep3 = this._formBuilder.group({ city : ['', Validators.required], state : ['', Validators.required], postalCode: ['', [Validators.required, Validators.maxLength(5)]] }); - this.verticalStepperStep1.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.verticalStepperStep1.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); - this.verticalStepperStep2.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.verticalStepperStep2.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); - this.verticalStepperStep3.valueChanges.subscribe(() => { - this.onFormValuesChanged(); - }); + this.verticalStepperStep3.valueChanges + .pipe(takeUntil(this._unsubscribeAll)) + .subscribe(() => { + this.onFormValuesChanged(); + }); } - onFormValuesChanged() + /** + * On destroy + */ + ngOnDestroy(): void + { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(); + this._unsubscribeAll.complete(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * On form values changed + */ + onFormValuesChanged(): void { for ( const field in this.formErrors ) { @@ -178,12 +231,18 @@ export class FuseFormsComponent implements OnInit } } - finishHorizontalStepper() + /** + * Finish the horizontal stepper + */ + finishHorizontalStepper(): void { alert('You have finished the horizontal stepper!'); } - finishVerticalStepper() + /** + * Finish the vertical stepper + */ + finishVerticalStepper(): void { alert('You have finished the vertical stepper!'); } diff --git a/src/app/main/ui/forms/forms.module.ts b/src/app/main/ui/forms/forms.module.ts index c9fc1d6e..bd667254 100644 --- a/src/app/main/ui/forms/forms.module.ts +++ b/src/app/main/ui/forms/forms.module.ts @@ -1,22 +1,21 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatSelectModule, MatStepperModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseFormsComponent } from './forms.component'; +import { FormsComponent } from 'app/main/ui/forms/forms.component'; const routes: Routes = [ { path : 'forms', - component: FuseFormsComponent + component: FormsComponent } ]; @NgModule({ declarations: [ - FuseFormsComponent + FormsComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/helper-classes/helper-classes.component.html b/src/app/main/ui/helper-classes/helper-classes.component.html index 5bd37fc4..a470baa4 100644 --- a/src/app/main/ui/helper-classes/helper-classes.component.html +++ b/src/app/main/ui/helper-classes/helper-classes.component.html @@ -20,13 +20,13 @@ - + - + diff --git a/src/app/main/ui/helper-classes/helper-classes.component.ts b/src/app/main/ui/helper-classes/helper-classes.component.ts index 7372b0a3..036abefb 100644 --- a/src/app/main/ui/helper-classes/helper-classes.component.ts +++ b/src/app/main/ui/helper-classes/helper-classes.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-helper-classes', + selector : 'helper-classes', templateUrl: './helper-classes.component.html', styleUrls : ['./helper-classes.component.scss'] }) -export class FuseHelperClassesComponent +export class HelperClassesComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/helper-classes/helper-classes.module.ts b/src/app/main/ui/helper-classes/helper-classes.module.ts index 31ee6c1f..0b09b802 100644 --- a/src/app/main/ui/helper-classes/helper-classes.module.ts +++ b/src/app/main/ui/helper-classes/helper-classes.module.ts @@ -1,27 +1,26 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatIconModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHighlightModule } from '@fuse/components'; -import { FuseHelperClassesComponent } from './helper-classes.component'; -import { FuseHelperClassesPaddingMarginComponent } from './tabs/padding-margin/padding-margin.component'; -import { FuseHelperClassesWidthHeightComponent } from './tabs/width-height/width-height.component'; +import { HelperClassesComponent } from 'app/main/ui/helper-classes/helper-classes.component'; +import { HelperClassesPaddingMarginComponent } from 'app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component'; +import { HelperClassesWidthHeightComponent } from 'app/main/ui/helper-classes/tabs/width-height/width-height.component'; const routes: Routes = [ { path : 'helper-classes', - component: FuseHelperClassesComponent + component: HelperClassesComponent } ]; @NgModule({ declarations: [ - FuseHelperClassesComponent, - FuseHelperClassesPaddingMarginComponent, - FuseHelperClassesWidthHeightComponent + HelperClassesComponent, + HelperClassesPaddingMarginComponent, + HelperClassesWidthHeightComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts b/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts index e4a02a32..387c9753 100644 --- a/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts +++ b/src/app/main/ui/helper-classes/tabs/padding-margin/padding-margin.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-helper-classes-padding-margin', + selector : 'helper-classes-padding-margin', templateUrl: './padding-margin.component.html', styleUrls : ['./padding-margin.component.scss'] }) -export class FuseHelperClassesPaddingMarginComponent +export class HelperClassesPaddingMarginComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts b/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts index fe5b14cf..323b733f 100644 --- a/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts +++ b/src/app/main/ui/helper-classes/tabs/width-height/width-height.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-helper-classes-width-height', + selector : 'helper-classes-width-height', templateUrl: './width-height.component.html', styleUrls : ['./width-height.component.scss'] }) -export class FuseHelperClassesWidthHeightComponent +export class HelperClassesWidthHeightComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/icons/icons.component.ts b/src/app/main/ui/icons/icons.component.ts index 188de0dd..e289964a 100644 --- a/src/app/main/ui/icons/icons.component.ts +++ b/src/app/main/ui/icons/icons.component.ts @@ -1,24 +1,49 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { HttpClient } from '@angular/common/http'; +import { takeUntil } from 'rxjs/operators'; +import { Subject } from 'rxjs'; @Component({ - selector : 'fuse-icons', + selector : 'icons', templateUrl: './icons.component.html', styleUrls : ['./icons.component.scss'] }) -export class FuseIconsComponent implements OnInit +export class IconsComponent implements OnInit, OnDestroy { icons: string[]; filteredIcons: string[]; - loading = true; + loading: boolean; - constructor(private http: HttpClient) + // Private + private _unsubscribeAll: Subject; + + /** + * Constructor + * + * @param {HttpClient} _httpClient + */ + constructor( + private _httpClient: HttpClient + ) { + // Set the defaults + this.loading = true; + + // Set the private defaults + this._unsubscribeAll = new Subject(); } - ngOnInit() + // ----------------------------------------------------------------------------------------------------- + // @ Lifecycle hooks + // ----------------------------------------------------------------------------------------------------- + + /** + * On init + */ + ngOnInit(): void { - this.http.get('api/icons') + this._httpClient.get('api/icons') + .pipe(takeUntil(this._unsubscribeAll)) .subscribe((icons: any) => { this.icons = icons; this.filteredIcons = this.icons; @@ -26,7 +51,26 @@ export class FuseIconsComponent implements OnInit }); } - filterIcons(event) + /** + * On destroy + */ + ngOnDestroy(): void + { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(); + this._unsubscribeAll.complete(); + } + + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Filter icons + * + * @param event + */ + filterIcons(event): void { const value = event.target.value; diff --git a/src/app/main/ui/icons/icons.module.ts b/src/app/main/ui/icons/icons.module.ts index 8e14e039..464185b5 100644 --- a/src/app/main/ui/icons/icons.module.ts +++ b/src/app/main/ui/icons/icons.module.ts @@ -1,22 +1,21 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatButtonModule, MatFormFieldModule, MatIconModule, MatInputModule, MatProgressSpinnerModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; -import { FuseIconsComponent } from './icons.component'; +import { IconsComponent } from 'app/main/ui/icons/icons.component'; const routes: Routes = [ { path : 'icons', - component: FuseIconsComponent + component: IconsComponent } ]; @NgModule({ declarations: [ - FuseIconsComponent + IconsComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/page-layouts/blank/blank.component.ts b/src/app/main/ui/page-layouts/blank/blank.component.ts index 9b47592b..cfbf76b0 100644 --- a/src/app/main/ui/page-layouts/blank/blank.component.ts +++ b/src/app/main/ui/page-layouts/blank/blank.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-blank', + selector : 'blank', templateUrl: './blank.component.html', styleUrls : ['./blank.component.scss'] }) -export class FuseBlankComponent +export class BlankComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts b/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts index 3b886572..f05d08d6 100644 --- a/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts +++ b/src/app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-fullwidth-2', + selector : 'carded-fullwidth-2', templateUrl: './fullwidth-2.component.html', styleUrls : ['./fullwidth-2.component.scss'] }) -export class FuseCardedFullWidth2Component +export class CardedFullWidth2Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts b/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts index b6862012..7128f849 100644 --- a/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts +++ b/src/app/main/ui/page-layouts/carded/fullwidth/fullwidth.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-fullwidth', + selector : 'carded-fullwidth', templateUrl: './fullwidth.component.html', styleUrls : ['./fullwidth.component.scss'] }) -export class FuseCardedFullWidthComponent +export class CardedFullWidthComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts index 8c03df33..e715bb04 100644 --- a/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts +++ b/src/app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-left-sidenav-2-tabbed', + selector : 'carded-left-sidenav-2-tabbed', templateUrl: './left-sidenav-2-tabbed.component.html', styleUrls : ['./left-sidenav-2-tabbed.component.scss'] }) -export class FuseCardedLeftSidenav2TabbedComponent +export class CardedLeftSidenav2TabbedComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts index 2e51b725..6ef5d61a 100644 --- a/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts +++ b/src/app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-left-sidenav-2', + selector : 'carded-left-sidenav-2', templateUrl: './left-sidenav-2.component.html', styleUrls : ['./left-sidenav-2.component.scss'] }) -export class FuseCardedLeftSidenav2Component +export class CardedLeftSidenav2Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts index 0a44a54a..e1cc2130 100644 --- a/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts +++ b/src/app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-left-sidenav-tabbed', + selector : 'carded-left-sidenav-tabbed', templateUrl: './left-sidenav-tabbed.component.html', styleUrls : ['./left-sidenav-tabbed.component.scss'] }) -export class FuseCardedLeftSidenavTabbedComponent +export class CardedLeftSidenavTabbedComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts b/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts index f92c2514..babe06ef 100644 --- a/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts +++ b/src/app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-left-sidenav', + selector : 'carded-left-sidenav', templateUrl: './left-sidenav.component.html', styleUrls : ['./left-sidenav.component.scss'] }) -export class FuseCardedLeftSidenavComponent +export class CardedLeftSidenavComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts index ceaec07f..83585df2 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts +++ b/src/app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-right-sidenav-2-tabbed', + selector : 'carded-right-sidenav-2-tabbed', templateUrl: './right-sidenav-2-tabbed.component.html', styleUrls : ['./right-sidenav-2-tabbed.component.scss'] }) -export class FuseCardedRightSidenav2TabbedComponent +export class CardedRightSidenav2TabbedComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts index 001d16f1..8b1c9d9c 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts +++ b/src/app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-right-sidenav-2', + selector : 'carded-right-sidenav-2', templateUrl: './right-sidenav-2.component.html', styleUrls : ['./right-sidenav-2.component.scss'] }) -export class FuseCardedRightSidenav2Component +export class CardedRightSidenav2Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts index 371cb1ef..2e5dedfe 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts +++ b/src/app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-right-sidenav-tabbed', + selector : 'carded-right-sidenav-tabbed', templateUrl: './right-sidenav-tabbed.component.html', styleUrls : ['./right-sidenav-tabbed.component.scss'] }) -export class FuseCardedRightSidenavTabbedComponent +export class CardedRightSidenavTabbedComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts index abe45083..7ea8b054 100644 --- a/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts +++ b/src/app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-carded-right-sidenav', + selector : 'carded-right-sidenav', templateUrl: './right-sidenav.component.html', styleUrls : ['./right-sidenav.component.scss'] }) -export class FuseCardedRightSidenavComponent +export class CardedRightSidenavComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/page-layouts.module.ts b/src/app/main/ui/page-layouts/page-layouts.module.ts index f300822f..45041b57 100644 --- a/src/app/main/ui/page-layouts/page-layouts.module.ts +++ b/src/app/main/ui/page-layouts/page-layouts.module.ts @@ -1,131 +1,130 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatButtonModule, MatIconModule, MatSidenavModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseDemoModule } from '@fuse/components/demo/demo.module'; -import { FuseCardedFullWidthComponent } from './carded/fullwidth/fullwidth.component'; -import { FuseCardedFullWidth2Component } from './carded/fullwidth-2/fullwidth-2.component'; -import { FuseCardedLeftSidenavComponent } from './carded/left-sidenav/left-sidenav.component'; -import { FuseCardedLeftSidenavTabbedComponent } from './carded/left-sidenav-tabbed/left-sidenav-tabbed.component'; -import { FuseCardedLeftSidenav2Component } from './carded/left-sidenav-2/left-sidenav-2.component'; -import { FuseCardedLeftSidenav2TabbedComponent } from './carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component'; -import { FuseCardedRightSidenavComponent } from './carded/right-sidenav/right-sidenav.component'; -import { FuseCardedRightSidenavTabbedComponent } from './carded/right-sidenav-tabbed/right-sidenav-tabbed.component'; -import { FuseCardedRightSidenav2Component } from './carded/right-sidenav-2/right-sidenav-2.component'; -import { FuseCardedRightSidenav2TabbedComponent } from './carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component'; -import { FuseSimpleFullWidthComponent } from './simple/fullwidth/fullwidth.component'; -import { FuseSimpleLeftSidenavComponent } from './simple/left-sidenav/left-sidenav.component'; -import { FuseSimpleLeftSidenav2Component } from './simple/left-sidenav-2/left-sidenav-2.component'; -import { FuseSimpleLeftSidenav3Component } from './simple/left-sidenav-3/left-sidenav-3.component'; -import { FuseSimpleRightSidenavComponent } from './simple/right-sidenav/right-sidenav.component'; -import { FuseSimpleRightSidenav2Component } from './simple/right-sidenav-2/right-sidenav-2.component'; -import { FuseSimpleRightSidenav3Component } from './simple/right-sidenav-3/right-sidenav-3.component'; -import { FuseTabbedComponent } from './simple/tabbed/tabbed.component'; -import { FuseBlankComponent } from './blank/blank.component'; +import { CardedFullWidthComponent } from 'app/main/ui/page-layouts/carded/fullwidth/fullwidth.component'; +import { CardedFullWidth2Component } from 'app/main/ui/page-layouts/carded/fullwidth-2/fullwidth-2.component'; +import { CardedLeftSidenavComponent } from 'app/main/ui/page-layouts/carded/left-sidenav/left-sidenav.component'; +import { CardedLeftSidenavTabbedComponent } from 'app/main/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component'; +import { CardedLeftSidenav2Component } from 'app/main/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component'; +import { CardedLeftSidenav2TabbedComponent } from 'app/main/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component'; +import { CardedRightSidenavComponent } from 'app/main/ui/page-layouts/carded/right-sidenav/right-sidenav.component'; +import { CardedRightSidenavTabbedComponent } from 'app/main/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component'; +import { CardedRightSidenav2Component } from 'app/main/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component'; +import { CardedRightSidenav2TabbedComponent } from 'app/main/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component'; +import { SimpleFullWidthComponent } from 'app/main/ui/page-layouts/simple/fullwidth/fullwidth.component'; +import { SimpleLeftSidenavComponent } from 'app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component'; +import { SimpleLeftSidenav2Component } from 'app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component'; +import { SimpleLeftSidenav3Component } from 'app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component'; +import { SimpleRightSidenavComponent } from 'app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component'; +import { SimpleRightSidenav2Component } from 'app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component'; +import { SimpleRightSidenav3Component } from 'app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component'; +import { TabbedComponent } from 'app/main/ui/page-layouts/simple/tabbed/tabbed.component'; +import { BlankComponent } from 'app/main/ui/page-layouts/blank/blank.component'; const routes: Routes = [ { path : 'page-layouts/carded/full-width', - component: FuseCardedFullWidthComponent + component: CardedFullWidthComponent }, { path : 'page-layouts/carded/full-width-2', - component: FuseCardedFullWidth2Component + component: CardedFullWidth2Component }, { path : 'page-layouts/carded/left-sidenav', - component: FuseCardedLeftSidenavComponent + component: CardedLeftSidenavComponent }, { path : 'page-layouts/carded/left-sidenav-tabbed', - component: FuseCardedLeftSidenavTabbedComponent + component: CardedLeftSidenavTabbedComponent }, { path : 'page-layouts/carded/left-sidenav-2', - component: FuseCardedLeftSidenav2Component + component: CardedLeftSidenav2Component }, { path : 'page-layouts/carded/left-sidenav-2-tabbed', - component: FuseCardedLeftSidenav2TabbedComponent + component: CardedLeftSidenav2TabbedComponent }, { path : 'page-layouts/carded/right-sidenav', - component: FuseCardedRightSidenavComponent + component: CardedRightSidenavComponent }, { path : 'page-layouts/carded/right-sidenav-tabbed', - component: FuseCardedRightSidenavTabbedComponent + component: CardedRightSidenavTabbedComponent }, { path : 'page-layouts/carded/right-sidenav-2', - component: FuseCardedRightSidenav2Component + component: CardedRightSidenav2Component }, { path : 'page-layouts/carded/right-sidenav-2-tabbed', - component: FuseCardedRightSidenav2TabbedComponent + component: CardedRightSidenav2TabbedComponent }, { path : 'page-layouts/simple/full-width', - component: FuseSimpleFullWidthComponent + component: SimpleFullWidthComponent }, { path : 'page-layouts/simple/left-sidenav', - component: FuseSimpleLeftSidenavComponent + component: SimpleLeftSidenavComponent }, { path : 'page-layouts/simple/left-sidenav-2', - component: FuseSimpleLeftSidenav2Component + component: SimpleLeftSidenav2Component }, { path : 'page-layouts/simple/left-sidenav-3', - component: FuseSimpleLeftSidenav3Component + component: SimpleLeftSidenav3Component }, { path : 'page-layouts/simple/right-sidenav', - component: FuseSimpleRightSidenavComponent + component: SimpleRightSidenavComponent }, { path : 'page-layouts/simple/right-sidenav-2', - component: FuseSimpleRightSidenav2Component + component: SimpleRightSidenav2Component }, { path : 'page-layouts/simple/right-sidenav-3', - component: FuseSimpleRightSidenav3Component + component: SimpleRightSidenav3Component }, { path : 'page-layouts/simple/tabbed', - component: FuseTabbedComponent + component: TabbedComponent }, { path : 'page-layouts/blank', - component: FuseBlankComponent + component: BlankComponent } ]; @NgModule({ declarations: [ - FuseCardedFullWidthComponent, - FuseCardedFullWidth2Component, - FuseCardedLeftSidenavComponent, - FuseCardedLeftSidenavTabbedComponent, - FuseCardedLeftSidenav2Component, - FuseCardedLeftSidenav2TabbedComponent, - FuseCardedRightSidenavComponent, - FuseCardedRightSidenavTabbedComponent, - FuseCardedRightSidenav2Component, - FuseCardedRightSidenav2TabbedComponent, - FuseSimpleFullWidthComponent, - FuseSimpleLeftSidenavComponent, - FuseSimpleLeftSidenav2Component, - FuseSimpleLeftSidenav3Component, - FuseSimpleRightSidenavComponent, - FuseSimpleRightSidenav2Component, - FuseSimpleRightSidenav3Component, - FuseTabbedComponent, - FuseBlankComponent + CardedFullWidthComponent, + CardedFullWidth2Component, + CardedLeftSidenavComponent, + CardedLeftSidenavTabbedComponent, + CardedLeftSidenav2Component, + CardedLeftSidenav2TabbedComponent, + CardedRightSidenavComponent, + CardedRightSidenavTabbedComponent, + CardedRightSidenav2Component, + CardedRightSidenav2TabbedComponent, + SimpleFullWidthComponent, + SimpleLeftSidenavComponent, + SimpleLeftSidenav2Component, + SimpleLeftSidenav3Component, + SimpleRightSidenavComponent, + SimpleRightSidenav2Component, + SimpleRightSidenav3Component, + TabbedComponent, + BlankComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts b/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts index 074ad5d1..d0c7414d 100644 --- a/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts +++ b/src/app/main/ui/page-layouts/simple/fullwidth/fullwidth.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-fullwidth', + selector : 'simple-fullwidth', templateUrl: './fullwidth.component.html', styleUrls : ['./fullwidth.component.scss'] }) -export class FuseSimpleFullWidthComponent +export class SimpleFullWidthComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts index d6805429..3d1b0aa2 100644 --- a/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts +++ b/src/app/main/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-left-sidenav-2', + selector : 'simple-left-sidenav-2', templateUrl: './left-sidenav-2.component.html', styleUrls : ['./left-sidenav-2.component.scss'] }) -export class FuseSimpleLeftSidenav2Component +export class SimpleLeftSidenav2Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts index 2a86f582..ad6b586f 100644 --- a/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts +++ b/src/app/main/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-left-sidenav-3', + selector : 'simple-left-sidenav-3', templateUrl: './left-sidenav-3.component.html', styleUrls : ['./left-sidenav-3.component.scss'] }) -export class FuseSimpleLeftSidenav3Component +export class SimpleLeftSidenav3Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts b/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts index 9d07e40b..682b638a 100644 --- a/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts +++ b/src/app/main/ui/page-layouts/simple/left-sidenav/left-sidenav.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-left-sidenav', + selector : 'simple-left-sidenav', templateUrl: './left-sidenav.component.html', styleUrls : ['./left-sidenav.component.scss'] }) -export class FuseSimpleLeftSidenavComponent +export class SimpleLeftSidenavComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts index 7f32155d..bd43f140 100644 --- a/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts +++ b/src/app/main/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-right-sidenav-2', + selector : 'simple-right-sidenav-2', templateUrl: './right-sidenav-2.component.html', styleUrls : ['./right-sidenav-2.component.scss'] }) -export class FuseSimpleRightSidenav2Component +export class SimpleRightSidenav2Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts index bb2b476e..446da2de 100644 --- a/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts +++ b/src/app/main/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-right-sidenav-3', + selector : 'simple-right-sidenav-3', templateUrl: './right-sidenav-3.component.html', styleUrls : ['./right-sidenav-3.component.scss'] }) -export class FuseSimpleRightSidenav3Component +export class SimpleRightSidenav3Component { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts index 186cfa71..bd3ab81d 100644 --- a/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts +++ b/src/app/main/ui/page-layouts/simple/right-sidenav/right-sidenav.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-simple-right-sidenav', + selector : 'simple-right-sidenav', templateUrl: './right-sidenav.component.html', styleUrls : ['./right-sidenav.component.scss'] }) -export class FuseSimpleRightSidenavComponent +export class SimpleRightSidenavComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts b/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts index 70e6cdf1..6e01380f 100644 --- a/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts +++ b/src/app/main/ui/page-layouts/simple/tabbed/tabbed.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-tabbed', + selector : 'tabbed', templateUrl: './tabbed.component.html', styleUrls : ['./tabbed.component.scss'] }) -export class FuseTabbedComponent +export class TabbedComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts b/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts index 5ed7aa4d..c3954e51 100644 --- a/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts +++ b/src/app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-typography-blockquotes-lists', + selector : 'typography-blockquotes-lists', templateUrl: './blockquotes-lists.component.html', styleUrls : ['./blockquotes-lists.component.scss'] }) -export class FuseTypographyBlockquotesListsComponent +export class TypographyBlockquotesListsComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/typography/tabs/headings/headings.component.ts b/src/app/main/ui/typography/tabs/headings/headings.component.ts index eaee877b..c4cac991 100644 --- a/src/app/main/ui/typography/tabs/headings/headings.component.ts +++ b/src/app/main/ui/typography/tabs/headings/headings.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-typography-headings', + selector : 'typography-headings', templateUrl: './headings.component.html', styleUrls : ['./headings.component.scss'] }) -export class FuseTypographyHeadingsComponent +export class TypographyHeadingsComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/typography/tabs/helpers/helpers.component.ts b/src/app/main/ui/typography/tabs/helpers/helpers.component.ts index 77a27901..b2867300 100644 --- a/src/app/main/ui/typography/tabs/helpers/helpers.component.ts +++ b/src/app/main/ui/typography/tabs/helpers/helpers.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-typography-helpers', + selector : 'typography-helpers', templateUrl: './helpers.component.html', styleUrls : ['./helpers.component.scss'] }) -export class FuseTypographyHelpersComponent +export class TypographyHelpersComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts b/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts index 47e078e9..f5aa289c 100644 --- a/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts +++ b/src/app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component.ts @@ -1,13 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-typography-inline-text-elements', + selector : 'typography-inline-text-elements', templateUrl: './inline-text-elements.component.html', styleUrls : ['./inline-text-elements.component.scss'] }) -export class FuseTypographyInlineTextElementsComponent +export class TypographyInlineTextElementsComponent { - + /** + * Constructor + */ constructor() { diff --git a/src/app/main/ui/typography/typography.component.html b/src/app/main/ui/typography/typography.component.html index d20c1f29..7762f434 100644 --- a/src/app/main/ui/typography/typography.component.html +++ b/src/app/main/ui/typography/typography.component.html @@ -20,25 +20,25 @@ - + - + - + - + diff --git a/src/app/main/ui/typography/typography.component.ts b/src/app/main/ui/typography/typography.component.ts index 44e979b7..6c1de786 100644 --- a/src/app/main/ui/typography/typography.component.ts +++ b/src/app/main/ui/typography/typography.component.ts @@ -1,12 +1,15 @@ import { Component } from '@angular/core'; @Component({ - selector : 'fuse-typography', + selector : 'typography', templateUrl: './typography.component.html', styleUrls : ['./typography.component.scss'] }) -export class FuseTypographyComponent +export class TypographyComponent { + /** + * Constructor + */ constructor() { } diff --git a/src/app/main/ui/typography/typography.module.ts b/src/app/main/ui/typography/typography.module.ts index bf4e2321..34ba3129 100644 --- a/src/app/main/ui/typography/typography.module.ts +++ b/src/app/main/ui/typography/typography.module.ts @@ -1,31 +1,30 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; - import { MatIconModule, MatTabsModule } from '@angular/material'; import { FuseSharedModule } from '@fuse/shared.module'; import { FuseHighlightModule } from '@fuse/components'; -import { FuseTypographyComponent } from './typography.component'; -import { FuseTypographyHeadingsComponent } from './tabs/headings/headings.component'; -import { FuseTypographyInlineTextElementsComponent } from './tabs/inline-text-elements/inline-text-elements.component'; -import { FuseTypographyBlockquotesListsComponent } from './tabs/blockquotes-lists/blockquotes-lists.component'; -import { FuseTypographyHelpersComponent } from './tabs/helpers/helpers.component'; +import { TypographyComponent } from 'app/main/ui/typography/typography.component'; +import { TypographyHeadingsComponent } from 'app/main/ui/typography/tabs/headings/headings.component'; +import { TypographyInlineTextElementsComponent } from 'app/main/ui/typography/tabs/inline-text-elements/inline-text-elements.component'; +import { TypographyBlockquotesListsComponent } from 'app/main/ui/typography/tabs/blockquotes-lists/blockquotes-lists.component'; +import { TypographyHelpersComponent } from 'app/main/ui/typography/tabs/helpers/helpers.component'; const routes: Routes = [ { path : 'typography', - component: FuseTypographyComponent + component: TypographyComponent } ]; @NgModule({ declarations: [ - FuseTypographyComponent, - FuseTypographyHeadingsComponent, - FuseTypographyInlineTextElementsComponent, - FuseTypographyBlockquotesListsComponent, - FuseTypographyHelpersComponent + TypographyComponent, + TypographyHeadingsComponent, + TypographyInlineTextElementsComponent, + TypographyBlockquotesListsComponent, + TypographyHelpersComponent ], imports : [ RouterModule.forChild(routes), diff --git a/src/app/main/ui/ui.module.ts b/src/app/main/ui/ui.module.ts index f6798a1c..1d594101 100644 --- a/src/app/main/ui/ui.module.ts +++ b/src/app/main/ui/ui.module.ts @@ -17,6 +17,6 @@ import { UIColorsModule } from 'app/main/ui/colors/colors.module'; UIColorsModule ] }) -export class FuseUIModule +export class UIModule { } diff --git a/src/index.html b/src/index.html index 865a7105..cbb463c6 100644 --- a/src/index.html +++ b/src/index.html @@ -213,7 +213,7 @@ - +