From df98563e2104b82b119c00a3cd83cd0dc1242d25 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 16 Jun 2017 14:32:15 +0200 Subject: Use typescript standard and lint all files --- .../account-change-password.component.ts | 48 ++++++++++---------- .../app/account/account-change-password/index.ts | 2 +- .../account-details/account-details.component.ts | 52 +++++++++++----------- client/src/app/account/account-details/index.ts | 2 +- client/src/app/account/account-routing.module.ts | 8 ++-- client/src/app/account/account.component.ts | 20 ++++----- client/src/app/account/account.module.ts | 14 +++--- client/src/app/account/index.ts | 6 +-- 8 files changed, 76 insertions(+), 76 deletions(-) (limited to 'client/src/app/account') diff --git a/client/src/app/account/account-change-password/account-change-password.component.ts b/client/src/app/account/account-change-password/account-change-password.component.ts index 15dc42d22..ce786cfa3 100644 --- a/client/src/app/account/account-change-password/account-change-password.component.ts +++ b/client/src/app/account/account-change-password/account-change-password.component.ts @@ -1,10 +1,10 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core' +import { FormBuilder, FormGroup } from '@angular/forms' +import { Router } from '@angular/router' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { FormReactive, UserService, USER_PASSWORD } from '../../shared'; +import { FormReactive, UserService, USER_PASSWORD } from '../../shared' @Component({ selector: 'my-account-change-password', @@ -12,55 +12,55 @@ import { FormReactive, UserService, USER_PASSWORD } from '../../shared'; }) export class AccountChangePasswordComponent extends FormReactive implements OnInit { - error: string = null; + error: string = null - form: FormGroup; + form: FormGroup formErrors = { 'new-password': '', 'new-confirmed-password': '' - }; + } validationMessages = { 'new-password': USER_PASSWORD.MESSAGES, 'new-confirmed-password': USER_PASSWORD.MESSAGES - }; + } - constructor( + constructor ( private formBuilder: FormBuilder, private router: Router, private notificationsService: NotificationsService, private userService: UserService ) { - super(); + super() } - buildForm() { + buildForm () { this.form = this.formBuilder.group({ 'new-password': [ '', USER_PASSWORD.VALIDATORS ], - 'new-confirmed-password': [ '', USER_PASSWORD.VALIDATORS ], - }); + 'new-confirmed-password': [ '', USER_PASSWORD.VALIDATORS ] + }) - this.form.valueChanges.subscribe(data => this.onValueChanged(data)); + this.form.valueChanges.subscribe(data => this.onValueChanged(data)) } - ngOnInit() { - this.buildForm(); + ngOnInit () { + this.buildForm() } - changePassword() { - const newPassword = this.form.value['new-password']; - const newConfirmedPassword = this.form.value['new-confirmed-password']; + changePassword () { + const newPassword = this.form.value['new-password'] + const newConfirmedPassword = this.form.value['new-confirmed-password'] - this.error = null; + this.error = null if (newPassword !== newConfirmedPassword) { - this.error = 'The new password and the confirmed password do not correspond.'; - return; + this.error = 'The new password and the confirmed password do not correspond.' + return } this.userService.changePassword(newPassword).subscribe( () => this.notificationsService.success('Success', 'Password updated.'), err => this.error = err - ); + ) } } diff --git a/client/src/app/account/account-change-password/index.ts b/client/src/app/account/account-change-password/index.ts index 72a63e48d..44c330b66 100644 --- a/client/src/app/account/account-change-password/index.ts +++ b/client/src/app/account/account-change-password/index.ts @@ -1 +1 @@ -export * from './account-change-password.component'; +export * from './account-change-password.component' diff --git a/client/src/app/account/account-details/account-details.component.ts b/client/src/app/account/account-details/account-details.component.ts index 30e5b14ee..d7531cb55 100644 --- a/client/src/app/account/account-details/account-details.component.ts +++ b/client/src/app/account/account-details/account-details.component.ts @@ -1,16 +1,16 @@ -import { Component, OnInit, Input } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit, Input } from '@angular/core' +import { FormBuilder, FormGroup } from '@angular/forms' +import { Router } from '@angular/router' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { AuthService } from '../../core'; +import { AuthService } from '../../core' import { FormReactive, User, UserService, USER_PASSWORD -} from '../../shared'; +} from '../../shared' @Component({ selector: 'my-account-details', @@ -18,51 +18,51 @@ import { }) export class AccountDetailsComponent extends FormReactive implements OnInit { - @Input() user: User = null; + @Input() user: User = null - error: string = null; + error: string = null - form: FormGroup; - formErrors = {}; - validationMessages = {}; + form: FormGroup + formErrors = {} + validationMessages = {} - constructor( + constructor ( private authService: AuthService, private formBuilder: FormBuilder, private router: Router, private notificationsService: NotificationsService, private userService: UserService ) { - super(); + super() } - buildForm() { + buildForm () { this.form = this.formBuilder.group({ - displayNSFW: [ this.user.displayNSFW ], - }); + displayNSFW: [ this.user.displayNSFW ] + }) - this.form.valueChanges.subscribe(data => this.onValueChanged(data)); + this.form.valueChanges.subscribe(data => this.onValueChanged(data)) } - ngOnInit() { - this.buildForm(); + ngOnInit () { + this.buildForm() } - updateDetails() { - const displayNSFW = this.form.value['displayNSFW']; + updateDetails () { + const displayNSFW = this.form.value['displayNSFW'] const details = { displayNSFW - }; + } - this.error = null; + this.error = null this.userService.updateDetails(details).subscribe( () => { - this.notificationsService.success('Success', 'Informations updated.'); + this.notificationsService.success('Success', 'Informations updated.') - this.authService.refreshUserInformations(); + this.authService.refreshUserInformations() }, err => this.error = err - ); + ) } } diff --git a/client/src/app/account/account-details/index.ts b/client/src/app/account/account-details/index.ts index 28f644738..4829f608a 100644 --- a/client/src/app/account/account-details/index.ts +++ b/client/src/app/account/account-details/index.ts @@ -1 +1 @@ -export * from './account-details.component'; +export * from './account-details.component' diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/account/account-routing.module.ts index 9004605f3..e9b8f7031 100644 --- a/client/src/app/account/account-routing.module.ts +++ b/client/src/app/account/account-routing.module.ts @@ -1,7 +1,7 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { NgModule } from '@angular/core' +import { RouterModule, Routes } from '@angular/router' -import { AccountComponent } from './account.component'; +import { AccountComponent } from './account.component' const accountRoutes: Routes = [ { @@ -13,7 +13,7 @@ const accountRoutes: Routes = [ } } } -]; +] @NgModule({ imports: [ RouterModule.forChild(accountRoutes) ], diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts index 57b3d4ccd..929934f67 100644 --- a/client/src/app/account/account.component.ts +++ b/client/src/app/account/account.component.ts @@ -1,16 +1,16 @@ -import { Component, OnInit } from '@angular/core'; -import { FormBuilder, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core' +import { FormBuilder, FormGroup } from '@angular/forms' +import { Router } from '@angular/router' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { AuthService } from '../core'; +import { AuthService } from '../core' import { FormReactive, User, UserService, USER_PASSWORD -} from '../shared'; +} from '../shared' @Component({ selector: 'my-account', @@ -18,11 +18,11 @@ import { styleUrls: [ './account.component.scss' ] }) export class AccountComponent implements OnInit { - user: User = null; + user: User = null - constructor(private authService: AuthService) {} + constructor (private authService: AuthService) {} - ngOnInit() { - this.user = this.authService.getUser(); + ngOnInit () { + this.user = this.authService.getUser() } } diff --git a/client/src/app/account/account.module.ts b/client/src/app/account/account.module.ts index f6c141ae6..380e9d235 100644 --- a/client/src/app/account/account.module.ts +++ b/client/src/app/account/account.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; +import { NgModule } from '@angular/core' -import { AccountRoutingModule } from './account-routing.module'; -import { AccountComponent } from './account.component'; -import { AccountChangePasswordComponent } from './account-change-password'; -import { AccountDetailsComponent } from './account-details'; -import { AccountService } from './account.service'; -import { SharedModule } from '../shared'; +import { AccountRoutingModule } from './account-routing.module' +import { AccountComponent } from './account.component' +import { AccountChangePasswordComponent } from './account-change-password' +import { AccountDetailsComponent } from './account-details' +import { AccountService } from './account.service' +import { SharedModule } from '../shared' @NgModule({ imports: [ diff --git a/client/src/app/account/index.ts b/client/src/app/account/index.ts index 9265fa10a..dc56ffdbd 100644 --- a/client/src/app/account/index.ts +++ b/client/src/app/account/index.ts @@ -1,3 +1,3 @@ -export * from './account-routing.module'; -export * from './account.component'; -export * from './account.module'; +export * from './account-routing.module' +export * from './account.component' +export * from './account.module' -- cgit v1.2.3