From 230809efa1e7e81ce60cd65f8b398f01a27d525b Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 13 May 2016 14:18:37 +0200 Subject: Update to Angular RC 1 --- client/angular/app/app.component.ts | 6 +++--- client/angular/bootstrap.ts | 4 ---- client/angular/friends/services/friends.service.ts | 4 ++-- client/angular/main.ts | 4 ++++ client/angular/users/components/login/login.component.ts | 4 ++-- client/angular/users/services/auth.service.ts | 4 ++-- client/angular/videos/components/add/videos-add.component.ts | 4 ++-- client/angular/videos/components/list/videos-list.component.ts | 4 ++-- client/angular/videos/components/watch/videos-watch.component.ts | 6 +++--- client/angular/videos/services/videos.service.ts | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 client/angular/bootstrap.ts create mode 100644 client/angular/main.ts (limited to 'client/angular') diff --git a/client/angular/app/app.component.ts b/client/angular/app/app.component.ts index 83a4f3310..359d7128e 100644 --- a/client/angular/app/app.component.ts +++ b/client/angular/app/app.component.ts @@ -1,6 +1,6 @@ -import { Component } from 'angular2/core'; -import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS, Router } from 'angular2/router'; -import { HTTP_PROVIDERS } from 'angular2/http'; +import { Component } from '@angular/core'; +import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS, Router } from '@angular/router-deprecated'; +import { HTTP_PROVIDERS } from '@angular/http'; import { VideosAddComponent } from '../videos/components/add/videos-add.component'; import { VideosListComponent } from '../videos/components/list/videos-list.component'; diff --git a/client/angular/bootstrap.ts b/client/angular/bootstrap.ts deleted file mode 100644 index d0f524f4a..000000000 --- a/client/angular/bootstrap.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { bootstrap } from 'angular2/platform/browser'; -import { AppComponent } from './app/app.component'; - -bootstrap(AppComponent); diff --git a/client/angular/friends/services/friends.service.ts b/client/angular/friends/services/friends.service.ts index 4eb1fc67b..cb34323e4 100644 --- a/client/angular/friends/services/friends.service.ts +++ b/client/angular/friends/services/friends.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from 'angular2/core'; -import { Http, Response } from 'angular2/http'; +import { Injectable } from '@angular/core'; +import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; @Injectable() diff --git a/client/angular/main.ts b/client/angular/main.ts new file mode 100644 index 000000000..e35f7dbdf --- /dev/null +++ b/client/angular/main.ts @@ -0,0 +1,4 @@ +import { bootstrap } from '@angular/platform-browser-dynamic'; +import { AppComponent } from './app/app.component'; + +bootstrap(AppComponent); diff --git a/client/angular/users/components/login/login.component.ts b/client/angular/users/components/login/login.component.ts index cecf5d2fd..d339353ef 100644 --- a/client/angular/users/components/login/login.component.ts +++ b/client/angular/users/components/login/login.component.ts @@ -1,5 +1,5 @@ -import { Component } from 'angular2/core'; -import { Router } from 'angular2/router'; +import { Component } from '@angular/core'; +import { Router } from '@angular/router-deprecated'; import { AuthService } from '../../services/auth.service'; import { AuthStatus } from '../../models/authStatus'; diff --git a/client/angular/users/services/auth.service.ts b/client/angular/users/services/auth.service.ts index fc5048d8a..099563d43 100644 --- a/client/angular/users/services/auth.service.ts +++ b/client/angular/users/services/auth.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from 'angular2/core'; -import { Http, Response, Headers, URLSearchParams, RequestOptions } from 'angular2/http'; +import { Injectable } from '@angular/core'; +import { Http, Response, Headers, URLSearchParams, RequestOptions } from '@angular/http'; import { Observable, Subject } from 'rxjs/Rx'; import { AuthStatus } from '../models/authStatus'; diff --git a/client/angular/videos/components/add/videos-add.component.ts b/client/angular/videos/components/add/videos-add.component.ts index bc7b4057c..f801cecbb 100644 --- a/client/angular/videos/components/add/videos-add.component.ts +++ b/client/angular/videos/components/add/videos-add.component.ts @@ -1,5 +1,5 @@ -import { Component, ElementRef, OnInit } from 'angular2/core'; -import { Router } from 'angular2/router'; +import { Component, ElementRef, OnInit } from '@angular/core'; +import { Router } from '@angular/router-deprecated'; import { AuthService } from '../../../users/services/auth.service'; import { User } from '../../../users/models/user'; diff --git a/client/angular/videos/components/list/videos-list.component.ts b/client/angular/videos/components/list/videos-list.component.ts index b081522c7..6ff0b2afb 100644 --- a/client/angular/videos/components/list/videos-list.component.ts +++ b/client/angular/videos/components/list/videos-list.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit } from 'angular2/core'; -import { ROUTER_DIRECTIVES, RouteParams } from 'angular2/router'; +import { Component, OnInit } from '@angular/core'; +import { ROUTER_DIRECTIVES, RouteParams } from '@angular/router-deprecated'; import { AuthService } from '../../../users/services/auth.service'; import { User } from '../../../users/models/user'; diff --git a/client/angular/videos/components/watch/videos-watch.component.ts b/client/angular/videos/components/watch/videos-watch.component.ts index b996ad882..6ac2787ed 100644 --- a/client/angular/videos/components/watch/videos-watch.component.ts +++ b/client/angular/videos/components/watch/videos-watch.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, ElementRef } from 'angular2/core'; -import { RouteParams, CanDeactivate, ComponentInstruction } from 'angular2/router'; -import { BytesPipe } from 'angular-pipes/math'; +import { Component, OnInit, ElementRef } from '@angular/core'; +import { RouteParams, CanDeactivate, ComponentInstruction } from '@angular/router-deprecated'; +import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; // TODO import it with systemjs declare var WebTorrent: any; diff --git a/client/angular/videos/services/videos.service.ts b/client/angular/videos/services/videos.service.ts index 74b6a1ddc..d08548339 100644 --- a/client/angular/videos/services/videos.service.ts +++ b/client/angular/videos/services/videos.service.ts @@ -1,5 +1,5 @@ -import { Injectable } from 'angular2/core'; -import { Http, Response } from 'angular2/http'; +import { Injectable } from '@angular/core'; +import { Http, Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; import { Video } from '../models/video'; -- cgit v1.2.3