53 files changed, 17 insertions, 13 deletions

diff --git a/client/src/app/admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts
index cabc6df15..d3adf3f3b 100644
--- a/client/src/app/admin/admin-routing.module.ts
+++ b/client/src/app/+admin/admin-routing.module.ts
@@ -9,7 +9,7 @@ import { VideoAbusesRoutes } from './video-abuses';
 
 const adminRoutes: Routes = [
   {
-    path: 'admin',
+    path: '',
     component: AdminComponent,
     children: [
       {
diff --git a/client/src/app/admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 64a7400e7..64a7400e7 100644
--- a/client/src/app/admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
diff --git a/client/src/app/admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index d3ada8ce8..db1ce2d7f 100644
--- a/client/src/app/admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -6,7 +6,6 @@ import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendServic
 import { RequestsComponent, RequestStatsComponent, RequestService } from './requests';
 import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users';
 import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses';
-import { MenuAdminComponent } from './menu-admin.component';
 import { SharedModule } from '../shared';
 
 @NgModule({
@@ -30,14 +29,11 @@ import { SharedModule } from '../shared';
     UserListComponent,
 
     VideoAbusesComponent,
-    VideoAbuseListComponent,
-
-    MenuAdminComponent
+    VideoAbuseListComponent
   ],
 
   exports: [
-    AdminComponent,
-    MenuAdminComponent
+    AdminComponent
   ],
 
   providers: [
diff --git a/client/src/app/admin/friends/friend-add/friend-add.component.html b/client/src/app/+admin/friends/friend-add/friend-add.component.html
index eebe033f9..eebe033f9 100644
--- a/client/src/app/admin/friends/friend-add/friend-add.component.html
+++ b/client/src/app/+admin/friends/friend-add/friend-add.component.html
diff --git a/client/src/app/admin/friends/friend-add/friend-add.component.scss b/client/src/app/+admin/friends/friend-add/friend-add.component.scss
index 5fde51636..5fde51636 100644
--- a/client/src/app/admin/friends/friend-add/friend-add.component.scss
+++ b/client/src/app/+admin/friends/friend-add/friend-add.component.scss
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 014252011..014252011 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
diff --git a/client/src/app/admin/friends/friend-add/index.ts b/client/src/app/+admin/friends/friend-add/index.ts
index a101b3be5..a101b3be5 100644
--- a/client/src/app/admin/friends/friend-add/index.ts
+++ b/client/src/app/+admin/friends/friend-add/index.ts
diff --git a/client/src/app/admin/friends/friend-list/friend-list.component.html b/client/src/app/+admin/friends/friend-list/friend-list.component.html
index 06258f8c8..06258f8c8 100644
--- a/client/src/app/admin/friends/friend-list/friend-list.component.html
+++ b/client/src/app/+admin/friends/friend-list/friend-list.component.html
diff --git a/client/src/app/admin/friends/friend-list/friend-list.component.scss b/client/src/app/+admin/friends/friend-list/friend-list.component.scss
index cb597e12b..cb597e12b 100644
--- a/client/src/app/admin/friends/friend-list/friend-list.component.scss
+++ b/client/src/app/+admin/friends/friend-list/friend-list.component.scss
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 bec10162c..bec10162c 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
diff --git a/client/src/app/admin/friends/friend-list/index.ts b/client/src/app/+admin/friends/friend-list/index.ts
index 354c978a4..354c978a4 100644
--- a/client/src/app/admin/friends/friend-list/index.ts
+++ b/client/src/app/+admin/friends/friend-list/index.ts
diff --git a/client/src/app/admin/friends/friends.component.ts b/client/src/app/+admin/friends/friends.component.ts
index bc3f54158..bc3f54158 100644
--- a/client/src/app/admin/friends/friends.component.ts
+++ b/client/src/app/+admin/friends/friends.component.ts
diff --git a/client/src/app/admin/friends/friends.routes.ts b/client/src/app/+admin/friends/friends.routes.ts
index a9a06539b..a9a06539b 100644
--- a/client/src/app/admin/friends/friends.routes.ts
+++ b/client/src/app/+admin/friends/friends.routes.ts
diff --git a/client/src/app/admin/friends/index.ts b/client/src/app/+admin/friends/index.ts
index dd4df2538..dd4df2538 100644
--- a/client/src/app/admin/friends/index.ts
+++ b/client/src/app/+admin/friends/index.ts
diff --git a/client/src/app/admin/friends/shared/friend.model.ts b/client/src/app/+admin/friends/shared/friend.model.ts
index 462cc82ed..462cc82ed 100644
--- a/client/src/app/admin/friends/shared/friend.model.ts
+++ b/client/src/app/+admin/friends/shared/friend.model.ts
diff --git a/client/src/app/admin/friends/shared/friend.service.ts b/client/src/app/+admin/friends/shared/friend.service.ts
index e97459385..e97459385 100644
--- a/client/src/app/admin/friends/shared/friend.service.ts
+++ b/client/src/app/+admin/friends/shared/friend.service.ts
diff --git a/client/src/app/admin/friends/shared/index.ts b/client/src/app/+admin/friends/shared/index.ts
index 0d671637d..0d671637d 100644
--- a/client/src/app/admin/friends/shared/index.ts
+++ b/client/src/app/+admin/friends/shared/index.ts
diff --git a/client/src/app/admin/index.ts b/client/src/app/+admin/index.ts
index b75ff9b51..2f47a3cc3 100644
--- a/client/src/app/admin/index.ts
+++ b/client/src/app/+admin/index.ts
@@ -4,4 +4,3 @@ export * from './users';
 export * from './admin-routing.module';
 export * from './admin.module';
 export * from './admin.component';
-export * from './menu-admin.component';
diff --git a/client/src/app/admin/requests/index.ts b/client/src/app/+admin/requests/index.ts
index 236a9ee8f..236a9ee8f 100644
--- a/client/src/app/admin/requests/index.ts
+++ b/client/src/app/+admin/requests/index.ts
diff --git a/client/src/app/admin/requests/request-stats/index.ts b/client/src/app/+admin/requests/request-stats/index.ts
index be3a66f77..be3a66f77 100644
--- a/client/src/app/admin/requests/request-stats/index.ts
+++ b/client/src/app/+admin/requests/request-stats/index.ts
diff --git a/client/src/app/admin/requests/request-stats/request-stats.component.html b/client/src/app/+admin/requests/request-stats/request-stats.component.html
index 9dbed1739..9dbed1739 100644
--- a/client/src/app/admin/requests/request-stats/request-stats.component.html
+++ b/client/src/app/+admin/requests/request-stats/request-stats.component.html
diff --git a/client/src/app/admin/requests/request-stats/request-stats.component.scss b/client/src/app/+admin/requests/request-stats/request-stats.component.scss
index 9c68fba99..9c68fba99 100644
--- a/client/src/app/admin/requests/request-stats/request-stats.component.scss
+++ b/client/src/app/+admin/requests/request-stats/request-stats.component.scss
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 23b836779..23b836779 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
diff --git a/client/src/app/admin/requests/requests.component.ts b/client/src/app/+admin/requests/requests.component.ts
index 471112b45..471112b45 100644
--- a/client/src/app/admin/requests/requests.component.ts
+++ b/client/src/app/+admin/requests/requests.component.ts
diff --git a/client/src/app/admin/requests/requests.routes.ts b/client/src/app/+admin/requests/requests.routes.ts
index 70fbf41c3..70fbf41c3 100644
--- a/client/src/app/admin/requests/requests.routes.ts
+++ b/client/src/app/+admin/requests/requests.routes.ts
diff --git a/client/src/app/admin/requests/shared/index.ts b/client/src/app/+admin/requests/shared/index.ts
index 32ab5767b..32ab5767b 100644
--- a/client/src/app/admin/requests/shared/index.ts
+++ b/client/src/app/+admin/requests/shared/index.ts
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..f658c4682 100644
--- a/client/src/app/admin/requests/shared/request-stats.model.ts
+++ b/client/src/app/+admin/requests/shared/request-stats.model.ts
diff --git a/client/src/app/admin/requests/shared/request.service.ts b/client/src/app/+admin/requests/shared/request.service.ts
index 55b28bcfc..55b28bcfc 100644
--- a/client/src/app/admin/requests/shared/request.service.ts
+++ b/client/src/app/+admin/requests/shared/request.service.ts
diff --git a/client/src/app/admin/users/index.ts b/client/src/app/+admin/users/index.ts
index e98a81f62..e98a81f62 100644
--- a/client/src/app/admin/users/index.ts
+++ b/client/src/app/+admin/users/index.ts
diff --git a/client/src/app/admin/users/shared/index.ts b/client/src/app/+admin/users/shared/index.ts
index e17ee5c7a..e17ee5c7a 100644
--- a/client/src/app/admin/users/shared/index.ts
+++ b/client/src/app/+admin/users/shared/index.ts
diff --git a/client/src/app/admin/users/shared/user.service.ts b/client/src/app/+admin/users/shared/user.service.ts
index d9005b213..d9005b213 100644
--- a/client/src/app/admin/users/shared/user.service.ts
+++ b/client/src/app/+admin/users/shared/user.service.ts
diff --git a/client/src/app/admin/users/user-add/index.ts b/client/src/app/+admin/users/user-add/index.ts
index 66d5ca04f..66d5ca04f 100644
--- a/client/src/app/admin/users/user-add/index.ts
+++ b/client/src/app/+admin/users/user-add/index.ts
diff --git a/client/src/app/admin/users/user-add/user-add.component.html b/client/src/app/+admin/users/user-add/user-add.component.html
index 9b76c7c1b..9b76c7c1b 100644
--- a/client/src/app/admin/users/user-add/user-add.component.html
+++ b/client/src/app/+admin/users/user-add/user-add.component.html
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 ab96fb01d..ab96fb01d 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
diff --git a/client/src/app/admin/users/user-list/index.ts b/client/src/app/+admin/users/user-list/index.ts
index 51fbefa80..51fbefa80 100644
--- a/client/src/app/admin/users/user-list/index.ts
+++ b/client/src/app/+admin/users/user-list/index.ts
diff --git a/client/src/app/admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html
index 36193d119..36193d119 100644
--- a/client/src/app/admin/users/user-list/user-list.component.html
+++ b/client/src/app/+admin/users/user-list/user-list.component.html
diff --git a/client/src/app/admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss
index e9f61e900..e9f61e900 100644
--- a/client/src/app/admin/users/user-list/user-list.component.scss
+++ b/client/src/app/+admin/users/user-list/user-list.component.scss
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 03f4e5c0a..03f4e5c0a 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
diff --git a/client/src/app/admin/users/users.component.ts b/client/src/app/+admin/users/users.component.ts
index 37e3b158d..37e3b158d 100644
--- a/client/src/app/admin/users/users.component.ts
+++ b/client/src/app/+admin/users/users.component.ts
diff --git a/client/src/app/admin/users/users.routes.ts b/client/src/app/+admin/users/users.routes.ts
index 92e3e43e3..92e3e43e3 100644
--- a/client/src/app/admin/users/users.routes.ts
+++ b/client/src/app/+admin/users/users.routes.ts
diff --git a/client/src/app/admin/video-abuses/index.ts b/client/src/app/+admin/video-abuses/index.ts
index 7f5e65f91..7f5e65f91 100644
--- a/client/src/app/admin/video-abuses/index.ts
+++ b/client/src/app/+admin/video-abuses/index.ts
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..3f2ed1714 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
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html
index 46043577c..46043577c 100644
--- a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html
diff --git a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
index a094f74b8..a094f74b8 100644
--- a/client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
+++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss
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 de58bba3d..de58bba3d 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
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..001f27e87 100644
--- a/client/src/app/admin/video-abuses/video-abuses.component.ts
+++ b/client/src/app/+admin/video-abuses/video-abuses.component.ts
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 26a761887..26a761887 100644
--- a/client/src/app/admin/video-abuses/video-abuses.routes.ts
+++ b/client/src/app/+admin/video-abuses/video-abuses.routes.ts
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 900a4c5b6..f9465dc9c 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -6,6 +6,10 @@ const routes: Routes = [
     path: '',
     redirectTo: '/videos/list',
     pathMatch: 'full'
+  },
+  {
+    path: 'admin',
+    loadChildren: './+admin#AdminModule'
   }
 ];
 
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 10526e813..482a9b5b7 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -11,7 +11,6 @@ import { AppComponent } from './app.component';
 import { AppState } from './app.service';
 
 import { AccountModule } from './account';
-import { AdminModule } from './admin';
 import { CoreModule } from './core';
 import { LoginModule } from './login';
 import { SharedModule } from './shared';
@@ -47,7 +46,6 @@ const APP_PROVIDERS = [
     MetaModule.forRoot(metaConfig),
 
     AccountModule,
-    AdminModule,
     CoreModule,
     LoginModule,
     SharedModule,
diff --git a/client/src/app/core/core.module.ts b/client/src/app/core/core.module.ts
index 27e6ee1fb..09a6f92f5 100644
--- a/client/src/app/core/core.module.ts
+++ b/client/src/app/core/core.module.ts
@@ -4,7 +4,7 @@ import { HttpModule } from '@angular/http';
 import { RouterModule } from '@angular/router';
 
 import { AuthService } from './auth';
-import { MenuComponent } from './menu';
+import { MenuComponent, MenuAdminComponent } from './menu';
 import { throwIfAlreadyLoaded } from './module-import-guard';
 
 @NgModule({
@@ -13,8 +13,14 @@ import { throwIfAlreadyLoaded } from './module-import-guard';
     HttpModule,
     RouterModule
   ],
-  declarations: [ MenuComponent ],
-  exports: [ MenuComponent ],
+  declarations: [
+    MenuComponent,
+    MenuAdminComponent
+  ],
+  exports: [
+    MenuComponent,
+    MenuAdminComponent
+  ],
   providers: [ AuthService ]
 })
 export class CoreModule {
diff --git a/client/src/app/core/menu/index.ts b/client/src/app/core/menu/index.ts
index d07a1144c..ff40f26e1 100644
--- a/client/src/app/core/menu/index.ts
+++ b/client/src/app/core/menu/index.ts
@@ -1 +1,2 @@
 export * from './menu.component';
+export * from './menu-admin.component';
diff --git a/client/src/app/admin/menu-admin.component.html b/client/src/app/core/menu/menu-admin.component.html
index ad7a7a1b4..ad7a7a1b4 100644
--- a/client/src/app/admin/menu-admin.component.html
+++ b/client/src/app/core/menu/menu-admin.component.html
diff --git a/client/src/app/admin/menu-admin.component.ts b/client/src/app/core/menu/menu-admin.component.ts
index 59ffccf9f..59ffccf9f 100644
--- a/client/src/app/admin/menu-admin.component.ts
+++ b/client/src/app/core/menu/menu-admin.component.ts