8 files changed, 18 insertions, 3 deletions

diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index bcc94a9f3..03782c258 100644
--- a/client/src/app/+admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
+import { MetaGuard } from '@ngx-meta/core'
+
 import { AdminComponent } from './admin.component'
 import { FriendsRoutes } from './friends'
 import { RequestSchedulersRoutes } from './request-schedulers'
@@ -11,6 +13,7 @@ const adminRoutes: Routes = [
   {
     path: '',
     component: AdminComponent,
+    canActivateChild: [ MetaGuard ],
     children: [
       {
         path: '',
diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/account/account-routing.module.ts
index e9b8f7031..029d97788 100644
--- a/client/src/app/account/account-routing.module.ts
+++ b/client/src/app/account/account-routing.module.ts
@@ -1,12 +1,15 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
+import { MetaGuard } from '@ngx-meta/core'
+
 import { AccountComponent } from './account.component'
 
 const accountRoutes: Routes = [
   {
     path: 'account',
     component: AccountComponent,
+    canActivate: [ MetaGuard ],
     data: {
       meta: {
         title: 'My account'
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index d7c9f6548..804a7a71e 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -6,7 +6,7 @@ import {
   createInputTransfer
 } from '@angularclass/hmr'
 
-import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta'
+import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
 // TODO: remove, we need this to avoid error in ng2-smart-table
 import 'rxjs/add/operator/toPromise'
 import 'bootstrap-loader'
diff --git a/client/src/app/login/login-routing.module.ts b/client/src/app/login/login-routing.module.ts
index 1a91677c0..4d8913041 100644
--- a/client/src/app/login/login-routing.module.ts
+++ b/client/src/app/login/login-routing.module.ts
@@ -1,12 +1,15 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
+import { MetaGuard } from '@ngx-meta/core'
+
 import { LoginComponent } from './login.component'
 
 const loginRoutes: Routes = [
   {
     path: 'login',
     component: LoginComponent,
+    canActivate: [ MetaGuard ],
     data: {
       meta: {
         title: 'Login'
diff --git a/client/src/app/signup/signup-routing.module.ts b/client/src/app/signup/signup-routing.module.ts
index 122d6c976..b7ac69b53 100644
--- a/client/src/app/signup/signup-routing.module.ts
+++ b/client/src/app/signup/signup-routing.module.ts
@@ -1,12 +1,15 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
+import { MetaGuard } from '@ngx-meta/core'
+
 import { SignupComponent } from './signup.component'
 
 const signupRoutes: Routes = [
   {
     path: 'signup',
     component: SignupComponent,
+    canActivate: [ MetaGuard ],
     data: {
       meta: {
         title: 'Signup'
diff --git a/client/src/app/videos/video-watch/video-watch.component.ts b/client/src/app/videos/video-watch/video-watch.component.ts
index 1284aa033..12ddf3eef 100644
--- a/client/src/app/videos/video-watch/video-watch.component.ts
+++ b/client/src/app/videos/video-watch/video-watch.component.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs/Observable'
 import { Subscription } from 'rxjs/Subscription'
 
 import videojs from 'video.js'
-import { MetaService } from '@nglibs/meta'
+import { MetaService } from '@ngx-meta/core'
 import { NotificationsService } from 'angular2-notifications'
 
 import { AuthService, ConfirmService } from '../../core'
diff --git a/client/src/app/videos/videos-routing.module.ts b/client/src/app/videos/videos-routing.module.ts
index 7d002abde..e18c1cec0 100644
--- a/client/src/app/videos/videos-routing.module.ts
+++ b/client/src/app/videos/videos-routing.module.ts
@@ -1,6 +1,8 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
 
+import { MetaGuard } from '@ngx-meta/core'
+
 import { VideoAddComponent, VideoUpdateComponent } from './video-edit'
 import { VideoListComponent } from './video-list'
 import { VideosComponent } from './videos.component'
@@ -10,6 +12,7 @@ const videosRoutes: Routes = [
   {
     path: 'videos',
     component: VideosComponent,
+    canActivateChild: [ MetaGuard ],
     children: [
       {
         path: 'list',
diff --git a/client/src/app/videos/videos.module.ts b/client/src/app/videos/videos.module.ts
index 75a8dd24f..7d2451de7 100644
--- a/client/src/app/videos/videos.module.ts
+++ b/client/src/app/videos/videos.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core'
 
-import { TagInputModule } from 'ng2-tag-input'
+import { TagInputModule } from 'ngx-chips'
 
 import { VideosRoutingModule } from './videos-routing.module'
 import { VideosComponent } from './videos.component'