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 --- client/src/app/+admin/admin-routing.module.ts | 16 +-- client/src/app/+admin/admin.component.ts | 2 +- client/src/app/+admin/admin.module.ts | 18 ++-- .../friends/friend-add/friend-add.component.ts | 108 ++++++++++----------- client/src/app/+admin/friends/friend-add/index.ts | 2 +- .../friends/friend-list/friend-list.component.ts | 38 ++++---- client/src/app/+admin/friends/friend-list/index.ts | 2 +- client/src/app/+admin/friends/friends.component.ts | 5 +- client/src/app/+admin/friends/friends.routes.ts | 60 ++++++------ client/src/app/+admin/friends/index.ts | 10 +- .../src/app/+admin/friends/shared/friend.model.ts | 10 +- .../app/+admin/friends/shared/friend.service.ts | 30 +++--- client/src/app/+admin/friends/shared/index.ts | 4 +- client/src/app/+admin/index.ts | 12 +-- client/src/app/+admin/requests/index.ts | 8 +- .../src/app/+admin/requests/request-stats/index.ts | 2 +- .../request-stats/request-stats.component.ts | 55 +++++------ .../src/app/+admin/requests/requests.component.ts | 5 +- client/src/app/+admin/requests/requests.routes.ts | 42 ++++---- client/src/app/+admin/requests/shared/index.ts | 4 +- .../+admin/requests/shared/request-stats.model.ts | 36 +++---- .../app/+admin/requests/shared/request.service.ts | 28 +++--- client/src/app/+admin/users/index.ts | 10 +- client/src/app/+admin/users/shared/index.ts | 2 +- client/src/app/+admin/users/shared/user.service.ts | 26 ++--- client/src/app/+admin/users/user-add/index.ts | 2 +- .../+admin/users/user-add/user-add.component.ts | 50 +++++----- client/src/app/+admin/users/user-list/index.ts | 2 +- .../+admin/users/user-list/user-list.component.ts | 36 +++---- client/src/app/+admin/users/users.component.ts | 5 +- client/src/app/+admin/users/users.routes.ts | 10 +- client/src/app/+admin/video-abuses/index.ts | 6 +- .../+admin/video-abuses/video-abuse-list/index.ts | 2 +- .../video-abuse-list/video-abuse-list.component.ts | 24 ++--- .../+admin/video-abuses/video-abuses.component.ts | 2 +- .../app/+admin/video-abuses/video-abuses.routes.ts | 8 +- 36 files changed, 338 insertions(+), 344 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts index d3adf3f3b..839913135 100644 --- a/client/src/app/+admin/admin-routing.module.ts +++ b/client/src/app/+admin/admin-routing.module.ts @@ -1,11 +1,11 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { NgModule } from '@angular/core' +import { RouterModule, Routes } from '@angular/router' -import { AdminComponent } from './admin.component'; -import { FriendsRoutes } from './friends'; -import { RequestsRoutes } from './requests'; -import { UsersRoutes } from './users'; -import { VideoAbusesRoutes } from './video-abuses'; +import { AdminComponent } from './admin.component' +import { FriendsRoutes } from './friends' +import { RequestsRoutes } from './requests' +import { UsersRoutes } from './users' +import { VideoAbusesRoutes } from './video-abuses' const adminRoutes: Routes = [ { @@ -23,7 +23,7 @@ const adminRoutes: Routes = [ ...VideoAbusesRoutes ] } -]; +] @NgModule({ imports: [ RouterModule.forChild(adminRoutes) ], diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts index 64a7400e7..93ec216bf 100644 --- a/client/src/app/+admin/admin.component.ts +++ b/client/src/app/+admin/admin.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' @Component({ template: '' diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index db1ce2d7f..9ecce5dc3 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts @@ -1,12 +1,12 @@ -import { NgModule } from '@angular/core'; - -import { AdminComponent } from './admin.component'; -import { AdminRoutingModule } from './admin-routing.module'; -import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends'; -import { RequestsComponent, RequestStatsComponent, RequestService } from './requests'; -import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users'; -import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses'; -import { SharedModule } from '../shared'; +import { NgModule } from '@angular/core' + +import { AdminComponent } from './admin.component' +import { AdminRoutingModule } from './admin-routing.module' +import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends' +import { RequestsComponent, RequestStatsComponent, RequestService } from './requests' +import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users' +import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses' +import { SharedModule } from '../shared' @NgModule({ imports: [ diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.ts b/client/src/app/+admin/friends/friend-add/friend-add.component.ts index 12c46e5cd..35cf4a1f7 100644 --- a/client/src/app/+admin/friends/friend-add/friend-add.component.ts +++ b/client/src/app/+admin/friends/friend-add/friend-add.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit } from '@angular/core'; -import { FormControl, FormGroup } from '@angular/forms'; -import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core' +import { FormControl, FormGroup } from '@angular/forms' +import { Router } from '@angular/router' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { ConfirmService } from '../../../core'; -import { validateHost } from '../../../shared'; -import { FriendService } from '../shared'; +import { ConfirmService } from '../../../core' +import { validateHost } from '../../../shared' +import { FriendService } from '../shared' @Component({ selector: 'my-friend-add', @@ -14,107 +14,107 @@ import { FriendService } from '../shared'; styleUrls: [ './friend-add.component.scss' ] }) export class FriendAddComponent implements OnInit { - form: FormGroup; - hosts = [ ]; - error: string = null; + form: FormGroup + hosts = [ ] + error: string = null - constructor( + constructor ( private router: Router, private notificationsService: NotificationsService, private confirmService: ConfirmService, private friendService: FriendService ) {} - ngOnInit() { - this.form = new FormGroup({}); - this.addField(); + ngOnInit () { + this.form = new FormGroup({}) + this.addField() } - addField() { - this.form.addControl(`host-${this.hosts.length}`, new FormControl('', [ validateHost ])); - this.hosts.push(''); + addField () { + this.form.addControl(`host-${this.hosts.length}`, new FormControl('', [ validateHost ])) + this.hosts.push('') } - canMakeFriends() { - return window.location.protocol === 'https:'; + canMakeFriends () { + return window.location.protocol === 'https:' } - customTrackBy(index: number, obj: any): any { - return index; + customTrackBy (index: number, obj: any): any { + return index } - displayAddField(index: number) { - return index === (this.hosts.length - 1); + displayAddField (index: number) { + return index === (this.hosts.length - 1) } - displayRemoveField(index: number) { - return (index !== 0 || this.hosts.length > 1) && index !== (this.hosts.length - 1); + displayRemoveField (index: number) { + return (index !== 0 || this.hosts.length > 1) && index !== (this.hosts.length - 1) } - isFormValid() { + isFormValid () { // Do not check the last input for (let i = 0; i < this.hosts.length - 1; i++) { - if (!this.form.controls[`host-${i}`].valid) return false; + if (!this.form.controls[`host-${i}`].valid) return false } - const lastIndex = this.hosts.length - 1; + const lastIndex = this.hosts.length - 1 // If the last input (which is not the first) is empty, it's ok if (this.hosts[lastIndex] === '' && lastIndex !== 0) { - return true; + return true } else { - return this.form.controls[`host-${lastIndex}`].valid; + return this.form.controls[`host-${lastIndex}`].valid } } - removeField(index: number) { + removeField (index: number) { // Remove the last control - this.form.removeControl(`host-${this.hosts.length - 1}`); - this.hosts.splice(index, 1); + this.form.removeControl(`host-${this.hosts.length - 1}`) + this.hosts.splice(index, 1) } - makeFriends() { - this.error = ''; + makeFriends () { + this.error = '' - const notEmptyHosts = this.getNotEmptyHosts(); + const notEmptyHosts = this.getNotEmptyHosts() if (notEmptyHosts.length === 0) { - this.error = 'You need to specify at least 1 host.'; - return; + this.error = 'You need to specify at least 1 host.' + return } if (!this.isHostsUnique(notEmptyHosts)) { - this.error = 'Hosts need to be unique.'; - return; + this.error = 'Hosts need to be unique.' + return } - const confirmMessage = 'Are you sure to make friends with:
- ' + notEmptyHosts.join('
- '); + const confirmMessage = 'Are you sure to make friends with:
- ' + notEmptyHosts.join('
- ') this.confirmService.confirm(confirmMessage, 'Make friends').subscribe( res => { - if (res === false) return; + if (res === false) return this.friendService.makeFriends(notEmptyHosts).subscribe( status => { - this.notificationsService.success('Sucess', 'Make friends request sent!'); - this.router.navigate([ '/admin/friends/list' ]); + this.notificationsService.success('Sucess', 'Make friends request sent!') + this.router.navigate([ '/admin/friends/list' ]) }, err => this.notificationsService.error('Error', err.text) - ); + ) } - ); + ) } - private getNotEmptyHosts() { - const notEmptyHosts = []; + private getNotEmptyHosts () { + const notEmptyHosts = [] Object.keys(this.form.value).forEach((hostKey) => { - const host = this.form.value[hostKey]; - if (host !== '') notEmptyHosts.push(host); - }); + const host = this.form.value[hostKey] + if (host !== '') notEmptyHosts.push(host) + }) - return notEmptyHosts; + return notEmptyHosts } - private isHostsUnique(hosts: string[]) { - return hosts.every(host => hosts.indexOf(host) === hosts.lastIndexOf(host)); + private isHostsUnique (hosts: string[]) { + return hosts.every(host => hosts.indexOf(host) === hosts.lastIndexOf(host)) } } diff --git a/client/src/app/+admin/friends/friend-add/index.ts b/client/src/app/+admin/friends/friend-add/index.ts index a101b3be5..978ab3d46 100644 --- a/client/src/app/+admin/friends/friend-add/index.ts +++ b/client/src/app/+admin/friends/friend-add/index.ts @@ -1 +1 @@ -export * from './friend-add.component'; +export * from './friend-add.component' diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.ts b/client/src/app/+admin/friends/friend-list/friend-list.component.ts index 525a9fbc3..7bf9d2c6b 100644 --- a/client/src/app/+admin/friends/friend-list/friend-list.component.ts +++ b/client/src/app/+admin/friends/friend-list/friend-list.component.ts @@ -1,11 +1,11 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' -import { NotificationsService } from 'angular2-notifications'; -import { ServerDataSource } from 'ng2-smart-table'; +import { NotificationsService } from 'angular2-notifications' +import { ServerDataSource } from 'ng2-smart-table' -import { ConfirmService } from '../../../core'; -import { Utils } from '../../../shared'; -import { Friend, FriendService } from '../shared'; +import { ConfirmService } from '../../../core' +import { Utils } from '../../../shared' +import { Friend, FriendService } from '../shared' @Component({ selector: 'my-friend-list', @@ -13,7 +13,7 @@ import { Friend, FriendService } from '../shared'; styleUrls: [ './friend-list.component.scss' ] }) export class FriendListComponent { - friendsSource = null; + friendsSource = null tableSettings = { attr: { class: 'table-hover' @@ -49,36 +49,36 @@ export class FriendListComponent { valuePrepareFunction: Utils.dateToHuman } } - }; + } - constructor( + constructor ( private notificationsService: NotificationsService, private confirmService: ConfirmService, private friendService: FriendService ) { - this.friendsSource = this.friendService.getDataSource(); + this.friendsSource = this.friendService.getDataSource() } - hasFriends() { - return this.friendsSource.count() !== 0; + hasFriends () { + return this.friendsSource.count() !== 0 } - quitFriends() { - const confirmMessage = 'Do you really want to quit your friends? All their videos will be deleted.'; + quitFriends () { + const confirmMessage = 'Do you really want to quit your friends? All their videos will be deleted.' this.confirmService.confirm(confirmMessage, 'Quit friends').subscribe( res => { - if (res === false) return; + if (res === false) return this.friendService.quitFriends().subscribe( status => { - this.notificationsService.success('Sucess', 'Friends left!'); + this.notificationsService.success('Sucess', 'Friends left!') - this.friendsSource.refresh(); + this.friendsSource.refresh() }, err => this.notificationsService.error('Error', err.text) - ); + ) } - ); + ) } } diff --git a/client/src/app/+admin/friends/friend-list/index.ts b/client/src/app/+admin/friends/friend-list/index.ts index 354c978a4..c9cbd2800 100644 --- a/client/src/app/+admin/friends/friend-list/index.ts +++ b/client/src/app/+admin/friends/friend-list/index.ts @@ -1 +1 @@ -export * from './friend-list.component'; +export * from './friend-list.component' diff --git a/client/src/app/+admin/friends/friends.component.ts b/client/src/app/+admin/friends/friends.component.ts index 5ca29111c..5ef0aaa03 100644 --- a/client/src/app/+admin/friends/friends.component.ts +++ b/client/src/app/+admin/friends/friends.component.ts @@ -1,8 +1,7 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' @Component({ - template: '' + template: '' }) - export class FriendsComponent { } diff --git a/client/src/app/+admin/friends/friends.routes.ts b/client/src/app/+admin/friends/friends.routes.ts index 747066d1f..615b6f4f7 100644 --- a/client/src/app/+admin/friends/friends.routes.ts +++ b/client/src/app/+admin/friends/friends.routes.ts @@ -1,37 +1,37 @@ -import { Routes } from '@angular/router'; +import { Routes } from '@angular/router' -import { FriendsComponent } from './friends.component'; -import { FriendAddComponent } from './friend-add'; -import { FriendListComponent } from './friend-list'; +import { FriendsComponent } from './friends.component' +import { FriendAddComponent } from './friend-add' +import { FriendListComponent } from './friend-list' export const FriendsRoutes: Routes = [ { - path: 'friends', - component: FriendsComponent, - children: [ - { - path: '', - redirectTo: 'list', - pathMatch: 'full' - }, - { - path: 'list', - component: FriendListComponent, - data: { - meta: { - title: 'Friends list' - } + path: 'friends', + component: FriendsComponent, + children: [ + { + path: '', + redirectTo: 'list', + pathMatch: 'full' + }, + { + path: 'list', + component: FriendListComponent, + data: { + meta: { + title: 'Friends list' } - }, - { - path: 'add', - component: FriendAddComponent, - data: { - meta: { - title: 'Add friends' - } + } + }, + { + path: 'add', + component: FriendAddComponent, + data: { + meta: { + title: 'Add friends' } } - ] - } -]; + } + ] + } +] diff --git a/client/src/app/+admin/friends/index.ts b/client/src/app/+admin/friends/index.ts index dd4df2538..356dee8e9 100644 --- a/client/src/app/+admin/friends/index.ts +++ b/client/src/app/+admin/friends/index.ts @@ -1,5 +1,5 @@ -export * from './friend-add'; -export * from './friend-list'; -export * from './shared'; -export * from './friends.component'; -export * from './friends.routes'; +export * from './friend-add' +export * from './friend-list' +export * from './shared' +export * from './friends.component' +export * from './friends.routes' diff --git a/client/src/app/+admin/friends/shared/friend.model.ts b/client/src/app/+admin/friends/shared/friend.model.ts index f72156d05..6950405b9 100644 --- a/client/src/app/+admin/friends/shared/friend.model.ts +++ b/client/src/app/+admin/friends/shared/friend.model.ts @@ -1,7 +1,7 @@ export interface Friend { - id: string; - host: string; - score: number; - email: string; - createdAt: Date; + id: string + host: string + score: number + email: string + createdAt: Date } diff --git a/client/src/app/+admin/friends/shared/friend.service.ts b/client/src/app/+admin/friends/shared/friend.service.ts index 6e51c954f..f4ecd36ad 100644 --- a/client/src/app/+admin/friends/shared/friend.service.ts +++ b/client/src/app/+admin/friends/shared/friend.service.ts @@ -1,39 +1,39 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/map'; +import { Injectable } from '@angular/core' +import { Observable } from 'rxjs/Observable' +import 'rxjs/add/operator/catch' +import 'rxjs/add/operator/map' -import { ServerDataSource } from 'ng2-smart-table'; +import { ServerDataSource } from 'ng2-smart-table' -import { Friend } from './friend.model'; -import { AuthHttp, RestExtractor, RestDataSource, ResultList } from '../../../shared'; +import { Friend } from './friend.model' +import { AuthHttp, RestExtractor, RestDataSource, ResultList } from '../../../shared' @Injectable() export class FriendService { - private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/'; + private static BASE_FRIEND_URL = API_URL + '/api/v1/pods/' constructor ( private authHttp: AuthHttp, private restExtractor: RestExtractor ) {} - getDataSource() { - return new RestDataSource(this.authHttp, FriendService.BASE_FRIEND_URL); + getDataSource () { + return new RestDataSource(this.authHttp, FriendService.BASE_FRIEND_URL) } - makeFriends(notEmptyHosts) { + makeFriends (notEmptyHosts) { const body = { hosts: notEmptyHosts - }; + } return this.authHttp.post(FriendService.BASE_FRIEND_URL + 'makefriends', body) .map(this.restExtractor.extractDataBool) - .catch((res) => this.restExtractor.handleError(res)); + .catch((res) => this.restExtractor.handleError(res)) } - quitFriends() { + quitFriends () { return this.authHttp.get(FriendService.BASE_FRIEND_URL + 'quitfriends') .map(res => res.status) - .catch((res) => this.restExtractor.handleError(res)); + .catch((res) => this.restExtractor.handleError(res)) } } diff --git a/client/src/app/+admin/friends/shared/index.ts b/client/src/app/+admin/friends/shared/index.ts index 0d671637d..41aa6edd6 100644 --- a/client/src/app/+admin/friends/shared/index.ts +++ b/client/src/app/+admin/friends/shared/index.ts @@ -1,2 +1,2 @@ -export * from './friend.model'; -export * from './friend.service'; +export * from './friend.model' +export * from './friend.service' diff --git a/client/src/app/+admin/index.ts b/client/src/app/+admin/index.ts index 2f47a3cc3..11e2587c0 100644 --- a/client/src/app/+admin/index.ts +++ b/client/src/app/+admin/index.ts @@ -1,6 +1,6 @@ -export * from './friends'; -export * from './requests'; -export * from './users'; -export * from './admin-routing.module'; -export * from './admin.module'; -export * from './admin.component'; +export * from './friends' +export * from './requests' +export * from './users' +export * from './admin-routing.module' +export * from './admin.module' +export * from './admin.component' diff --git a/client/src/app/+admin/requests/index.ts b/client/src/app/+admin/requests/index.ts index 236a9ee8f..d96a893c3 100644 --- a/client/src/app/+admin/requests/index.ts +++ b/client/src/app/+admin/requests/index.ts @@ -1,4 +1,4 @@ -export * from './request-stats'; -export * from './shared'; -export * from './requests.component'; -export * from './requests.routes'; +export * from './request-stats' +export * from './shared' +export * from './requests.component' +export * from './requests.routes' diff --git a/client/src/app/+admin/requests/request-stats/index.ts b/client/src/app/+admin/requests/request-stats/index.ts index be3a66f77..740c401bb 100644 --- a/client/src/app/+admin/requests/request-stats/index.ts +++ b/client/src/app/+admin/requests/request-stats/index.ts @@ -1 +1 @@ -export * from './request-stats.component'; +export * from './request-stats.component' diff --git a/client/src/app/+admin/requests/request-stats/request-stats.component.ts b/client/src/app/+admin/requests/request-stats/request-stats.component.ts index 85dd7e492..cca4926cf 100644 --- a/client/src/app/+admin/requests/request-stats/request-stats.component.ts +++ b/client/src/app/+admin/requests/request-stats/request-stats.component.ts @@ -1,12 +1,12 @@ -import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Component, OnInit, OnDestroy } from '@angular/core' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { RequestService, RequestStats } from '../shared'; +import { RequestService, RequestStats } from '../shared' @Component({ - selector: 'my-request-stats', - templateUrl: './request-stats.component.html', + selector: 'my-request-stats', + templateUrl: './request-stats.component.html', styleUrls: [ './request-stats.component.scss' ] }) export class RequestStatsComponent implements OnInit, OnDestroy { @@ -14,70 +14,67 @@ export class RequestStatsComponent implements OnInit, OnDestroy { requestScheduler: 'Basic request scheduler', requestVideoEventScheduler: 'Video events request scheduler', requestVideoQaduScheduler: 'Quick and dirty video updates request scheduler' - }; + } stats: { [ id: string ]: RequestStats } = { requestScheduler: null, requestVideoEventScheduler: null, requestVideoQaduScheduler: null - }; + } private intervals: { [ id: string ]: number } = { requestScheduler: null, requestVideoEventScheduler: null, requestVideoQaduScheduler: null - }; + } private timeouts: { [ id: string ]: number } = { requestScheduler: null, requestVideoEventScheduler: null, requestVideoQaduScheduler: null - }; - + } - constructor( + constructor ( private notificationsService: NotificationsService, private requestService: RequestService - ) { } + ) { } - ngOnInit() { - this.getStats(); - this.runIntervals(); + ngOnInit () { + this.getStats() + this.runIntervals() } - ngOnDestroy() { + ngOnDestroy () { Object.keys(this.stats).forEach(requestSchedulerName => { if (this.intervals[requestSchedulerName] !== null) { - window.clearInterval(this.intervals[requestSchedulerName]); + window.clearInterval(this.intervals[requestSchedulerName]) } if (this.timeouts[requestSchedulerName] !== null) { - window.clearTimeout(this.timeouts[requestSchedulerName]); + window.clearTimeout(this.timeouts[requestSchedulerName]) } - }); + }) } - getStats() { + getStats () { this.requestService.getStats().subscribe( stats => this.stats = stats, err => this.notificationsService.error('Error', err.text) - ); + ) } - private runIntervals() { + private runIntervals () { Object.keys(this.intervals).forEach(requestSchedulerName => { this.intervals[requestSchedulerName] = window.setInterval(() => { - const stats = this.stats[requestSchedulerName]; + const stats = this.stats[requestSchedulerName] - stats.remainingMilliSeconds -= 1000; + stats.remainingMilliSeconds -= 1000 if (stats.remainingMilliSeconds <= 0) { - this.timeouts[requestSchedulerName] = window.setTimeout(() => this.getStats(), stats.remainingMilliSeconds + 100); + this.timeouts[requestSchedulerName] = window.setTimeout(() => this.getStats(), stats.remainingMilliSeconds + 100) } - }, 1000); - }); + }, 1000) + }) } - - } diff --git a/client/src/app/+admin/requests/requests.component.ts b/client/src/app/+admin/requests/requests.component.ts index 471112b45..88a90fa4e 100644 --- a/client/src/app/+admin/requests/requests.component.ts +++ b/client/src/app/+admin/requests/requests.component.ts @@ -1,8 +1,7 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' @Component({ - template: '' + template: '' }) - export class RequestsComponent { } diff --git a/client/src/app/+admin/requests/requests.routes.ts b/client/src/app/+admin/requests/requests.routes.ts index 251dd0da8..84db3fea8 100644 --- a/client/src/app/+admin/requests/requests.routes.ts +++ b/client/src/app/+admin/requests/requests.routes.ts @@ -1,27 +1,27 @@ -import { Routes } from '@angular/router'; +import { Routes } from '@angular/router' -import { RequestsComponent } from './requests.component'; -import { RequestStatsComponent } from './request-stats'; +import { RequestsComponent } from './requests.component' +import { RequestStatsComponent } from './request-stats' export const RequestsRoutes: Routes = [ { - path: 'requests', - component: RequestsComponent, - children: [ - { - path: '', - redirectTo: 'stats', - pathMatch: 'full' - }, - { - path: 'stats', - component: RequestStatsComponent, - data: { - meta: { - title: 'Request stats' - } + path: 'requests', + component: RequestsComponent, + children: [ + { + path: '', + redirectTo: 'stats', + pathMatch: 'full' + }, + { + path: 'stats', + component: RequestStatsComponent, + data: { + meta: { + title: 'Request stats' } } - ] - } -]; + } + ] + } +] diff --git a/client/src/app/+admin/requests/shared/index.ts b/client/src/app/+admin/requests/shared/index.ts index 32ab5767b..2442e810a 100644 --- a/client/src/app/+admin/requests/shared/index.ts +++ b/client/src/app/+admin/requests/shared/index.ts @@ -1,2 +1,2 @@ -export * from './request-stats.model'; -export * from './request.service'; +export * from './request-stats.model' +export * from './request.service' diff --git a/client/src/app/+admin/requests/shared/request-stats.model.ts b/client/src/app/+admin/requests/shared/request-stats.model.ts index f658c4682..31550b5c0 100644 --- a/client/src/app/+admin/requests/shared/request-stats.model.ts +++ b/client/src/app/+admin/requests/shared/request-stats.model.ts @@ -1,35 +1,35 @@ export interface Request { - request: any; - to: any; + request: any + to: any } export class RequestStats { - requestsLimitPods: number; - requestsLimitPerPod: number; - milliSecondsInterval: number; - remainingMilliSeconds: number; - totalRequests: number; + requestsLimitPods: number + requestsLimitPerPod: number + milliSecondsInterval: number + remainingMilliSeconds: number + totalRequests: number - constructor(hash: { + constructor (hash: { requestsLimitPods: number, requestsLimitPerPod: number, milliSecondsInterval: number, remainingMilliSeconds: number, - totalRequests: number; + totalRequests: number }) { - this.requestsLimitPods = hash.requestsLimitPods; - this.requestsLimitPerPod = hash.requestsLimitPerPod; - this.milliSecondsInterval = hash.milliSecondsInterval; - this.remainingMilliSeconds = hash.remainingMilliSeconds; - this.totalRequests = hash.totalRequests; + this.requestsLimitPods = hash.requestsLimitPods + this.requestsLimitPerPod = hash.requestsLimitPerPod + this.milliSecondsInterval = hash.milliSecondsInterval + this.remainingMilliSeconds = hash.remainingMilliSeconds + this.totalRequests = hash.totalRequests } - get remainingSeconds() { - return Math.floor(this.remainingMilliSeconds / 1000); + get remainingSeconds () { + return Math.floor(this.remainingMilliSeconds / 1000) } - get secondsInterval() { - return Math.floor(this.milliSecondsInterval / 1000); + get secondsInterva () { + return Math.floor(this.milliSecondsInterval / 1000) } } diff --git a/client/src/app/+admin/requests/shared/request.service.ts b/client/src/app/+admin/requests/shared/request.service.ts index 0872ba0b8..faa6b9383 100644 --- a/client/src/app/+admin/requests/shared/request.service.ts +++ b/client/src/app/+admin/requests/shared/request.service.ts @@ -1,34 +1,34 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/map'; +import { Injectable } from '@angular/core' +import { Observable } from 'rxjs/Observable' +import 'rxjs/add/operator/catch' +import 'rxjs/add/operator/map' -import { RequestStats } from './request-stats.model'; -import { AuthHttp, RestExtractor } from '../../../shared'; +import { RequestStats } from './request-stats.model' +import { AuthHttp, RestExtractor } from '../../../shared' @Injectable() export class RequestService { - private static BASE_REQUEST_URL = API_URL + '/api/v1/requests/'; + private static BASE_REQUEST_URL = API_URL + '/api/v1/requests/' constructor ( private authHttp: AuthHttp, private restExtractor: RestExtractor ) {} - getStats(): Observable<{ [ id: string ]: RequestStats }> { + getStats (): Observable<{ [ id: string ]: RequestStats }> { return this.authHttp.get(RequestService.BASE_REQUEST_URL + 'stats') .map(this.restExtractor.extractDataGet) .map(this.buildRequestObjects) - .catch((res) => this.restExtractor.handleError(res)); + .catch((res) => this.restExtractor.handleError(res)) } - private buildRequestObjects(data: any) { - const requestSchedulers = {}; + private buildRequestObjects (data: any) { + const requestSchedulers = {} Object.keys(data).forEach(requestSchedulerName => { - requestSchedulers[requestSchedulerName] = new RequestStats(data[requestSchedulerName]); - }); + requestSchedulers[requestSchedulerName] = new RequestStats(data[requestSchedulerName]) + }) - return requestSchedulers; + return requestSchedulers } } diff --git a/client/src/app/+admin/users/index.ts b/client/src/app/+admin/users/index.ts index e98a81f62..cef2c282c 100644 --- a/client/src/app/+admin/users/index.ts +++ b/client/src/app/+admin/users/index.ts @@ -1,5 +1,5 @@ -export * from './shared'; -export * from './user-add'; -export * from './user-list'; -export * from './users.component'; -export * from './users.routes'; +export * from './shared' +export * from './user-add' +export * from './user-list' +export * from './users.component' +export * from './users.routes' diff --git a/client/src/app/+admin/users/shared/index.ts b/client/src/app/+admin/users/shared/index.ts index e17ee5c7a..1f1302dc5 100644 --- a/client/src/app/+admin/users/shared/index.ts +++ b/client/src/app/+admin/users/shared/index.ts @@ -1 +1 @@ -export * from './user.service'; +export * from './user.service' diff --git a/client/src/app/+admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts index 9c7176d39..d52993a29 100644 --- a/client/src/app/+admin/users/shared/user.service.ts +++ b/client/src/app/+admin/users/shared/user.service.ts @@ -1,35 +1,35 @@ -import { Injectable } from '@angular/core'; -import 'rxjs/add/operator/catch'; -import 'rxjs/add/operator/map'; +import { Injectable } from '@angular/core' +import 'rxjs/add/operator/catch' +import 'rxjs/add/operator/map' -import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared'; +import { AuthHttp, RestExtractor, RestDataSource, User } from '../../../shared' @Injectable() export class UserService { - private static BASE_USERS_URL = API_URL + '/api/v1/users/'; + private static BASE_USERS_URL = API_URL + '/api/v1/users/' - constructor( + constructor ( private authHttp: AuthHttp, private restExtractor: RestExtractor ) {} - addUser(username: string, password: string, email: string) { + addUser (username: string, password: string, email: string) { const body = { username, email, password - }; + } return this.authHttp.post(UserService.BASE_USERS_URL, body) .map(this.restExtractor.extractDataBool) - .catch(this.restExtractor.handleError); + .catch(this.restExtractor.handleError) } - getDataSource() { - return new RestDataSource(this.authHttp, UserService.BASE_USERS_URL); + getDataSource () { + return new RestDataSource(this.authHttp, UserService.BASE_USERS_URL) } - removeUser(user: User) { - return this.authHttp.delete(UserService.BASE_USERS_URL + user.id); + removeUser (user: User) { + return this.authHttp.delete(UserService.BASE_USERS_URL + user.id) } } diff --git a/client/src/app/+admin/users/user-add/index.ts b/client/src/app/+admin/users/user-add/index.ts index 66d5ca04f..3a4654101 100644 --- a/client/src/app/+admin/users/user-add/index.ts +++ b/client/src/app/+admin/users/user-add/index.ts @@ -1 +1 @@ -export * from './user-add.component'; +export * from './user-add.component' diff --git a/client/src/app/+admin/users/user-add/user-add.component.ts b/client/src/app/+admin/users/user-add/user-add.component.ts index f1d2fde80..2d25ab469 100644 --- a/client/src/app/+admin/users/user-add/user-add.component.ts +++ b/client/src/app/+admin/users/user-add/user-add.component.ts @@ -1,71 +1,71 @@ -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 { UserService } from '../shared'; +import { UserService } from '../shared' import { FormReactive, USER_USERNAME, USER_EMAIL, USER_PASSWORD -} from '../../../shared'; +} from '../../../shared' @Component({ selector: 'my-user-add', templateUrl: './user-add.component.html' }) export class UserAddComponent extends FormReactive implements OnInit { - error: string = null; + error: string = null - form: FormGroup; + form: FormGroup formErrors = { 'username': '', 'email': '', 'password': '' - }; + } validationMessages = { 'username': USER_USERNAME.MESSAGES, 'email': USER_EMAIL.MESSAGES, - 'password': USER_PASSWORD.MESSAGES, - }; + '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({ username: [ '', USER_USERNAME.VALIDATORS ], email: [ '', USER_EMAIL.VALIDATORS ], - password: [ '', USER_PASSWORD.VALIDATORS ], - }); + 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() } - addUser() { - this.error = null; + addUser () { + this.error = null - const { username, password, email } = this.form.value; + const { username, password, email } = this.form.value this.userService.addUser(username, password, email).subscribe( () => { - this.notificationsService.success('Success', `User ${username} created.`); - this.router.navigate([ '/admin/users/list' ]); + this.notificationsService.success('Success', `User ${username} created.`) + this.router.navigate([ '/admin/users/list' ]) }, err => this.error = err.text - ); + ) } } diff --git a/client/src/app/+admin/users/user-list/index.ts b/client/src/app/+admin/users/user-list/index.ts index 51fbefa80..1826a4abe 100644 --- a/client/src/app/+admin/users/user-list/index.ts +++ b/client/src/app/+admin/users/user-list/index.ts @@ -1 +1 @@ -export * from './user-list.component'; +export * from './user-list.component' diff --git a/client/src/app/+admin/users/user-list/user-list.component.ts b/client/src/app/+admin/users/user-list/user-list.component.ts index 69ae4353d..b6fb0ed99 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/users/user-list/user-list.component.ts @@ -1,10 +1,10 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { ConfirmService } from '../../../core'; -import { User, Utils } from '../../../shared'; -import { UserService } from '../shared'; +import { ConfirmService } from '../../../core' +import { User, Utils } from '../../../shared' +import { UserService } from '../shared' @Component({ selector: 'my-user-list', @@ -12,7 +12,7 @@ import { UserService } from '../shared'; styleUrls: [ './user-list.component.scss' ] }) export class UserListComponent { - usersSource = null; + usersSource = null tableSettings = { mode: 'external', attr: { @@ -52,37 +52,37 @@ export class UserListComponent { valuePrepareFunction: Utils.dateToHuman } } - }; + } - constructor( + constructor ( private notificationsService: NotificationsService, private confirmService: ConfirmService, private userService: UserService ) { - this.usersSource = this.userService.getDataSource(); + this.usersSource = this.userService.getDataSource() } - removeUser({ data }) { - const user: User = data; + removeUser ({ data }) { + const user: User = data if (user.username === 'root') { - this.notificationsService.error('Error', 'You cannot delete root.'); - return; + this.notificationsService.error('Error', 'You cannot delete root.') + return } this.confirmService.confirm('Do you really want to delete this user?', 'Delete').subscribe( res => { - if (res === false) return; + if (res === false) return this.userService.removeUser(user).subscribe( () => { - this.notificationsService.success('Success', `User ${user.username} deleted.`); - this.usersSource.refresh(); + this.notificationsService.success('Success', `User ${user.username} deleted.`) + this.usersSource.refresh() }, err => this.notificationsService.error('Error', err.text) - ); + ) } - ); + ) } } diff --git a/client/src/app/+admin/users/users.component.ts b/client/src/app/+admin/users/users.component.ts index 91af6c320..e9c8f6b0d 100644 --- a/client/src/app/+admin/users/users.component.ts +++ b/client/src/app/+admin/users/users.component.ts @@ -1,8 +1,7 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' @Component({ - template: '' + template: '' }) - export class UsersComponent { } diff --git a/client/src/app/+admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts index 21fb192e0..723c5715d 100644 --- a/client/src/app/+admin/users/users.routes.ts +++ b/client/src/app/+admin/users/users.routes.ts @@ -1,8 +1,8 @@ -import { Routes } from '@angular/router'; +import { Routes } from '@angular/router' -import { UsersComponent } from './users.component'; -import { UserAddComponent } from './user-add'; -import { UserListComponent } from './user-list'; +import { UsersComponent } from './users.component' +import { UserAddComponent } from './user-add' +import { UserListComponent } from './user-list' export const UsersRoutes: Routes = [ { @@ -34,4 +34,4 @@ export const UsersRoutes: Routes = [ } ] } -]; +] diff --git a/client/src/app/+admin/video-abuses/index.ts b/client/src/app/+admin/video-abuses/index.ts index 7f5e65f91..395fac2e7 100644 --- a/client/src/app/+admin/video-abuses/index.ts +++ b/client/src/app/+admin/video-abuses/index.ts @@ -1,3 +1,3 @@ -export * from './video-abuse-list'; -export * from './video-abuses.component'; -export * from './video-abuses.routes'; +export * from './video-abuse-list' +export * from './video-abuses.component' +export * from './video-abuses.routes' diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/index.ts b/client/src/app/+admin/video-abuses/video-abuse-list/index.ts index 3f2ed1714..01c24d860 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/index.ts +++ b/client/src/app/+admin/video-abuses/video-abuse-list/index.ts @@ -1 +1 @@ -export * from './video-abuse-list.component'; +export * from './video-abuse-list.component' diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts index 55d82f790..60eaebb44 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts @@ -1,15 +1,15 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' -import { NotificationsService } from 'angular2-notifications'; +import { NotificationsService } from 'angular2-notifications' -import { Utils, VideoAbuseService, VideoAbuse } from '../../../shared'; +import { Utils, VideoAbuseService, VideoAbuse } from '../../../shared' @Component({ - selector: 'my-video-abuse-list', - templateUrl: './video-abuse-list.component.html' + selector: 'my-video-abuse-list', + templateUrl: './video-abuse-list.component.html' }) export class VideoAbuseListComponent { - videoAbusesSource = null; + videoAbusesSource = null tableSettings = { mode: 'external', attr: { @@ -54,18 +54,18 @@ export class VideoAbuseListComponent { valuePrepareFunction: Utils.dateToHuman } } - }; + } - constructor( + constructor ( private notificationsService: NotificationsService, private videoAbuseService: VideoAbuseService ) { - this.videoAbusesSource = this.videoAbuseService.getDataSource(); - } + this.videoAbusesSource = this.videoAbuseService.getDataSource() + } - buildVideoLink(videoId: string) { + buildVideoLink (videoId: string) { // TODO: transform to routerLink // https://github.com/akveo/ng2-smart-table/issues/57 - return `${videoId}`; + return `${videoId}` } } diff --git a/client/src/app/+admin/video-abuses/video-abuses.component.ts b/client/src/app/+admin/video-abuses/video-abuses.component.ts index 001f27e87..9dae5c0b6 100644 --- a/client/src/app/+admin/video-abuses/video-abuses.component.ts +++ b/client/src/app/+admin/video-abuses/video-abuses.component.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import { Component } from '@angular/core' @Component({ template: '' diff --git a/client/src/app/+admin/video-abuses/video-abuses.routes.ts b/client/src/app/+admin/video-abuses/video-abuses.routes.ts index 1f19d7885..a8c1561cd 100644 --- a/client/src/app/+admin/video-abuses/video-abuses.routes.ts +++ b/client/src/app/+admin/video-abuses/video-abuses.routes.ts @@ -1,7 +1,7 @@ -import { Routes } from '@angular/router'; +import { Routes } from '@angular/router' -import { VideoAbusesComponent } from './video-abuses.component'; -import { VideoAbuseListComponent } from './video-abuse-list'; +import { VideoAbusesComponent } from './video-abuses.component' +import { VideoAbuseListComponent } from './video-abuse-list' export const VideoAbusesRoutes: Routes = [ { @@ -25,4 +25,4 @@ export const VideoAbusesRoutes: Routes = [ } ] } -]; +] -- cgit v1.2.3