diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-01-23 22:32:43 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-01-23 22:32:43 +0100 |
commit | b99290b1d5d736083513fb8f66e91f61bfe07e0b (patch) | |
tree | e0e7fa738ee661a267f5330db35bc46d295f945f | |
parent | 11ac88de40215783835cf6e6259ff0f6cee258dd (diff) | |
download | PeerTube-b99290b1d5d736083513fb8f66e91f61bfe07e0b.tar.gz PeerTube-b99290b1d5d736083513fb8f66e91f61bfe07e0b.tar.zst PeerTube-b99290b1d5d736083513fb8f66e91f61bfe07e0b.zip |
Client: lazy load admin area
-rw-r--r-- | client/config/webpack.common.js | 25 | ||||
-rw-r--r-- | client/package.json | 1 | ||||
-rw-r--r-- | client/src/app/+admin/admin-routing.module.ts (renamed from client/src/app/admin/admin-routing.module.ts) | 2 | ||||
-rw-r--r-- | client/src/app/+admin/admin.component.ts (renamed from client/src/app/admin/admin.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/admin.module.ts (renamed from client/src/app/admin/admin.module.ts) | 8 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-add/friend-add.component.html (renamed from client/src/app/admin/friends/friend-add/friend-add.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-add/friend-add.component.scss (renamed from client/src/app/admin/friends/friend-add/friend-add.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-add/friend-add.component.ts (renamed from client/src/app/admin/friends/friend-add/friend-add.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-add/index.ts (renamed from client/src/app/admin/friends/friend-add/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-list/friend-list.component.html (renamed from client/src/app/admin/friends/friend-list/friend-list.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-list/friend-list.component.scss (renamed from client/src/app/admin/friends/friend-list/friend-list.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-list/friend-list.component.ts (renamed from client/src/app/admin/friends/friend-list/friend-list.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friend-list/index.ts (renamed from client/src/app/admin/friends/friend-list/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friends.component.ts (renamed from client/src/app/admin/friends/friends.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/friends.routes.ts (renamed from client/src/app/admin/friends/friends.routes.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/index.ts (renamed from client/src/app/admin/friends/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/shared/friend.model.ts (renamed from client/src/app/admin/friends/shared/friend.model.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/shared/friend.service.ts (renamed from client/src/app/admin/friends/shared/friend.service.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/friends/shared/index.ts (renamed from client/src/app/admin/friends/shared/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/index.ts (renamed from client/src/app/admin/index.ts) | 1 | ||||
-rw-r--r-- | client/src/app/+admin/requests/index.ts (renamed from client/src/app/admin/requests/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/request-stats/index.ts (renamed from client/src/app/admin/requests/request-stats/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/request-stats/request-stats.component.html (renamed from client/src/app/admin/requests/request-stats/request-stats.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/request-stats/request-stats.component.scss (renamed from client/src/app/admin/requests/request-stats/request-stats.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/request-stats/request-stats.component.ts (renamed from client/src/app/admin/requests/request-stats/request-stats.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/requests.component.ts (renamed from client/src/app/admin/requests/requests.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/requests.routes.ts (renamed from client/src/app/admin/requests/requests.routes.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/shared/index.ts (renamed from client/src/app/admin/requests/shared/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/shared/request-stats.model.ts (renamed from client/src/app/admin/requests/shared/request-stats.model.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/requests/shared/request.service.ts (renamed from client/src/app/admin/requests/shared/request.service.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/index.ts (renamed from client/src/app/admin/users/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/shared/index.ts (renamed from client/src/app/admin/users/shared/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/shared/user.service.ts (renamed from client/src/app/admin/users/shared/user.service.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-add/index.ts (renamed from client/src/app/admin/users/user-add/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-add/user-add.component.html (renamed from client/src/app/admin/users/user-add/user-add.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-add/user-add.component.ts (renamed from client/src/app/admin/users/user-add/user-add.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/index.ts (renamed from client/src/app/admin/users/user-list/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.html (renamed from client/src/app/admin/users/user-list/user-list.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.scss (renamed from client/src/app/admin/users/user-list/user-list.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/user-list/user-list.component.ts (renamed from client/src/app/admin/users/user-list/user-list.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/users.component.ts (renamed from client/src/app/admin/users/users.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/users/users.routes.ts (renamed from client/src/app/admin/users/users.routes.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/index.ts (renamed from client/src/app/admin/video-abuses/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuse-list/index.ts (renamed from client/src/app/admin/video-abuses/video-abuse-list/index.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html (renamed from client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss (renamed from client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.scss) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts (renamed from client/src/app/admin/video-abuses/video-abuse-list/video-abuse-list.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuses.component.ts (renamed from client/src/app/admin/video-abuses/video-abuses.component.ts) | 0 | ||||
-rw-r--r-- | client/src/app/+admin/video-abuses/video-abuses.routes.ts (renamed from client/src/app/admin/video-abuses/video-abuses.routes.ts) | 0 | ||||
-rw-r--r-- | client/src/app/app-routing.module.ts | 4 | ||||
-rw-r--r-- | client/src/app/app.module.ts | 2 | ||||
-rw-r--r-- | client/src/app/core/core.module.ts | 12 | ||||
-rw-r--r-- | client/src/app/core/menu/index.ts | 1 | ||||
-rw-r--r-- | client/src/app/core/menu/menu-admin.component.html (renamed from client/src/app/admin/menu-admin.component.html) | 0 | ||||
-rw-r--r-- | client/src/app/core/menu/menu-admin.component.ts (renamed from client/src/app/admin/menu-admin.component.ts) | 0 |
55 files changed, 43 insertions, 13 deletions
diff --git a/client/config/webpack.common.js b/client/config/webpack.common.js index 223f55c2e..08b8a4b09 100644 --- a/client/config/webpack.common.js +++ b/client/config/webpack.common.js | |||
@@ -5,6 +5,7 @@ const helpers = require('./helpers') | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | const AssetsPlugin = require('assets-webpack-plugin') | 7 | const AssetsPlugin = require('assets-webpack-plugin') |
8 | const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin | ||
8 | const NormalModuleReplacementPlugin = require('webpack/lib/NormalModuleReplacementPlugin') | 9 | const NormalModuleReplacementPlugin = require('webpack/lib/NormalModuleReplacementPlugin') |
9 | const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') | 10 | const ContextReplacementPlugin = require('webpack/lib/ContextReplacementPlugin') |
10 | const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') | 11 | const CommonsChunkPlugin = require('webpack/lib/optimize/CommonsChunkPlugin') |
@@ -313,6 +314,30 @@ module.exports = function (options) { | |||
313 | disabled: !AOT, | 314 | disabled: !AOT, |
314 | tsConfig: helpers.root('tsconfig.webpack.json'), | 315 | tsConfig: helpers.root('tsconfig.webpack.json'), |
315 | resourceOverride: helpers.root('config/resource-override.js') | 316 | resourceOverride: helpers.root('config/resource-override.js') |
317 | }), | ||
318 | |||
319 | new BundleAnalyzerPlugin({ | ||
320 | // Can be `server`, `static` or `disabled`. | ||
321 | // In `server` mode analyzer will start HTTP server to show bundle report. | ||
322 | // In `static` mode single HTML file with bundle report will be generated. | ||
323 | // In `disabled` mode you can use this plugin to just generate Webpack Stats JSON file by setting `generateStatsFile` to `true`. | ||
324 | analyzerMode: 'static', | ||
325 | // Path to bundle report file that will be generated in `static` mode. | ||
326 | // Relative to bundles output directory. | ||
327 | reportFilename: 'report.html', | ||
328 | // Automatically open report in default browser | ||
329 | openAnalyzer: false, | ||
330 | // If `true`, Webpack Stats JSON file will be generated in bundles output directory | ||
331 | generateStatsFile: true, | ||
332 | // Name of Webpack Stats JSON file that will be generated if `generateStatsFile` is `true`. | ||
333 | // Relative to bundles output directory. | ||
334 | statsFilename: 'stats.json', | ||
335 | // Options for `stats.toJson()` method. | ||
336 | // For example you can exclude sources of your modules from stats file with `source: false` option. | ||
337 | // See more options here: https://github.com/webpack/webpack/blob/webpack-1/lib/Stats.js#L21 | ||
338 | statsOptions: null, | ||
339 | // Log level. Can be 'info', 'warn', 'error' or 'silent'. | ||
340 | logLevel: 'info' | ||
316 | }) | 341 | }) |
317 | ], | 342 | ], |
318 | 343 | ||
diff --git a/client/package.json b/client/package.json index ea458f1d4..f4835590e 100644 --- a/client/package.json +++ b/client/package.json | |||
@@ -88,6 +88,7 @@ | |||
88 | "add-asset-html-webpack-plugin": "^1.0.2", | 88 | "add-asset-html-webpack-plugin": "^1.0.2", |
89 | "codelyzer": "2.0.0-beta.4", | 89 | "codelyzer": "2.0.0-beta.4", |
90 | "standard": "^8.0.0", | 90 | "standard": "^8.0.0", |
91 | "webpack-bundle-analyzer": "^2.2.1", | ||
91 | "webpack-dll-bundles-plugin": "^1.0.0-beta.5" | 92 | "webpack-dll-bundles-plugin": "^1.0.0-beta.5" |
92 | } | 93 | } |
93 | } | 94 | } |
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'; | |||
9 | 9 | ||
10 | const adminRoutes: Routes = [ | 10 | const adminRoutes: Routes = [ |
11 | { | 11 | { |
12 | path: 'admin', | 12 | path: '', |
13 | component: AdminComponent, | 13 | component: AdminComponent, |
14 | children: [ | 14 | children: [ |
15 | { | 15 | { |
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 | |||
6 | import { RequestsComponent, RequestStatsComponent, RequestService } from './requests'; | 6 | import { RequestsComponent, RequestStatsComponent, RequestService } from './requests'; |
7 | import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users'; | 7 | import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users'; |
8 | import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses'; | 8 | import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses'; |
9 | import { MenuAdminComponent } from './menu-admin.component'; | ||
10 | import { SharedModule } from '../shared'; | 9 | import { SharedModule } from '../shared'; |
11 | 10 | ||
12 | @NgModule({ | 11 | @NgModule({ |
@@ -30,14 +29,11 @@ import { SharedModule } from '../shared'; | |||
30 | UserListComponent, | 29 | UserListComponent, |
31 | 30 | ||
32 | VideoAbusesComponent, | 31 | VideoAbusesComponent, |
33 | VideoAbuseListComponent, | 32 | VideoAbuseListComponent |
34 | |||
35 | MenuAdminComponent | ||
36 | ], | 33 | ], |
37 | 34 | ||
38 | exports: [ | 35 | exports: [ |
39 | AdminComponent, | 36 | AdminComponent |
40 | MenuAdminComponent | ||
41 | ], | 37 | ], |
42 | 38 | ||
43 | providers: [ | 39 | 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'; | |||
4 | export * from './admin-routing.module'; | 4 | export * from './admin-routing.module'; |
5 | export * from './admin.module'; | 5 | export * from './admin.module'; |
6 | export * from './admin.component'; | 6 | export * from './admin.component'; |
7 | 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 = [ | |||
6 | path: '', | 6 | path: '', |
7 | redirectTo: '/videos/list', | 7 | redirectTo: '/videos/list', |
8 | pathMatch: 'full' | 8 | pathMatch: 'full' |
9 | }, | ||
10 | { | ||
11 | path: 'admin', | ||
12 | loadChildren: './+admin#AdminModule' | ||
9 | } | 13 | } |
10 | ]; | 14 | ]; |
11 | 15 | ||
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'; | |||
11 | import { AppState } from './app.service'; | 11 | import { AppState } from './app.service'; |
12 | 12 | ||
13 | import { AccountModule } from './account'; | 13 | import { AccountModule } from './account'; |
14 | import { AdminModule } from './admin'; | ||
15 | import { CoreModule } from './core'; | 14 | import { CoreModule } from './core'; |
16 | import { LoginModule } from './login'; | 15 | import { LoginModule } from './login'; |
17 | import { SharedModule } from './shared'; | 16 | import { SharedModule } from './shared'; |
@@ -47,7 +46,6 @@ const APP_PROVIDERS = [ | |||
47 | MetaModule.forRoot(metaConfig), | 46 | MetaModule.forRoot(metaConfig), |
48 | 47 | ||
49 | AccountModule, | 48 | AccountModule, |
50 | AdminModule, | ||
51 | CoreModule, | 49 | CoreModule, |
52 | LoginModule, | 50 | LoginModule, |
53 | SharedModule, | 51 | 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'; | |||
4 | import { RouterModule } from '@angular/router'; | 4 | import { RouterModule } from '@angular/router'; |
5 | 5 | ||
6 | import { AuthService } from './auth'; | 6 | import { AuthService } from './auth'; |
7 | import { MenuComponent } from './menu'; | 7 | import { MenuComponent, MenuAdminComponent } from './menu'; |
8 | import { throwIfAlreadyLoaded } from './module-import-guard'; | 8 | import { throwIfAlreadyLoaded } from './module-import-guard'; |
9 | 9 | ||
10 | @NgModule({ | 10 | @NgModule({ |
@@ -13,8 +13,14 @@ import { throwIfAlreadyLoaded } from './module-import-guard'; | |||
13 | HttpModule, | 13 | HttpModule, |
14 | RouterModule | 14 | RouterModule |
15 | ], | 15 | ], |
16 | declarations: [ MenuComponent ], | 16 | declarations: [ |
17 | exports: [ MenuComponent ], | 17 | MenuComponent, |
18 | MenuAdminComponent | ||
19 | ], | ||
20 | exports: [ | ||
21 | MenuComponent, | ||
22 | MenuAdminComponent | ||
23 | ], | ||
18 | providers: [ AuthService ] | 24 | providers: [ AuthService ] |
19 | }) | 25 | }) |
20 | export class CoreModule { | 26 | 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 @@ | |||
1 | export * from './menu.component'; | 1 | export * from './menu.component'; |
2 | 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 | |||