diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..06271d3c --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,57 @@ +{ + "root": true, + "ignorePatterns": [ + "projects/**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "tsconfig.json", + "e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "extends": [ + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/no-input-rename": [ + "warn", + { + "allowedNames": ["name"] + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "prefix": "ngx", + "style": "kebab-case", + "type": "element" + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + "prefix": "ngx", + "style": "camelCase", + "type": "attribute" + } + ] + } + }, + { + "files": [ + "*.html" + ], + "extends": [ + "plugin:@angular-eslint/template/recommended" + ], + "rules": {} + } + ] +} diff --git a/angular.json b/angular.json index d7c2c7aa..d9a98ba4 100644 --- a/angular.json +++ b/angular.json @@ -148,14 +148,12 @@ } }, "lint": { - "builder": "@angular-devkit/build-angular:tslint", + "builder": "@angular-eslint/builder:lint", "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "typeCheck": true, - "exclude": [] + "lintFilePatterns": [ + "src/**/*.ts", + "src/**/*.html" + ] } } } @@ -171,15 +169,6 @@ "protractorConfig": "./protractor.conf.js", "devServerTarget": "ngx-admin-demo:serve" } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "e2e/tsconfig.e2e.json" - ], - "exclude": [] - } } } } diff --git a/e2e/.eslintrc.json b/e2e/.eslintrc.json new file mode 100644 index 00000000..3ddeb707 --- /dev/null +++ b/e2e/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "extends": "../.eslintrc.json", + "ignorePatterns": [ + "!**/*" + ], + "overrides": [ + { + "files": [ + "*.ts" + ], + "parserOptions": { + "project": [ + "e2e/tsconfig.app.json", + "e2e/tsconfig.spec.json", + "e2e/e2e/tsconfig.json" + ], + "createDefaultProgram": true + }, + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "style": "kebab-case" + } + ] + } + }, + { + "files": [ + "*.html" + ], + "rules": {} + } + ] +} diff --git a/package-lock.json b/package-lock.json index 8bb981f8..77a84817 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19563,6 +19563,11 @@ "defaults": "^1.0.3" } }, + "web-animations-js": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/web-animations-js/-/web-animations-js-2.3.2.tgz", + "integrity": "sha512-TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA==" + }, "webdriver-js-extender": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz", diff --git a/package.json b/package.json index 10cfb887..0fc95adb 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ "tinymce": "4.5.7", "tslib": "^2.3.1", "typeface-exo": "0.0.22", + "web-animations-js": "^2.3.2", "zone.js": "~0.11.4" }, "devDependencies": { diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html index 1226fa06..f99d6efa 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.html @@ -78,7 +78,7 @@ [attr.d]="strokedArea.d" *ngFor="let strokedArea of roomSvg.stokedAreas"/> - + diff --git a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts index 7e0639a7..9ccb7f61 100644 --- a/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts +++ b/src/app/pages/dashboard/rooms/room-selector/room-selector.component.ts @@ -14,7 +14,7 @@ export class RoomSelectorComponent implements OnInit, OnDestroy { private destroy$ = new Subject(); private hideGrid: boolean; - @Output() select: EventEmitter = new EventEmitter(); + @Output() selectEvent: EventEmitter = new EventEmitter(); selectedRoom = null; sortedRooms = []; @@ -108,7 +108,7 @@ export class RoomSelectorComponent implements OnInit, OnDestroy { } selectRoom(roomNumber) { - this.select.emit(roomNumber); + this.selectEvent.emit(roomNumber); this.selectedRoom = roomNumber; this.sortRooms(); } diff --git a/src/app/pages/dashboard/solar/solar.component.ts b/src/app/pages/dashboard/solar/solar.component.ts index 07754dd6..b73335ee 100644 --- a/src/app/pages/dashboard/solar/solar.component.ts +++ b/src/app/pages/dashboard/solar/solar.component.ts @@ -25,7 +25,7 @@ export class SolarComponent implements AfterViewInit, OnDestroy { private value = 0; - @Input('chartValue') + @Input() set chartValue(value: number) { this.value = value; diff --git a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.ts b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.ts index 528e56cf..b25120c9 100644 --- a/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.ts +++ b/src/app/pages/e-commerce/country-orders/map/country-orders-map.component.ts @@ -19,7 +19,7 @@ export class CountryOrdersMapComponent implements OnDestroy { @Input() countryId: string; - @Output() select: EventEmitter = new EventEmitter(); + @Output() selectEvent: EventEmitter = new EventEmitter(); layers = []; currentTheme: any; @@ -124,7 +124,7 @@ export class CountryOrdersMapComponent implements OnDestroy { this.resetHighlight(this.selectedCountry); this.highlightFeature(featureLayer); this.selectedCountry = featureLayer; - this.select.emit(featureLayer.feature.properties.name); + this.selectEvent.emit(featureLayer.feature.properties.name); } } diff --git a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts index d6d821b3..71675c1e 100644 --- a/src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts +++ b/src/app/pages/extra-components/calendar/day-cell/day-cell.component.ts @@ -1,11 +1,15 @@ -import { Component } from '@angular/core'; +import { Component, HostBinding, HostListener } from '@angular/core'; import { NbCalendarDayCellComponent } from '@nebular/theme'; @Component({ selector: 'ngx-day-cell', templateUrl: 'day-cell.component.html', styleUrls: ['day-cell.component.scss'], - host: { '(click)': 'onClick()', 'class': 'day-cell' }, }) export class DayCellComponent extends NbCalendarDayCellComponent { + @HostBinding('class') classes = 'day-cell'; + + @HostListener('click') onClick() { + // do work + } }