Skip to content

Commit

Permalink
chore: integrate new lint rules and fix all issues (#1488)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamincharity authored May 8, 2019
1 parent d85b207 commit 8648c3d
Show file tree
Hide file tree
Showing 244 changed files with 4,634 additions and 2,919 deletions.
3 changes: 0 additions & 3 deletions .eslintrc

This file was deleted.

18 changes: 18 additions & 0 deletions .eslintrc.ci.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
"extends": ["@terminus/eslint-config-frontend"],
"parserOptions": {
"ecmaVersion": 6,
"project": "./tsconfig.json",
"sourceType": "module"
},
"rules": {
"no-console": [
"error",
{
"allow": [
"warn"
]
}
]
}
}
18 changes: 18 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
"extends": ["@terminus/eslint-config-frontend/development"],
"parserOptions": {
"ecmaVersion": 6,
"project": "./tsconfig.json",
"sourceType": "module"
},
"rules": {
"no-console": [
"error",
{
"allow": [
"warn"
]
}
]
}
}
5 changes: 4 additions & 1 deletion demo/app/app.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { HttpClientModule } from '@angular/common/http';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import {
FormsModule,
ReactiveFormsModule,
} from '@angular/forms';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import {
Expand Down
24 changes: 15 additions & 9 deletions demo/app/components/autocomplete/autocomplete.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,21 @@ import {
of,
Subscription,
} from 'rxjs';
import { delay, map, startWith, switchMap } from 'rxjs/operators';
import {
delay,
map,
startWith,
switchMap,
} from 'rxjs/operators';

import {
TsAutocompleteComparatorFn,
TsAutocompleteComponent,
} from '@terminus/ui/autocomplete';

interface GitHubUser {
[key: string]: any;
}
// tslint:disable-next-line no-any
type GitHubUser = Record<string, any>;


// Values used to seed initial selections
const INITIAL: GitHubUser[] = [
Expand Down Expand Up @@ -96,6 +101,7 @@ const INJECTION_ITEM = {
interface OptionType {
id: string;
login: string;
// tslint:disable-next-line no-any
[key: string]: any;
}

Expand Down Expand Up @@ -128,12 +134,12 @@ export class AutocompleteComponent implements OnInit {
inProgress = false;
delayApiResponse = false;
changesSubscription$!: Subscription;
users$: any;
users$: Observable<GitHubUser[]> | undefined;
minCharacters = 4;


ngOnInit() {
this.changesSubscription$ = this.auto.selection.subscribe((v: any) => {
this.changesSubscription$ = this.auto.selection.subscribe((v: OptionType) => {
console.log('DEMO: subscription change ', v);
});

Expand All @@ -148,7 +154,7 @@ export class AutocompleteComponent implements OnInit {
return this.http.get(`https://api.github.com/search/users?q=${term}`)
.pipe(
delay(this.delayApiResponse ? 3000 : 0),
map((response: any) => {
map((response) => {
this.inProgress = false;
const items: GitHubUser[] = response['items'];

Expand Down Expand Up @@ -193,9 +199,9 @@ export class AutocompleteComponent implements OnInit {
}
}

comparator: TsAutocompleteComparatorFn = (v: any) => v.id;
comparator: TsAutocompleteComparatorFn<OptionType> = (v: OptionType) => v.id;

displayFn(user?: any): string | undefined {
displayFn(user?: OptionType): string | undefined {
return user ? user.login : undefined;
}

Expand Down
10 changes: 9 additions & 1 deletion demo/app/components/autocomplete/autocomplete.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@ import { AutocompleteRoutingModule } from './autocomplete-routing.module';
import { AutocompleteComponent } from './autocomplete.component';

@NgModule({
imports: [AutocompleteRoutingModule, CommonModule, FormsModule, TsAutocompleteModule, TsCheckboxModule, TsCardModule, TsSpacingModule],
imports: [
AutocompleteRoutingModule,
CommonModule,
FormsModule,
TsAutocompleteModule,
TsCheckboxModule,
TsCardModule,
TsSpacingModule,
],
declarations: [AutocompleteComponent],
})
export class AutocompleteModule {}
16 changes: 13 additions & 3 deletions demo/app/components/autofocus/autofocus.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';

import { TsAutofocusModule } from '@terminus/ui/autofocus';
import { TsCardModule } from '@terminus/ui/card';
import { TsSelectModule } from '@terminus/ui/select';
Expand All @@ -10,8 +9,19 @@ import { TsSpacingModule } from '@terminus/ui/spacing';
import { AutofocusRoutingModule } from './autofocus-routing.module';
import { AutofocusComponent } from './autofocus.component';


@NgModule({
imports: [AutofocusRoutingModule, CommonModule, FormsModule, TsAutofocusModule, TsCardModule, TsSelectModule, TsSpacingModule],
declarations: [AutofocusComponent],
imports: [
AutofocusRoutingModule,
CommonModule,
FormsModule,
TsAutofocusModule,
TsCardModule,
TsSelectModule,
TsSpacingModule,
],
declarations: [
AutofocusComponent,
],
})
export class AutofocusModule {}
12 changes: 9 additions & 3 deletions demo/app/components/breakpoints/breakpoints.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';

import { TsCardModule } from '@terminus/ui/card';

import { BreakpointsRoutingModule } from './breakpoints-routing.module';
import { BreakpointsComponent } from './breakpoints.component';


@NgModule({
imports: [BreakpointsRoutingModule, CommonModule, TsCardModule ],
declarations: [BreakpointsComponent],
imports: [
BreakpointsRoutingModule,
CommonModule,
TsCardModule,
],
declarations: [
BreakpointsComponent,
],
})
export class BreakpointsModule {}
15 changes: 12 additions & 3 deletions demo/app/components/button/button.module.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';

import { TsButtonModule } from '@terminus/ui/button';
import { TsCardModule } from '@terminus/ui/card';
import { TsSpacingModule } from '@terminus/ui/spacing';

import { ButtonRoutingModule } from './button-routing.module';
import { ButtonComponent } from './button.component';


@NgModule({
imports: [ButtonRoutingModule, CommonModule, FormsModule, TsButtonModule, TsCardModule, TsSpacingModule],
declarations: [ButtonComponent],
imports: [
ButtonRoutingModule,
CommonModule,
FormsModule,
TsButtonModule,
TsCardModule,
TsSpacingModule,
],
declarations: [
ButtonComponent,
],
})
export class ButtonModule {}
17 changes: 14 additions & 3 deletions demo/app/components/card/card.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FlexLayoutModule } from '@angular/flex-layout';
import { FormsModule } from '@angular/forms';

import { TsButtonModule } from '@terminus/ui/button';
import { TsCardModule } from '@terminus/ui/card';
import { TsMenuModule } from '@terminus/ui/menu';
Expand All @@ -11,8 +10,20 @@ import { TsSpacingModule } from '@terminus/ui/spacing';
import { CardRoutingModule } from './card-routing.module';
import { CardComponent } from './card.component';


@NgModule({
imports: [CardRoutingModule, CommonModule, FlexLayoutModule, FormsModule, TsButtonModule, TsCardModule, TsMenuModule, TsSpacingModule],
declarations: [CardComponent],
imports: [
CardRoutingModule,
CommonModule,
FlexLayoutModule,
FormsModule,
TsButtonModule,
TsCardModule,
TsMenuModule,
TsSpacingModule,
],
declarations: [
CardComponent,
],
})
export class CardModule {}
Loading

0 comments on commit 8648c3d

Please sign in to comment.