Fix some typescript compilations issues

[github/Chocobozzz/PeerTube.git] / client / angular / app / app.component.ts

diff --git a/client/angular/app/app.component.ts b/client/angular/app/app.component.ts
index 1648b887020df7fcaa73cbdca7a5bc264f902e65..359d7128ee47ca935be17122b5602e8a349ee4e1 100644 (file)
--- a/client/angular/app/app.component.ts
+++ b/client/angular/app/app.component.ts
@@ -1,6 +1,6 @@
-import { Component, ElementRef } 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';
@@ -40,10 +40,7 @@ import { AuthStatus } from '../users/models/authStatus';
     templateUrl: 'app/angular/app/app.component.html',
     styleUrls: [ 'app/angular/app/app.component.css' ],
     directives: [ ROUTER_DIRECTIVES ],
-    providers: [ ROUTER_PROVIDERS, HTTP_PROVIDERS,
-                 ElementRef, VideosService, FriendsService,
-                 AuthService
-               ]
+    providers: [ ROUTER_PROVIDERS, HTTP_PROVIDERS, VideosService, FriendsService, AuthService ]
 })
 
 export class AppComponent {
@@ -53,8 +50,7 @@ export class AppComponent {
               private _authService: AuthService,
               private _router: Router
   ) {
-    if (localStorage.getItem('access_token')) this.isLoggedIn = true;
-    else this.isLoggedIn = false;
+    this.isLoggedIn = this._authService.isLoggedIn();
 
     this._authService.loginChanged$.subscribe(
       status => {
@@ -87,7 +83,7 @@ export class AppComponent {
         }
       },
       error => alert(error)
-    )
+    );
   }
 
   quitFriends() {
@@ -96,6 +92,6 @@ export class AppComponent {
           alert('Quit friends!');
       },
       error => alert(error)
-    )
+    );
   }
 }