From d159ae1458f3ad0ce80c951a8833db2ffe3b070e Mon Sep 17 00:00:00 2001 From: sercan Date: Fri, 14 May 2021 17:17:06 +0300 Subject: [PATCH] (linting) Migrated over to the ESLint --- .eslintrc.json | 95 + angular.json | 17 +- package-lock.json | 1698 ++++++++++++++--- package.json | 13 +- src/@fuse/animations/defaults.ts | 14 +- src/@fuse/animations/expand-collapse.ts | 2 +- src/@fuse/animations/fade.ts | 20 +- src/@fuse/animations/public-api.ts | 2 +- src/@fuse/animations/slide.ts | 16 +- src/@fuse/animations/zoom.ts | 4 +- src/@fuse/components/alert/alert.component.ts | 10 +- src/@fuse/components/card/card.component.ts | 6 +- .../date-range/date-range.component.ts | 17 +- .../components/drawer/drawer.component.ts | 66 +- .../components/highlight/highlight.service.ts | 4 +- .../components/masonry/masonry.component.ts | 4 +- .../components/branch/branch.component.ts | 2 + .../horizontal/horizontal.component.ts | 4 +- .../navigation/navigation.service.ts | 2 - .../components/aside/aside.component.ts | 32 +- .../collapsable/collapsable.component.ts | 161 +- .../components/group/group.component.ts | 2 + .../navigation/vertical/vertical.component.ts | 70 +- .../directives/autogrow/autogrow.directive.ts | 68 +- .../scrollbar/scrollbar.directive.ts | 34 +- src/@fuse/lib/mock-api/mock-api.service.ts | 26 +- src/@fuse/lib/mock-api/mock-api.types.ts | 10 +- src/@fuse/lib/mock-api/mock-api.utils.ts | 4 +- .../pipes/find-by-key/find-by-key.pipe.ts | 4 +- .../media-watcher/media-watcher.service.ts | 6 +- src/@fuse/version/fuse-version.ts | 3 +- src/app/app.routing.ts | 2 +- src/app/app.types.ts | 8 +- src/app/core/auth/auth.service.ts | 24 +- src/app/core/auth/auth.utils.ts | 72 +- src/app/core/auth/guards/auth.guard.ts | 66 +- src/app/core/auth/guards/noAuth.guard.ts | 64 +- .../layout/common/search/search.component.ts | 13 +- src/app/layout/common/search/search.module.ts | 4 +- .../common/user-menu/user-menu.component.ts | 2 + src/app/mock-api/apps/academy/api.ts | 2 +- src/app/mock-api/apps/academy/data.ts | 2 +- src/app/mock-api/apps/calendar/api.ts | 14 +- src/app/mock-api/apps/calendar/data.ts | 2 +- src/app/mock-api/apps/chat/api.ts | 12 +- src/app/mock-api/apps/chat/data.ts | 1034 +++++----- src/app/mock-api/apps/contacts/api.ts | 14 +- src/app/mock-api/apps/contacts/data.ts | 1034 +++++----- .../mock-api/apps/ecommerce/inventory/api.ts | 8 +- .../mock-api/apps/ecommerce/inventory/data.ts | 2 +- src/app/mock-api/apps/file-manager/api.ts | 4 +- src/app/mock-api/apps/file-manager/data.ts | 4 +- src/app/mock-api/apps/help-center/data.ts | 2 +- src/app/mock-api/apps/mailbox/api.ts | 18 +- src/app/mock-api/apps/mailbox/data.ts | 2 +- src/app/mock-api/apps/notes/api.ts | 21 +- src/app/mock-api/apps/notes/data.ts | 2 +- src/app/mock-api/apps/tasks/api.ts | 22 +- src/app/mock-api/apps/tasks/data.ts | 2 +- src/app/mock-api/common/auth/api.ts | 48 +- src/app/mock-api/common/messages/data.ts | 2 +- src/app/mock-api/common/navigation/data.ts | 2 +- src/app/mock-api/common/notifications/data.ts | 2 +- src/app/mock-api/common/search/api.ts | 8 +- src/app/mock-api/common/shortcuts/data.ts | 2 +- src/app/mock-api/common/user/data.ts | 2 +- src/app/mock-api/dashboards/analytics/data.ts | 2 +- src/app/mock-api/dashboards/project/data.ts | 2 +- src/app/mock-api/ui/icons/data.ts | 2 +- .../admin/apps/academy/academy.module.ts | 2 +- .../academy/details/details.component.html | 3 +- .../admin/apps/academy/list/list.component.ts | 12 +- .../admin/apps/calendar/calendar.component.ts | 11 +- .../admin/apps/calendar/calendar.service.ts | 4 +- .../recurrence/recurrence.component.ts | 2 +- .../calendar/sidebar/sidebar.component.ts | 3 +- .../modules/admin/apps/chat/chat.module.ts | 4 +- src/app/modules/admin/apps/chat/chat.types.ts | 8 +- .../admin/apps/chat/chats/chats.component.ts | 2 +- .../contact-info/contact-info.component.html | 2 +- .../conversation/conversation.component.ts | 66 +- .../apps/chat/new-chat/new-chat.component.ts | 6 +- .../apps/chat/profile/profile.component.ts | 6 +- .../admin/apps/contacts/contacts.guards.ts | 4 +- .../admin/apps/contacts/contacts.service.ts | 3 +- .../admin/apps/contacts/contacts.types.ts | 8 +- .../contacts/details/details.component.html | 4 +- .../contacts/details/details.component.ts | 30 +- .../apps/contacts/list/list.component.ts | 14 +- .../inventory/inventory.resolvers.ts | 2 +- .../ecommerce/inventory/inventory.service.ts | 6 +- .../inventory/list/inventory.component.ts | 6 +- .../apps/file-manager/file-manager.guards.ts | 4 +- .../help-center/support/support.component.ts | 4 +- .../apps/mailbox/compose/compose.component.ts | 2 +- .../apps/mailbox/details/details.component.ts | 4 +- .../admin/apps/mailbox/mailbox.routing.ts | 12 +- .../mailbox/settings/settings.component.ts | 2 +- .../apps/mailbox/sidebar/sidebar.component.ts | 4 +- .../apps/notes/details/details.component.ts | 8 +- .../apps/notes/labels/labels.component.ts | 4 +- .../admin/apps/notes/list/list.component.ts | 6 +- .../modules/admin/apps/notes/notes.service.ts | 4 +- .../apps/tasks/details/details.component.ts | 2 +- .../admin/apps/tasks/list/list.component.ts | 8 +- .../modules/admin/apps/tasks/tasks.guards.ts | 4 +- .../modules/admin/apps/tasks/tasks.service.ts | 2 +- .../analytics/analytics.component.ts | 116 +- .../dashboards/project/project.component.ts | 60 +- .../navigation/navigation.component.ts | 1 - .../docs/guides/authentication/jwt/jwt.html | 2 +- .../directory-structure.ts | 2 +- .../confirmation-required.component.ts | 4 +- .../confirmation-required.component.ts | 4 +- .../confirmation-required.component.ts | 4 +- .../confirmation-required.component.ts | 4 +- .../modern/confirmation-required.component.ts | 4 +- .../confirmation-required.component.ts | 4 +- .../confirmation-required.component.ts | 4 +- .../classic/forgot-password.component.ts | 6 +- .../forgot-password.component.ts | 6 +- .../fullscreen/forgot-password.component.ts | 6 +- .../forgot-password.component.ts | 6 +- .../modern/forgot-password.component.ts | 6 +- .../forgot-password.component.ts | 6 +- .../split-screen/forgot-password.component.ts | 6 +- .../classic/reset-password.component.ts | 6 +- .../reset-password.component.ts | 6 +- .../fullscreen/reset-password.component.ts | 6 +- .../reset-password.component.ts | 6 +- .../modern/reset-password.component.ts | 6 +- .../reset-password.component.ts | 6 +- .../split-screen/reset-password.component.ts | 6 +- .../sign-in/classic/sign-in.component.ts | 6 +- .../fullscreen-reversed/sign-in.component.ts | 6 +- .../sign-in/fullscreen/sign-in.component.ts | 6 +- .../modern-reversed/sign-in.component.ts | 6 +- .../sign-in/modern/sign-in.component.ts | 6 +- .../sign-in.component.ts | 6 +- .../sign-in/split-screen/sign-in.component.ts | 6 +- .../sign-out/classic/sign-out.component.ts | 4 +- .../fullscreen-reversed/sign-out.component.ts | 4 +- .../sign-out/fullscreen/sign-out.component.ts | 4 +- .../modern-reversed/sign-out.component.ts | 4 +- .../sign-out/modern/sign-out.component.ts | 4 +- .../sign-out.component.ts | 4 +- .../split-screen/sign-out.component.ts | 4 +- .../sign-up/classic/sign-up.component.ts | 6 +- .../fullscreen-reversed/sign-up.component.ts | 6 +- .../sign-up/fullscreen/sign-up.component.ts | 6 +- .../modern-reversed/sign-up.component.ts | 6 +- .../sign-up/modern/sign-up.component.ts | 6 +- .../sign-up.component.ts | 6 +- .../sign-up/split-screen/sign-up.component.ts | 6 +- .../classic/unlock-session.component.ts | 6 +- .../unlock-session.component.ts | 6 +- .../fullscreen/unlock-session.component.ts | 6 +- .../unlock-session.component.ts | 6 +- .../modern/unlock-session.component.ts | 6 +- .../unlock-session.component.ts | 6 +- .../split-screen/unlock-session.component.ts | 6 +- .../classic/coming-soon.component.ts | 6 +- .../coming-soon.component.ts | 6 +- .../fullscreen/coming-soon.component.ts | 6 +- .../modern-reversed/coming-soon.component.ts | 6 +- .../modern/coming-soon.component.ts | 6 +- .../coming-soon.component.ts | 6 +- .../split-screen/coming-soon.component.ts | 6 +- .../pages/settings/settings.component.ts | 2 +- .../ui/animations/animations.component.ts | 4 +- .../modules/admin/ui/cards/cards.component.ts | 4 +- .../admin/ui/colors/colors.component.ts | 4 +- .../layout-overview.component.ts | 6 +- .../ui/page-layouts/page-layouts.module.ts | 7 +- .../confirmation-required.component.ts | 4 +- .../forgot-password.component.ts | 6 +- .../reset-password.component.ts | 6 +- .../modules/auth/sign-in/sign-in.component.ts | 6 +- .../modules/auth/sign-up/sign-up.component.ts | 6 +- .../unlock-session.component.ts | 6 +- src/global.d.ts | 2 +- tslint.json | 169 -- 182 files changed, 3543 insertions(+), 2400 deletions(-) create mode 100644 .eslintrc.json delete mode 100644 tslint.json diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..50ad1585 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,95 @@ +{ + "root": true, + "env": { + "es6": true + }, + "parserOptions": { + "ecmaVersion": 2018 + }, + "ignorePatterns": [ + "projects/**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "tsconfig.json", + "e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "extends": [ + "plugin:@angular-eslint/ng-cli-compat", + "plugin:@angular-eslint/ng-cli-compat--formatting-add-on", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "", + "style": "kebab-case" + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "", + "style": "camelCase" + } + ], + "@typescript-eslint/dot-notation": "off", + "@typescript-eslint/explicit-member-accessibility": [ + "off", + { + "accessibility": "explicit" + } + ], + "@typescript-eslint/no-inferrable-types": "off", + "arrow-parens": [ + "error", + "as-needed", + { + "requireForBlockBody": true + } + ], + "brace-style": [ + "off", + "off" + ], + "import/order": "off", + "max-len": [ + "error", + { + "ignorePattern": "^import |^export | implements", + "code": 180 + } + ], + "no-underscore-dangle": "off", + "object-shorthand": "off", + "quote-props": [ + "error", + "consistent" + ], + "quotes": [ + "error", + "single" + ] + } + }, + { + "files": [ + "*.html" + ], + "extends": [ + "plugin:@angular-eslint/template/recommended" + ], + "rules": {} + } + ] +} diff --git a/angular.json b/angular.json index 5e092c09..4a624096 100644 --- a/angular.json +++ b/angular.json @@ -126,15 +126,11 @@ } }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": [ - "tsconfig.app.json", - "tsconfig.spec.json", - "e2e/tsconfig.json" - ], - "exclude": [ - "**/node_modules/**" + "lintFilePatterns": [ + "src/**/*.ts", + "src/**/*.html" ] } }, @@ -153,5 +149,8 @@ } } }, - "defaultProject": "fuse" + "defaultProject": "fuse", + "cli": { + "defaultCollection": "@angular-eslint/schematics" + } } diff --git a/package-lock.json b/package-lock.json index 1fabf851..07c8f122 100644 --- a/package-lock.json +++ b/package-lock.json @@ -352,6 +352,83 @@ "rxjs": "6.6.7" } }, + "@angular-eslint/builder": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-12.0.0.tgz", + "integrity": "sha512-gvvXQDXXi0gsWZ25KyMqF/1b3AaX+CJbpVgTPqxJdEx4euvmG/m3993ynmpf+Kc+F+aI2O9W4TUbDbbLWoCjIA==", + "dev": true + }, + "@angular-eslint/eslint-plugin": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-12.0.0.tgz", + "integrity": "sha512-osdJdMu8bYFv9WGhC04AwRcbeKq4sxCQnShV7NiF0xkgNG9KqDaStytVhPjJFn2Ja1QhfiTGlcFFk4D/9aruog==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.23.0" + } + }, + "@angular-eslint/eslint-plugin-template": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-12.0.0.tgz", + "integrity": "sha512-RF8PwN2A3U4ihd7sKYUM8wgPj46M30reziLl8CPPhN3H5Hn46nksmKmHRbPNakH2gW0Ba7NIxy+ocqUy0fQpcQ==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.23.0", + "aria-query": "^4.2.2", + "axobject-query": "^2.2.0" + }, + "dependencies": { + "aria-query": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "dev": true, + "requires": { + "@babel/runtime": "^7.10.2", + "@babel/runtime-corejs3": "^7.10.2" + } + }, + "axobject-query": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", + "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", + "dev": true + } + } + }, + "@angular-eslint/schematics": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-12.0.0.tgz", + "integrity": "sha512-AwYEVuAQLJfyIF5vxBL98a67ecF9U25pQSIg0xCY6DeDpIaGdORr4yg2rGYy8fTlzDQo6BctKZQOTiVX3Y3uew==", + "dev": true, + "requires": { + "@angular-eslint/eslint-plugin": "12.0.0", + "@angular-eslint/eslint-plugin-template": "12.0.0", + "ignore": "5.1.8", + "strip-json-comments": "3.1.1", + "tmp": "0.2.1" + }, + "dependencies": { + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" + } + } + } + }, + "@angular-eslint/template-parser": { + "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-12.0.0.tgz", + "integrity": "sha512-gl5ansA2a8LY6TEjhe0k8NiQJJdEQPjjqpysO1Rpt3NWUYQkFMt+1+AnUyokHB1TU3/11dHRUjVWXj+pMtTIAA==", + "dev": true, + "requires": { + "eslint-scope": "^5.1.0" + } + }, "@angular/animations": { "version": "12.0.0", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-12.0.0.tgz", @@ -2191,6 +2268,16 @@ "regenerator-runtime": "^0.13.4" } }, + "@babel/runtime-corejs3": { + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz", + "integrity": "sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==", + "dev": true, + "requires": { + "core-js-pure": "^3.0.0", + "regenerator-runtime": "^0.13.4" + } + }, "@babel/template": { "version": "7.12.7", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz", @@ -2260,6 +2347,57 @@ "integrity": "sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg==", "dev": true }, + "@es-joy/jsdoccomment": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.4.4.tgz", + "integrity": "sha512-ua4qDt9dQb4qt5OI38eCZcQZYE5Bq3P0GzgvDARdT8Lt0mAUpxKTPy8JGGqEvF77tG1irKDZ3WreeezEa3P43w==", + "dev": true, + "requires": { + "comment-parser": "^1.1.5", + "esquery": "^1.4.0", + "jsdoctypeparser": "^9.0.0" + } + }, + "@eslint/eslintrc": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz", + "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + } + } + }, "@fullcalendar/angular": { "version": "4.4.5-beta", "resolved": "https://registry.npmjs.org/@fullcalendar/angular/-/angular-4.4.5-beta.tgz", @@ -2579,6 +2717,12 @@ "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==", "dev": true }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/lodash": { "version": "4.14.168", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz", @@ -2648,6 +2792,123 @@ } } }, + "@typescript-eslint/eslint-plugin": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.23.0.tgz", + "integrity": "sha512-tGK1y3KIvdsQEEgq6xNn1DjiFJtl+wn8JJQiETtCbdQxw1vzjXyAaIkEmO2l6Nq24iy3uZBMFQjZ6ECf1QdgGw==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "4.23.0", + "@typescript-eslint/scope-manager": "4.23.0", + "debug": "^4.1.1", + "functional-red-black-tree": "^1.0.1", + "lodash": "^4.17.15", + "regexpp": "^3.0.0", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "@typescript-eslint/experimental-utils": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.23.0.tgz", + "integrity": "sha512-WAFNiTDnQfrF3Z2fQ05nmCgPsO5o790vOhmWKXbbYQTO9erE1/YsFot5/LnOUizLzU2eeuz6+U/81KV5/hFTGA==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/scope-manager": "4.23.0", + "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/typescript-estree": "4.23.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/parser": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.23.0.tgz", + "integrity": "sha512-wsvjksHBMOqySy/Pi2Q6UuIuHYbgAMwLczRl4YanEPKW5KVxI9ZzDYh3B5DtcZPQTGRWFJrfcbJ6L01Leybwug==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "4.23.0", + "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/typescript-estree": "4.23.0", + "debug": "^4.1.1" + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.23.0.tgz", + "integrity": "sha512-ZZ21PCFxPhI3n0wuqEJK9omkw51wi2bmeKJvlRZPH5YFkcawKOuRMQMnI8mH6Vo0/DoHSeZJnHiIx84LmVQY+w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/visitor-keys": "4.23.0" + } + }, + "@typescript-eslint/types": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.23.0.tgz", + "integrity": "sha512-oqkNWyG2SLS7uTWLZf6Sr7Dm02gA5yxiz1RP87tvsmDsguVATdpVguHr4HoGOcFOpCvx9vtCSCyQUGfzq28YCw==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.23.0.tgz", + "integrity": "sha512-5Sty6zPEVZF5fbvrZczfmLCOcby3sfrSPu30qKoY1U3mca5/jvU5cwsPb/CO6Q3ByRjixTMIVsDkqwIxCf/dMw==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.23.0", + "@typescript-eslint/visitor-keys": "4.23.0", + "debug": "^4.1.1", + "globby": "^11.0.1", + "is-glob": "^4.0.1", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.23.0.tgz", + "integrity": "sha512-5PNe5cmX9pSifit0H+nPoQBXdbNzi5tOEec+3riK+ku4e3er37pKxMKDH5Ct5Y4fhWxcD4spnlYjxi9vXbSpwg==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.23.0", + "eslint-visitor-keys": "^2.0.0" + } + }, "@webassemblyjs/ast": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.0.tgz", @@ -2840,6 +3101,12 @@ "integrity": "sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==", "dev": true }, + "acorn-jsx": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "dev": true + }, "acorn-node": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", @@ -3029,12 +3296,6 @@ "svg.select.js": "^3.0.1" } }, - "app-root-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz", - "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==", - "dev": true - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -3092,24 +3353,6 @@ "sprintf-js": "~1.0.2" } }, - "aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - } - } - }, "arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", @@ -3134,6 +3377,19 @@ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "array-includes": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz", + "integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.2", + "get-intrinsic": "^1.1.1", + "is-string": "^1.0.5" + } + }, "array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -3152,6 +3408,17 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, + "array.prototype.flat": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", + "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + } + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -3179,10 +3446,10 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, - "ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", + "astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, "async": { @@ -3250,15 +3517,6 @@ "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, - "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } - }, "babel-loader": { "version": "8.2.2", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz", @@ -3630,12 +3888,6 @@ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, "builtins": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", @@ -3941,66 +4193,6 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, - "codelyzer": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz", - "integrity": "sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==", - "dev": true, - "requires": { - "@angular/compiler": "9.0.0", - "@angular/core": "9.0.0", - "app-root-path": "^3.0.0", - "aria-query": "^3.0.0", - "axobject-query": "2.0.2", - "css-selector-tokenizer": "^0.7.1", - "cssauron": "^1.4.0", - "damerau-levenshtein": "^1.0.4", - "rxjs": "^6.5.3", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.2", - "tslib": "^1.10.0", - "zone.js": "~0.10.3" - }, - "dependencies": { - "@angular/compiler": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-9.0.0.tgz", - "integrity": "sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==", - "dev": true - }, - "@angular/core": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-9.0.0.tgz", - "integrity": "sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "zone.js": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.3.tgz", - "integrity": "sha512-LXVLVEq0NNOqK/fLJo3d0kfzd4sxwn2/h67/02pjCjfKDxgx1i9QqpvtHD8CrBnSSwMw5+dy11O7FRX5mkO7Cg==", - "dev": true - } - } - }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", @@ -4072,6 +4264,12 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" }, + "comment-parser": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.5.tgz", + "integrity": "sha512-RePCE4leIhBlmrqiYTvaqEeGYg7qpSl4etaIabKtdOQVi+mSTIBBklGUwIr79GXYnl3LpMwmDw4KeR2stNc6FA==", + "dev": true + }, "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -4172,6 +4370,27 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, + "contains-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-1.0.0.tgz", + "integrity": "sha1-NFizMhhWA+ju0Y9RjUoQiIo6vJE=", + "dev": true, + "requires": { + "normalize-path": "^2.1.1", + "path-starts-with": "^1.0.0" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -4309,6 +4528,12 @@ } } }, + "core-js-pure": { + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz", + "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ==", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -4736,16 +4961,6 @@ "nth-check": "^2.0.0" } }, - "css-selector-tokenizer": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz", - "integrity": "sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "fastparse": "^1.1.2" - } - }, "css-tree": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", @@ -4776,15 +4991,6 @@ "integrity": "sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A==", "dev": true }, - "cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", - "dev": true, - "requires": { - "through": "X.X.X" - } - }, "cssdb": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz", @@ -4866,12 +5072,6 @@ "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", "dev": true }, - "damerau-levenshtein": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz", - "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==", - "dev": true - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -4921,6 +5121,12 @@ "regexp.prototype.flags": "^1.2.0" } }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -5182,6 +5388,15 @@ "buffer-indexof": "^1.0.0" } }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dom-serialize": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", @@ -5364,6 +5579,15 @@ "tapable": "^2.2.0" } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + } + }, "ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", @@ -5406,12 +5630,47 @@ "is-arrayish": "^0.2.1" } }, + "es-abstract": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz", + "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "get-intrinsic": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.2", + "is-callable": "^1.2.3", + "is-negative-zero": "^2.0.1", + "is-regex": "^1.1.2", + "is-string": "^1.0.5", + "object-inspect": "^1.9.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.2", + "string.prototype.trimend": "^1.0.4", + "string.prototype.trimstart": "^1.0.4", + "unbox-primitive": "^1.0.0" + } + }, "es-module-lexer": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.4.1.tgz", "integrity": "sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==", "dev": true }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", @@ -5445,6 +5704,410 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "eslint": { + "version": "7.26.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.26.0.tgz", + "integrity": "sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==", + "dev": true, + "requires": { + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.1", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", + "esutils": "^2.0.2", + "file-entry-cache": "^6.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^13.6.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash": "^4.17.21", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.4", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", + "dev": true, + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "globals": { + "version": "13.8.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz", + "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "eslint-import-resolver-node": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", + "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "resolve": "^1.13.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "eslint-module-utils": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz", + "integrity": "sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==", + "dev": true, + "requires": { + "debug": "^3.2.7", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + } + } + }, + "eslint-plugin-import": { + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.23.0.tgz", + "integrity": "sha512-W5v1f7Cbam6BwbSSKtN6+yoUAms07ozbqAEhLOtf5erEqRv7w67PeZuAuBThaUkzdq2GfBx/5GBvxF+NWJshrQ==", + "dev": true, + "requires": { + "array-includes": "^3.1.3", + "array.prototype.flat": "^1.2.4", + "contains-path": "^1.0.0", + "debug": "^2.6.9", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.4", + "eslint-module-utils": "^2.6.1", + "find-up": "^2.0.0", + "has": "^1.0.3", + "is-core-module": "^2.4.0", + "minimatch": "^3.0.4", + "object.values": "^1.1.3", + "pkg-up": "^2.0.0", + "read-pkg-up": "^3.0.0", + "resolve": "^1.20.0", + "tsconfig-paths": "^3.9.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "is-core-module": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz", + "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "eslint-plugin-jsdoc": { + "version": "34.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-34.2.2.tgz", + "integrity": "sha512-9JCeUUZ2MefGd/Pl3blx9/EDjCd7/Z2+fcVBuJdNdvSLApRqZ8CwjGjLHf5s4uVikqF968A0CfnID0WK9B/H/w==", + "dev": true, + "requires": { + "@es-joy/jsdoccomment": "^0.4.4", + "comment-parser": "1.1.5", + "debug": "^4.3.1", + "esquery": "^1.4.0", + "jsdoctypeparser": "^9.0.0", + "lodash": "^4.17.21", + "regextras": "^0.7.1", + "semver": "^7.3.5", + "spdx-expression-parse": "^3.0.1" + } + }, + "eslint-plugin-prefer-arrow": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz", + "integrity": "sha512-J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ==", + "dev": true + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5455,12 +6118,77 @@ "estraverse": "^4.1.1" } }, + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + }, + "espree": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", + "dev": true, + "requires": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, + "esquery": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz", + "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, "esrecurse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", @@ -5786,10 +6514,10 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, "fastq": { @@ -5819,6 +6547,15 @@ "escape-string-regexp": "^1.0.5" } }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -5888,6 +6625,24 @@ "path-exists": "^4.0.0" } }, + "flat-cache": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "dev": true, + "requires": { + "flatted": "^3.1.0", + "rimraf": "^3.0.2" + }, + "dependencies": { + "flatted": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", + "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==", + "dev": true + } + } + }, "flatted": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", @@ -6000,6 +6755,12 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -6246,6 +7007,12 @@ } } }, + "has-bigints": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz", + "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==", + "dev": true + }, "has-flag": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", @@ -6919,6 +7686,12 @@ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", "dev": true }, + "is-bigint": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.2.tgz", + "integrity": "sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==", + "dev": true + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -6928,12 +7701,27 @@ "binary-extensions": "^2.0.0" } }, + "is-boolean-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.1.tgz", + "integrity": "sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, + "is-callable": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz", + "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==", + "dev": true + }, "is-color-stop": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", @@ -7060,12 +7848,24 @@ "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=", "dev": true }, + "is-negative-zero": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", + "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "dev": true + }, "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, + "is-number-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", + "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==", + "dev": true + }, "is-obj": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", @@ -7126,6 +7926,21 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, + "is-string": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.6.tgz", + "integrity": "sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==", + "dev": true + }, + "is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.2" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -7362,6 +8177,12 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", "dev": true }, + "jsdoctypeparser": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz", + "integrity": "sha512-jrTA2jJIL6/DAEILBEh2/w9QxCuwmvNXIry39Ay/HVfhE3o2yVV0U44blYkqdHA/OKloJEqvJy0xU+GSdE2SIw==", + "dev": true + }, "jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -7392,6 +8213,12 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -7744,6 +8571,16 @@ "klona": "^2.0.4" } }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, "license-webpack-plugin": { "version": "2.3.17", "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.17.tgz", @@ -7769,6 +8606,36 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, "loader-runner": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.2.0.tgz", @@ -7812,6 +8679,12 @@ "integrity": "sha1-wCUTUV4wna3dTCTGDP3c9ZdtkRU=", "dev": true }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -7848,6 +8721,12 @@ "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=", "dev": true }, + "lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", + "dev": true + }, "lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", @@ -8414,6 +9293,12 @@ "to-regex": "^3.0.1" } }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, "needle": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/needle/-/needle-2.6.0.tgz", @@ -8551,6 +9436,32 @@ "abbrev": "1" } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + }, + "dependencies": { + "hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -8734,6 +9645,12 @@ "integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==", "dev": true }, + "object-inspect": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz", + "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==", + "dev": true + }, "object-is": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", @@ -8778,6 +9695,18 @@ "isobject": "^3.0.1" } }, + "object.values": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz", + "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.2", + "has": "^1.0.3" + } + }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -8845,6 +9774,20 @@ } } }, + "optionator": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, "ora": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz", @@ -9182,6 +10125,26 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", "dev": true }, + "path-starts-with": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/path-starts-with/-/path-starts-with-1.0.0.tgz", + "integrity": "sha1-soJDAV6LE43lcmgqxS2kLmRq2E4=", + "dev": true, + "requires": { + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -9241,6 +10204,66 @@ "find-up": "^4.0.0" } }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, "portfinder": { "version": "1.0.28", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", @@ -10938,6 +11961,12 @@ "uniq": "^1.0.1" } }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, "pretty-bytes": { "version": "5.6.0", "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", @@ -10964,6 +11993,12 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -11489,6 +12524,95 @@ "npm-normalize-package-bin": "^1.0.1" } }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz", + "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, "readable-stream": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", @@ -11588,6 +12712,12 @@ "define-properties": "^1.1.3" } }, + "regexpp": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true + }, "regexpu-core": { "version": "4.7.1", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", @@ -11602,6 +12732,12 @@ "unicode-match-property-value-ecmascript": "^1.2.0" } }, + "regextras": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/regextras/-/regextras-0.7.1.tgz", + "integrity": "sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==", + "dev": true + }, "regjsgen": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", @@ -12042,23 +13178,6 @@ "lru-cache": "^6.0.0" } }, - "semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", - "dev": true, - "requires": { - "semver": "^5.3.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } - }, "send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -12276,6 +13395,43 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + } + } + }, "smart-buffer": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", @@ -12594,6 +13750,38 @@ "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", "dev": true }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "dev": true, + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", + "dev": true + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz", + "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==", + "dev": true + }, "spdy": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", @@ -12725,6 +13913,26 @@ "strip-ansi": "^6.0.0" } }, + "string.prototype.trimend": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz", + "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, + "string.prototype.trimstart": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz", + "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + } + }, "string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", @@ -12751,12 +13959,24 @@ "ansi-regex": "^5.0.0" } }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, "style-loader": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz", @@ -12991,6 +14211,40 @@ "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==", "dev": true }, + "table": { + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", + "dev": true, + "requires": { + "ajv": "^8.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.3.0.tgz", + "integrity": "sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + } + } + }, "tailwindcss": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-2.1.2.tgz", @@ -13310,78 +14564,34 @@ "yn": "^3.0.0" } }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + } + } + }, "tslib": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz", "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==" }, - "tslint": { - "version": "6.1.3", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz", - "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^4.0.1", - "glob": "^7.1.1", - "js-yaml": "^3.13.1", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.3", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.13.0", - "tsutils": "^2.29.0" - }, - "dependencies": { - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, - "tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", - "dev": true, - "requires": { - "tslib": "^1.8.1" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -13397,6 +14607,15 @@ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", "dev": true }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, "type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", @@ -13425,6 +14644,18 @@ "integrity": "sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==", "dev": true }, + "unbox-primitive": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz", + "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has-bigints": "^1.0.1", + "has-symbols": "^1.0.2", + "which-boxed-primitive": "^1.0.2" + } + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -13620,6 +14851,22 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, + "v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "dev": true, + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "validate-npm-package-name": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", @@ -14240,6 +15487,19 @@ "isexe": "^2.0.0" } }, + "which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dev": true, + "requires": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + } + }, "which-module": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", @@ -14294,6 +15554,12 @@ "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true + }, "wrap-ansi": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", diff --git a/package.json b/package.json index 936e93aa..a319ff78 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,11 @@ }, "devDependencies": { "@angular-devkit/build-angular": "12.0.0", + "@angular-eslint/builder": "12.0.0", + "@angular-eslint/eslint-plugin": "12.0.0", + "@angular-eslint/eslint-plugin-template": "12.0.0", + "@angular-eslint/schematics": "12.0.0", + "@angular-eslint/template-parser": "12.0.0", "@angular/cli": "12.0.0", "@angular/compiler-cli": "12.0.0", "@angular/language-service": "12.0.0", @@ -62,9 +67,14 @@ "@types/lodash": "4.14.168", "@types/lodash-es": "4.17.4", "@types/node": "12.20.13", + "@typescript-eslint/eslint-plugin": "4.23.0", + "@typescript-eslint/parser": "4.23.0", "autoprefixer": "10.2.5", "chroma-js": "2.1.1", - "codelyzer": "6.0.1", + "eslint": "7.26.0", + "eslint-plugin-import": "2.23.0", + "eslint-plugin-jsdoc": "34.2.2", + "eslint-plugin-prefer-arrow": "1.2.3", "jasmine-core": "3.7.1", "jasmine-spec-reporter": "5.0.2", "karma": "6.3.2", @@ -77,7 +87,6 @@ "protractor": "7.0.0", "tailwindcss": "2.1.2", "ts-node": "8.3.0", - "tslint": "6.1.3", "typescript": "4.2.4" } } diff --git a/src/@fuse/animations/defaults.ts b/src/@fuse/animations/defaults.ts index 61263cc5..784fd751 100644 --- a/src/@fuse/animations/defaults.ts +++ b/src/@fuse/animations/defaults.ts @@ -1,14 +1,14 @@ export class FuseAnimationCurves { - static STANDARD_CURVE = 'cubic-bezier(0.4, 0.0, 0.2, 1)'; - static DECELERATION_CURVE = 'cubic-bezier(0.0, 0.0, 0.2, 1)'; - static ACCELERATION_CURVE = 'cubic-bezier(0.4, 0.0, 1, 1)'; - static SHARP_CURVE = 'cubic-bezier(0.4, 0.0, 0.6, 1)'; + static standard = 'cubic-bezier(0.4, 0.0, 0.2, 1)'; + static deceleration = 'cubic-bezier(0.0, 0.0, 0.2, 1)'; + static acceleration = 'cubic-bezier(0.4, 0.0, 1, 1)'; + static sharp = 'cubic-bezier(0.4, 0.0, 0.6, 1)'; } export class FuseAnimationDurations { - static COMPLEX = '375ms'; - static ENTERING = '225ms'; - static EXITING = '195ms'; + static complex = '375ms'; + static entering = '225ms'; + static exiting = '195ms'; } diff --git a/src/@fuse/animations/expand-collapse.ts b/src/@fuse/animations/expand-collapse.ts index 0ef88be6..60b63903 100644 --- a/src/@fuse/animations/expand-collapse.ts +++ b/src/@fuse/animations/expand-collapse.ts @@ -24,7 +24,7 @@ const expandCollapse = trigger('expandCollapse', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) diff --git a/src/@fuse/animations/fade.ts b/src/@fuse/animations/fade.ts index 5a5457d3..a2982b70 100644 --- a/src/@fuse/animations/fade.ts +++ b/src/@fuse/animations/fade.ts @@ -25,7 +25,7 @@ const fadeIn = trigger('fadeIn', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -58,7 +58,7 @@ const fadeInTop = trigger('fadeInTop', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -91,7 +91,7 @@ const fadeInBottom = trigger('fadeInBottom', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -124,7 +124,7 @@ const fadeInLeft = trigger('fadeInLeft', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -157,7 +157,7 @@ const fadeInRight = trigger('fadeInRight', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -188,7 +188,7 @@ const fadeOut = trigger('fadeOut', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -221,7 +221,7 @@ const fadeOutTop = trigger('fadeOutTop', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -254,7 +254,7 @@ const fadeOutBottom = trigger('fadeOutBottom', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -287,7 +287,7 @@ const fadeOutLeft = trigger('fadeOutLeft', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -320,7 +320,7 @@ const fadeOutRight = trigger('fadeOutRight', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) diff --git a/src/@fuse/animations/public-api.ts b/src/@fuse/animations/public-api.ts index 0e908818..60d4ee81 100644 --- a/src/@fuse/animations/public-api.ts +++ b/src/@fuse/animations/public-api.ts @@ -4,7 +4,7 @@ import { shake } from './shake'; import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from './slide'; import { zoomIn, zoomOut } from './zoom'; -export const FuseAnimations = [ +export const fuseAnimations = [ expandCollapse, fadeIn, fadeInTop, fadeInBottom, fadeInLeft, fadeInRight, fadeOut, fadeOutTop, fadeOutBottom, fadeOutLeft, fadeOutRight, diff --git a/src/@fuse/animations/slide.ts b/src/@fuse/animations/slide.ts index f9e07584..08a80ba7 100644 --- a/src/@fuse/animations/slide.ts +++ b/src/@fuse/animations/slide.ts @@ -25,7 +25,7 @@ const slideInTop = trigger('slideInTop', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -56,7 +56,7 @@ const slideInBottom = trigger('slideInBottom', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -87,7 +87,7 @@ const slideInLeft = trigger('slideInLeft', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -118,7 +118,7 @@ const slideInRight = trigger('slideInRight', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -149,7 +149,7 @@ const slideOutTop = trigger('slideOutTop', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -180,7 +180,7 @@ const slideOutBottom = trigger('slideOutBottom', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -211,7 +211,7 @@ const slideOutLeft = trigger('slideOutLeft', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) @@ -242,7 +242,7 @@ const slideOutRight = trigger('slideOutRight', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) diff --git a/src/@fuse/animations/zoom.ts b/src/@fuse/animations/zoom.ts index aff564dd..c9742515 100644 --- a/src/@fuse/animations/zoom.ts +++ b/src/@fuse/animations/zoom.ts @@ -28,7 +28,7 @@ const zoomIn = trigger('zoomIn', transition('void => *', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}` + timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}` } } ) @@ -62,7 +62,7 @@ const zoomOut = trigger('zoomOut', transition('* => void', animate('{{timings}}'), { params: { - timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}` + timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}` } } ) diff --git a/src/@fuse/components/alert/alert.component.ts b/src/@fuse/components/alert/alert.component.ts index 6a915f5e..a9ef31cd 100644 --- a/src/@fuse/components/alert/alert.component.ts +++ b/src/@fuse/components/alert/alert.component.ts @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Ho import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertAppearance, FuseAlertType } from '@fuse/components/alert/alert.types'; import { FuseAlertService } from '@fuse/components/alert/alert.service'; import { FuseUtilsService } from '@fuse/services/utils/utils.service'; @@ -13,14 +13,16 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service'; styleUrls : ['./alert.component.scss'], encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, - animations : FuseAnimations, + animations : fuseAnimations, exportAs : 'fuseAlert' }) export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_dismissible: BooleanInput; static ngAcceptInputType_dismissed: BooleanInput; static ngAcceptInputType_showIcon: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() appearance: FuseAlertAppearance = 'soft'; @Input() dismissed: boolean = false; @@ -115,7 +117,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy // Subscribe to the dismiss calls this._fuseAlertService.onDismiss .pipe( - filter((name) => this.name === name), + filter(name => this.name === name), takeUntil(this._unsubscribeAll) ) .subscribe(() => { @@ -127,7 +129,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy // Subscribe to the show calls this._fuseAlertService.onShow .pipe( - filter((name) => this.name === name), + filter(name => this.name === name), takeUntil(this._unsubscribeAll) ) .subscribe(() => { diff --git a/src/@fuse/components/card/card.component.ts b/src/@fuse/components/card/card.component.ts index b8649a16..bd9e0f7d 100644 --- a/src/@fuse/components/card/card.component.ts +++ b/src/@fuse/components/card/card.component.ts @@ -1,6 +1,6 @@ import { Component, HostBinding, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseCardFace } from '@fuse/components/card/card.types'; @Component({ @@ -8,13 +8,15 @@ import { FuseCardFace } from '@fuse/components/card/card.types'; templateUrl : './card.component.html', styleUrls : ['./card.component.scss'], encapsulation: ViewEncapsulation.None, - animations : FuseAnimations, + animations : fuseAnimations, exportAs : 'fuseCard' }) export class FuseCardComponent implements OnChanges { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_expanded: BooleanInput; static ngAcceptInputType_flippable: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() expanded: boolean = false; @Input() face: FuseCardFace = 'front'; diff --git a/src/@fuse/components/date-range/date-range.component.ts b/src/@fuse/components/date-range/date-range.component.ts index a2e7aecc..2794df7c 100644 --- a/src/@fuse/components/date-range/date-range.component.ts +++ b/src/@fuse/components/date-range/date-range.component.ts @@ -23,14 +23,14 @@ import { Moment } from 'moment'; }) export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnDestroy { - @Output() readonly rangeChanged: EventEmitter<{ start: string, end: string }> = new EventEmitter<{ start: string; end: string }>(); + @Output() readonly rangeChanged: EventEmitter<{ start: string; end: string }> = new EventEmitter<{ start: string; end: string }>(); @ViewChild('matMonthView1') private _matMonthView1: MatMonthView; @ViewChild('matMonthView2') private _matMonthView2: MatMonthView; @ViewChild('pickerPanelOrigin', {read: ElementRef}) private _pickerPanelOrigin: ElementRef; @ViewChild('pickerPanel') private _pickerPanel: TemplateRef; @HostBinding('class.fuse-date-range') private _defaultClassNames = true; - activeDates: { month1: Moment | null, month2: Moment | null } = { + activeDates: { month1: Moment | null; month2: Moment | null } = { month1: null, month2: null }; @@ -41,7 +41,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD private _onChange: (value: any) => void; private _onTouched: (value: any) => void; private _programmaticChange!: boolean; - private _range: { start: Moment | null, end: Moment | null } = { + private _range: { start: Moment | null; end: Moment | null } = { start: null, end : null }; @@ -330,7 +330,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD * * @param range */ - writeValue(range: { start: string, end: string }): void + writeValue(range: { start: string; end: string }): void { // Set this change as a programmatic one this._programmaticChange = true; @@ -481,11 +481,8 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD */ dateFilter(): any { - return (date: Moment): boolean => { - - // If we are selecting the end date, disable all the dates that comes before the start date - return !(this.setWhichDate === 'end' && date.isBefore(this._range.start, 'day')); - }; + // If we are selecting the end date, disable all the dates that comes before the start date + return (date: Moment): boolean => !(this.setWhichDate === 'end' && date.isBefore(this._range.start, 'day')); } /** @@ -667,7 +664,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD private _parseTime(value: string): Moment { // Parse the time using the time regexp - const timeArr = value.split(this._timeRegExp).filter((part) => part !== ''); + const timeArr = value.split(this._timeRegExp).filter(part => part !== ''); // Get the meridiem const meridiem = timeArr[2] || null; diff --git a/src/@fuse/components/drawer/drawer.component.ts b/src/@fuse/components/drawer/drawer.component.ts index e2dc0943..d489dbc9 100644 --- a/src/@fuse/components/drawer/drawer.component.ts +++ b/src/@fuse/components/drawer/drawer.component.ts @@ -14,9 +14,11 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; }) export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_fixed: BooleanInput; static ngAcceptInputType_opened: BooleanInput; static ngAcceptInputType_transparentOverlay: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() fixed: boolean = false; @Input() mode: FuseDrawerMode = 'side'; @@ -76,6 +78,40 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy }; } + // ----------------------------------------------------------------------------------------------------- + // @ Decorated methods + // ----------------------------------------------------------------------------------------------------- + + /** + * On mouseenter + * + * @private + */ + @HostListener('mouseenter') + private _onMouseenter(): void + { + // Enable the animations + this._enableAnimations(); + + // Set the hovered + this._hovered = true; + } + + /** + * On mouseleave + * + * @private + */ + @HostListener('mouseleave') + private _onMouseleave(): void + { + // Enable the animations + this._enableAnimations(); + + // Set the hovered + this._hovered = false; + } + // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- @@ -347,36 +383,6 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy }); } - /** - * On mouseenter - * - * @private - */ - @HostListener('mouseenter') - private _onMouseenter(): void - { - // Enable the animations - this._enableAnimations(); - - // Set the hovered - this._hovered = true; - } - - /** - * On mouseleave - * - * @private - */ - @HostListener('mouseleave') - private _onMouseleave(): void - { - // Enable the animations - this._enableAnimations(); - - // Set the hovered - this._hovered = false; - } - /** * Open/close the drawer * diff --git a/src/@fuse/components/highlight/highlight.service.ts b/src/@fuse/components/highlight/highlight.service.ts index b97d64f7..091baa21 100644 --- a/src/@fuse/components/highlight/highlight.service.ts +++ b/src/@fuse/components/highlight/highlight.service.ts @@ -60,7 +60,7 @@ export class FuseHighlightService } // Iterate through the lines - lines.filter((line) => line.length) + lines.filter(line => line.length) .forEach((line, index) => { // Always get the indentation of the first line so we can @@ -77,6 +77,6 @@ export class FuseHighlightService // Iterate through the lines one more time, remove the extra // indentation, join them together and return it - return lines.map((line) => line.substring(indentation)).join('\n'); + return lines.map(line => line.substring(indentation)).join('\n'); } } diff --git a/src/@fuse/components/masonry/masonry.component.ts b/src/@fuse/components/masonry/masonry.component.ts index 5cc91ec4..bf49f65c 100644 --- a/src/@fuse/components/masonry/masonry.component.ts +++ b/src/@fuse/components/masonry/masonry.component.ts @@ -1,5 +1,5 @@ import { AfterViewInit, Component, Input, OnChanges, SimpleChanges, TemplateRef, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseMediaWatcherService } from '@fuse/services/media-watcher'; @Component({ @@ -7,7 +7,7 @@ import { FuseMediaWatcherService } from '@fuse/services/media-watcher'; templateUrl : './masonry.component.html', styleUrls : ['./masonry.component.scss'], encapsulation: ViewEncapsulation.None, - animations : FuseAnimations, + animations : fuseAnimations, exportAs : 'fuseMasonry' }) export class FuseMasonryComponent implements OnChanges, AfterViewInit diff --git a/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts b/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts index 26983272..2abf7cc5 100644 --- a/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts +++ b/src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts @@ -15,7 +15,9 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types }) export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_child: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() child: boolean = false; @Input() item: FuseNavigationItem; diff --git a/src/@fuse/components/navigation/horizontal/horizontal.component.ts b/src/@fuse/components/navigation/horizontal/horizontal.component.ts index 094900c5..dbd159c7 100644 --- a/src/@fuse/components/navigation/horizontal/horizontal.component.ts +++ b/src/@fuse/components/navigation/horizontal/horizontal.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core'; import { ReplaySubject, Subject } from 'rxjs'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseUtilsService } from '@fuse/services/utils/utils.service'; @@ -9,7 +9,7 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service'; selector : 'fuse-horizontal-navigation', templateUrl : './horizontal.component.html', styleUrls : ['./horizontal.component.scss'], - animations : FuseAnimations, + animations : fuseAnimations, encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, exportAs : 'fuseHorizontalNavigation' diff --git a/src/@fuse/components/navigation/navigation.service.ts b/src/@fuse/components/navigation/navigation.service.ts index 8d195c41..31a2738c 100644 --- a/src/@fuse/components/navigation/navigation.service.ts +++ b/src/@fuse/components/navigation/navigation.service.ts @@ -67,7 +67,6 @@ export class FuseNavigationService * Get navigation from storage by key * * @param key - * @returns {any} */ getNavigation(key: string): FuseNavigationItem[] { @@ -97,7 +96,6 @@ export class FuseNavigationService * * @param navigation * @param flatNavigation - * @returns {FuseNavigationItem[]} */ getFlatNavigation(navigation: FuseNavigationItem[], flatNavigation: FuseNavigationItem[] = []): FuseNavigationItem[] { diff --git a/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts b/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts index b4d332a1..2b2a25b8 100644 --- a/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts +++ b/src/@fuse/components/navigation/vertical/components/aside/aside.component.ts @@ -15,8 +15,10 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types }) export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_autoCollapse: BooleanInput; static ngAcceptInputType_skipChildren: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() activeItemId: string; @Input() autoCollapse: boolean; @@ -101,6 +103,21 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn this._unsubscribeAll.complete(); } + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Track by function for ngFor loops + * + * @param index + * @param item + */ + trackByFn(index: number, item: any): any + { + return item.id || index; + } + // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- @@ -168,19 +185,4 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn // Mark for check this._changeDetectorRef.markForCheck(); } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Track by function for ngFor loops - * - * @param index - * @param item - */ - trackByFn(index: number, item: any): any - { - return item.id || index; - } } diff --git a/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts b/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts index dbf81b68..6c944fcd 100644 --- a/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts +++ b/src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts @@ -3,7 +3,7 @@ import { NavigationEnd, Router } from '@angular/router'; import { BooleanInput } from '@angular/cdk/coercion'; import { Subject } from 'rxjs'; import { filter, takeUntil } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types'; @@ -12,12 +12,14 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types selector : 'fuse-vertical-navigation-collapsable-item', templateUrl : './collapsable.component.html', styles : [], - animations : FuseAnimations, + animations : fuseAnimations, changeDetection: ChangeDetectionStrategy.OnPush }) export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_autoCollapse: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() autoCollapse: boolean; @Input() item: FuseNavigationItem; @@ -179,84 +181,6 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O this._unsubscribeAll.complete(); } - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Check if the given item has the given url - * in one of its children - * - * @param item - * @param currentUrl - * @private - */ - private _hasActiveChild(item: FuseNavigationItem, currentUrl: string): boolean - { - const children = item.children; - - if ( !children ) - { - return false; - } - - for ( const child of children ) - { - if ( child.children ) - { - if ( this._hasActiveChild(child, currentUrl) ) - { - return true; - } - } - - // Check if the child has a link and is active - if ( child.link && this._router.isActive(child.link, child.exactMatch || false) ) - { - return true; - } - } - - return false; - } - - /** - * Check if this is a children - * of the given item - * - * @param parent - * @param item - * @return {boolean} - * @private - */ - private _isChildrenOf(parent: FuseNavigationItem, item: FuseNavigationItem): boolean - { - const children = parent.children; - - if ( !children ) - { - return false; - } - - if ( children.indexOf(item) > -1 ) - { - return true; - } - - for ( const child of children ) - { - if ( child.children ) - { - if ( this._isChildrenOf(child, item) ) - { - return true; - } - } - } - - return false; - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- @@ -343,4 +267,81 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O { return item.id || index; } + + // ----------------------------------------------------------------------------------------------------- + // @ Private methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Check if the given item has the given url + * in one of its children + * + * @param item + * @param currentUrl + * @private + */ + private _hasActiveChild(item: FuseNavigationItem, currentUrl: string): boolean + { + const children = item.children; + + if ( !children ) + { + return false; + } + + for ( const child of children ) + { + if ( child.children ) + { + if ( this._hasActiveChild(child, currentUrl) ) + { + return true; + } + } + + // Check if the child has a link and is active + if ( child.link && this._router.isActive(child.link, child.exactMatch || false) ) + { + return true; + } + } + + return false; + } + + /** + * Check if this is a children + * of the given item + * + * @param parent + * @param item + * @private + */ + private _isChildrenOf(parent: FuseNavigationItem, item: FuseNavigationItem): boolean + { + const children = parent.children; + + if ( !children ) + { + return false; + } + + if ( children.indexOf(item) > -1 ) + { + return true; + } + + for ( const child of children ) + { + if ( child.children ) + { + if ( this._isChildrenOf(child, item) ) + { + return true; + } + } + } + + return false; + } } diff --git a/src/@fuse/components/navigation/vertical/components/group/group.component.ts b/src/@fuse/components/navigation/vertical/components/group/group.component.ts index d9145b98..614f5c4e 100644 --- a/src/@fuse/components/navigation/vertical/components/group/group.component.ts +++ b/src/@fuse/components/navigation/vertical/components/group/group.component.ts @@ -14,7 +14,9 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types }) export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_autoCollapse: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() autoCollapse: boolean; @Input() item: FuseNavigationItem; diff --git a/src/@fuse/components/navigation/vertical/vertical.component.ts b/src/@fuse/components/navigation/vertical/vertical.component.ts index 88efb054..39d25ecc 100644 --- a/src/@fuse/components/navigation/vertical/vertical.component.ts +++ b/src/@fuse/components/navigation/vertical/vertical.component.ts @@ -4,7 +4,7 @@ import { NavigationEnd, Router } from '@angular/router'; import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay'; import { merge, ReplaySubject, Subject, Subscription } from 'rxjs'; import { delay, filter, takeUntil } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseNavigationItem, FuseVerticalNavigationAppearance, FuseVerticalNavigationMode, FuseVerticalNavigationPosition } from '@fuse/components/navigation/navigation.types'; import { FuseNavigationService } from '@fuse/components/navigation/navigation.service'; import { FuseScrollbarDirective } from '@fuse/directives/scrollbar/scrollbar.directive'; @@ -15,16 +15,18 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; selector : 'fuse-vertical-navigation', templateUrl : './vertical.component.html', styleUrls : ['./vertical.component.scss'], - animations : FuseAnimations, + animations : fuseAnimations, encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, exportAs : 'fuseVerticalNavigation' }) export class FuseVerticalNavigationComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_inner: BooleanInput; static ngAcceptInputType_opened: BooleanInput; static ngAcceptInputType_transparentOverlay: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() appearance: FuseVerticalNavigationAppearance = 'default'; @Input() autoCollapse: boolean = true; @@ -151,6 +153,40 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After }); } + // ----------------------------------------------------------------------------------------------------- + // @ Decorated methods + // ----------------------------------------------------------------------------------------------------- + + /** + * On mouseenter + * + * @private + */ + @HostListener('mouseenter') + private _onMouseenter(): void + { + // Enable the animations + this._enableAnimations(); + + // Set the hovered + this._hovered = true; + } + + /** + * On mouseleave + * + * @private + */ + @HostListener('mouseleave') + private _onMouseleave(): void + { + // Enable the animations + this._enableAnimations(); + + // Set the hovered + this._hovered = false; + } + // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- @@ -672,36 +708,6 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After }); } - /** - * On mouseenter - * - * @private - */ - @HostListener('mouseenter') - private _onMouseenter(): void - { - // Enable the animations - this._enableAnimations(); - - // Set the hovered - this._hovered = true; - } - - /** - * On mouseleave - * - * @private - */ - @HostListener('mouseleave') - private _onMouseleave(): void - { - // Enable the animations - this._enableAnimations(); - - // Set the hovered - this._hovered = false; - } - /** * Open/close the navigation * diff --git a/src/@fuse/directives/autogrow/autogrow.directive.ts b/src/@fuse/directives/autogrow/autogrow.directive.ts index 3f62401f..20624005 100644 --- a/src/@fuse/directives/autogrow/autogrow.directive.ts +++ b/src/@fuse/directives/autogrow/autogrow.directive.ts @@ -7,7 +7,7 @@ import { Subject } from 'rxjs'; }) export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy { - // tslint:disable-next-line:no-input-rename + // eslint-disable-next-line @angular-eslint/no-input-rename @Input('fuseAutogrowVerticalPadding') padding: number = 8; @HostBinding('rows') private _rows: number = 1; @@ -41,6 +41,39 @@ export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy }; } + // ----------------------------------------------------------------------------------------------------- + // @ Decorated methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resize on 'input' and 'ngModelChange' events + * + * @private + */ + @HostListener('input') + @HostListener('ngModelChange') + private _resize(): void + { + // This doesn't need to trigger Angular's change detection by itself + this._ngZone.runOutsideAngular(() => { + + setTimeout(() => { + + // Set the height to 'auto' so we can correctly read the scrollHeight + this._height = 'auto'; + + // Detect the changes so the height is applied + this._changeDetectorRef.detectChanges(); + + // Get the scrollHeight and subtract the vertical padding + this._height = `${this._elementRef.nativeElement.scrollHeight - this.padding}px`; + + // Detect the changes one more time to apply the final height + this._changeDetectorRef.detectChanges(); + }); + }); + } + // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- @@ -78,37 +111,4 @@ export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy this._unsubscribeAll.next(); this._unsubscribeAll.complete(); } - - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Resize on 'input' and 'ngModelChange' events - * - * @private - */ - @HostListener('input') - @HostListener('ngModelChange') - private _resize(): void - { - // This doesn't need to trigger Angular's change detection by itself - this._ngZone.runOutsideAngular(() => { - - setTimeout(() => { - - // Set the height to 'auto' so we can correctly read the scrollHeight - this._height = 'auto'; - - // Detect the changes so the height is applied - this._changeDetectorRef.detectChanges(); - - // Get the scrollHeight and subtract the vertical padding - this._height = `${this._elementRef.nativeElement.scrollHeight - this.padding}px`; - - // Detect the changes one more time to apply the final height - this._changeDetectorRef.detectChanges(); - }); - }); - } } diff --git a/src/@fuse/directives/scrollbar/scrollbar.directive.ts b/src/@fuse/directives/scrollbar/scrollbar.directive.ts index c4c9c053..6644fd15 100644 --- a/src/@fuse/directives/scrollbar/scrollbar.directive.ts +++ b/src/@fuse/directives/scrollbar/scrollbar.directive.ts @@ -17,7 +17,9 @@ import { ScrollbarGeometry, ScrollbarPosition } from '@fuse/directives/scrollbar }) export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_fuseScrollbar: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() fuseScrollbar: boolean = true; @Input() fuseScrollbarOptions: PerfectScrollbar.Options; @@ -246,8 +248,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to X * - * @param {number} x - * @param {number} speed + * @param x + * @param speed */ scrollToX(x: number, speed?: number): void { @@ -257,8 +259,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to Y * - * @param {number} y - * @param {number} speed + * @param y + * @param speed */ scrollToY(y: number, speed?: number): void { @@ -268,8 +270,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to top * - * @param {number} offset - * @param {number} speed + * @param offset + * @param speed */ scrollToTop(offset: number = 0, speed?: number): void { @@ -279,8 +281,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to bottom * - * @param {number} offset - * @param {number} speed + * @param offset + * @param speed */ scrollToBottom(offset: number = 0, speed?: number): void { @@ -291,8 +293,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to left * - * @param {number} offset - * @param {number} speed + * @param offset + * @param speed */ scrollToLeft(offset: number = 0, speed?: number): void { @@ -302,8 +304,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to right * - * @param {number} offset - * @param {number} speed + * @param offset + * @param speed */ scrollToRight(offset: number = 0, speed?: number): void { @@ -314,10 +316,10 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy /** * Scroll to element * - * @param {string} qs - * @param {number} offset - * @param {boolean} ignoreVisible If true, scrollToElement won't happen if element is already inside the current viewport - * @param {number} speed + * @param qs + * @param offset + * @param ignoreVisible If true, scrollToElement won't happen if element is already inside the current viewport + * @param speed */ scrollToElement(qs: string, offset: number = 0, ignoreVisible: boolean = false, speed?: number): void { diff --git a/src/@fuse/lib/mock-api/mock-api.service.ts b/src/@fuse/lib/mock-api/mock-api.service.ts index e317f486..4d7eea28 100644 --- a/src/@fuse/lib/mock-api/mock-api.service.ts +++ b/src/@fuse/lib/mock-api/mock-api.service.ts @@ -9,11 +9,11 @@ import { FuseMockApiMethods } from '@fuse/lib/mock-api/mock-api.types'; export class FuseMockApiService { private _handlers: { [key: string]: Map } = { - DELETE: new Map(), - GET : new Map(), - PATCH : new Map(), - POST : new Map(), - PUT : new Map() + 'delete': new Map(), + 'get' : new Map(), + 'patch' : new Map(), + 'post' : new Map(), + 'put' : new Map() }; /** @@ -34,10 +34,10 @@ export class FuseMockApiService * @param method * @param url */ - findHandler(method: string, url: string): { handler: FuseMockApiHandler | undefined, urlParams: { [key: string]: string } } + findHandler(method: string, url: string): { handler: FuseMockApiHandler | undefined; urlParams: { [key: string]: string } } { // Prepare the return object - const matchingHandler: { handler: FuseMockApiHandler | undefined, urlParams: { [key: string]: string } } = { + const matchingHandler: { handler: FuseMockApiHandler | undefined; urlParams: { [key: string]: string } } = { handler : undefined, urlParams: {} }; @@ -46,7 +46,7 @@ export class FuseMockApiService const urlParts = url.split('/'); // Get all related request handlers - const handlers = this._handlers[method.toUpperCase()]; + const handlers = this._handlers[method.toLowerCase()]; // Iterate through the handlers handlers.forEach((handler, handlerUrl) => { @@ -93,7 +93,7 @@ export class FuseMockApiService */ onDelete(url: string, delay?: number): FuseMockApiHandler { - return this._registerHandler('DELETE', url, delay); + return this._registerHandler('delete', url, delay); } /** @@ -104,7 +104,7 @@ export class FuseMockApiService */ onGet(url: string, delay?: number): FuseMockApiHandler { - return this._registerHandler('GET', url, delay); + return this._registerHandler('get', url, delay); } /** @@ -115,7 +115,7 @@ export class FuseMockApiService */ onPatch(url: string, delay?: number): FuseMockApiHandler { - return this._registerHandler('PATCH', url, delay); + return this._registerHandler('patch', url, delay); } /** @@ -126,7 +126,7 @@ export class FuseMockApiService */ onPost(url: string, delay?: number): FuseMockApiHandler { - return this._registerHandler('POST', url, delay); + return this._registerHandler('post', url, delay); } /** @@ -137,7 +137,7 @@ export class FuseMockApiService */ onPut(url: string, delay?: number): FuseMockApiHandler { - return this._registerHandler('PUT', url, delay); + return this._registerHandler('put', url, delay); } // ----------------------------------------------------------------------------------------------------- diff --git a/src/@fuse/lib/mock-api/mock-api.types.ts b/src/@fuse/lib/mock-api/mock-api.types.ts index c8e6e43c..4a3afdb5 100644 --- a/src/@fuse/lib/mock-api/mock-api.types.ts +++ b/src/@fuse/lib/mock-api/mock-api.types.ts @@ -6,8 +6,8 @@ export type FuseMockApiReplyCallback = | undefined; export type FuseMockApiMethods = - | 'GET' - | 'POST' - | 'PUT' - | 'PATCH' - | 'DELETE'; + | 'get' + | 'post' + | 'put' + | 'patch' + | 'delete'; diff --git a/src/@fuse/lib/mock-api/mock-api.utils.ts b/src/@fuse/lib/mock-api/mock-api.utils.ts index 2ee8d19b..91af6a8f 100644 --- a/src/@fuse/lib/mock-api/mock-api.utils.ts +++ b/src/@fuse/lib/mock-api/mock-api.utils.ts @@ -16,7 +16,7 @@ export class FuseMockApiUtils */ static guid(): string { - /* tslint:disable */ + /* eslint-disable */ let d = new Date().getTime(); @@ -32,6 +32,6 @@ export class FuseMockApiUtils return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16); }); - /* tslint:enable */ + /* eslint-enable */ } } diff --git a/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts b/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts index 506409e7..ef56d410 100644 --- a/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts +++ b/src/@fuse/pipes/find-by-key/find-by-key.pipe.ts @@ -28,9 +28,7 @@ export class FuseFindByKeyPipe implements PipeTransform // If the given value is an array of strings... if ( Array.isArray(value) ) { - return value.map((item) => { - return source.find((sourceItem) => sourceItem[key] === item); - }); + return value.map(item => source.find(sourceItem => sourceItem[key] === item)); } // If the value is a string... diff --git a/src/@fuse/services/media-watcher/media-watcher.service.ts b/src/@fuse/services/media-watcher/media-watcher.service.ts index 49203137..c6197bac 100644 --- a/src/@fuse/services/media-watcher/media-watcher.service.ts +++ b/src/@fuse/services/media-watcher/media-watcher.service.ts @@ -7,7 +7,7 @@ import { FuseTailwindService } from '@fuse/services/tailwind/tailwind.service'; @Injectable() export class FuseMediaWatcherService { - private _onMediaChange: ReplaySubject<{ matchingAliases: string[], matchingQueries: any }> = new ReplaySubject<{ matchingAliases: string[], matchingQueries: any }>(1); + private _onMediaChange: ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }> = new ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }>(1); /** * Constructor @@ -18,7 +18,7 @@ export class FuseMediaWatcherService ) { this._fuseTailwindConfigService.tailwindConfig$.pipe( - switchMap((config) => this._breakpointObserver.observe(Object.values(config.breakpoints)).pipe( + switchMap(config => this._breakpointObserver.observe(Object.values(config.breakpoints)).pipe( map((state) => { // Prepare the observable values and set their defaults @@ -57,7 +57,7 @@ export class FuseMediaWatcherService /** * Getter for _onMediaChange */ - get onMediaChange$(): Observable<{ matchingAliases: string[], matchingQueries: any }> + get onMediaChange$(): Observable<{ matchingAliases: string[]; matchingQueries: any }> { return this._onMediaChange.asObservable(); } diff --git a/src/@fuse/version/fuse-version.ts b/src/@fuse/version/fuse-version.ts index a43d2acb..df461ff5 100644 --- a/src/@fuse/version/fuse-version.ts +++ b/src/@fuse/version/fuse-version.ts @@ -1,4 +1,3 @@ import { Version } from '@fuse/version/version'; -const __FUSE_VERSION__ = '12.3.0'; -export const FUSE_VERSION = new Version(__FUSE_VERSION__).full; +export const FUSE_VERSION = new Version('12.3.0').full; diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index ed35b6a8..253a1dd3 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -5,7 +5,7 @@ import { LayoutComponent } from 'app/layout/layout.component'; import { InitialDataResolver } from 'app/app.resolvers'; // @formatter:off -// tslint:disable:max-line-length +/* eslint-disable max-len */ export const appRoutes: Route[] = [ // Redirect empty path to '/dashboards/project' diff --git a/src/app/app.types.ts b/src/app/app.types.ts index 2d1b0820..10a6fb69 100644 --- a/src/app/app.types.ts +++ b/src/app/app.types.ts @@ -8,10 +8,10 @@ export interface InitialData { messages: Message[]; navigation: { - compact: FuseNavigationItem[], - default: FuseNavigationItem[], - futuristic: FuseNavigationItem[], - horizontal: FuseNavigationItem[] + compact: FuseNavigationItem[]; + default: FuseNavigationItem[]; + futuristic: FuseNavigationItem[]; + horizontal: FuseNavigationItem[]; }; notifications: Notification[]; shortcuts: Shortcut[]; diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts index ccdfbdd6..b720a0ca 100644 --- a/src/app/core/auth/auth.service.ts +++ b/src/app/core/auth/auth.service.ts @@ -29,12 +29,12 @@ export class AuthService */ set accessToken(token: string) { - localStorage.setItem('access_token', token); + localStorage.setItem('accessToken', token); } get accessToken(): string { - return localStorage.getItem('access_token') ?? ''; + return localStorage.getItem('accessToken') ?? ''; } // ----------------------------------------------------------------------------------------------------- @@ -66,7 +66,7 @@ export class AuthService * * @param credentials */ - signIn(credentials: { email: string, password: string }): Observable + signIn(credentials: { email: string; password: string }): Observable { // Throw error, if the user is already logged in if ( this._authenticated ) @@ -78,7 +78,7 @@ export class AuthService switchMap((response: any) => { // Store the access token in the local storage - this.accessToken = response.access_token; + this.accessToken = response.accessToken; // Set the authenticated flag to true this._authenticated = true; @@ -99,17 +99,17 @@ export class AuthService { // Renew token return this._httpClient.post('api/auth/refresh-access-token', { - access_token: this.accessToken + accessToken: this.accessToken }).pipe( - catchError(() => { + catchError(() => // Return false - return of(false); - }), + of(false) + ), switchMap((response: any) => { // Store the access token in the local storage - this.accessToken = response.access_token; + this.accessToken = response.accessToken; // Set the authenticated flag to true this._authenticated = true; @@ -129,7 +129,7 @@ export class AuthService signOut(): Observable { // Remove the access token from the local storage - localStorage.removeItem('access_token'); + localStorage.removeItem('accessToken'); // Set the authenticated flag to false this._authenticated = false; @@ -143,7 +143,7 @@ export class AuthService * * @param user */ - signUp(user: { name: string, email: string, password: string, company: string }): Observable + signUp(user: { name: string; email: string; password: string; company: string }): Observable { return this._httpClient.post('api/auth/sign-up', user); } @@ -153,7 +153,7 @@ export class AuthService * * @param credentials */ - unlockSession(credentials: { email: string, password: string }): Observable + unlockSession(credentials: { email: string; password: string }): Observable { return this._httpClient.post('api/auth/unlock-session', credentials); } diff --git a/src/app/core/auth/auth.utils.ts b/src/app/core/auth/auth.utils.ts index f8666f36..5f20ea07 100644 --- a/src/app/core/auth/auth.utils.ts +++ b/src/app/core/auth/auth.utils.ts @@ -14,6 +14,38 @@ export class AuthUtils { } + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Is token expired? + * + * @param token + * @param offsetSeconds + */ + static isTokenExpired(token: string, offsetSeconds?: number): boolean + { + // Return if there is no token + if ( !token || token === '' ) + { + return true; + } + + // Get the expiration date + const date = this._getTokenExpirationDate(token); + + offsetSeconds = offsetSeconds || 0; + + if ( date === null ) + { + return true; + } + + // Check if the token is expired + return !(date.valueOf() > new Date().valueOf() + offsetSeconds * 1000); + } + // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- @@ -39,7 +71,7 @@ export class AuthUtils ); } - /* tslint:disable */ + /* eslint-disable */ for ( // initialize result and counters let bc = 0, bs: any, buffer: any, idx = 0; @@ -60,7 +92,7 @@ export class AuthUtils // try to find character in table (0-63, not found => -1) buffer = chars.indexOf(buffer); } - /* tslint:enable */ + /* eslint-enable */ return output; } @@ -75,9 +107,7 @@ export class AuthUtils { return decodeURIComponent( Array.prototype.map - .call(this._b64decode(str), (c: any) => { - return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2); - }) + .call(this._b64decode(str), (c: any) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2)) .join('') ); } @@ -171,36 +201,4 @@ export class AuthUtils return date; } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Is token expired? - * - * @param token - * @param offsetSeconds - */ - static isTokenExpired(token: string, offsetSeconds?: number): boolean - { - // Return if there is no token - if ( !token || token === '' ) - { - return true; - } - - // Get the expiration date - const date = this._getTokenExpirationDate(token); - - offsetSeconds = offsetSeconds || 0; - - if ( date === null ) - { - return true; - } - - // Check if the token is expired - return !(date.valueOf() > new Date().valueOf() + offsetSeconds * 1000); - } } diff --git a/src/app/core/auth/guards/auth.guard.ts b/src/app/core/auth/guards/auth.guard.ts index 41caddb4..99628adf 100644 --- a/src/app/core/auth/guards/auth.guard.ts +++ b/src/app/core/auth/guards/auth.guard.ts @@ -19,39 +19,6 @@ export class AuthGuard implements CanActivate, CanActivateChild, CanLoad { } - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Check the authenticated status - * - * @param redirectURL - * @private - */ - private _check(redirectURL: string): Observable - { - // Check the authentication status - return this._authService.check() - .pipe( - switchMap((authenticated) => { - - // If the user is not authenticated... - if ( !authenticated ) - { - // Redirect to the sign-in page - this._router.navigate(['sign-in'], {queryParams: {redirectURL}}); - - // Prevent the access - return of(false); - } - - // Allow the access - return of(true); - }) - ); - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- @@ -90,4 +57,37 @@ export class AuthGuard implements CanActivate, CanActivateChild, CanLoad { return this._check('/'); } + + // ----------------------------------------------------------------------------------------------------- + // @ Private methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Check the authenticated status + * + * @param redirectURL + * @private + */ + private _check(redirectURL: string): Observable + { + // Check the authentication status + return this._authService.check() + .pipe( + switchMap((authenticated) => { + + // If the user is not authenticated... + if ( !authenticated ) + { + // Redirect to the sign-in page + this._router.navigate(['sign-in'], {queryParams: {redirectURL}}); + + // Prevent the access + return of(false); + } + + // Allow the access + return of(true); + }) + ); + } } diff --git a/src/app/core/auth/guards/noAuth.guard.ts b/src/app/core/auth/guards/noAuth.guard.ts index 6ec40b50..37400e6e 100644 --- a/src/app/core/auth/guards/noAuth.guard.ts +++ b/src/app/core/auth/guards/noAuth.guard.ts @@ -19,38 +19,6 @@ export class NoAuthGuard implements CanActivate, CanActivateChild, CanLoad { } - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Check the authenticated status - * - * @private - */ - private _check(): Observable - { - // Check the authentication status - return this._authService.check() - .pipe( - switchMap((authenticated) => { - - // If the user is authenticated... - if ( authenticated ) - { - // Redirect to the root - this._router.navigate(['']); - - // Prevent the access - return of(false); - } - - // Allow the access - return of(true); - }) - ); - } - // ----------------------------------------------------------------------------------------------------- // @ Public methods // ----------------------------------------------------------------------------------------------------- @@ -87,4 +55,36 @@ export class NoAuthGuard implements CanActivate, CanActivateChild, CanLoad { return this._check(); } + + // ----------------------------------------------------------------------------------------------------- + // @ Private methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Check the authenticated status + * + * @private + */ + private _check(): Observable + { + // Check the authentication status + return this._authService.check() + .pipe( + switchMap((authenticated) => { + + // If the user is authenticated... + if ( authenticated ) + { + // Redirect to the root + this._router.navigate(['']); + + // Prevent the access + return of(false); + } + + // Allow the access + return of(true); + }) + ); + } } diff --git a/src/app/layout/common/search/search.component.ts b/src/app/layout/common/search/search.component.ts index e501feee..3ec7f25e 100644 --- a/src/app/layout/common/search/search.component.ts +++ b/src/app/layout/common/search/search.component.ts @@ -3,14 +3,14 @@ import { FormControl } from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { Subject } from 'rxjs'; import { debounceTime, filter, map, takeUntil } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations/public-api'; +import { fuseAnimations } from '@fuse/animations/public-api'; @Component({ selector : 'search', templateUrl : './search.component.html', encapsulation: ViewEncapsulation.None, exportAs : 'fuseSearch', - animations : FuseAnimations + animations : fuseAnimations }) export class SearchComponent implements OnChanges, OnInit, OnDestroy { @@ -115,12 +115,9 @@ export class SearchComponent implements OnChanges, OnInit, OnDestroy // Continue return value; }), - filter((value) => { - - // Filter out undefined/null/false statements and also - // filter out the values that are smaller than minLength - return value && value.length >= this.minLength; - }) + // Filter out undefined/null/false statements and also + // filter out the values that are smaller than minLength + filter(value => value && value.length >= this.minLength) ) .subscribe((value) => { this._httpClient.post('api/common/search', {query: value}) diff --git a/src/app/layout/common/search/search.module.ts b/src/app/layout/common/search/search.module.ts index 4dec6521..456d478d 100644 --- a/src/app/layout/common/search/search.module.ts +++ b/src/app/layout/common/search/search.module.ts @@ -28,9 +28,7 @@ import { SearchComponent } from 'app/layout/common/search/search.component'; providers : [ { provide : MAT_AUTOCOMPLETE_SCROLL_STRATEGY, - useFactory: (overlay: Overlay) => { - return () => overlay.scrollStrategies.block(); - }, + useFactory: (overlay: Overlay) => () => overlay.scrollStrategies.block(), deps : [Overlay] } ] diff --git a/src/app/layout/common/user-menu/user-menu.component.ts b/src/app/layout/common/user-menu/user-menu.component.ts index 6b2fabef..45a4bc4b 100644 --- a/src/app/layout/common/user-menu/user-menu.component.ts +++ b/src/app/layout/common/user-menu/user-menu.component.ts @@ -15,7 +15,9 @@ import { UserService } from 'app/core/user/user.service'; }) export class UserMenuComponent implements OnInit, OnDestroy { + /* eslint-disable @typescript-eslint/naming-convention */ static ngAcceptInputType_showAvatar: BooleanInput; + /* eslint-enable @typescript-eslint/naming-convention */ @Input() showAvatar: boolean = true; user: User; diff --git a/src/app/mock-api/apps/academy/api.ts b/src/app/mock-api/apps/academy/api.ts index cf4abe7c..ed843342 100644 --- a/src/app/mock-api/apps/academy/api.ts +++ b/src/app/mock-api/apps/academy/api.ts @@ -74,7 +74,7 @@ export class AcademyMockApi const steps = cloneDeep(this._demoCourseSteps); // Find the course and attach steps to it - const course = courses.find((item) => item.id === id); + const course = courses.find(item => item.id === id); if ( course ) { course.steps = steps; diff --git a/src/app/mock-api/apps/academy/data.ts b/src/app/mock-api/apps/academy/data.ts index 8b1c35d4..21dfad88 100644 --- a/src/app/mock-api/apps/academy/data.ts +++ b/src/app/mock-api/apps/academy/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const categories = [ { id : '9a67dff7-3c38-4052-a335-0cef93438ff6', diff --git a/src/app/mock-api/apps/calendar/api.ts b/src/app/mock-api/apps/calendar/api.ts index f0331d3e..f780c141 100644 --- a/src/app/mock-api/apps/calendar/api.ts +++ b/src/app/mock-api/apps/calendar/api.ts @@ -110,11 +110,11 @@ export class CalendarMockApi const id = request.params.get('id'); // Find the calendar and delete it - const index = this._calendars.findIndex((calendar) => calendar.id === id); + const index = this._calendars.findIndex(calendar => calendar.id === id); this._calendars.splice(index, 1); // Find the events that belong to the calendar and remove them as well - this._events = this._events.filter((event) => event.calendarId !== id); + this._events = this._events.filter(event => event.calendarId !== id); // Return the response return [200, true]; @@ -287,7 +287,7 @@ export class CalendarMockApi const id = request.params.get('id'); // Find the event and delete it - const index = this._events.findIndex((item) => item.id === id); + const index = this._events.findIndex(item => item.id === id); this._events.splice(index, 1); // Return the response @@ -307,7 +307,7 @@ export class CalendarMockApi const mode = request.body.mode; // Find the original recurring event from db - const recurringEvent = this._events.find((item) => item.id === event.recurringEventId); + const recurringEvent = this._events.find(item => item.id === event.recurringEventId); // Single if ( mode === 'single' ) @@ -406,7 +406,7 @@ export class CalendarMockApi if ( mode === 'all' ) { // Find the event index - const eventIndex = this._events.findIndex((item) => item.id === event.recurringEventId); + const eventIndex = this._events.findIndex(item => item.id === event.recurringEventId); // Update the recurring event this._events[eventIndex] = assign({}, this._events[eventIndex], omit(event, ['id', 'recurringEventId', 'range'])); @@ -428,7 +428,7 @@ export class CalendarMockApi const mode = request.params.get('mode'); // Find the recurring event - const recurringEvent = this._events.find((item) => item.id === event.recurringEventId); + const recurringEvent = this._events.find(item => item.id === event.recurringEventId); // Single if ( mode === 'single' ) @@ -495,7 +495,7 @@ export class CalendarMockApi if ( mode === 'all' ) { // Find the event and delete it - const index = this._events.findIndex((item) => item.id === event.recurringEventId); + const index = this._events.findIndex(item => item.id === event.recurringEventId); this._events.splice(index, 1); } diff --git a/src/app/mock-api/apps/calendar/data.ts b/src/app/mock-api/apps/calendar/data.ts index 89fee0c4..c9753ac1 100644 --- a/src/app/mock-api/apps/calendar/data.ts +++ b/src/app/mock-api/apps/calendar/data.ts @@ -1,6 +1,6 @@ +/* eslint-disable */ import * as moment from 'moment'; -/* tslint:disable:max-line-length */ export const calendars = [ { id : '1a470c8e-40ed-4c2d-b590-a4f1f6ead6cc', diff --git a/src/app/mock-api/apps/chat/api.ts b/src/app/mock-api/apps/chat/api.ts index 4e465962..db2286d5 100644 --- a/src/app/mock-api/apps/chat/api.ts +++ b/src/app/mock-api/apps/chat/api.ts @@ -22,12 +22,12 @@ export class ChatMockApi this.registerHandlers(); // Modify the chats array to attach certain data to it - this._chats = this._chats.map((chat) => ({ + this._chats = this._chats.map(chat => ({ ...chat, // Get the actual contact object from the id and attach it to the chat - contact: this._contacts.find((contact) => contact.id === chat.contactId), + contact: this._contacts.find(contact => contact.id === chat.contactId), // Since we use same set of messages on all chats, we assign them here. - messages: this._messages.map((message) => ({ + messages: this._messages.map(message => ({ ...message, chatId : chat.id, contactId: message.contactId === 'me' ? this._profile.id : chat.contactId, @@ -73,7 +73,7 @@ export class ChatMockApi const chats = cloneDeep(this._chats); // Find the chat we need - const chat = chats.find((item) => item.id === id); + const chat = chats.find(item => item.id === id); // Return the response return [200, chat]; @@ -124,7 +124,7 @@ export class ChatMockApi contacts.sort((a, b) => a.name.localeCompare(b.name)); // Omit details and attachments from contacts - contacts = contacts.map((contact) => omit(contact, ['details', 'attachments'])); + contacts = contacts.map(contact => omit(contact, ['details', 'attachments'])); // Return the response return [200, contacts]; @@ -144,7 +144,7 @@ export class ChatMockApi const contacts = cloneDeep(this._contacts); // Find the contact - const contact = contacts.find((item) => item.id === id); + const contact = contacts.find(item => item.id === id); // Return the response return [200, contact]; diff --git a/src/app/mock-api/apps/chat/data.ts b/src/app/mock-api/apps/chat/data.ts index 0ca269cc..7882bb3f 100644 --- a/src/app/mock-api/apps/chat/data.ts +++ b/src/app/mock-api/apps/chat/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ import * as moment from 'moment'; /** @@ -343,14 +343,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bs', - number : '984 531 2468', - label : 'Mobile' + country : 'bs', + phoneNumber: '984 531 2468', + label : 'Mobile' }, { - country: 'bs', - number : '806 470 2693', - label : 'Work' + country : 'bs', + phoneNumber: '806 470 2693', + label : 'Work' } ], title : 'Track Service Worker', @@ -378,9 +378,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'io', - number : '934 537 3180', - label : 'Mobile' + country : 'io', + phoneNumber: '934 537 3180', + label : 'Mobile' } ], title : 'Weather Analyst', @@ -408,9 +408,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'md', - number : '893 548 2862', - label : 'Mobile' + country : 'md', + phoneNumber: '893 548 2862', + label : 'Mobile' } ], title : 'Electromedical Equipment Technician', @@ -438,19 +438,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'va', - number : '830 484 3813', - label : 'Mobile' + country : 'va', + phoneNumber: '830 484 3813', + label : 'Mobile' }, { - country: 'va', - number : '999 475 2789', - label : 'Work' + country : 'va', + phoneNumber: '999 475 2789', + label : 'Work' }, { - country: 'va', - number : '933 406 3598', - label : 'Home' + country : 'va', + phoneNumber: '933 406 3598', + label : 'Home' } ], company : 'Accel', @@ -473,14 +473,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tz', - number : '864 401 3980', - label : 'Mobile' + country : 'tz', + phoneNumber: '864 401 3980', + label : 'Mobile' }, { - country: 'tz', - number : '956 546 2589', - label : 'Work' + country : 'tz', + phoneNumber: '956 546 2589', + label : 'Work' } ], title : 'Fundraising Director', @@ -508,19 +508,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lv', - number : '834 426 3574', - label : 'Mobile' + country : 'lv', + phoneNumber: '834 426 3574', + label : 'Mobile' }, { - country: 'lv', - number : '816 573 3694', - label : 'Work' + country : 'lv', + phoneNumber: '816 573 3694', + label : 'Work' }, { - country: 'lv', - number : '967 515 2009', - label : 'Home' + country : 'lv', + phoneNumber: '967 515 2009', + label : 'Home' } ], title : 'Motor Winder', @@ -544,14 +544,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ar', - number : '964 417 2318', - label : 'Mobile' + country : 'ar', + phoneNumber: '964 417 2318', + label : 'Mobile' }, { - country: 'ar', - number : '830 410 2506', - label : 'Work' + country : 'ar', + phoneNumber: '830 410 2506', + label : 'Work' } ], title : 'Television News Producer', @@ -579,19 +579,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'pe', - number : '934 519 2903', - label : 'Mobile' + country : 'pe', + phoneNumber: '934 519 2903', + label : 'Mobile' }, { - country: 'pe', - number : '989 489 3662', - label : 'Work' + country : 'pe', + phoneNumber: '989 489 3662', + label : 'Work' }, { - country: 'pe', - number : '813 461 2790', - label : 'Home' + country : 'pe', + phoneNumber: '813 461 2790', + label : 'Home' } ], title : 'Legal Assistant', @@ -619,9 +619,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ls', - number : '912 539 2770', - label : 'Mobile' + country : 'ls', + phoneNumber: '912 539 2770', + label : 'Mobile' } ], title : 'Meteorologist', @@ -649,14 +649,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tg', - number : '907 515 3007', - label : 'Mobile' + country : 'tg', + phoneNumber: '907 515 3007', + label : 'Mobile' }, { - country: 'tg', - number : '967 534 2803', - label : 'Work' + country : 'tg', + phoneNumber: '967 534 2803', + label : 'Work' } ], title : 'Fundraising Director', @@ -680,19 +680,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'pf', - number : '855 517 2767', - label : 'Mobile' + country : 'pf', + phoneNumber: '855 517 2767', + label : 'Mobile' }, { - country: 'pf', - number : '906 442 3593', - label : 'Work' + country : 'pf', + phoneNumber: '906 442 3593', + label : 'Work' }, { - country: 'pf', - number : '905 402 2121', - label : 'Home' + country : 'pf', + phoneNumber: '905 402 2121', + label : 'Home' } ], title : 'Legal Assistant', @@ -716,19 +716,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'dz', - number : '892 430 2631', - label : 'Mobile' + country : 'dz', + phoneNumber: '892 430 2631', + label : 'Mobile' }, { - country: 'dz', - number : '997 525 2354', - label : 'Work' + country : 'dz', + phoneNumber: '997 525 2354', + label : 'Work' }, { - country: 'dz', - number : '907 472 2857', - label : 'Home' + country : 'dz', + phoneNumber: '907 472 2857', + label : 'Home' } ], title : 'Banker Mason', @@ -752,19 +752,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'at', - number : '977 590 2773', - label : 'Mobile' + country : 'at', + phoneNumber: '977 590 2773', + label : 'Mobile' }, { - country: 'at', - number : '828 496 3813', - label : 'Work' + country : 'at', + phoneNumber: '828 496 3813', + label : 'Work' }, { - country: 'at', - number : '831 432 2512', - label : 'Home' + country : 'at', + phoneNumber: '831 432 2512', + label : 'Home' } ], company : 'Inrt', @@ -791,19 +791,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tn', - number : '841 530 3641', - label : 'Mobile' + country : 'tn', + phoneNumber: '841 530 3641', + label : 'Mobile' }, { - country: 'tn', - number : '941 410 3743', - label : 'Work' + country : 'tn', + phoneNumber: '941 410 3743', + label : 'Work' }, { - country: 'tn', - number : '938 599 3850', - label : 'Home' + country : 'tn', + phoneNumber: '938 599 3850', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -827,19 +827,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gb', - number : '899 508 2992', - label : 'Mobile' + country : 'gb', + phoneNumber: '899 508 2992', + label : 'Mobile' }, { - country: 'gb', - number : '834 499 3354', - label : 'Work' + country : 'gb', + phoneNumber: '834 499 3354', + label : 'Work' }, { - country: 'gb', - number : '834 526 3388', - label : 'Home' + country : 'gb', + phoneNumber: '834 526 3388', + label : 'Home' } ], title : 'Gas Meter Mechanic', @@ -867,19 +867,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gb', - number : '844 480 3309', - label : 'Mobile' + country : 'gb', + phoneNumber: '844 480 3309', + label : 'Mobile' }, { - country: 'gb', - number : '981 591 3239', - label : 'Work' + country : 'gb', + phoneNumber: '981 591 3239', + label : 'Work' }, { - country: 'gb', - number : '923 484 3147', - label : 'Home' + country : 'gb', + phoneNumber: '923 484 3147', + label : 'Home' } ], title : 'Short Story Writer', @@ -907,9 +907,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'so', - number : '974 542 2061', - label : 'Mobile' + country : 'so', + phoneNumber: '974 542 2061', + label : 'Mobile' } ], title : 'Animal Sitter', @@ -937,14 +937,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tv', - number : '922 585 2914', - label : 'Mobile' + country : 'tv', + phoneNumber: '922 585 2914', + label : 'Mobile' }, { - country: 'tv', - number : '913 538 2961', - label : 'Work' + country : 'tv', + phoneNumber: '913 538 2961', + label : 'Work' } ], title : 'Track Service Worker', @@ -968,19 +968,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tm', - number : '981 508 2080', - label : 'Mobile' + country : 'tm', + phoneNumber: '981 508 2080', + label : 'Mobile' }, { - country: 'tm', - number : '817 425 2052', - label : 'Work' + country : 'tm', + phoneNumber: '817 425 2052', + label : 'Work' }, { - country: 'tm', - number : '939 434 3805', - label : 'Home' + country : 'tm', + phoneNumber: '939 434 3805', + label : 'Home' } ], title : 'Motor Winder', @@ -1004,19 +1004,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ck', - number : '992 583 3187', - label : 'Mobile' + country : 'ck', + phoneNumber: '992 583 3187', + label : 'Mobile' }, { - country: 'ck', - number : '881 472 3297', - label : 'Work' + country : 'ck', + phoneNumber: '881 472 3297', + label : 'Work' }, { - country: 'ck', - number : '846 477 3596', - label : 'Home' + country : 'ck', + phoneNumber: '846 477 3596', + label : 'Home' } ], title : 'Congressional Representative', @@ -1040,14 +1040,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ai', - number : '995 411 2513', - label : 'Mobile' + country : 'ai', + phoneNumber: '995 411 2513', + label : 'Mobile' }, { - country: 'ai', - number : '839 492 2760', - label : 'Work' + country : 'ai', + phoneNumber: '839 492 2760', + label : 'Work' } ], title : 'Gas Meter Mechanic', @@ -1071,14 +1071,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ht', - number : '969 499 3077', - label : 'Mobile' + country : 'ht', + phoneNumber: '969 499 3077', + label : 'Mobile' }, { - country: 'ht', - number : '907 513 2784', - label : 'Work' + country : 'ht', + phoneNumber: '907 513 2784', + label : 'Work' } ], title : 'Weather Analyst', @@ -1106,9 +1106,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mm', - number : '977 516 2492', - label : 'Mobile' + country : 'mm', + phoneNumber: '977 516 2492', + label : 'Mobile' } ], title : 'Short Story Writer', @@ -1132,9 +1132,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lb', - number : '989 567 3834', - label : 'Mobile' + country : 'lb', + phoneNumber: '989 567 3834', + label : 'Mobile' } ], title : 'Meteorologist', @@ -1162,9 +1162,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jo', - number : '990 450 2729', - label : 'Mobile' + country : 'jo', + phoneNumber: '990 450 2729', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -1188,9 +1188,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'xk', - number : '909 552 3327', - label : 'Mobile' + country : 'xk', + phoneNumber: '909 552 3327', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -1214,9 +1214,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ee', - number : '868 438 3943', - label : 'Mobile' + country : 'ee', + phoneNumber: '868 438 3943', + label : 'Mobile' } ], title : 'Meteorologist', @@ -1240,9 +1240,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mr', - number : '891 498 2043', - label : 'Mobile' + country : 'mr', + phoneNumber: '891 498 2043', + label : 'Mobile' } ], title : 'Electromedical Equipment Technician', @@ -1266,19 +1266,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bt', - number : '979 541 2691', - label : 'Mobile' + country : 'bt', + phoneNumber: '979 541 2691', + label : 'Mobile' }, { - country: 'bt', - number : '909 407 3887', - label : 'Work' + country : 'bt', + phoneNumber: '909 407 3887', + label : 'Work' }, { - country: 'bt', - number : '864 557 3128', - label : 'Home' + country : 'bt', + phoneNumber: '864 557 3128', + label : 'Home' } ], title : 'Hotel Manager', @@ -1306,9 +1306,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bi', - number : '855 456 2754', - label : 'Mobile' + country : 'bi', + phoneNumber: '855 456 2754', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -1332,19 +1332,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'se', - number : '993 504 3286', - label : 'Mobile' + country : 'se', + phoneNumber: '993 504 3286', + label : 'Mobile' }, { - country: 'se', - number : '924 434 2238', - label : 'Work' + country : 'se', + phoneNumber: '924 434 2238', + label : 'Work' }, { - country: 'se', - number : '816 466 2634', - label : 'Home' + country : 'se', + phoneNumber: '816 466 2634', + label : 'Home' } ], title : 'Historiographer', @@ -1368,14 +1368,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bn', - number : '916 511 3837', - label : 'Mobile' + country : 'bn', + phoneNumber: '916 511 3837', + label : 'Mobile' }, { - country: 'bn', - number : '949 564 3247', - label : 'Work' + country : 'bn', + phoneNumber: '949 564 3247', + label : 'Work' } ], title : 'Insurance Analyst', @@ -1403,19 +1403,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'na', - number : '896 471 3036', - label : 'Mobile' + country : 'na', + phoneNumber: '896 471 3036', + label : 'Mobile' }, { - country: 'na', - number : '851 491 3567', - label : 'Work' + country : 'na', + phoneNumber: '851 491 3567', + label : 'Work' }, { - country: 'na', - number : '805 487 2016', - label : 'Home' + country : 'na', + phoneNumber: '805 487 2016', + label : 'Home' } ], title : 'Short Story Writer', @@ -1439,14 +1439,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bh', - number : '915 577 3020', - label : 'Mobile' + country : 'bh', + phoneNumber: '915 577 3020', + label : 'Mobile' }, { - country: 'bh', - number : '923 431 3594', - label : 'Work' + country : 'bh', + phoneNumber: '923 431 3594', + label : 'Work' } ], title : 'Fundraising Director', @@ -1470,9 +1470,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mt', - number : '902 529 2999', - label : 'Mobile' + country : 'mt', + phoneNumber: '902 529 2999', + label : 'Mobile' } ], title : 'Dental Laboratory Worker', @@ -1496,14 +1496,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bh', - number : '813 410 3258', - label : 'Mobile' + country : 'bh', + phoneNumber: '813 410 3258', + label : 'Mobile' }, { - country: 'bh', - number : '877 501 2767', - label : 'Work' + country : 'bh', + phoneNumber: '877 501 2767', + label : 'Work' } ], title : 'Historiographer', @@ -1527,14 +1527,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tk', - number : '943 511 2203', - label : 'Mobile' + country : 'tk', + phoneNumber: '943 511 2203', + label : 'Mobile' }, { - country: 'tk', - number : '817 578 2993', - label : 'Work' + country : 'tk', + phoneNumber: '817 578 2993', + label : 'Work' } ], title : 'Legal Assistant', @@ -1562,9 +1562,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gl', - number : '814 498 3701', - label : 'Mobile' + country : 'gl', + phoneNumber: '814 498 3701', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -1588,19 +1588,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jm', - number : '968 547 2111', - label : 'Mobile' + country : 'jm', + phoneNumber: '968 547 2111', + label : 'Mobile' }, { - country: 'jm', - number : '968 433 3120', - label : 'Work' + country : 'jm', + phoneNumber: '968 433 3120', + label : 'Work' }, { - country: 'jm', - number : '905 425 2777', - label : 'Home' + country : 'jm', + phoneNumber: '905 425 2777', + label : 'Home' } ], title : 'Historiographer', @@ -1624,19 +1624,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mg', - number : '902 500 2668', - label : 'Mobile' + country : 'mg', + phoneNumber: '902 500 2668', + label : 'Mobile' }, { - country: 'mg', - number : '947 559 2919', - label : 'Work' + country : 'mg', + phoneNumber: '947 559 2919', + label : 'Work' }, { - country: 'mg', - number : '934 434 3768', - label : 'Home' + country : 'mg', + phoneNumber: '934 434 3768', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -1660,9 +1660,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fm', - number : '838 562 2769', - label : 'Mobile' + country : 'fm', + phoneNumber: '838 562 2769', + label : 'Mobile' } ], title : 'Legal Assistant', @@ -1686,14 +1686,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tr', - number : '939 555 3054', - label : 'Mobile' + country : 'tr', + phoneNumber: '939 555 3054', + label : 'Mobile' }, { - country: 'tr', - number : '852 486 2053', - label : 'Work' + country : 'tr', + phoneNumber: '852 486 2053', + label : 'Work' } ], title : 'Bindery Machine Operator', @@ -1717,14 +1717,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gp', - number : '933 464 2431', - label : 'Mobile' + country : 'gp', + phoneNumber: '933 464 2431', + label : 'Mobile' }, { - country: 'gp', - number : '894 535 3609', - label : 'Work' + country : 'gp', + phoneNumber: '894 535 3609', + label : 'Work' } ], title : 'Short Story Writer', @@ -1752,14 +1752,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'nz', - number : '822 531 2600', - label : 'Mobile' + country : 'nz', + phoneNumber: '822 531 2600', + label : 'Mobile' }, { - country: 'nz', - number : '922 549 2094', - label : 'Work' + country : 'nz', + phoneNumber: '922 549 2094', + label : 'Work' } ], title : 'Fundraising Director', @@ -1783,14 +1783,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'kp', - number : '990 457 2106', - label : 'Mobile' + country : 'kp', + phoneNumber: '990 457 2106', + label : 'Mobile' }, { - country: 'kp', - number : '918 550 2946', - label : 'Work' + country : 'kp', + phoneNumber: '918 550 2946', + label : 'Work' } ], company : 'Grupoli', @@ -1813,19 +1813,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'nu', - number : '855 445 2483', - label : 'Mobile' + country : 'nu', + phoneNumber: '855 445 2483', + label : 'Mobile' }, { - country: 'nu', - number : '858 415 2860', - label : 'Work' + country : 'nu', + phoneNumber: '858 415 2860', + label : 'Work' }, { - country: 'nu', - number : '968 587 2752', - label : 'Home' + country : 'nu', + phoneNumber: '968 587 2752', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -1849,9 +1849,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'es', - number : '879 591 3327', - label : 'Mobile' + country : 'es', + phoneNumber: '879 591 3327', + label : 'Mobile' } ], title : 'Dental Laboratory Worker', @@ -1875,14 +1875,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jp', - number : '906 579 3698', - label : 'Mobile' + country : 'jp', + phoneNumber: '906 579 3698', + label : 'Mobile' }, { - country: 'jp', - number : '841 475 2681', - label : 'Work' + country : 'jp', + phoneNumber: '841 475 2681', + label : 'Work' } ], title : 'Electromedical Equipment Technician', @@ -1910,19 +1910,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tl', - number : '971 514 3366', - label : 'Mobile' + country : 'tl', + phoneNumber: '971 514 3366', + label : 'Mobile' }, { - country: 'tl', - number : '807 480 2033', - label : 'Work' + country : 'tl', + phoneNumber: '807 480 2033', + label : 'Work' }, { - country: 'tl', - number : '810 528 3783', - label : 'Home' + country : 'tl', + phoneNumber: '810 528 3783', + label : 'Home' } ], title : 'Pastry Baker', @@ -1946,19 +1946,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fm', - number : '932 404 3308', - label : 'Mobile' + country : 'fm', + phoneNumber: '932 404 3308', + label : 'Mobile' }, { - country: 'fm', - number : '979 550 3200', - label : 'Work' + country : 'fm', + phoneNumber: '979 550 3200', + label : 'Work' }, { - country: 'fm', - number : '868 557 3568', - label : 'Home' + country : 'fm', + phoneNumber: '868 557 3568', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -1986,9 +1986,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ki', - number : '927 589 3619', - label : 'Mobile' + country : 'ki', + phoneNumber: '927 589 3619', + label : 'Mobile' } ], title : 'Historiographer', @@ -2016,19 +2016,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'no', - number : '883 432 3718', - label : 'Mobile' + country : 'no', + phoneNumber: '883 432 3718', + label : 'Mobile' }, { - country: 'no', - number : '934 516 2135', - label : 'Work' + country : 'no', + phoneNumber: '934 516 2135', + label : 'Work' }, { - country: 'no', - number : '923 596 3843', - label : 'Home' + country : 'no', + phoneNumber: '923 596 3843', + label : 'Home' } ], title : 'Track Service Worker', @@ -2052,9 +2052,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bd', - number : '936 590 2412', - label : 'Mobile' + country : 'bd', + phoneNumber: '936 590 2412', + label : 'Mobile' } ], title : 'Insurance Analyst', @@ -2078,19 +2078,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'sx', - number : '881 472 3113', - label : 'Mobile' + country : 'sx', + phoneNumber: '881 472 3113', + label : 'Mobile' }, { - country: 'sx', - number : '974 548 3124', - label : 'Work' + country : 'sx', + phoneNumber: '974 548 3124', + label : 'Work' }, { - country: 'sx', - number : '800 518 3615', - label : 'Home' + country : 'sx', + phoneNumber: '800 518 3615', + label : 'Home' } ], title : 'Track Service Worker', @@ -2118,14 +2118,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'au', - number : '830 430 3437', - label : 'Mobile' + country : 'au', + phoneNumber: '830 430 3437', + label : 'Mobile' }, { - country: 'au', - number : '868 538 2886', - label : 'Work' + country : 'au', + phoneNumber: '868 538 2886', + label : 'Work' } ], title : 'Dental Laboratory Worker', @@ -2153,19 +2153,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gt', - number : '847 513 2248', - label : 'Mobile' + country : 'gt', + phoneNumber: '847 513 2248', + label : 'Mobile' }, { - country: 'gt', - number : '866 591 3665', - label : 'Work' + country : 'gt', + phoneNumber: '866 591 3665', + label : 'Work' }, { - country: 'gt', - number : '877 539 3840', - label : 'Home' + country : 'gt', + phoneNumber: '877 539 3840', + label : 'Home' } ], title : 'Banker Mason', @@ -2193,14 +2193,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bf', - number : '861 419 2752', - label : 'Mobile' + country : 'bf', + phoneNumber: '861 419 2752', + label : 'Mobile' }, { - country: 'bf', - number : '935 553 3031', - label : 'Work' + country : 'bf', + phoneNumber: '935 553 3031', + label : 'Work' } ], title : 'Fundraising Director', @@ -2228,19 +2228,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fo', - number : '947 441 2999', - label : 'Mobile' + country : 'fo', + phoneNumber: '947 441 2999', + label : 'Mobile' }, { - country: 'fo', - number : '984 441 2615', - label : 'Work' + country : 'fo', + phoneNumber: '984 441 2615', + label : 'Work' }, { - country: 'fo', - number : '824 541 2714', - label : 'Home' + country : 'fo', + phoneNumber: '824 541 2714', + label : 'Home' } ], title : 'Legal Assistant', @@ -2268,19 +2268,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ao', - number : '992 596 3391', - label : 'Mobile' + country : 'ao', + phoneNumber: '992 596 3391', + label : 'Mobile' }, { - country: 'ao', - number : '950 489 2505', - label : 'Work' + country : 'ao', + phoneNumber: '950 489 2505', + label : 'Work' }, { - country: 'ao', - number : '891 540 2231', - label : 'Home' + country : 'ao', + phoneNumber: '891 540 2231', + label : 'Home' } ], title : 'Television News Producer', @@ -2304,9 +2304,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lv', - number : '961 537 3956', - label : 'Mobile' + country : 'lv', + phoneNumber: '961 537 3956', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2334,19 +2334,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '811 502 3398', - label : 'Mobile' + country : 'et', + phoneNumber: '811 502 3398', + label : 'Mobile' }, { - country: 'et', - number : '877 402 2443', - label : 'Work' + country : 'et', + phoneNumber: '877 402 2443', + label : 'Work' }, { - country: 'et', - number : '949 536 3451', - label : 'Home' + country : 'et', + phoneNumber: '949 536 3451', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -2374,19 +2374,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'si', - number : '837 503 2254', - label : 'Mobile' + country : 'si', + phoneNumber: '837 503 2254', + label : 'Mobile' }, { - country: 'si', - number : '893 405 3190', - label : 'Work' + country : 'si', + phoneNumber: '893 405 3190', + label : 'Work' }, { - country: 'si', - number : '931 402 3874', - label : 'Home' + country : 'si', + phoneNumber: '931 402 3874', + label : 'Home' } ], title : 'Legal Assistant', @@ -2410,19 +2410,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vg', - number : '864 459 3205', - label : 'Mobile' + country : 'vg', + phoneNumber: '864 459 3205', + label : 'Mobile' }, { - country: 'vg', - number : '886 524 2880', - label : 'Work' + country : 'vg', + phoneNumber: '886 524 2880', + label : 'Work' }, { - country: 'vg', - number : '815 484 3420', - label : 'Home' + country : 'vg', + phoneNumber: '815 484 3420', + label : 'Home' } ], title : 'Animal Sitter', @@ -2450,9 +2450,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'uy', - number : '898 554 3354', - label : 'Mobile' + country : 'uy', + phoneNumber: '898 554 3354', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2476,19 +2476,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'uz', - number : '891 543 2053', - label : 'Mobile' + country : 'uz', + phoneNumber: '891 543 2053', + label : 'Mobile' }, { - country: 'uz', - number : '842 564 3671', - label : 'Work' + country : 'uz', + phoneNumber: '842 564 3671', + label : 'Work' }, { - country: 'uz', - number : '992 491 3514', - label : 'Home' + country : 'uz', + phoneNumber: '992 491 3514', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -2516,14 +2516,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tn', - number : '860 472 2458', - label : 'Mobile' + country : 'tn', + phoneNumber: '860 472 2458', + label : 'Mobile' }, { - country: 'tn', - number : '887 499 3580', - label : 'Work' + country : 'tn', + phoneNumber: '887 499 3580', + label : 'Work' } ], title : 'Banker Mason', @@ -2547,19 +2547,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'az', - number : '928 567 2521', - label : 'Mobile' + country : 'az', + phoneNumber: '928 567 2521', + label : 'Mobile' }, { - country: 'az', - number : '898 515 2048', - label : 'Work' + country : 'az', + phoneNumber: '898 515 2048', + label : 'Work' }, { - country: 'az', - number : '935 495 3348', - label : 'Home' + country : 'az', + phoneNumber: '935 495 3348', + label : 'Home' } ], title : 'Talent Manager', @@ -2583,14 +2583,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vg', - number : '998 498 2507', - label : 'Mobile' + country : 'vg', + phoneNumber: '998 498 2507', + label : 'Mobile' }, { - country: 'vg', - number : '856 477 3445', - label : 'Work' + country : 'vg', + phoneNumber: '856 477 3445', + label : 'Work' } ], title : 'Motor Winder', @@ -2614,19 +2614,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bb', - number : '875 422 2053', - label : 'Mobile' + country : 'bb', + phoneNumber: '875 422 2053', + label : 'Mobile' }, { - country: 'bb', - number : '861 487 2597', - label : 'Work' + country : 'bb', + phoneNumber: '861 487 2597', + label : 'Work' }, { - country: 'bb', - number : '873 414 3953', - label : 'Home' + country : 'bb', + phoneNumber: '873 414 3953', + label : 'Home' } ], title : 'Bindery Machine Operator', @@ -2650,19 +2650,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vu', - number : '978 546 3699', - label : 'Mobile' + country : 'vu', + phoneNumber: '978 546 3699', + label : 'Mobile' }, { - country: 'vu', - number : '892 551 2229', - label : 'Work' + country : 'vu', + phoneNumber: '892 551 2229', + label : 'Work' }, { - country: 'vu', - number : '949 495 3479', - label : 'Home' + country : 'vu', + phoneNumber: '949 495 3479', + label : 'Home' } ], company : 'Buzzmaker', @@ -2685,19 +2685,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lu', - number : '805 502 3677', - label : 'Mobile' + country : 'lu', + phoneNumber: '805 502 3677', + label : 'Mobile' }, { - country: 'lu', - number : '925 527 2973', - label : 'Work' + country : 'lu', + phoneNumber: '925 527 2973', + label : 'Work' }, { - country: 'lu', - number : '975 495 2977', - label : 'Home' + country : 'lu', + phoneNumber: '975 495 2977', + label : 'Home' } ], title : 'Fundraising Director', @@ -2725,9 +2725,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'co', - number : '974 428 2886', - label : 'Mobile' + country : 'co', + phoneNumber: '974 428 2886', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -2755,19 +2755,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'dz', - number : '947 561 3783', - label : 'Mobile' + country : 'dz', + phoneNumber: '947 561 3783', + label : 'Mobile' }, { - country: 'dz', - number : '917 463 3737', - label : 'Work' + country : 'dz', + phoneNumber: '917 463 3737', + label : 'Work' }, { - country: 'dz', - number : '835 510 2059', - label : 'Home' + country : 'dz', + phoneNumber: '835 510 2059', + label : 'Home' } ], title : 'Hotel Manager', @@ -2795,9 +2795,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'au', - number : '947 468 2942', - label : 'Mobile' + country : 'au', + phoneNumber: '947 468 2942', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2821,14 +2821,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'id', - number : '944 525 2944', - label : 'Mobile' + country : 'id', + phoneNumber: '944 525 2944', + label : 'Mobile' }, { - country: 'id', - number : '877 500 2506', - label : 'Work' + country : 'id', + phoneNumber: '877 500 2506', + label : 'Work' } ], title : 'Banker Mason', @@ -2852,19 +2852,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '996 514 3856', - label : 'Mobile' + country : 'et', + phoneNumber: '996 514 3856', + label : 'Mobile' }, { - country: 'et', - number : '903 539 2049', - label : 'Work' + country : 'et', + phoneNumber: '903 539 2049', + label : 'Work' }, { - country: 'et', - number : '938 463 3685', - label : 'Home' + country : 'et', + phoneNumber: '938 463 3685', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -2888,14 +2888,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '970 546 3452', - label : 'Mobile' + country : 'et', + phoneNumber: '970 546 3452', + label : 'Mobile' }, { - country: 'et', - number : '894 438 2430', - label : 'Work' + country : 'et', + phoneNumber: '894 438 2430', + label : 'Work' } ], title : 'Congressional Representative', @@ -2919,9 +2919,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lu', - number : '893 600 2639', - label : 'Mobile' + country : 'lu', + phoneNumber: '893 600 2639', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -2945,9 +2945,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bn', - number : '977 528 3294', - label : 'Mobile' + country : 'bn', + phoneNumber: '977 528 3294', + label : 'Mobile' } ], title : 'Meteorologist', @@ -2975,19 +2975,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'sr', - number : '857 457 2508', - label : 'Mobile' + country : 'sr', + phoneNumber: '857 457 2508', + label : 'Mobile' }, { - country: 'sr', - number : '887 522 2146', - label : 'Work' + country : 'sr', + phoneNumber: '887 522 2146', + label : 'Work' }, { - country: 'sr', - number : '947 574 3174', - label : 'Home' + country : 'sr', + phoneNumber: '947 574 3174', + label : 'Home' } ], title : 'Insurance Analyst', diff --git a/src/app/mock-api/apps/contacts/api.ts b/src/app/mock-api/apps/contacts/api.ts index 3026de46..c8b01168 100644 --- a/src/app/mock-api/apps/contacts/api.ts +++ b/src/app/mock-api/apps/contacts/api.ts @@ -66,7 +66,7 @@ export class ContactsMockApi if ( query ) { // Filter the contacts - contacts = contacts.filter((contact) => contact.name && contact.name.toLowerCase().includes(query.toLowerCase())); + contacts = contacts.filter(contact => contact.name && contact.name.toLowerCase().includes(query.toLowerCase())); } // Sort the contacts by the name field by default @@ -90,9 +90,7 @@ export class ContactsMockApi const contacts = cloneDeep(this._contacts); // Find the contact - const contact = contacts.find((item) => { - return item.id === id; - }); + const contact = contacts.find(item => item.id === id); // Return the response return [200, contact]; @@ -288,10 +286,10 @@ export class ContactsMockApi * * @param file */ - const readAsDataURL = (file: File): Promise => { + const readAsDataURL = (file: File): Promise => // Return a new promise - return new Promise((resolve, reject) => { + new Promise((resolve, reject) => { // Create a new reader const reader = new FileReader(); @@ -308,8 +306,8 @@ export class ContactsMockApi // Read the file as the reader.readAsDataURL(file); - }); - }; + }) + ; this._fuseMockApiService .onPost('api/apps/contacts/avatar') diff --git a/src/app/mock-api/apps/contacts/data.ts b/src/app/mock-api/apps/contacts/data.ts index 957bca53..c1dbdcc6 100644 --- a/src/app/mock-api/apps/contacts/data.ts +++ b/src/app/mock-api/apps/contacts/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const contacts = [ { id : 'cd5fa417-b667-482d-b208-798d9da3213c', @@ -17,14 +17,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bs', - number : '984 531 2468', - label : 'Mobile' + country : 'bs', + phoneNumber: '984 531 2468', + label : 'Mobile' }, { - country: 'bs', - number : '806 470 2693', - label : 'Work' + country : 'bs', + phoneNumber: '806 470 2693', + label : 'Work' } ], title : 'Track Service Worker', @@ -53,9 +53,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'io', - number : '934 537 3180', - label : 'Mobile' + country : 'io', + phoneNumber: '934 537 3180', + label : 'Mobile' } ], title : 'Weather Analyst', @@ -84,9 +84,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'md', - number : '893 548 2862', - label : 'Mobile' + country : 'md', + phoneNumber: '893 548 2862', + label : 'Mobile' } ], title : 'Electromedical Equipment Technician', @@ -115,19 +115,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'va', - number : '830 484 3813', - label : 'Mobile' + country : 'va', + phoneNumber: '830 484 3813', + label : 'Mobile' }, { - country: 'va', - number : '999 475 2789', - label : 'Work' + country : 'va', + phoneNumber: '999 475 2789', + label : 'Work' }, { - country: 'va', - number : '933 406 3598', - label : 'Home' + country : 'va', + phoneNumber: '933 406 3598', + label : 'Home' } ], company : 'Accel', @@ -151,14 +151,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tz', - number : '864 401 3980', - label : 'Mobile' + country : 'tz', + phoneNumber: '864 401 3980', + label : 'Mobile' }, { - country: 'tz', - number : '956 546 2589', - label : 'Work' + country : 'tz', + phoneNumber: '956 546 2589', + label : 'Work' } ], title : 'Fundraising Director', @@ -187,19 +187,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lv', - number : '834 426 3574', - label : 'Mobile' + country : 'lv', + phoneNumber: '834 426 3574', + label : 'Mobile' }, { - country: 'lv', - number : '816 573 3694', - label : 'Work' + country : 'lv', + phoneNumber: '816 573 3694', + label : 'Work' }, { - country: 'lv', - number : '967 515 2009', - label : 'Home' + country : 'lv', + phoneNumber: '967 515 2009', + label : 'Home' } ], title : 'Motor Winder', @@ -224,14 +224,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ar', - number : '964 417 2318', - label : 'Mobile' + country : 'ar', + phoneNumber: '964 417 2318', + label : 'Mobile' }, { - country: 'ar', - number : '830 410 2506', - label : 'Work' + country : 'ar', + phoneNumber: '830 410 2506', + label : 'Work' } ], title : 'Television News Producer', @@ -260,19 +260,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'pe', - number : '934 519 2903', - label : 'Mobile' + country : 'pe', + phoneNumber: '934 519 2903', + label : 'Mobile' }, { - country: 'pe', - number : '989 489 3662', - label : 'Work' + country : 'pe', + phoneNumber: '989 489 3662', + label : 'Work' }, { - country: 'pe', - number : '813 461 2790', - label : 'Home' + country : 'pe', + phoneNumber: '813 461 2790', + label : 'Home' } ], title : 'Legal Assistant', @@ -301,9 +301,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ls', - number : '912 539 2770', - label : 'Mobile' + country : 'ls', + phoneNumber: '912 539 2770', + label : 'Mobile' } ], title : 'Meteorologist', @@ -332,14 +332,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tg', - number : '907 515 3007', - label : 'Mobile' + country : 'tg', + phoneNumber: '907 515 3007', + label : 'Mobile' }, { - country: 'tg', - number : '967 534 2803', - label : 'Work' + country : 'tg', + phoneNumber: '967 534 2803', + label : 'Work' } ], title : 'Fundraising Director', @@ -364,19 +364,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'pf', - number : '855 517 2767', - label : 'Mobile' + country : 'pf', + phoneNumber: '855 517 2767', + label : 'Mobile' }, { - country: 'pf', - number : '906 442 3593', - label : 'Work' + country : 'pf', + phoneNumber: '906 442 3593', + label : 'Work' }, { - country: 'pf', - number : '905 402 2121', - label : 'Home' + country : 'pf', + phoneNumber: '905 402 2121', + label : 'Home' } ], title : 'Legal Assistant', @@ -401,19 +401,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'dz', - number : '892 430 2631', - label : 'Mobile' + country : 'dz', + phoneNumber: '892 430 2631', + label : 'Mobile' }, { - country: 'dz', - number : '997 525 2354', - label : 'Work' + country : 'dz', + phoneNumber: '997 525 2354', + label : 'Work' }, { - country: 'dz', - number : '907 472 2857', - label : 'Home' + country : 'dz', + phoneNumber: '907 472 2857', + label : 'Home' } ], title : 'Banker Mason', @@ -438,19 +438,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'at', - number : '977 590 2773', - label : 'Mobile' + country : 'at', + phoneNumber: '977 590 2773', + label : 'Mobile' }, { - country: 'at', - number : '828 496 3813', - label : 'Work' + country : 'at', + phoneNumber: '828 496 3813', + label : 'Work' }, { - country: 'at', - number : '831 432 2512', - label : 'Home' + country : 'at', + phoneNumber: '831 432 2512', + label : 'Home' } ], company : 'Inrt', @@ -478,19 +478,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tn', - number : '841 530 3641', - label : 'Mobile' + country : 'tn', + phoneNumber: '841 530 3641', + label : 'Mobile' }, { - country: 'tn', - number : '941 410 3743', - label : 'Work' + country : 'tn', + phoneNumber: '941 410 3743', + label : 'Work' }, { - country: 'tn', - number : '938 599 3850', - label : 'Home' + country : 'tn', + phoneNumber: '938 599 3850', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -515,19 +515,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gb', - number : '899 508 2992', - label : 'Mobile' + country : 'gb', + phoneNumber: '899 508 2992', + label : 'Mobile' }, { - country: 'gb', - number : '834 499 3354', - label : 'Work' + country : 'gb', + phoneNumber: '834 499 3354', + label : 'Work' }, { - country: 'gb', - number : '834 526 3388', - label : 'Home' + country : 'gb', + phoneNumber: '834 526 3388', + label : 'Home' } ], title : 'Gas Meter Mechanic', @@ -556,19 +556,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gb', - number : '844 480 3309', - label : 'Mobile' + country : 'gb', + phoneNumber: '844 480 3309', + label : 'Mobile' }, { - country: 'gb', - number : '981 591 3239', - label : 'Work' + country : 'gb', + phoneNumber: '981 591 3239', + label : 'Work' }, { - country: 'gb', - number : '923 484 3147', - label : 'Home' + country : 'gb', + phoneNumber: '923 484 3147', + label : 'Home' } ], title : 'Short Story Writer', @@ -597,9 +597,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'so', - number : '974 542 2061', - label : 'Mobile' + country : 'so', + phoneNumber: '974 542 2061', + label : 'Mobile' } ], title : 'Animal Sitter', @@ -628,14 +628,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tv', - number : '922 585 2914', - label : 'Mobile' + country : 'tv', + phoneNumber: '922 585 2914', + label : 'Mobile' }, { - country: 'tv', - number : '913 538 2961', - label : 'Work' + country : 'tv', + phoneNumber: '913 538 2961', + label : 'Work' } ], title : 'Track Service Worker', @@ -660,19 +660,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tm', - number : '981 508 2080', - label : 'Mobile' + country : 'tm', + phoneNumber: '981 508 2080', + label : 'Mobile' }, { - country: 'tm', - number : '817 425 2052', - label : 'Work' + country : 'tm', + phoneNumber: '817 425 2052', + label : 'Work' }, { - country: 'tm', - number : '939 434 3805', - label : 'Home' + country : 'tm', + phoneNumber: '939 434 3805', + label : 'Home' } ], title : 'Motor Winder', @@ -697,19 +697,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ck', - number : '992 583 3187', - label : 'Mobile' + country : 'ck', + phoneNumber: '992 583 3187', + label : 'Mobile' }, { - country: 'ck', - number : '881 472 3297', - label : 'Work' + country : 'ck', + phoneNumber: '881 472 3297', + label : 'Work' }, { - country: 'ck', - number : '846 477 3596', - label : 'Home' + country : 'ck', + phoneNumber: '846 477 3596', + label : 'Home' } ], title : 'Congressional Representative', @@ -734,14 +734,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ai', - number : '995 411 2513', - label : 'Mobile' + country : 'ai', + phoneNumber: '995 411 2513', + label : 'Mobile' }, { - country: 'ai', - number : '839 492 2760', - label : 'Work' + country : 'ai', + phoneNumber: '839 492 2760', + label : 'Work' } ], title : 'Gas Meter Mechanic', @@ -766,14 +766,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ht', - number : '969 499 3077', - label : 'Mobile' + country : 'ht', + phoneNumber: '969 499 3077', + label : 'Mobile' }, { - country: 'ht', - number : '907 513 2784', - label : 'Work' + country : 'ht', + phoneNumber: '907 513 2784', + label : 'Work' } ], title : 'Weather Analyst', @@ -802,9 +802,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mm', - number : '977 516 2492', - label : 'Mobile' + country : 'mm', + phoneNumber: '977 516 2492', + label : 'Mobile' } ], title : 'Short Story Writer', @@ -829,9 +829,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lb', - number : '989 567 3834', - label : 'Mobile' + country : 'lb', + phoneNumber: '989 567 3834', + label : 'Mobile' } ], title : 'Meteorologist', @@ -860,9 +860,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jo', - number : '990 450 2729', - label : 'Mobile' + country : 'jo', + phoneNumber: '990 450 2729', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -887,9 +887,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'xk', - number : '909 552 3327', - label : 'Mobile' + country : 'xk', + phoneNumber: '909 552 3327', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -914,9 +914,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ee', - number : '868 438 3943', - label : 'Mobile' + country : 'ee', + phoneNumber: '868 438 3943', + label : 'Mobile' } ], title : 'Meteorologist', @@ -941,9 +941,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mr', - number : '891 498 2043', - label : 'Mobile' + country : 'mr', + phoneNumber: '891 498 2043', + label : 'Mobile' } ], title : 'Electromedical Equipment Technician', @@ -968,19 +968,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bt', - number : '979 541 2691', - label : 'Mobile' + country : 'bt', + phoneNumber: '979 541 2691', + label : 'Mobile' }, { - country: 'bt', - number : '909 407 3887', - label : 'Work' + country : 'bt', + phoneNumber: '909 407 3887', + label : 'Work' }, { - country: 'bt', - number : '864 557 3128', - label : 'Home' + country : 'bt', + phoneNumber: '864 557 3128', + label : 'Home' } ], title : 'Hotel Manager', @@ -1009,9 +1009,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bi', - number : '855 456 2754', - label : 'Mobile' + country : 'bi', + phoneNumber: '855 456 2754', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -1036,19 +1036,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'se', - number : '993 504 3286', - label : 'Mobile' + country : 'se', + phoneNumber: '993 504 3286', + label : 'Mobile' }, { - country: 'se', - number : '924 434 2238', - label : 'Work' + country : 'se', + phoneNumber: '924 434 2238', + label : 'Work' }, { - country: 'se', - number : '816 466 2634', - label : 'Home' + country : 'se', + phoneNumber: '816 466 2634', + label : 'Home' } ], title : 'Historiographer', @@ -1073,14 +1073,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bn', - number : '916 511 3837', - label : 'Mobile' + country : 'bn', + phoneNumber: '916 511 3837', + label : 'Mobile' }, { - country: 'bn', - number : '949 564 3247', - label : 'Work' + country : 'bn', + phoneNumber: '949 564 3247', + label : 'Work' } ], title : 'Insurance Analyst', @@ -1109,19 +1109,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'na', - number : '896 471 3036', - label : 'Mobile' + country : 'na', + phoneNumber: '896 471 3036', + label : 'Mobile' }, { - country: 'na', - number : '851 491 3567', - label : 'Work' + country : 'na', + phoneNumber: '851 491 3567', + label : 'Work' }, { - country: 'na', - number : '805 487 2016', - label : 'Home' + country : 'na', + phoneNumber: '805 487 2016', + label : 'Home' } ], title : 'Short Story Writer', @@ -1146,14 +1146,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bh', - number : '915 577 3020', - label : 'Mobile' + country : 'bh', + phoneNumber: '915 577 3020', + label : 'Mobile' }, { - country: 'bh', - number : '923 431 3594', - label : 'Work' + country : 'bh', + phoneNumber: '923 431 3594', + label : 'Work' } ], title : 'Fundraising Director', @@ -1178,9 +1178,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mt', - number : '902 529 2999', - label : 'Mobile' + country : 'mt', + phoneNumber: '902 529 2999', + label : 'Mobile' } ], title : 'Dental Laboratory Worker', @@ -1205,14 +1205,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bh', - number : '813 410 3258', - label : 'Mobile' + country : 'bh', + phoneNumber: '813 410 3258', + label : 'Mobile' }, { - country: 'bh', - number : '877 501 2767', - label : 'Work' + country : 'bh', + phoneNumber: '877 501 2767', + label : 'Work' } ], title : 'Historiographer', @@ -1237,14 +1237,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tk', - number : '943 511 2203', - label : 'Mobile' + country : 'tk', + phoneNumber: '943 511 2203', + label : 'Mobile' }, { - country: 'tk', - number : '817 578 2993', - label : 'Work' + country : 'tk', + phoneNumber: '817 578 2993', + label : 'Work' } ], title : 'Legal Assistant', @@ -1273,9 +1273,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gl', - number : '814 498 3701', - label : 'Mobile' + country : 'gl', + phoneNumber: '814 498 3701', + label : 'Mobile' } ], title : 'Hotel Manager', @@ -1300,19 +1300,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jm', - number : '968 547 2111', - label : 'Mobile' + country : 'jm', + phoneNumber: '968 547 2111', + label : 'Mobile' }, { - country: 'jm', - number : '968 433 3120', - label : 'Work' + country : 'jm', + phoneNumber: '968 433 3120', + label : 'Work' }, { - country: 'jm', - number : '905 425 2777', - label : 'Home' + country : 'jm', + phoneNumber: '905 425 2777', + label : 'Home' } ], title : 'Historiographer', @@ -1337,19 +1337,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'mg', - number : '902 500 2668', - label : 'Mobile' + country : 'mg', + phoneNumber: '902 500 2668', + label : 'Mobile' }, { - country: 'mg', - number : '947 559 2919', - label : 'Work' + country : 'mg', + phoneNumber: '947 559 2919', + label : 'Work' }, { - country: 'mg', - number : '934 434 3768', - label : 'Home' + country : 'mg', + phoneNumber: '934 434 3768', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -1374,9 +1374,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fm', - number : '838 562 2769', - label : 'Mobile' + country : 'fm', + phoneNumber: '838 562 2769', + label : 'Mobile' } ], title : 'Legal Assistant', @@ -1401,14 +1401,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tr', - number : '939 555 3054', - label : 'Mobile' + country : 'tr', + phoneNumber: '939 555 3054', + label : 'Mobile' }, { - country: 'tr', - number : '852 486 2053', - label : 'Work' + country : 'tr', + phoneNumber: '852 486 2053', + label : 'Work' } ], title : 'Bindery Machine Operator', @@ -1433,14 +1433,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gp', - number : '933 464 2431', - label : 'Mobile' + country : 'gp', + phoneNumber: '933 464 2431', + label : 'Mobile' }, { - country: 'gp', - number : '894 535 3609', - label : 'Work' + country : 'gp', + phoneNumber: '894 535 3609', + label : 'Work' } ], title : 'Short Story Writer', @@ -1469,14 +1469,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'nz', - number : '822 531 2600', - label : 'Mobile' + country : 'nz', + phoneNumber: '822 531 2600', + label : 'Mobile' }, { - country: 'nz', - number : '922 549 2094', - label : 'Work' + country : 'nz', + phoneNumber: '922 549 2094', + label : 'Work' } ], title : 'Fundraising Director', @@ -1501,14 +1501,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'kp', - number : '990 457 2106', - label : 'Mobile' + country : 'kp', + phoneNumber: '990 457 2106', + label : 'Mobile' }, { - country: 'kp', - number : '918 550 2946', - label : 'Work' + country : 'kp', + phoneNumber: '918 550 2946', + label : 'Work' } ], company : 'Grupoli', @@ -1532,19 +1532,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'nu', - number : '855 445 2483', - label : 'Mobile' + country : 'nu', + phoneNumber: '855 445 2483', + label : 'Mobile' }, { - country: 'nu', - number : '858 415 2860', - label : 'Work' + country : 'nu', + phoneNumber: '858 415 2860', + label : 'Work' }, { - country: 'nu', - number : '968 587 2752', - label : 'Home' + country : 'nu', + phoneNumber: '968 587 2752', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -1569,9 +1569,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'es', - number : '879 591 3327', - label : 'Mobile' + country : 'es', + phoneNumber: '879 591 3327', + label : 'Mobile' } ], title : 'Dental Laboratory Worker', @@ -1596,14 +1596,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'jp', - number : '906 579 3698', - label : 'Mobile' + country : 'jp', + phoneNumber: '906 579 3698', + label : 'Mobile' }, { - country: 'jp', - number : '841 475 2681', - label : 'Work' + country : 'jp', + phoneNumber: '841 475 2681', + label : 'Work' } ], title : 'Electromedical Equipment Technician', @@ -1632,19 +1632,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tl', - number : '971 514 3366', - label : 'Mobile' + country : 'tl', + phoneNumber: '971 514 3366', + label : 'Mobile' }, { - country: 'tl', - number : '807 480 2033', - label : 'Work' + country : 'tl', + phoneNumber: '807 480 2033', + label : 'Work' }, { - country: 'tl', - number : '810 528 3783', - label : 'Home' + country : 'tl', + phoneNumber: '810 528 3783', + label : 'Home' } ], title : 'Pastry Baker', @@ -1669,19 +1669,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fm', - number : '932 404 3308', - label : 'Mobile' + country : 'fm', + phoneNumber: '932 404 3308', + label : 'Mobile' }, { - country: 'fm', - number : '979 550 3200', - label : 'Work' + country : 'fm', + phoneNumber: '979 550 3200', + label : 'Work' }, { - country: 'fm', - number : '868 557 3568', - label : 'Home' + country : 'fm', + phoneNumber: '868 557 3568', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -1710,9 +1710,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ki', - number : '927 589 3619', - label : 'Mobile' + country : 'ki', + phoneNumber: '927 589 3619', + label : 'Mobile' } ], title : 'Historiographer', @@ -1741,19 +1741,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'no', - number : '883 432 3718', - label : 'Mobile' + country : 'no', + phoneNumber: '883 432 3718', + label : 'Mobile' }, { - country: 'no', - number : '934 516 2135', - label : 'Work' + country : 'no', + phoneNumber: '934 516 2135', + label : 'Work' }, { - country: 'no', - number : '923 596 3843', - label : 'Home' + country : 'no', + phoneNumber: '923 596 3843', + label : 'Home' } ], title : 'Track Service Worker', @@ -1778,9 +1778,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bd', - number : '936 590 2412', - label : 'Mobile' + country : 'bd', + phoneNumber: '936 590 2412', + label : 'Mobile' } ], title : 'Insurance Analyst', @@ -1805,19 +1805,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'sx', - number : '881 472 3113', - label : 'Mobile' + country : 'sx', + phoneNumber: '881 472 3113', + label : 'Mobile' }, { - country: 'sx', - number : '974 548 3124', - label : 'Work' + country : 'sx', + phoneNumber: '974 548 3124', + label : 'Work' }, { - country: 'sx', - number : '800 518 3615', - label : 'Home' + country : 'sx', + phoneNumber: '800 518 3615', + label : 'Home' } ], title : 'Track Service Worker', @@ -1846,14 +1846,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'au', - number : '830 430 3437', - label : 'Mobile' + country : 'au', + phoneNumber: '830 430 3437', + label : 'Mobile' }, { - country: 'au', - number : '868 538 2886', - label : 'Work' + country : 'au', + phoneNumber: '868 538 2886', + label : 'Work' } ], title : 'Dental Laboratory Worker', @@ -1882,19 +1882,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'gt', - number : '847 513 2248', - label : 'Mobile' + country : 'gt', + phoneNumber: '847 513 2248', + label : 'Mobile' }, { - country: 'gt', - number : '866 591 3665', - label : 'Work' + country : 'gt', + phoneNumber: '866 591 3665', + label : 'Work' }, { - country: 'gt', - number : '877 539 3840', - label : 'Home' + country : 'gt', + phoneNumber: '877 539 3840', + label : 'Home' } ], title : 'Banker Mason', @@ -1923,14 +1923,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bf', - number : '861 419 2752', - label : 'Mobile' + country : 'bf', + phoneNumber: '861 419 2752', + label : 'Mobile' }, { - country: 'bf', - number : '935 553 3031', - label : 'Work' + country : 'bf', + phoneNumber: '935 553 3031', + label : 'Work' } ], title : 'Fundraising Director', @@ -1959,19 +1959,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'fo', - number : '947 441 2999', - label : 'Mobile' + country : 'fo', + phoneNumber: '947 441 2999', + label : 'Mobile' }, { - country: 'fo', - number : '984 441 2615', - label : 'Work' + country : 'fo', + phoneNumber: '984 441 2615', + label : 'Work' }, { - country: 'fo', - number : '824 541 2714', - label : 'Home' + country : 'fo', + phoneNumber: '824 541 2714', + label : 'Home' } ], title : 'Legal Assistant', @@ -2000,19 +2000,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'ao', - number : '992 596 3391', - label : 'Mobile' + country : 'ao', + phoneNumber: '992 596 3391', + label : 'Mobile' }, { - country: 'ao', - number : '950 489 2505', - label : 'Work' + country : 'ao', + phoneNumber: '950 489 2505', + label : 'Work' }, { - country: 'ao', - number : '891 540 2231', - label : 'Home' + country : 'ao', + phoneNumber: '891 540 2231', + label : 'Home' } ], title : 'Television News Producer', @@ -2037,9 +2037,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lv', - number : '961 537 3956', - label : 'Mobile' + country : 'lv', + phoneNumber: '961 537 3956', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2068,19 +2068,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '811 502 3398', - label : 'Mobile' + country : 'et', + phoneNumber: '811 502 3398', + label : 'Mobile' }, { - country: 'et', - number : '877 402 2443', - label : 'Work' + country : 'et', + phoneNumber: '877 402 2443', + label : 'Work' }, { - country: 'et', - number : '949 536 3451', - label : 'Home' + country : 'et', + phoneNumber: '949 536 3451', + label : 'Home' } ], title : 'Dental Laboratory Worker', @@ -2109,19 +2109,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'si', - number : '837 503 2254', - label : 'Mobile' + country : 'si', + phoneNumber: '837 503 2254', + label : 'Mobile' }, { - country: 'si', - number : '893 405 3190', - label : 'Work' + country : 'si', + phoneNumber: '893 405 3190', + label : 'Work' }, { - country: 'si', - number : '931 402 3874', - label : 'Home' + country : 'si', + phoneNumber: '931 402 3874', + label : 'Home' } ], title : 'Legal Assistant', @@ -2146,19 +2146,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vg', - number : '864 459 3205', - label : 'Mobile' + country : 'vg', + phoneNumber: '864 459 3205', + label : 'Mobile' }, { - country: 'vg', - number : '886 524 2880', - label : 'Work' + country : 'vg', + phoneNumber: '886 524 2880', + label : 'Work' }, { - country: 'vg', - number : '815 484 3420', - label : 'Home' + country : 'vg', + phoneNumber: '815 484 3420', + label : 'Home' } ], title : 'Animal Sitter', @@ -2187,9 +2187,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'uy', - number : '898 554 3354', - label : 'Mobile' + country : 'uy', + phoneNumber: '898 554 3354', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2214,19 +2214,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'uz', - number : '891 543 2053', - label : 'Mobile' + country : 'uz', + phoneNumber: '891 543 2053', + label : 'Mobile' }, { - country: 'uz', - number : '842 564 3671', - label : 'Work' + country : 'uz', + phoneNumber: '842 564 3671', + label : 'Work' }, { - country: 'uz', - number : '992 491 3514', - label : 'Home' + country : 'uz', + phoneNumber: '992 491 3514', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -2255,14 +2255,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'tn', - number : '860 472 2458', - label : 'Mobile' + country : 'tn', + phoneNumber: '860 472 2458', + label : 'Mobile' }, { - country: 'tn', - number : '887 499 3580', - label : 'Work' + country : 'tn', + phoneNumber: '887 499 3580', + label : 'Work' } ], title : 'Banker Mason', @@ -2287,19 +2287,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'az', - number : '928 567 2521', - label : 'Mobile' + country : 'az', + phoneNumber: '928 567 2521', + label : 'Mobile' }, { - country: 'az', - number : '898 515 2048', - label : 'Work' + country : 'az', + phoneNumber: '898 515 2048', + label : 'Work' }, { - country: 'az', - number : '935 495 3348', - label : 'Home' + country : 'az', + phoneNumber: '935 495 3348', + label : 'Home' } ], title : 'Talent Manager', @@ -2324,14 +2324,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vg', - number : '998 498 2507', - label : 'Mobile' + country : 'vg', + phoneNumber: '998 498 2507', + label : 'Mobile' }, { - country: 'vg', - number : '856 477 3445', - label : 'Work' + country : 'vg', + phoneNumber: '856 477 3445', + label : 'Work' } ], title : 'Motor Winder', @@ -2356,19 +2356,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bb', - number : '875 422 2053', - label : 'Mobile' + country : 'bb', + phoneNumber: '875 422 2053', + label : 'Mobile' }, { - country: 'bb', - number : '861 487 2597', - label : 'Work' + country : 'bb', + phoneNumber: '861 487 2597', + label : 'Work' }, { - country: 'bb', - number : '873 414 3953', - label : 'Home' + country : 'bb', + phoneNumber: '873 414 3953', + label : 'Home' } ], title : 'Bindery Machine Operator', @@ -2393,19 +2393,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'vu', - number : '978 546 3699', - label : 'Mobile' + country : 'vu', + phoneNumber: '978 546 3699', + label : 'Mobile' }, { - country: 'vu', - number : '892 551 2229', - label : 'Work' + country : 'vu', + phoneNumber: '892 551 2229', + label : 'Work' }, { - country: 'vu', - number : '949 495 3479', - label : 'Home' + country : 'vu', + phoneNumber: '949 495 3479', + label : 'Home' } ], company : 'Buzzmaker', @@ -2429,19 +2429,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lu', - number : '805 502 3677', - label : 'Mobile' + country : 'lu', + phoneNumber: '805 502 3677', + label : 'Mobile' }, { - country: 'lu', - number : '925 527 2973', - label : 'Work' + country : 'lu', + phoneNumber: '925 527 2973', + label : 'Work' }, { - country: 'lu', - number : '975 495 2977', - label : 'Home' + country : 'lu', + phoneNumber: '975 495 2977', + label : 'Home' } ], title : 'Fundraising Director', @@ -2470,9 +2470,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'co', - number : '974 428 2886', - label : 'Mobile' + country : 'co', + phoneNumber: '974 428 2886', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -2501,19 +2501,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'dz', - number : '947 561 3783', - label : 'Mobile' + country : 'dz', + phoneNumber: '947 561 3783', + label : 'Mobile' }, { - country: 'dz', - number : '917 463 3737', - label : 'Work' + country : 'dz', + phoneNumber: '917 463 3737', + label : 'Work' }, { - country: 'dz', - number : '835 510 2059', - label : 'Home' + country : 'dz', + phoneNumber: '835 510 2059', + label : 'Home' } ], title : 'Hotel Manager', @@ -2542,9 +2542,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'au', - number : '947 468 2942', - label : 'Mobile' + country : 'au', + phoneNumber: '947 468 2942', + label : 'Mobile' } ], title : 'Fundraising Director', @@ -2569,14 +2569,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'id', - number : '944 525 2944', - label : 'Mobile' + country : 'id', + phoneNumber: '944 525 2944', + label : 'Mobile' }, { - country: 'id', - number : '877 500 2506', - label : 'Work' + country : 'id', + phoneNumber: '877 500 2506', + label : 'Work' } ], title : 'Banker Mason', @@ -2601,19 +2601,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '996 514 3856', - label : 'Mobile' + country : 'et', + phoneNumber: '996 514 3856', + label : 'Mobile' }, { - country: 'et', - number : '903 539 2049', - label : 'Work' + country : 'et', + phoneNumber: '903 539 2049', + label : 'Work' }, { - country: 'et', - number : '938 463 3685', - label : 'Home' + country : 'et', + phoneNumber: '938 463 3685', + label : 'Home' } ], title : 'Electromedical Equipment Technician', @@ -2638,14 +2638,14 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'et', - number : '970 546 3452', - label : 'Mobile' + country : 'et', + phoneNumber: '970 546 3452', + label : 'Mobile' }, { - country: 'et', - number : '894 438 2430', - label : 'Work' + country : 'et', + phoneNumber: '894 438 2430', + label : 'Work' } ], title : 'Congressional Representative', @@ -2670,9 +2670,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'lu', - number : '893 600 2639', - label : 'Mobile' + country : 'lu', + phoneNumber: '893 600 2639', + label : 'Mobile' } ], title : 'Bindery Machine Operator', @@ -2697,9 +2697,9 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'bn', - number : '977 528 3294', - label : 'Mobile' + country : 'bn', + phoneNumber: '977 528 3294', + label : 'Mobile' } ], title : 'Meteorologist', @@ -2728,19 +2728,19 @@ export const contacts = [ ], phoneNumbers: [ { - country: 'sr', - number : '857 457 2508', - label : 'Mobile' + country : 'sr', + phoneNumber: '857 457 2508', + label : 'Mobile' }, { - country: 'sr', - number : '887 522 2146', - label : 'Work' + country : 'sr', + phoneNumber: '887 522 2146', + label : 'Work' }, { - country: 'sr', - number : '947 574 3174', - label : 'Home' + country : 'sr', + phoneNumber: '947 574 3174', + label : 'Home' } ], title : 'Insurance Analyst', diff --git a/src/app/mock-api/apps/ecommerce/inventory/api.ts b/src/app/mock-api/apps/ecommerce/inventory/api.ts index 93303344..95d1796f 100644 --- a/src/app/mock-api/apps/ecommerce/inventory/api.ts +++ b/src/app/mock-api/apps/ecommerce/inventory/api.ts @@ -81,9 +81,7 @@ export class ECommerceInventoryMockApi if ( search ) { // Filter the products - products = products.filter((contact) => { - return contact.name && contact.name.toLowerCase().includes(search.toLowerCase()); - }); + products = products.filter(contact => contact.name && contact.name.toLowerCase().includes(search.toLowerCase())); } // Paginate - Start @@ -148,9 +146,7 @@ export class ECommerceInventoryMockApi const products = cloneDeep(this._products); // Find the product - const product = products.find((item) => { - return item.id === id; - }); + const product = products.find(item => item.id === id); // Return the response return [200, product]; diff --git a/src/app/mock-api/apps/ecommerce/inventory/data.ts b/src/app/mock-api/apps/ecommerce/inventory/data.ts index 66f0131c..2863773c 100644 --- a/src/app/mock-api/apps/ecommerce/inventory/data.ts +++ b/src/app/mock-api/apps/ecommerce/inventory/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const categories = [ { id : 'b899ec30-b85a-40ab-bb1f-18a596d5c6de', diff --git a/src/app/mock-api/apps/file-manager/api.ts b/src/app/mock-api/apps/file-manager/api.ts index a1c6cc9d..95c56045 100644 --- a/src/app/mock-api/apps/file-manager/api.ts +++ b/src/app/mock-api/apps/file-manager/api.ts @@ -39,8 +39,8 @@ export class FileManagerMockApi const items = cloneDeep(this._items); // Separate the items by folders and files - const folders = items.filter((item) => item.type === 'folder'); - const files = items.filter((item) => item.type !== 'folder'); + const folders = items.filter(item => item.type === 'folder'); + const files = items.filter(item => item.type !== 'folder'); // Sort the folders and files alphabetically by filename folders.sort((a, b) => a.name.localeCompare(b.name)); diff --git a/src/app/mock-api/apps/file-manager/data.ts b/src/app/mock-api/apps/file-manager/data.ts index 40b28532..bf4b7ff0 100644 --- a/src/app/mock-api/apps/file-manager/data.ts +++ b/src/app/mock-api/apps/file-manager/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const items = [ { id : 'cd6897cb-acfd-4016-8b53-3f66a5b5fc68', @@ -175,5 +175,5 @@ export const items = [ type : 'XLS', contents : null, description: null - }, + } ]; diff --git a/src/app/mock-api/apps/help-center/data.ts b/src/app/mock-api/apps/help-center/data.ts index 4d3dff5b..b4737080 100644 --- a/src/app/mock-api/apps/help-center/data.ts +++ b/src/app/mock-api/apps/help-center/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const faqCategories = [ { id : '28924eab-97cc-465a-ba21-f232bb95843f', diff --git a/src/app/mock-api/apps/mailbox/api.ts b/src/app/mock-api/apps/mailbox/api.ts index 00186c67..3e7e1eec 100644 --- a/src/app/mock-api/apps/mailbox/api.ts +++ b/src/app/mock-api/apps/mailbox/api.ts @@ -69,7 +69,7 @@ export class MailboxMockApi this._folders.forEach((folder) => { // Get the mails of this folder - const mails = this._mails.filter((mail) => mail.folder === folder.id); + const mails = this._mails.filter(mail => mail.folder === folder.id); // If we are counting the 'sent' or the 'trash' folder... if ( folder.slug === 'sent' || folder.slug === 'trash' ) @@ -148,9 +148,7 @@ export class MailboxMockApi do { - sameSlug = this._labels.filter((item) => { - return item.slug === label.slug; - }); + sameSlug = this._labels.filter(item => item.slug === label.slug); if ( sameSlug.length > 0 ) { @@ -215,13 +213,11 @@ export class MailboxMockApi const id = request.params.get('id'); // Find the label and delete it - const index = this._labels.findIndex((item) => item.id === id); + const index = this._labels.findIndex(item => item.id === id); this._labels.splice(index, 1); // Get all the mails that have the label - const mailsWithLabel = this._mails.filter((mail) => { - return mail.labels.indexOf(id) > -1; - }); + const mailsWithLabel = this._mails.filter(mail => mail.labels.indexOf(id) > -1); // Iterate through them and remove the label mailsWithLabel.forEach((mail) => { @@ -267,9 +263,7 @@ export class MailboxMockApi }); // Sort by date - descending - mails.sort((a, b) => { - return new Date(b.date).getTime() - new Date(a.date).getTime(); - }); + mails.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()); // Figure out the cc and bcc counts mails.forEach((mail) => { @@ -343,7 +337,7 @@ export class MailboxMockApi const mails = cloneDeep(this._mails); // Find the mail - const mail = mails.find((item) => item.id === id); + const mail = mails.find(item => item.id === id); return [ 200, diff --git a/src/app/mock-api/apps/mailbox/data.ts b/src/app/mock-api/apps/mailbox/data.ts index 280bd531..d0584651 100644 --- a/src/app/mock-api/apps/mailbox/data.ts +++ b/src/app/mock-api/apps/mailbox/data.ts @@ -1,6 +1,6 @@ +/* eslint-disable */ import * as moment from 'moment'; -/* tslint:disable:max-line-length */ export const folders = [ { id : '7c004a19-4506-48ef-93ab-f16381302e3b', diff --git a/src/app/mock-api/apps/notes/api.ts b/src/app/mock-api/apps/notes/api.ts index fe80771d..bd8b874b 100644 --- a/src/app/mock-api/apps/notes/api.ts +++ b/src/app/mock-api/apps/notes/api.ts @@ -35,13 +35,10 @@ export class NotesMockApi // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService .onGet('api/apps/notes/labels') - .reply(() => { - - return [ - 200, - cloneDeep(this._labels) - ]; - }); + .reply(() => [ + 200, + cloneDeep(this._labels) + ]); // ----------------------------------------------------------------------------------------------------- // @ Labels - POST @@ -105,12 +102,12 @@ export class NotesMockApi const id = request.params.get('id'); // Delete the label - this._labels = this._labels.filter((label) => label.id !== id); + this._labels = this._labels.filter(label => label.id !== id); // Go through notes and delete the label - this._notes = this._notes.map((note) => ({ + this._notes = this._notes.map(note => ({ ...note, - labels: note.labels.filter((item) => item !== id) + labels: note.labels.filter(item => item !== id) })); return [ @@ -175,10 +172,10 @@ export class NotesMockApi let notes = cloneDeep(this._notes); // Attach the labels to the notes - notes = notes.map((note) => ( + notes = notes.map(note => ( { ...note, - labels: note.labels.map((labelId) => labels.find((label) => label.id === labelId)) + labels: note.labels.map(labelId => labels.find(label => label.id === labelId)) } )); diff --git a/src/app/mock-api/apps/notes/data.ts b/src/app/mock-api/apps/notes/data.ts index f10717c4..4a392e9a 100644 --- a/src/app/mock-api/apps/notes/data.ts +++ b/src/app/mock-api/apps/notes/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ import moment from 'moment'; export const labels = [ diff --git a/src/app/mock-api/apps/tasks/api.ts b/src/app/mock-api/apps/tasks/api.ts index b1ef8342..015a5d59 100644 --- a/src/app/mock-api/apps/tasks/api.ts +++ b/src/app/mock-api/apps/tasks/api.ts @@ -35,13 +35,10 @@ export class TasksMockApi // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService .onGet('api/apps/tasks/tags') - .reply(() => { - - return [ - 200, - cloneDeep(this._tags) - ]; - }); + .reply(() => [ + 200, + cloneDeep(this._tags) + ]); // ----------------------------------------------------------------------------------------------------- // @ Tags - POST @@ -109,7 +106,7 @@ export class TasksMockApi const id = request.params.get('id'); // Find the tag and delete it - const index = this._tags.findIndex((item) => item.id === id); + const index = this._tags.findIndex(item => item.id === id); this._tags.splice(index, 1); // Get the tasks that have the tag @@ -165,9 +162,8 @@ export class TasksMockApi let tasks = cloneDeep(this._tasks); // Filter the tasks - tasks = tasks.filter((task) => { - return task.title && task.title.toLowerCase().includes(query.toLowerCase()) || task.notes && task.notes.toLowerCase().includes(query.toLowerCase()); - }); + tasks = tasks.filter(task => task.title && task.title.toLowerCase().includes(query.toLowerCase()) || task.notes && task.notes.toLowerCase() + .includes(query.toLowerCase())); // Mark the found chars tasks.forEach((task) => { @@ -231,7 +227,7 @@ export class TasksMockApi const tasks = cloneDeep(this._tasks); // Find the task - const task = tasks.find((item) => item.id === id); + const task = tasks.find(item => item.id === id); return [ 200, @@ -317,7 +313,7 @@ export class TasksMockApi const id = request.params.get('id'); // Find the task and delete it - const index = this._tasks.findIndex((item) => item.id === id); + const index = this._tasks.findIndex(item => item.id === id); this._tasks.splice(index, 1); return [ diff --git a/src/app/mock-api/apps/tasks/data.ts b/src/app/mock-api/apps/tasks/data.ts index 2f56bae3..44ddf93d 100644 --- a/src/app/mock-api/apps/tasks/data.ts +++ b/src/app/mock-api/apps/tasks/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const tags = [ { id : 'a0bf42ca-c3a5-47be-8341-b9c0bb8ef270', diff --git a/src/app/mock-api/common/auth/api.ts b/src/app/mock-api/common/auth/api.ts index d284164e..5d3c9ec3 100644 --- a/src/app/mock-api/common/auth/api.ts +++ b/src/app/mock-api/common/auth/api.ts @@ -40,28 +40,24 @@ export class AuthMockApi // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService .onPost('api/auth/forgot-password', 1000) - .reply(() => { - - // Simply return true - return [ + .reply(() => + [ 200, true - ]; - }); + ] + ); // ----------------------------------------------------------------------------------------------------- // @ Reset password - POST // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService .onPost('api/auth/reset-password', 1000) - .reply(() => { - - // Simply return true - return [ + .reply(() => + [ 200, true - ]; - }); + ] + ); // ----------------------------------------------------------------------------------------------------- // @ Sign in - POST @@ -76,9 +72,9 @@ export class AuthMockApi return [ 200, { - user : cloneDeep(this._user), - access_token: this._generateJWTToken(), - token_type : 'bearer' + user : cloneDeep(this._user), + accessToken: this._generateJWTToken(), + tokenType : 'bearer' } ]; } @@ -98,7 +94,7 @@ export class AuthMockApi .reply(({request}) => { // Get the access token - const accessToken = request.body.access_token; + const accessToken = request.body.accessToken; // Verify the token if ( this._verifyJWTToken(accessToken) ) @@ -106,9 +102,9 @@ export class AuthMockApi return [ 200, { - user : cloneDeep(this._user), - access_token: this._generateJWTToken(), - token_type : 'bearer' + user : cloneDeep(this._user), + accessToken: this._generateJWTToken(), + tokenType : 'bearer' } ]; } @@ -127,14 +123,14 @@ export class AuthMockApi // ----------------------------------------------------------------------------------------------------- this._fuseMockApiService .onPost('api/auth/sign-up', 1500) - .reply(() => { + .reply(() => // Simply return true - return [ + [ 200, true - ]; - }); + ] + ); // ----------------------------------------------------------------------------------------------------- // @ Unlock session - POST @@ -149,9 +145,9 @@ export class AuthMockApi return [ 200, { - user : cloneDeep(this._user), - access_token: this._generateJWTToken(), - token_type : 'bearer' + user : cloneDeep(this._user), + accessToken: this._generateJWTToken(), + tokenType : 'bearer' } ]; } diff --git a/src/app/mock-api/common/messages/data.ts b/src/app/mock-api/common/messages/data.ts index e6a07a7d..cc85818e 100644 --- a/src/app/mock-api/common/messages/data.ts +++ b/src/app/mock-api/common/messages/data.ts @@ -1,7 +1,7 @@ +/* eslint-disable */ import * as moment from 'moment'; import { Message } from 'app/layout/common/messages/messages.types'; -/* tslint:disable:max-line-length */ export const messages: Message[] = [ { id : '832276cc-c5e9-4fcc-8e23-d38e2e267bc9', diff --git a/src/app/mock-api/common/navigation/data.ts b/src/app/mock-api/common/navigation/data.ts index 2f3ae883..552eeaec 100644 --- a/src/app/mock-api/common/navigation/data.ts +++ b/src/app/mock-api/common/navigation/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ import { FuseNavigationItem } from '@fuse/components/navigation'; export const defaultNavigation: FuseNavigationItem[] = [ diff --git a/src/app/mock-api/common/notifications/data.ts b/src/app/mock-api/common/notifications/data.ts index 7a9f69f3..7f056fe1 100644 --- a/src/app/mock-api/common/notifications/data.ts +++ b/src/app/mock-api/common/notifications/data.ts @@ -1,7 +1,7 @@ +/* eslint-disable */ import * as moment from 'moment'; import { Notification } from 'app/layout/common/notifications/notifications.types'; -/* tslint:disable:max-line-length */ export const notifications: Notification[] = [ { id : '493190c9-5b61-4912-afe5-78c21f1044d7', diff --git a/src/app/mock-api/common/search/api.ts b/src/app/mock-api/common/search/api.ts index a7dbf020..f6525d6b 100644 --- a/src/app/mock-api/common/search/api.ts +++ b/src/app/mock-api/common/search/api.ts @@ -55,14 +55,10 @@ export class SearchMockApi } // Filter the navigation - const navigationResults = cloneDeep(flatNavigation).filter((item) => { - return (item.title?.toLowerCase().includes(query) || (item.subtitle && item.subtitle.includes(query))); - }); + const navigationResults = cloneDeep(flatNavigation).filter(item => (item.title?.toLowerCase().includes(query) || (item.subtitle && item.subtitle.includes(query)))); // Filter the contacts - const contactsResults = cloneDeep(this._contacts).filter((user) => { - return user.name.toLowerCase().includes(query); - }); + const contactsResults = cloneDeep(this._contacts).filter(user => user.name.toLowerCase().includes(query)); // Create the results array const results = []; diff --git a/src/app/mock-api/common/shortcuts/data.ts b/src/app/mock-api/common/shortcuts/data.ts index 1621475a..bb56e940 100644 --- a/src/app/mock-api/common/shortcuts/data.ts +++ b/src/app/mock-api/common/shortcuts/data.ts @@ -1,6 +1,6 @@ +/* eslint-disable */ import { Shortcut } from 'app/layout/common/shortcuts/shortcuts.types'; -/* tslint:disable:max-line-length */ export const shortcuts: Shortcut[] = [ { id : 'a1ae91d3-e2cb-459b-9be9-a184694f548b', diff --git a/src/app/mock-api/common/user/data.ts b/src/app/mock-api/common/user/data.ts index a9fc9cd8..6f0f751b 100644 --- a/src/app/mock-api/common/user/data.ts +++ b/src/app/mock-api/common/user/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ export const user: any = { id : 'cfaad35d-07a3-4447-a6c3-d8c3d54fd5df', name : 'Brian Hughes', diff --git a/src/app/mock-api/dashboards/analytics/data.ts b/src/app/mock-api/dashboards/analytics/data.ts index 1e372c8d..c41a7891 100644 --- a/src/app/mock-api/dashboards/analytics/data.ts +++ b/src/app/mock-api/dashboards/analytics/data.ts @@ -1,6 +1,6 @@ +/* eslint-disable */ import * as moment from 'moment'; -/* tslint:disable:max-line-length */ export const analytics = { visitors : { series: { diff --git a/src/app/mock-api/dashboards/project/data.ts b/src/app/mock-api/dashboards/project/data.ts index 661a9c9e..4516a5c0 100644 --- a/src/app/mock-api/dashboards/project/data.ts +++ b/src/app/mock-api/dashboards/project/data.ts @@ -1,6 +1,6 @@ +/* eslint-disable */ import * as moment from 'moment'; -/* tslint:disable:max-line-length */ export const project = { githubIssues : { overview: { diff --git a/src/app/mock-api/ui/icons/data.ts b/src/app/mock-api/ui/icons/data.ts index 80c29da5..bd89ec15 100644 --- a/src/app/mock-api/ui/icons/data.ts +++ b/src/app/mock-api/ui/icons/data.ts @@ -1,4 +1,4 @@ -/* tslint:disable:max-line-length */ +/* eslint-disable */ // Updated at: 20210425 - 1792 icons export const material = [ diff --git a/src/app/modules/admin/apps/academy/academy.module.ts b/src/app/modules/admin/apps/academy/academy.module.ts index 4ae79191..a6a84729 100644 --- a/src/app/modules/admin/apps/academy/academy.module.ts +++ b/src/app/modules/admin/apps/academy/academy.module.ts @@ -23,7 +23,7 @@ import { MatTabsModule } from '@angular/material/tabs'; AcademyDetailsComponent, AcademyListComponent ], - imports: [ + imports : [ RouterModule.forChild(academyRoutes), MatButtonModule, MatFormFieldModule, diff --git a/src/app/modules/admin/apps/academy/details/details.component.html b/src/app/modules/admin/apps/academy/details/details.component.html index 52aa9125..2a001478 100644 --- a/src/app/modules/admin/apps/academy/details/details.component.html +++ b/src/app/modules/admin/apps/academy/details/details.component.html @@ -48,7 +48,8 @@
    -
  1. course.category === categorySlug); + this.filteredCourses = this.filteredCourses.filter(course => course.category === categorySlug); } // Filter by search query if ( query !== '' ) { - this.filteredCourses = this.filteredCourses.filter((course) => { - return course.title.toLowerCase().includes(query.toLowerCase()) - || course.description.toLowerCase().includes(query.toLowerCase()) - || course.category.toLowerCase().includes(query.toLowerCase()); - }); + this.filteredCourses = this.filteredCourses.filter(course => course.title.toLowerCase().includes(query.toLowerCase()) + || course.description.toLowerCase().includes(query.toLowerCase()) + || course.category.toLowerCase().includes(query.toLowerCase())); } // Filter by completed if ( hideCompleted ) { - this.filteredCourses = this.filteredCourses.filter((course) => course.progress.completed === 0); + this.filteredCourses = this.filteredCourses.filter(course => course.progress.completed === 0); } }); } diff --git a/src/app/modules/admin/apps/calendar/calendar.component.ts b/src/app/modules/admin/apps/calendar/calendar.component.ts index db0b9658..e95fb418 100644 --- a/src/app/modules/admin/apps/calendar/calendar.component.ts +++ b/src/app/modules/admin/apps/calendar/calendar.component.ts @@ -243,10 +243,8 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy day : 'numeric', omitCommas: true }, - columnHeaderHtml : (date) => { - return `${moment(date).format('ddd')} - ${moment(date).format('D')}`; - }, + columnHeaderHtml : date => `${moment(date).format('ddd')} + ${moment(date).format('D')}`, slotDuration : '01:00:00', slotLabelFormat : this.eventTimeFormat }, @@ -386,7 +384,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy return; } - return this.calendars.find((calendar) => calendar.id === id); + return this.calendars.find(calendar => calendar.id === id); } /** @@ -552,7 +550,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy onEventRender(calendarEvent): void { // Get event's calendar - const calendar = this.calendars.find((item) => item.id === calendarEvent.event.extendedProps.calendarId); + const calendar = this.calendars.find(item => item.id === calendarEvent.event.extendedProps.calendarId); // Return if the calendar doesn't exist... if ( !calendar ) @@ -779,6 +777,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy /** * Create the event panel overlay + * * @private */ private _createEventPanelOverlay(positionStrategy): void diff --git a/src/app/modules/admin/apps/calendar/calendar.service.ts b/src/app/modules/admin/apps/calendar/calendar.service.ts index d8e743cb..8150e0b1 100644 --- a/src/app/modules/admin/apps/calendar/calendar.service.ts +++ b/src/app/modules/admin/apps/calendar/calendar.service.ts @@ -13,7 +13,7 @@ export class CalendarService // Private private _calendars: BehaviorSubject = new BehaviorSubject(null); private _events: BehaviorSubject = new BehaviorSubject(null); - private _loadedEventsRange: { start: Moment | null, end: Moment | null } = { + private _loadedEventsRange: { start: Moment | null; end: Moment | null } = { start: null, end : null }; @@ -163,7 +163,7 @@ export class CalendarService this._calendars.next(calendars); // Remove the events belong to deleted calendar - const events = this._events.value.filter((event) => event.calendarId !== id); + const events = this._events.value.filter(event => event.calendarId !== id); // Update the events this._events.next(events); diff --git a/src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts b/src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts index c5abd23e..5f9a33c9 100644 --- a/src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts +++ b/src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts @@ -212,7 +212,7 @@ export class CalendarRecurrenceComponent implements OnInit, OnDestroy 5: 'th' }; this.nthWeekdayText = nthWeekday.slice(0, 1) + ordinalNumberSuffixes[nthWeekday.slice(0, 1)] + ' ' + - this.weekdays.find((item) => item.value === nthWeekday.slice(-2)).label; + this.weekdays.find(item => item.value === nthWeekday.slice(-2)).label; // Set the defaults on recurrence form values this.recurrenceFormValues = { diff --git a/src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts b/src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts index 03bf404e..abe7ff7e 100644 --- a/src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts +++ b/src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts @@ -15,8 +15,8 @@ import { calendarColors } from 'app/modules/admin/apps/calendar/sidebar/calendar }) export class CalendarSidebarComponent implements OnInit, OnDestroy { - @ViewChild('editPanel') private _editPanel: TemplateRef; @Output() readonly calendarUpdated: EventEmitter = new EventEmitter(); + @ViewChild('editPanel') private _editPanel: TemplateRef; calendar: Calendar | null; calendarColors: any = calendarColors; @@ -194,6 +194,7 @@ export class CalendarSidebarComponent implements OnInit, OnDestroy /** * Create the edit panel overlay + * * @private */ private _createEditPanelOverlay(): void diff --git a/src/app/modules/admin/apps/chat/chat.module.ts b/src/app/modules/admin/apps/chat/chat.module.ts index 42125e37..d2ecdc80 100644 --- a/src/app/modules/admin/apps/chat/chat.module.ts +++ b/src/app/modules/admin/apps/chat/chat.module.ts @@ -26,7 +26,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co NewChatComponent, ProfileComponent ], - imports: [ + imports : [ RouterModule.forChild(chatRoutes), MatButtonModule, MatCheckboxModule, @@ -36,7 +36,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co MatMenuModule, MatSidenavModule, FuseAutogrowModule, - SharedModule, + SharedModule ] }) export class ChatModule diff --git a/src/app/modules/admin/apps/chat/chat.types.ts b/src/app/modules/admin/apps/chat/chat.types.ts index dededb11..8bbd33b7 100644 --- a/src/app/modules/admin/apps/chat/chat.types.ts +++ b/src/app/modules/admin/apps/chat/chat.types.ts @@ -20,7 +20,7 @@ export interface Contact }[]; phoneNumbers?: { country?: string; - number?: string; + phoneNumber?: string; label?: string; }[]; title?: string; @@ -29,9 +29,9 @@ export interface Contact address?: string; }; attachments?: { - media?: any[] - docs?: any[] - links?: any[] + media?: any[]; + docs?: any[]; + links?: any[]; }; } diff --git a/src/app/modules/admin/apps/chat/chats/chats.component.ts b/src/app/modules/admin/apps/chat/chats/chats.component.ts index 2d4c6571..2904226a 100644 --- a/src/app/modules/admin/apps/chat/chats/chats.component.ts +++ b/src/app/modules/admin/apps/chat/chats/chats.component.ts @@ -98,7 +98,7 @@ export class ChatsComponent implements OnInit, OnDestroy return; } - this.filteredChats = this.chats.filter((chat) => chat.contact.name.toLowerCase().includes(query.toLowerCase())); + this.filteredChats = this.chats.filter(chat => chat.contact.name.toLowerCase().includes(query.toLowerCase())); } /** diff --git a/src/app/modules/admin/apps/chat/contact-info/contact-info.component.html b/src/app/modules/admin/apps/chat/contact-info/contact-info.component.html index 9ea099c8..d050ccda 100644 --- a/src/app/modules/admin/apps/chat/contact-info/contact-info.component.html +++ b/src/app/modules/admin/apps/chat/contact-info/contact-info.component.html @@ -52,7 +52,7 @@
    Phone number
    -
    {{chat.contact.details.phoneNumbers[0].number}}
    +
    {{chat.contact.details.phoneNumbers[0].phoneNumber}}
     diff --git a/src/app/modules/admin/apps/chat/conversation/conversation.component.ts b/src/app/modules/admin/apps/chat/conversation/conversation.component.ts index 9bd0c4f9..7a90d19a 100644 --- a/src/app/modules/admin/apps/chat/conversation/conversation.component.ts +++ b/src/app/modules/admin/apps/chat/conversation/conversation.component.ts @@ -31,6 +31,39 @@ export class ConversationComponent implements OnInit, OnDestroy { } + // ----------------------------------------------------------------------------------------------------- + // @ Decorated methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Resize on 'input' and 'ngModelChange' events + * + * @private + */ + @HostListener('input') + @HostListener('ngModelChange') + private _resizeMessageInput(): void + { + // This doesn't need to trigger Angular's change detection by itself + this._ngZone.runOutsideAngular(() => { + + setTimeout(() => { + + // Set the height to 'auto' so we can correctly read the scrollHeight + this.messageInput.nativeElement.style.height = 'auto'; + + // Detect the changes so the height is applied + this._changeDetectorRef.detectChanges(); + + // Get the scrollHeight and subtract the vertical padding + this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`; + + // Detect the changes one more time to apply the final height + this._changeDetectorRef.detectChanges(); + }); + }); + } + // ----------------------------------------------------------------------------------------------------- // @ Lifecycle hooks // ----------------------------------------------------------------------------------------------------- @@ -132,37 +165,4 @@ export class ConversationComponent implements OnInit, OnDestroy { return item.id || index; } - - // ----------------------------------------------------------------------------------------------------- - // @ Private methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Resize on 'input' and 'ngModelChange' events - * - * @private - */ - @HostListener('input') - @HostListener('ngModelChange') - private _resizeMessageInput(): void - { - // This doesn't need to trigger Angular's change detection by itself - this._ngZone.runOutsideAngular(() => { - - setTimeout(() => { - - // Set the height to 'auto' so we can correctly read the scrollHeight - this.messageInput.nativeElement.style.height = 'auto'; - - // Detect the changes so the height is applied - this._changeDetectorRef.detectChanges(); - - // Get the scrollHeight and subtract the vertical padding - this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`; - - // Detect the changes one more time to apply the final height - this._changeDetectorRef.detectChanges(); - }); - }); - } } diff --git a/src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts b/src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts index 8492671f..3799676e 100644 --- a/src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts +++ b/src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts @@ -6,9 +6,9 @@ import { Contact } from 'app/modules/admin/apps/chat/chat.types'; import { ChatService } from 'app/modules/admin/apps/chat/chat.service'; @Component({ - selector : 'chat-new-chat', - templateUrl : './new-chat.component.html', - encapsulation: ViewEncapsulation.None, + selector : 'chat-new-chat', + templateUrl : './new-chat.component.html', + encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) export class NewChatComponent implements OnInit, OnDestroy diff --git a/src/app/modules/admin/apps/chat/profile/profile.component.ts b/src/app/modules/admin/apps/chat/profile/profile.component.ts index 18cf4e29..284d6f46 100644 --- a/src/app/modules/admin/apps/chat/profile/profile.component.ts +++ b/src/app/modules/admin/apps/chat/profile/profile.component.ts @@ -6,9 +6,9 @@ import { Profile } from 'app/modules/admin/apps/chat/chat.types'; import { ChatService } from 'app/modules/admin/apps/chat/chat.service'; @Component({ - selector : 'chat-profile', - templateUrl : './profile.component.html', - encapsulation: ViewEncapsulation.None, + selector : 'chat-profile', + templateUrl : './profile.component.html', + encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) export class ProfileComponent implements OnInit, OnDestroy diff --git a/src/app/modules/admin/apps/contacts/contacts.guards.ts b/src/app/modules/admin/apps/contacts/contacts.guards.ts index e6cf5e8f..b5af26ac 100644 --- a/src/app/modules/admin/apps/contacts/contacts.guards.ts +++ b/src/app/modules/admin/apps/contacts/contacts.guards.ts @@ -41,9 +41,7 @@ export class CanDeactivateContactsDetails implements CanDeactivate { - return true; - }); + return component.closeDrawer().then(() => true); } } } diff --git a/src/app/modules/admin/apps/contacts/contacts.service.ts b/src/app/modules/admin/apps/contacts/contacts.service.ts index cf38779c..20c4960f 100644 --- a/src/app/modules/admin/apps/contacts/contacts.service.ts +++ b/src/app/modules/admin/apps/contacts/contacts.service.ts @@ -127,7 +127,7 @@ export class ContactsService { return this.contacts$.pipe( take(1), - switchMap((contacts) => this._httpClient.post('api/apps/contacts/contact', {}).pipe( + switchMap(contacts => this._httpClient.post('api/apps/contacts/contact', {}).pipe( map((newContact) => { // Update the contacts with the new contact @@ -354,6 +354,7 @@ export class ContactsService avatar }, { headers: { + // eslint-disable-next-line @typescript-eslint/naming-convention 'Content-Type': avatar.type } }).pipe( diff --git a/src/app/modules/admin/apps/contacts/contacts.types.ts b/src/app/modules/admin/apps/contacts/contacts.types.ts index 8befb04b..1d8d9daf 100644 --- a/src/app/modules/admin/apps/contacts/contacts.types.ts +++ b/src/app/modules/admin/apps/contacts/contacts.types.ts @@ -5,13 +5,13 @@ export interface Contact background?: string | null; name: string; emails?: { - email: string, - label: string + email: string; + label: string; }[]; phoneNumbers?: { country: string; - number: string; - label: string + phoneNumber: string; + label: string; }[]; title?: string; company?: string; diff --git a/src/app/modules/admin/apps/contacts/details/details.component.html b/src/app/modules/admin/apps/contacts/details/details.component.html index b6ee2271..0d61995c 100644 --- a/src/app/modules/admin/apps/contacts/details/details.component.html +++ b/src/app/modules/admin/apps/contacts/details/details.component.html @@ -126,7 +126,7 @@ [style.backgroundSize]="'24px 3876px'" [style.backgroundPosition]="getCountryByIso(phoneNumber.country).flagImagePos">
    {{getCountryByIso(phoneNumber.country).code}}
    -
    {{phoneNumber.number}}
    +
    {{phoneNumber.phoneNumber}}
    @@ -481,7 +481,7 @@ Phone { - return email.email; - }); + contact.emails = contact.emails.filter(email => email.email); - contact.phoneNumbers = contact.phoneNumbers.filter((phoneNumber) => { - return phoneNumber.number; - }); + contact.phoneNumbers = contact.phoneNumbers.filter(phoneNumber => phoneNumber.phoneNumber); // Update the contact on the server this._contactsService.updateContact(contact.id, contact).subscribe(() => { @@ -480,7 +476,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy // If there is a tag... const tag = this.filteredTags[0]; - const isTagApplied = this.contact.tags.find((id) => id === tag.id); + const isTagApplied = this.contact.tags.find(id => id === tag.id); // If the found tag is already applied to the contact... if ( isTagApplied ) @@ -652,9 +648,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy { // Create an empty phone number form group const phoneNumberFormGroup = this._formBuilder.group({ - country: ['us'], - number : [''], - label : [''] + country : ['us'], + phoneNumber: [''], + label : [''] }); // Add the phone number form group to the phoneNumbers form array @@ -688,7 +684,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy */ getCountryByIso(iso: string): Country { - return this.countries.find((country) => country.iso === iso); + return this.countries.find(country => country.iso === iso); } /** diff --git a/src/app/modules/admin/apps/contacts/list/list.component.ts b/src/app/modules/admin/apps/contacts/list/list.component.ts index 78efe4b1..3f357d97 100644 --- a/src/app/modules/admin/apps/contacts/list/list.component.ts +++ b/src/app/modules/admin/apps/contacts/list/list.component.ts @@ -93,11 +93,11 @@ export class ContactsListComponent implements OnInit, OnDestroy this.searchInputControl.valueChanges .pipe( takeUntil(this._unsubscribeAll), - switchMap((query) => { + switchMap(query => // Search - return this._contactsService.searchContacts(query); - }) + this._contactsService.searchContacts(query) + ) ) .subscribe(); @@ -136,10 +136,10 @@ export class ContactsListComponent implements OnInit, OnDestroy fromEvent(this._document, 'keydown') .pipe( takeUntil(this._unsubscribeAll), - filter((event) => { - return (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd - && (event.key === '/'); // '/' - }) + filter(event => + (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd + && (event.key === '/') // '/' + ) ) .subscribe(() => { this.createContact(); diff --git a/src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts b/src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts index 47b83a18..ee03afc1 100644 --- a/src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts +++ b/src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts @@ -131,7 +131,7 @@ export class InventoryProductsResolver implements Resolve * @param route * @param state */ - resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }> + resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }> { return this._inventoryService.getProducts(); } diff --git a/src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts b/src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts index 50a13b68..98edd1ae 100644 --- a/src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts +++ b/src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts @@ -124,9 +124,9 @@ export class InventoryService * @param search */ getProducts(page: number = 0, size: number = 10, sort: string = 'name', order: 'asc' | 'desc' | '' = 'asc', search: string = ''): - Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }> + Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }> { - return this._httpClient.get<{ pagination: InventoryPagination, products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', { + return this._httpClient.get<{ pagination: InventoryPagination; products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', { params: { page: '' + page, size: '' + size, @@ -179,7 +179,7 @@ export class InventoryService { return this.products$.pipe( take(1), - switchMap((products) => this._httpClient.post('api/apps/ecommerce/inventory/product', {}).pipe( + switchMap(products => this._httpClient.post('api/apps/ecommerce/inventory/product', {}).pipe( map((newProduct) => { // Update the products with the new product diff --git a/src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts b/src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts index 5b35c2c1..9b3109bc 100644 --- a/src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts +++ b/src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts @@ -5,7 +5,7 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { merge, Observable, Subject } from 'rxjs'; import { debounceTime, map, switchMap, takeUntil } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { InventoryBrand, InventoryCategory, InventoryPagination, InventoryProduct, InventoryTag, InventoryVendor } from 'app/modules/admin/apps/ecommerce/inventory/inventory.types'; import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inventory.service'; @@ -14,7 +14,7 @@ import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inv templateUrl : './inventory.component.html', encapsulation : ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, - animations : FuseAnimations + animations : fuseAnimations }) export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy { @@ -333,7 +333,7 @@ export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy // If there is a tag... const tag = this.filteredTags[0]; - const isTagApplied = this.selectedProduct.tags.find((id) => id === tag.id); + const isTagApplied = this.selectedProduct.tags.find(id => id === tag.id); // If the found tag is already applied to the contact... if ( isTagApplied ) diff --git a/src/app/modules/admin/apps/file-manager/file-manager.guards.ts b/src/app/modules/admin/apps/file-manager/file-manager.guards.ts index 68a9bbfb..ce59124f 100644 --- a/src/app/modules/admin/apps/file-manager/file-manager.guards.ts +++ b/src/app/modules/admin/apps/file-manager/file-manager.guards.ts @@ -41,9 +41,7 @@ export class CanDeactivateFileManagerDetails implements CanDeactivate { - return true; - }); + return component.closeDrawer().then(() => true); } } } diff --git a/src/app/modules/admin/apps/help-center/support/support.component.ts b/src/app/modules/admin/apps/help-center/support/support.component.ts index 77714f31..f59512b9 100644 --- a/src/app/modules/admin/apps/help-center/support/support.component.ts +++ b/src/app/modules/admin/apps/help-center/support/support.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { HelpCenterService } from 'app/modules/admin/apps/help-center/help-center.service'; @Component({ selector : 'help-center-support', templateUrl : './support.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class HelpCenterSupportComponent implements OnInit { diff --git a/src/app/modules/admin/apps/mailbox/compose/compose.component.ts b/src/app/modules/admin/apps/mailbox/compose/compose.component.ts index 7b8dccf6..ee2b6a71 100644 --- a/src/app/modules/admin/apps/mailbox/compose/compose.component.ts +++ b/src/app/modules/admin/apps/mailbox/compose/compose.component.ts @@ -10,7 +10,7 @@ import { MatDialogRef } from '@angular/material/dialog'; export class MailboxComposeComponent implements OnInit { composeForm: FormGroup; - copyFields: { cc: boolean, bcc: boolean } = { + copyFields: { cc: boolean; bcc: boolean } = { cc : false, bcc: false }; diff --git a/src/app/modules/admin/apps/mailbox/details/details.component.ts b/src/app/modules/admin/apps/mailbox/details/details.component.ts index e75dddfa..24f29477 100644 --- a/src/app/modules/admin/apps/mailbox/details/details.component.ts +++ b/src/app/modules/admin/apps/mailbox/details/details.component.ts @@ -114,9 +114,7 @@ export class MailboxDetailsComponent implements OnInit, OnDestroy moveToFolder(folderSlug: string): void { // Find the folder details - const folder = this.folders.find((item) => { - return item.slug === folderSlug; - }); + const folder = this.folders.find(item => item.slug === folderSlug); // Return if the current folder of the mail // is already equals to the given folder diff --git a/src/app/modules/admin/apps/mailbox/mailbox.routing.ts b/src/app/modules/admin/apps/mailbox/mailbox.routing.ts index d836c7a0..e2b35e85 100644 --- a/src/app/modules/admin/apps/mailbox/mailbox.routing.ts +++ b/src/app/modules/admin/apps/mailbox/mailbox.routing.ts @@ -11,8 +11,8 @@ import { MailboxSettingsComponent } from 'app/modules/admin/apps/mailbox/setting * * @param url */ -export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult -{ +export const mailboxRouteMatcher: (url: UrlSegment[]) => UrlMatchResult = (url: UrlSegment[]) => { + // Prepare consumed url and positional parameters let consumed = url; const posParams = {}; @@ -52,10 +52,10 @@ export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult consumed, posParams }; -} +}; + +export const mailboxRunGuardsAndResolvers: (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => boolean = (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => { -export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot): boolean -{ // If we are navigating from mail to mails, meaning there is an id in // from's deepest first child and there isn't one in the to's, we will // trigger the resolver @@ -99,7 +99,7 @@ export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: A // Trigger the resolver on other cases return true; -} +}; export const mailboxRoutes: Route[] = [ { diff --git a/src/app/modules/admin/apps/mailbox/settings/settings.component.ts b/src/app/modules/admin/apps/mailbox/settings/settings.component.ts index fe967690..27f2352f 100644 --- a/src/app/modules/admin/apps/mailbox/settings/settings.component.ts +++ b/src/app/modules/admin/apps/mailbox/settings/settings.component.ts @@ -117,7 +117,7 @@ export class MailboxSettingsComponent implements OnInit const labelsFormArray = this.labelsForm.get('labels') as FormArray; // Remove the label from the labels form array - labelsFormArray.removeAt(labelsFormArray.value.findIndex((label) => label.id === id)); + labelsFormArray.removeAt(labelsFormArray.value.findIndex(label => label.id === id)); // Delete label on the server this._mailboxService.deleteLabel(id).subscribe(); diff --git a/src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts b/src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts index c7fff6b5..3b4c2cd8 100644 --- a/src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts +++ b/src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts @@ -106,7 +106,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy const dialogRef = this._matDialog.open(MailboxComposeComponent); dialogRef.afterClosed() - .subscribe(result => { + .subscribe((result) => { console.log('Compose dialog was closed!'); }); } @@ -276,7 +276,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy private _updateNavigationBadge(folders: MailFolder[]): void { // Get the inbox folder - const inboxFolder = this.folders.find((folder) => folder.slug === 'inbox'); + const inboxFolder = this.folders.find(folder => folder.slug === 'inbox'); // Get the component -> navigation mock-api -> item const mainNavigationComponent = this._fuseNavigationService.getComponent('mainNavigation'); diff --git a/src/app/modules/admin/apps/notes/details/details.component.ts b/src/app/modules/admin/apps/notes/details/details.component.ts index 9be71363..0b8fcf26 100644 --- a/src/app/modules/admin/apps/notes/details/details.component.ts +++ b/src/app/modules/admin/apps/notes/details/details.component.ts @@ -77,7 +77,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy .pipe( takeUntil(this._unsubscribeAll), debounceTime(500), - switchMap((note) => this._notesService.updateNote(note))) + switchMap(note => this._notesService.updateNote(note))) .subscribe(() => { // Mark for check @@ -198,7 +198,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy removeTaskFromNote(note: Note, task: Task): void { // Remove the task - note.tasks = note.tasks.filter((item) => item.id !== task.id); + note.tasks = note.tasks.filter(item => item.id !== task.id); // Update the note this.noteChanged.next(note); @@ -228,7 +228,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy */ isNoteHasLabel(note: Note, label: Label): boolean { - return !!note.labels.find((item) => item.id === label.id); + return !!note.labels.find(item => item.id === label.id); } /** @@ -242,7 +242,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy // If the note already has the label if ( this.isNoteHasLabel(note, label) ) { - note.labels = note.labels.filter((item) => item.id !== label.id); + note.labels = note.labels.filter(item => item.id !== label.id); } // Otherwise else diff --git a/src/app/modules/admin/apps/notes/labels/labels.component.ts b/src/app/modules/admin/apps/notes/labels/labels.component.ts index 3e25b56a..042c7c2d 100644 --- a/src/app/modules/admin/apps/notes/labels/labels.component.ts +++ b/src/app/modules/admin/apps/notes/labels/labels.component.ts @@ -44,8 +44,8 @@ export class NotesLabelsComponent implements OnInit, OnDestroy .pipe( takeUntil(this._unsubscribeAll), debounceTime(500), - filter((label) => label.title.trim() !== ''), - switchMap((label) => this._notesService.updateLabel(label))) + filter(label => label.title.trim() !== ''), + switchMap(label => this._notesService.updateLabel(label))) .subscribe(() => { // Mark for check diff --git a/src/app/modules/admin/apps/notes/list/list.component.ts b/src/app/modules/admin/apps/notes/list/list.component.ts index 806a163d..3aafd494 100644 --- a/src/app/modules/admin/apps/notes/list/list.component.ts +++ b/src/app/modules/admin/apps/notes/list/list.component.ts @@ -85,7 +85,7 @@ export class NotesListComponent implements OnInit, OnDestroy if ( searchQuery ) { searchQuery = searchQuery.trim().toLowerCase(); - filteredNotes = filteredNotes.filter((note) => note.title.toLowerCase().includes(searchQuery) || note.content.toLowerCase().includes(searchQuery)); + filteredNotes = filteredNotes.filter(note => note.title.toLowerCase().includes(searchQuery) || note.content.toLowerCase().includes(searchQuery)); } // Show all @@ -96,13 +96,13 @@ export class NotesListComponent implements OnInit, OnDestroy // Show archive const isArchive = filter === 'archived'; - filteredNotes = filteredNotes.filter((note) => note.archived === isArchive); + filteredNotes = filteredNotes.filter(note => note.archived === isArchive); // Filter by label if ( filter.startsWith('label:') ) { const labelId = filter.split(':')[1]; - filteredNotes = filteredNotes.filter((note) => !!note.labels.find((item) => item.id === labelId)); + filteredNotes = filteredNotes.filter(note => !!note.labels.find(item => item.id === labelId)); } return filteredNotes; diff --git a/src/app/modules/admin/apps/notes/notes.service.ts b/src/app/modules/admin/apps/notes/notes.service.ts index f03f1751..dd36be8f 100644 --- a/src/app/modules/admin/apps/notes/notes.service.ts +++ b/src/app/modules/admin/apps/notes/notes.service.ts @@ -186,7 +186,7 @@ export class NotesService createNote(note: Note): Observable { return this._httpClient.post('api/apps/notes', {note}).pipe( - switchMap((response) => this.getNotes().pipe( + switchMap(response => this.getNotes().pipe( switchMap(() => this.getNoteById(response.id).pipe( map(() => response) )) @@ -206,7 +206,7 @@ export class NotesService // Before sending the note to the server, handle the labels if ( updatedNote.labels.length ) { - updatedNote.labels = updatedNote.labels.map((label) => label.id); + updatedNote.labels = updatedNote.labels.map(label => label.id); } return this._httpClient.patch('api/apps/notes', {updatedNote}).pipe( diff --git a/src/app/modules/admin/apps/tasks/details/details.component.ts b/src/app/modules/admin/apps/tasks/details/details.component.ts index 8b200d63..750d2de2 100644 --- a/src/app/modules/admin/apps/tasks/details/details.component.ts +++ b/src/app/modules/admin/apps/tasks/details/details.component.ts @@ -318,7 +318,7 @@ export class TasksDetailsComponent implements OnInit, AfterViewInit, OnDestroy // If there is a tag... const tag = this.filteredTags[0]; - const isTagApplied = this.task.tags.find((id) => id === tag.id); + const isTagApplied = this.task.tags.find(id => id === tag.id); // If the found tag is already applied to the task... if ( isTagApplied ) diff --git a/src/app/modules/admin/apps/tasks/list/list.component.ts b/src/app/modules/admin/apps/tasks/list/list.component.ts index 80706228..0c022200 100644 --- a/src/app/modules/admin/apps/tasks/list/list.component.ts +++ b/src/app/modules/admin/apps/tasks/list/list.component.ts @@ -126,10 +126,10 @@ export class TasksListComponent implements OnInit, OnDestroy fromEvent(this._document, 'keydown') .pipe( takeUntil(this._unsubscribeAll), - filter((event) => { - return (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd - && (event.key === '/' || event.key === '.'); // '/' or '.' key - }) + filter(event => + (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd + && (event.key === '/' || event.key === '.') // '/' or '.' key + ) ) .subscribe((event: KeyboardEvent) => { diff --git a/src/app/modules/admin/apps/tasks/tasks.guards.ts b/src/app/modules/admin/apps/tasks/tasks.guards.ts index 382fac9f..ad6c0d0a 100644 --- a/src/app/modules/admin/apps/tasks/tasks.guards.ts +++ b/src/app/modules/admin/apps/tasks/tasks.guards.ts @@ -41,9 +41,7 @@ export class CanDeactivateTasksDetails implements CanDeactivate { - return true; - }); + return component.closeDrawer().then(() => true); } } } diff --git a/src/app/modules/admin/apps/tasks/tasks.service.ts b/src/app/modules/admin/apps/tasks/tasks.service.ts index 633eac64..d7364839 100644 --- a/src/app/modules/admin/apps/tasks/tasks.service.ts +++ b/src/app/modules/admin/apps/tasks/tasks.service.ts @@ -239,7 +239,7 @@ export class TasksService { return this.tasks$.pipe( take(1), - switchMap((tasks) => this._httpClient.post('api/apps/tasks/task', {type}).pipe( + switchMap(tasks => this._httpClient.post('api/apps/tasks/task', {type}).pipe( map((newTask) => { // Update the tasks with the new task diff --git a/src/app/modules/admin/dashboards/analytics/analytics.component.ts b/src/app/modules/admin/dashboards/analytics/analytics.component.ts index e8e6d52c..64c73ceb 100644 --- a/src/app/modules/admin/dashboards/analytics/analytics.component.ts +++ b/src/app/modules/admin/dashboards/analytics/analytics.component.ts @@ -19,7 +19,6 @@ export class AnalyticsComponent implements OnInit, OnDestroy chartVisits: ApexOptions; chartVisitorsVsPageViews: ApexOptions; data: any; - private _unsubscribeAll: Subject = new Subject(); chartAge: ApexOptions; averagePurchaseValueOptions: ApexOptions; @@ -34,6 +33,8 @@ export class AnalyticsComponent implements OnInit, OnDestroy uniqueVisitorsOptions: ApexOptions; uniquePurchasesOptions: ApexOptions; + private _unsubscribeAll: Subject = new Subject(); + /** * Constructor */ @@ -90,6 +91,21 @@ export class AnalyticsComponent implements OnInit, OnDestroy this._unsubscribeAll.complete(); } + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Track by function for ngFor loops + * + * @param index + * @param item + */ + trackByFn(index: number, item: any): any + { + return item.id || index; + } + // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- @@ -113,7 +129,7 @@ export class AnalyticsComponent implements OnInit, OnDestroy // 2. Filter out the ones that doesn't have cross reference so we only left with the ones that use the 'url(#id)' syntax // 3. Insert the 'currentURL' at the front of the 'fill' attribute value Array.from(element.querySelectorAll('*[fill]')) - .filter((el) => el.getAttribute('fill').indexOf('url(') !== -1) + .filter(el => el.getAttribute('fill').indexOf('url(') !== -1) .forEach((el) => { const attrVal = el.getAttribute('fill'); el.setAttribute('fill', `url(${currentURL}${attrVal.slice(attrVal.indexOf('#'))}`); @@ -182,10 +198,7 @@ export class AnalyticsComponent implements OnInit, OnDestroy format: 'MMM dd, yyyy' }, y : { - formatter(value: number): string - { - return `${value}`; - } + formatter: (value: number): string => `${value}` } }, xaxis : { @@ -261,9 +274,7 @@ export class AnalyticsComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return val.toString(); - } + formatter: val => val.toString() } } }; @@ -301,9 +312,7 @@ export class AnalyticsComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return val.toString(); - } + formatter: val => val.toString() } } }; @@ -341,9 +350,7 @@ export class AnalyticsComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return val.toString(); - } + formatter: val => val.toString() } } }; @@ -472,15 +479,13 @@ export class AnalyticsComponent implements OnInit, OnDestroy fillSeriesColor: false, theme : 'dark', custom : ({ - seriesIndex, - w - }) => { - return `
    -
    -
    ${w.config.labels[seriesIndex]}:
    -
    ${w.config.series[seriesIndex]}%
    -
    `; - } + seriesIndex, + w + }) => `
    +
    +
    ${w.config.labels[seriesIndex]}:
    +
    ${w.config.series[seriesIndex]}%
    +
    ` } }; @@ -530,15 +535,13 @@ export class AnalyticsComponent implements OnInit, OnDestroy fillSeriesColor: false, theme : 'dark', custom : ({ - seriesIndex, - w - }) => { - return `
    -
    -
    ${w.config.labels[seriesIndex]}:
    -
    ${w.config.series[seriesIndex]}%
    -
    `; - } + seriesIndex, + w + }) => `
    +
    +
    ${w.config.labels[seriesIndex]}:
    +
    ${w.config.series[seriesIndex]}%
    +
    ` } }; @@ -588,15 +591,13 @@ export class AnalyticsComponent implements OnInit, OnDestroy fillSeriesColor: false, theme : 'dark', custom : ({ - seriesIndex, - w - }) => { - return `
    -
    -
    ${w.config.labels[seriesIndex]}:
    -
    ${w.config.series[seriesIndex]}%
    -
    `; - } + seriesIndex, + w + }) => `
    +
    +
    ${w.config.labels[seriesIndex]}:
    +
    ${w.config.series[seriesIndex]}%
    +
    ` } }; @@ -646,31 +647,14 @@ export class AnalyticsComponent implements OnInit, OnDestroy fillSeriesColor: false, theme : 'dark', custom : ({ - seriesIndex, - w - }) => { - return `
    -
    -
    ${w.config.labels[seriesIndex]}:
    -
    ${w.config.series[seriesIndex]}%
    -
    `; - } + seriesIndex, + w + }) => `
    +
    +
    ${w.config.labels[seriesIndex]}:
    +
    ${w.config.series[seriesIndex]}%
    +
    ` } }; } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Track by function for ngFor loops - * - * @param index - * @param item - */ - trackByFn(index: number, item: any): any - { - return item.id || index; - } } diff --git a/src/app/modules/admin/dashboards/project/project.component.ts b/src/app/modules/admin/dashboards/project/project.component.ts index 79c5b3cb..22c48971 100644 --- a/src/app/modules/admin/dashboards/project/project.component.ts +++ b/src/app/modules/admin/dashboards/project/project.component.ts @@ -79,6 +79,21 @@ export class ProjectComponent implements OnInit, OnDestroy this._unsubscribeAll.complete(); } + // ----------------------------------------------------------------------------------------------------- + // @ Public methods + // ----------------------------------------------------------------------------------------------------- + + /** + * Track by function for ngFor loops + * + * @param index + * @param item + */ + trackByFn(index: number, item: any): any + { + return item.id || index; + } + // ----------------------------------------------------------------------------------------------------- // @ Private methods // ----------------------------------------------------------------------------------------------------- @@ -102,7 +117,7 @@ export class ProjectComponent implements OnInit, OnDestroy // 2. Filter out the ones that doesn't have cross reference so we only left with the ones that use the 'url(#id)' syntax // 3. Insert the 'currentURL' at the front of the 'fill' attribute value Array.from(element.querySelectorAll('*[fill]')) - .filter((el) => el.getAttribute('fill').indexOf('url(') !== -1) + .filter(el => el.getAttribute('fill').indexOf('url(') !== -1) .forEach((el) => { const attrVal = el.getAttribute('fill'); el.setAttribute('fill', `url(${currentURL}${attrVal.slice(attrVal.indexOf('#'))}`); @@ -266,11 +281,8 @@ export class ProjectComponent implements OnInit, OnDestroy }, colors : ['#818CF8'], dataLabels : { - enabled: true, - formatter(val: number): string | number - { - return `${val}%`; - }, + enabled : true, + formatter : (val: number): string | number => `${val}%`, textAnchor: 'start', style : { fontSize : '13px', @@ -301,10 +313,7 @@ export class ProjectComponent implements OnInit, OnDestroy tooltip : { theme: 'dark', y : { - formatter(val: number): string - { - return `${val}%`; - } + formatter: (val: number): string => `${val}%` } }, xaxis : { @@ -318,9 +327,7 @@ export class ProjectComponent implements OnInit, OnDestroy categories: this.data.budgetDistribution.categories }, yaxis : { - max : (max: number) => { - return parseInt((max + 10).toFixed(0), 10); - }, + max : (max: number) => parseInt((max + 10).toFixed(0), 10), tickAmount: 7 } }; @@ -353,9 +360,7 @@ export class ProjectComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return `$${val}`; - } + formatter: val => `$${val}` } } }; @@ -388,9 +393,7 @@ export class ProjectComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return `$${val}`; - } + formatter: val => `$${val}` } } }; @@ -423,26 +426,9 @@ export class ProjectComponent implements OnInit, OnDestroy }, yaxis : { labels: { - formatter: (val) => { - return `$${val}`; - } + formatter: val => `$${val}` } } }; } - - // ----------------------------------------------------------------------------------------------------- - // @ Public methods - // ----------------------------------------------------------------------------------------------------- - - /** - * Track by function for ngFor loops - * - * @param index - * @param item - */ - trackByFn(index: number, item: any): any - { - return item.id || index; - } } diff --git a/src/app/modules/admin/docs/core-features/components/navigation/navigation.component.ts b/src/app/modules/admin/docs/core-features/components/navigation/navigation.component.ts index e8cda489..4ca49d9f 100644 --- a/src/app/modules/admin/docs/core-features/components/navigation/navigation.component.ts +++ b/src/app/modules/admin/docs/core-features/components/navigation/navigation.component.ts @@ -173,7 +173,6 @@ export class NavigationComponent navComponent.refresh(); } - /** * Toggle the drawer */ diff --git a/src/app/modules/admin/docs/guides/authentication/jwt/jwt.html b/src/app/modules/admin/docs/guides/authentication/jwt/jwt.html index 859a6f78..95abc584 100644 --- a/src/app/modules/admin/docs/guides/authentication/jwt/jwt.html +++ b/src/app/modules/admin/docs/guides/authentication/jwt/jwt.html @@ -52,7 +52,7 @@

  2. AuthInterceptor

    -

    An interceptor to attach the access_token to the header of the requests and catching 401 responses.

    +

    An interceptor to attach the access token to the header of the requests and catching 401 responses.

  3. AuthService

    diff --git a/src/app/modules/admin/docs/guides/development/directory-structure/directory-structure.ts b/src/app/modules/admin/docs/guides/development/directory-structure/directory-structure.ts index a3be64fb..998548c0 100644 --- a/src/app/modules/admin/docs/guides/development/directory-structure/directory-structure.ts +++ b/src/app/modules/admin/docs/guides/development/directory-structure/directory-structure.ts @@ -237,7 +237,7 @@ export class DirectoryStructureComponent implements OnInit /** * Create a new tree */ - createTree(data): { dataSource: any, treeControl: any } + createTree(data): { dataSource: any; treeControl: any } { // Create tree control and mock-api source const treeControl = new FlatTreeControl(node => node.level, node => node.expandable); diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/classic/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/classic/confirmation-required.component.ts index c17d3d33..00f67367 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/classic/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/classic/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-classic', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredClassicComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen-reversed/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen-reversed/confirmation-required.component.ts index 0236d451..77102b55 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen-reversed/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen-reversed/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-fullscreen-reversed', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredFullscreenReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen/confirmation-required.component.ts index f703a19d..216176ca 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/fullscreen/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-fullscreen', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredFullscreenComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/modern-reversed/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/modern-reversed/confirmation-required.component.ts index 99b2cb9d..56557246 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/modern-reversed/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/modern-reversed/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-modern-reversed', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredModernReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/modern/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/modern/confirmation-required.component.ts index 56cee33a..58c6dca2 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/modern/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/modern/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-modern', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredModernComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/split-screen-reversed/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/split-screen-reversed/confirmation-required.component.ts index 2711c925..a3eda969 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/split-screen-reversed/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/split-screen-reversed/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-split-screen-reversed', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredSplitScreenReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/confirmation-required/split-screen/confirmation-required.component.ts b/src/app/modules/admin/pages/authentication/confirmation-required/split-screen/confirmation-required.component.ts index a0baad7b..44237304 100644 --- a/src/app/modules/admin/pages/authentication/confirmation-required/split-screen/confirmation-required.component.ts +++ b/src/app/modules/admin/pages/authentication/confirmation-required/split-screen/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'confirmation-required-split-screen', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ConfirmationRequiredSplitScreenComponent { diff --git a/src/app/modules/admin/pages/authentication/forgot-password/classic/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/classic/forgot-password.component.ts index b709dd2f..c038f9c2 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/classic/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/classic/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-classic', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordClassicComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/fullscreen-reversed/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/fullscreen-reversed/forgot-password.component.ts index a604768a..e6ff4f82 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/fullscreen-reversed/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/fullscreen-reversed/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-fullscreen-reversed', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordFullscreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/fullscreen/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/fullscreen/forgot-password.component.ts index eca52b3c..5f625198 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/fullscreen/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/fullscreen/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-fullscreen', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordFullscreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/modern-reversed/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/modern-reversed/forgot-password.component.ts index 48d12a5f..4438a7c7 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/modern-reversed/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/modern-reversed/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-modern-reversed', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordModernReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/modern/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/modern/forgot-password.component.ts index 788d122e..c42c9422 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/modern/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/modern/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-modern', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordModernComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/split-screen-reversed/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/split-screen-reversed/forgot-password.component.ts index 4daaab5b..67cad8e7 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/split-screen-reversed/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/split-screen-reversed/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-split-screen-reversed', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordSplitScreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/forgot-password/split-screen/forgot-password.component.ts b/src/app/modules/admin/pages/authentication/forgot-password/split-screen/forgot-password.component.ts index 0cf4abd9..11563f06 100644 --- a/src/app/modules/admin/pages/authentication/forgot-password/split-screen/forgot-password.component.ts +++ b/src/app/modules/admin/pages/authentication/forgot-password/split-screen/forgot-password.component.ts @@ -1,17 +1,17 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'forgot-password-split-screen', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ForgotPasswordSplitScreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/classic/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/classic/reset-password.component.ts index ed72d6ee..6661c478 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/classic/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/classic/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-classic', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordClassicComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/fullscreen-reversed/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/fullscreen-reversed/reset-password.component.ts index 7e21179c..d7582e42 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/fullscreen-reversed/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/fullscreen-reversed/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-fullscreen-reversed', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordFullscreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/fullscreen/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/fullscreen/reset-password.component.ts index 54ee9819..7f3003c1 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/fullscreen/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/fullscreen/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-fullscreen', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordFullscreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/modern-reversed/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/modern-reversed/reset-password.component.ts index ec98c029..6131d5d3 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/modern-reversed/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/modern-reversed/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-modern-reversed', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordModernReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/modern/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/modern/reset-password.component.ts index d68dec30..073ee813 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/modern/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/modern/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-modern', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordModernComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/split-screen-reversed/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/split-screen-reversed/reset-password.component.ts index c8e22498..4c6ed49a 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/split-screen-reversed/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/split-screen-reversed/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-split-screen-reversed', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordSplitScreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/reset-password/split-screen/reset-password.component.ts b/src/app/modules/admin/pages/authentication/reset-password/split-screen/reset-password.component.ts index aeb38200..f091ef38 100644 --- a/src/app/modules/admin/pages/authentication/reset-password/split-screen/reset-password.component.ts +++ b/src/app/modules/admin/pages/authentication/reset-password/split-screen/reset-password.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { FuseValidators } from '@fuse/validators'; @@ -8,11 +8,11 @@ import { FuseValidators } from '@fuse/validators'; selector : 'reset-password-split-screen', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ResetPasswordSplitScreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/classic/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/classic/sign-in.component.ts index fa674b81..fc68fc2d 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/classic/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/classic/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-classic', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInClassicComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/fullscreen-reversed/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/fullscreen-reversed/sign-in.component.ts index dc9ee74f..f3273345 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/fullscreen-reversed/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/fullscreen-reversed/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-fullscreen-reversed', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInFullscreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/fullscreen/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/fullscreen/sign-in.component.ts index 2db3388d..5420d397 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/fullscreen/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/fullscreen/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-fullscreen', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInFullscreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/modern-reversed/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/modern-reversed/sign-in.component.ts index 68bbf776..fbcb11fa 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/modern-reversed/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/modern-reversed/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-modern-reversed', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInModernReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/modern/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/modern/sign-in.component.ts index 47960970..76706f88 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/modern/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/modern/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-modern', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInModernComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/split-screen-reversed/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/split-screen-reversed/sign-in.component.ts index 8c0cabc5..272b926c 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/split-screen-reversed/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/split-screen-reversed/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-split-screen-reversed', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInSplitScreenReversedComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-in/split-screen/sign-in.component.ts b/src/app/modules/admin/pages/authentication/sign-in/split-screen/sign-in.component.ts index b4c63dc4..84657661 100644 --- a/src/app/modules/admin/pages/authentication/sign-in/split-screen/sign-in.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-in/split-screen/sign-in.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,11 +8,11 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-in-split-screen', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignInSplitScreenComponent implements OnInit { - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-out/classic/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/classic/sign-out.component.ts index ce232574..248fa732 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/classic/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/classic/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-classic', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutClassicComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/fullscreen-reversed/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/fullscreen-reversed/sign-out.component.ts index 23fbba24..57b4da43 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/fullscreen-reversed/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/fullscreen-reversed/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-fullscreen-reversed', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutFullscreenReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/fullscreen/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/fullscreen/sign-out.component.ts index 4ee090e2..ed7b8fab 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/fullscreen/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/fullscreen/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-fullscreen', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutFullscreenComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/modern-reversed/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/modern-reversed/sign-out.component.ts index d5985cf7..52c882d7 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/modern-reversed/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/modern-reversed/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-modern-reversed', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutModernReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/modern/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/modern/sign-out.component.ts index d6b0a70f..bdcf66ac 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/modern/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/modern/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-modern', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutModernComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/split-screen-reversed/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/split-screen-reversed/sign-out.component.ts index 8279c157..a7a6a08d 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/split-screen-reversed/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/split-screen-reversed/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-split-screen-reversed', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutSplitScreenReversedComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-out/split-screen/sign-out.component.ts b/src/app/modules/admin/pages/authentication/sign-out/split-screen/sign-out.component.ts index 13d99e8a..f0f33523 100644 --- a/src/app/modules/admin/pages/authentication/sign-out/split-screen/sign-out.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-out/split-screen/sign-out.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { Router } from '@angular/router'; @@ -7,7 +7,7 @@ import { Router } from '@angular/router'; selector : 'sign-out-split-screen', templateUrl : './sign-out.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignOutSplitScreenComponent { diff --git a/src/app/modules/admin/pages/authentication/sign-up/classic/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/classic/sign-up.component.ts index 08c3e076..b16650e3 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/classic/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/classic/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-classic', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpClassicComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/fullscreen-reversed/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/fullscreen-reversed/sign-up.component.ts index 4e435aa6..af613985 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/fullscreen-reversed/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/fullscreen-reversed/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-fullscreen-reversed', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpFullscreenReversedComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/fullscreen/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/fullscreen/sign-up.component.ts index a0b3f422..98f69868 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/fullscreen/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/fullscreen/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-fullscreen', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpFullscreenComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/modern-reversed/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/modern-reversed/sign-up.component.ts index b8e3438e..de0136a7 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/modern-reversed/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/modern-reversed/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-modern-reversed', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpModernReversedComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/modern/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/modern/sign-up.component.ts index 5e05ea70..780c07ad 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/modern/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/modern/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-modern', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpModernComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/split-screen-reversed/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/split-screen-reversed/sign-up.component.ts index a5e765cf..f56a0a77 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/split-screen-reversed/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/split-screen-reversed/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-split-screen-reversed', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpSplitScreenReversedComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/sign-up/split-screen/sign-up.component.ts b/src/app/modules/admin/pages/authentication/sign-up/split-screen/sign-up.component.ts index b6dbf8e6..3dfceae1 100644 --- a/src/app/modules/admin/pages/authentication/sign-up/split-screen/sign-up.component.ts +++ b/src/app/modules/admin/pages/authentication/sign-up/split-screen/sign-up.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'sign-up-split-screen', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class SignUpSplitScreenComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/classic/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/classic/unlock-session.component.ts index 3ffa68f2..43da6352 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/classic/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/classic/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-classic', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionClassicComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/fullscreen-reversed/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/fullscreen-reversed/unlock-session.component.ts index b61091ff..8a3021c0 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/fullscreen-reversed/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/fullscreen-reversed/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-fullscreen-reversed', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionFullscreenReversedComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/fullscreen/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/fullscreen/unlock-session.component.ts index f198b6da..c8909945 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/fullscreen/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/fullscreen/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-fullscreen', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionFullscreenComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/modern-reversed/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/modern-reversed/unlock-session.component.ts index 19878703..c223b55f 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/modern-reversed/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/modern-reversed/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-modern-reversed', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionModernReversedComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/modern/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/modern/unlock-session.component.ts index 2feaab70..54068b66 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/modern/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/modern/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-modern', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionModernComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/split-screen-reversed/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/split-screen-reversed/unlock-session.component.ts index 3a6d38ea..cbf4e3fa 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/split-screen-reversed/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/split-screen-reversed/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-split-screen-reversed', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionSplitScreenReversedComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/authentication/unlock-session/split-screen/unlock-session.component.ts b/src/app/modules/admin/pages/authentication/unlock-session/split-screen/unlock-session.component.ts index 303d8061..60b2b1e1 100644 --- a/src/app/modules/admin/pages/authentication/unlock-session/split-screen/unlock-session.component.ts +++ b/src/app/modules/admin/pages/authentication/unlock-session/split-screen/unlock-session.component.ts @@ -1,19 +1,19 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; @Component({ selector : 'unlock-session-split-screen', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class UnlockSessionSplitScreenComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/classic/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/classic/coming-soon.component.ts index 9db9235b..48185f1c 100644 --- a/src/app/modules/admin/pages/coming-soon/classic/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/classic/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonClassicComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/fullscreen-reversed/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/fullscreen-reversed/coming-soon.component.ts index 28fa10c1..bb862416 100644 --- a/src/app/modules/admin/pages/coming-soon/fullscreen-reversed/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/fullscreen-reversed/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonFullscreenReversedComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/fullscreen/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/fullscreen/coming-soon.component.ts index 95f3a109..a74b50a1 100644 --- a/src/app/modules/admin/pages/coming-soon/fullscreen/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/fullscreen/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonFullscreenComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/modern-reversed/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/modern-reversed/coming-soon.component.ts index cdc9d9fa..00378405 100644 --- a/src/app/modules/admin/pages/coming-soon/modern-reversed/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/modern-reversed/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonModernReversedComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/modern/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/modern/coming-soon.component.ts index 3bf570dc..d09007a6 100644 --- a/src/app/modules/admin/pages/coming-soon/modern/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/modern/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonModernComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/split-screen-reversed/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/split-screen-reversed/coming-soon.component.ts index 00d519fd..54524182 100644 --- a/src/app/modules/admin/pages/coming-soon/split-screen-reversed/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/split-screen-reversed/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonSplitScreenReversedComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/coming-soon/split-screen/coming-soon.component.ts b/src/app/modules/admin/pages/coming-soon/split-screen/coming-soon.component.ts index f41c343d..3a03ac0c 100644 --- a/src/app/modules/admin/pages/coming-soon/split-screen/coming-soon.component.ts +++ b/src/app/modules/admin/pages/coming-soon/split-screen/coming-soon.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -8,13 +8,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'coming-soon-classic', templateUrl : './coming-soon.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class ComingSoonSplitScreenComponent implements OnInit { @ViewChild('comingSoonNgForm') comingSoonNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/admin/pages/settings/settings.component.ts b/src/app/modules/admin/pages/settings/settings.component.ts index 741a3988..f8e43eb0 100644 --- a/src/app/modules/admin/pages/settings/settings.component.ts +++ b/src/app/modules/admin/pages/settings/settings.component.ts @@ -131,7 +131,7 @@ export class SettingsComponent implements OnInit, OnDestroy */ getPanelInfo(id: string): any { - return this.panels.find((panel) => panel.id === id); + return this.panels.find(panel => panel.id === id); } /** diff --git a/src/app/modules/admin/ui/animations/animations.component.ts b/src/app/modules/admin/ui/animations/animations.component.ts index de5e94b8..c3ec67ed 100644 --- a/src/app/modules/admin/ui/animations/animations.component.ts +++ b/src/app/modules/admin/ui/animations/animations.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'animations', templateUrl : './animations.component.html', styleUrls : ['./animations.component.scss'], - animations : FuseAnimations, + animations : fuseAnimations, encapsulation: ViewEncapsulation.None }) export class AnimationsComponent diff --git a/src/app/modules/admin/ui/cards/cards.component.ts b/src/app/modules/admin/ui/cards/cards.component.ts index 187adc9f..f1172247 100644 --- a/src/app/modules/admin/ui/cards/cards.component.ts +++ b/src/app/modules/admin/ui/cards/cards.component.ts @@ -86,7 +86,7 @@ export class CardsComponent implements AfterViewInit } else { - count = this.numberOfCards[filter] = this._fuseCards.filter((fuseCard) => fuseCard.nativeElement.classList.contains('filter-' + filter)).length; + count = this.numberOfCards[filter] = this._fuseCards.filter(fuseCard => fuseCard.nativeElement.classList.contains('filter-' + filter)).length; } // Fill the numberOfCards object with the counts @@ -99,7 +99,7 @@ export class CardsComponent implements AfterViewInit * * @private */ - _filterCards(): void + private _filterCards(): void { // Go through all fuse-cards this._fuseCards.forEach((fuseCard) => { diff --git a/src/app/modules/admin/ui/colors/colors.component.ts b/src/app/modules/admin/ui/colors/colors.component.ts index fd7aed8e..b9f3d86e 100644 --- a/src/app/modules/admin/ui/colors/colors.component.ts +++ b/src/app/modules/admin/ui/colors/colors.component.ts @@ -1,10 +1,10 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'colors', templateUrl : './colors.component.html', - animations : FuseAnimations, + animations : fuseAnimations, encapsulation: ViewEncapsulation.None }) export class ColorsComponent diff --git a/src/app/modules/admin/ui/page-layouts/common/layout-overview/layout-overview.component.ts b/src/app/modules/admin/ui/page-layouts/common/layout-overview/layout-overview.component.ts index 73d55d74..14a14cb6 100644 --- a/src/app/modules/admin/ui/page-layouts/common/layout-overview/layout-overview.component.ts +++ b/src/app/modules/admin/ui/page-layouts/common/layout-overview/layout-overview.component.ts @@ -15,7 +15,7 @@ export interface PageLayoutsOverviewData description: string; link: string; component: any; - } + }; }; } @@ -61,7 +61,9 @@ export interface PageLayoutsOverviewData
    -
    +
    diff --git a/src/app/modules/admin/ui/page-layouts/page-layouts.module.ts b/src/app/modules/admin/ui/page-layouts/page-layouts.module.ts index 50b5312b..29759b48 100644 --- a/src/app/modules/admin/ui/page-layouts/page-layouts.module.ts +++ b/src/app/modules/admin/ui/page-layouts/page-layouts.module.ts @@ -95,7 +95,7 @@ export const overviews = { } }, carded: { - fullwidth : { + fullwidth : { title : 'Carded Fullwidth Layout', description : 'Carded layout that spans the entire width of the content area with a dedicated header and 3 different scroll modes.', availableOptions: [ @@ -131,7 +131,7 @@ export const overviews = { } } }, - leftSidebar1: { + leftSidebar1 : { title : 'Carded Left Sidebar #1', description : 'Carded layout with a left sidebar, a dedicated header and 3 different scroll modes.', availableOptions: [ @@ -167,7 +167,7 @@ export const overviews = { } } }, - leftSidebar2: { + leftSidebar2 : { title : 'Carded Left Sidebar #2', description : 'Carded layout with a left sidebar, a dedicated header and 3 different scroll modes.', availableOptions: [ @@ -977,7 +977,6 @@ export const routes: Route[] = [ CardedLeftSidebar2PageScrollComponent, CardedLeftSidebar2ContentScrollComponent, - // Carded - Right sidebar CardedRightSidebar1NormalScrollComponent, CardedRightSidebar1PageScrollComponent, diff --git a/src/app/modules/auth/confirmation-required/confirmation-required.component.ts b/src/app/modules/auth/confirmation-required/confirmation-required.component.ts index a4c63984..f906579b 100644 --- a/src/app/modules/auth/confirmation-required/confirmation-required.component.ts +++ b/src/app/modules/auth/confirmation-required/confirmation-required.component.ts @@ -1,11 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; @Component({ selector : 'auth-confirmation-required', templateUrl : './confirmation-required.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthConfirmationRequiredComponent { diff --git a/src/app/modules/auth/forgot-password/forgot-password.component.ts b/src/app/modules/auth/forgot-password/forgot-password.component.ts index 96aa02ed..8a0ffac5 100644 --- a/src/app/modules/auth/forgot-password/forgot-password.component.ts +++ b/src/app/modules/auth/forgot-password/forgot-password.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; import { finalize } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -9,13 +9,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'auth-forgot-password', templateUrl : './forgot-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthForgotPasswordComponent implements OnInit { @ViewChild('forgotPasswordNgForm') forgotPasswordNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/auth/reset-password/reset-password.component.ts b/src/app/modules/auth/reset-password/reset-password.component.ts index b3f5a26c..6e407602 100644 --- a/src/app/modules/auth/reset-password/reset-password.component.ts +++ b/src/app/modules/auth/reset-password/reset-password.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; import { finalize } from 'rxjs/operators'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseValidators } from '@fuse/validators'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -10,13 +10,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'auth-reset-password', templateUrl : './reset-password.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthResetPasswordComponent implements OnInit { @ViewChild('resetPasswordNgForm') resetPasswordNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/auth/sign-in/sign-in.component.ts b/src/app/modules/auth/sign-in/sign-in.component.ts index fa950d25..910aed68 100644 --- a/src/app/modules/auth/sign-in/sign-in.component.ts +++ b/src/app/modules/auth/sign-in/sign-in.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -9,13 +9,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'auth-sign-in', templateUrl : './sign-in.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthSignInComponent implements OnInit { @ViewChild('signInNgForm') signInNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/auth/sign-up/sign-up.component.ts b/src/app/modules/auth/sign-up/sign-up.component.ts index 170d624b..c82c7140 100644 --- a/src/app/modules/auth/sign-up/sign-up.component.ts +++ b/src/app/modules/auth/sign-up/sign-up.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { FuseAlertType } from '@fuse/components/alert'; import { AuthService } from 'app/core/auth/auth.service'; @@ -9,13 +9,13 @@ import { AuthService } from 'app/core/auth/auth.service'; selector : 'auth-sign-up', templateUrl : './sign-up.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthSignUpComponent implements OnInit { @ViewChild('signUpNgForm') signUpNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/app/modules/auth/unlock-session/unlock-session.component.ts b/src/app/modules/auth/unlock-session/unlock-session.component.ts index ca24fb95..19691acd 100644 --- a/src/app/modules/auth/unlock-session/unlock-session.component.ts +++ b/src/app/modules/auth/unlock-session/unlock-session.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { FuseAnimations } from '@fuse/animations'; +import { fuseAnimations } from '@fuse/animations'; import { AuthService } from 'app/core/auth/auth.service'; import { UserService } from 'app/core/user/user.service'; import { FuseAlertType } from '@fuse/components/alert'; @@ -10,13 +10,13 @@ import { FuseAlertType } from '@fuse/components/alert'; selector : 'auth-unlock-session', templateUrl : './unlock-session.component.html', encapsulation: ViewEncapsulation.None, - animations : FuseAnimations + animations : fuseAnimations }) export class AuthUnlockSessionComponent implements OnInit { @ViewChild('unlockSessionNgForm') unlockSessionNgForm: NgForm; - alert: { type: FuseAlertType, message: string } = { + alert: { type: FuseAlertType; message: string } = { type : 'success', message: '' }; diff --git a/src/global.d.ts b/src/global.d.ts index 4364ffb8..fb9a4255 100644 --- a/src/global.d.ts +++ b/src/global.d.ts @@ -3,6 +3,6 @@ */ declare module '*.scss' { - const content: { [className: string]: string; }; + const content: { [className: string]: string }; export = content; } diff --git a/tslint.json b/tslint.json deleted file mode 100644 index 9258f16b..00000000 --- a/tslint.json +++ /dev/null @@ -1,169 +0,0 @@ -{ - "extends": "tslint:recommended", - "rulesDirectory": [ - "codelyzer" - ], - "rules": { - "align": { - "options": [ - "parameters", - "statements" - ] - }, - "array-type": false, - "arrow-parens": false, - "arrow-return-shorthand": true, - "curly": true, - "deprecation": { - "severity": "warning" - }, - "eofline": true, - "import-blacklist": [ - true, - "rxjs/Rx" - ], - "import-spacing": true, - "indent": { - "options": [ - "spaces" - ] - }, - "interface-name": false, - "max-classes-per-file": false, - "max-line-length": [ - true, - { - "limit": 180, - "ignore-pattern": "^import |^export | implements" - } - ], - "member-access": false, - "member-ordering": [ - true, - { - "order": [ - "static-field", - "instance-field", - "static-method", - "instance-method" - ] - } - ], - "no-consecutive-blank-lines": false, - "no-console": [ - true, - "debug", - "info", - "time", - "timeEnd", - "trace" - ], - "no-empty": false, - "no-inferrable-types": false, - "no-non-null-assertion": true, - "no-string-literal": false, - "no-switch-case-fall-through": true, - "no-trailing-whitespace": false, - "no-var-requires": false, - "object-literal-shorthand": false, - "object-literal-sort-keys": false, - "one-line": false, - "ordered-imports": false, - "quotemark": [ - true, - "single" - ], - "semicolon": { - "options": [ - "always" - ] - }, - "space-before-function-paren": { - "options": { - "anonymous": "never", - "asyncArrow": "always", - "constructor": "never", - "method": "never", - "named": "never" - } - }, - "typedef": [ - true, - "call-signature" - ], - "trailing-comma": false, - "typedef-whitespace": { - "options": [ - { - "call-signature": "nospace", - "index-signature": "nospace", - "parameter": "nospace", - "property-declaration": "nospace", - "variable-declaration": "nospace" - }, - { - "call-signature": "onespace", - "index-signature": "onespace", - "parameter": "onespace", - "property-declaration": "onespace", - "variable-declaration": "onespace" - } - ] - }, - "variable-name": { - "options": [ - "ban-keywords", - "allow-leading-underscore", - "allow-pascal-case" - ] - }, - "whitespace": { - "options": [ - "check-branch", - "check-decl", - "check-operator", - "check-separator", - "check-type", - "check-typecast" - ] - }, - "component-class-suffix": true, - "contextual-lifecycle": true, - "directive-class-suffix": true, - "no-conflicting-lifecycle": true, - "no-host-metadata-property": true, - "no-input-rename": true, - "no-inputs-metadata-property": true, - "no-output-native": true, - "no-output-on-prefix": true, - "no-output-rename": true, - "no-outputs-metadata-property": true, - "template-banana-in-box": true, - "template-no-negated-async": true, - "use-lifecycle-interface": true, - "use-pipe-transform-interface": true, - "directive-selector": [ - true, - "attribute", - [ - "fuse", - "" - ], - "camelCase" - ], - "component-selector": [ - true, - "element", - "attribute", - [ - "fuse", - "" - ], - [ - "kebab-case", - "camelCase" - ] - ] - } -} -