From ab32b0fc805b92c5a1d7ac5901cb1a38e94622ca Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 6 Sep 2016 22:40:57 +0200 Subject: Dirty update to Angular RC6 --- client/src/app/admin/users/user-add/user-add.component.ts | 6 ++---- client/src/app/admin/users/user-list/user-list.component.ts | 4 +--- client/src/app/admin/users/users.component.ts | 7 +------ client/src/app/admin/users/users.routes.ts | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) (limited to 'client/src/app/admin/users') 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 8dd98cc5c..e3f4b2e1a 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,14 +1,12 @@ -import { Validators } from '@angular/common'; import { Component, OnInit } from '@angular/core'; -import { FormGroup, FormControl, REACTIVE_FORM_DIRECTIVES } from '@angular/forms'; +import { FormGroup, FormControl, Validators } from '@angular/forms'; import { Router } from '@angular/router'; import { UserService } from '../shared'; @Component({ selector: 'my-user-add', - template: require('./user-add.component.html'), - directives: [ REACTIVE_FORM_DIRECTIVES ] + template: require('./user-add.component.html') }) export class UserAddComponent implements OnInit { userAddForm: FormGroup; 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 c89a61bca..d3827eb28 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,5 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { ROUTER_DIRECTIVES } from '@angular/router'; import { User } from '../../../shared'; import { UserService } from '../shared'; @@ -7,8 +6,7 @@ import { UserService } from '../shared'; @Component({ selector: 'my-user-list', template: require('./user-list.component.html'), - styles: [ require('./user-list.component.scss') ], - directives: [ ROUTER_DIRECTIVES ] + styles: [ require('./user-list.component.scss') ] }) export class UserListComponent implements OnInit { totalUsers: number; diff --git a/client/src/app/admin/users/users.component.ts b/client/src/app/admin/users/users.component.ts index 46aa0862f..37e3b158d 100644 --- a/client/src/app/admin/users/users.component.ts +++ b/client/src/app/admin/users/users.component.ts @@ -1,12 +1,7 @@ import { Component } from '@angular/core'; -import { ROUTER_DIRECTIVES } from '@angular/router'; - -import { UserService } from './shared'; @Component({ - template: '', - directives: [ ROUTER_DIRECTIVES ], - providers: [ UserService ] + 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 0457c3843..eb71bd0ae 100644 --- a/client/src/app/admin/users/users.routes.ts +++ b/client/src/app/admin/users/users.routes.ts @@ -1,10 +1,10 @@ -import { RouterConfig } from '@angular/router'; +import { Routes } from '@angular/router'; import { UsersComponent } from './users.component'; import { UserAddComponent } from './user-add'; import { UserListComponent } from './user-list'; -export const UsersRoutes: RouterConfig = [ +export const UsersRoutes: Routes = [ { path: 'users', component: UsersComponent, -- cgit v1.2.3