diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-14 16:38:37 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-14 18:01:22 +0200 |
commit | 614d1ae928ec307b708c4a3eb423797353b1df2a (patch) | |
tree | 8281785fc158073e56d31a9e1923906b72622ae2 | |
parent | 65b247ddc75aa9f131af86dde21c8d958f7f4b39 (diff) | |
download | PeerTube-614d1ae928ec307b708c4a3eb423797353b1df2a.tar.gz PeerTube-614d1ae928ec307b708c4a3eb423797353b1df2a.tar.zst PeerTube-614d1ae928ec307b708c4a3eb423797353b1df2a.zip |
Regroup abuse and blacklisted videos inside "moderation"
25 files changed, 99 insertions, 122 deletions
diff --git a/client/src/app/+admin/admin-routing.module.ts b/client/src/app/+admin/admin-routing.module.ts index 0301d7601..ca31ba585 100644 --- a/client/src/app/+admin/admin-routing.module.ts +++ b/client/src/app/+admin/admin-routing.module.ts | |||
@@ -8,8 +8,7 @@ import { AdminComponent } from './admin.component' | |||
8 | import { FollowsRoutes } from './follows' | 8 | import { FollowsRoutes } from './follows' |
9 | import { JobsRoutes } from './jobs/job.routes' | 9 | import { JobsRoutes } from './jobs/job.routes' |
10 | import { UsersRoutes } from './users' | 10 | import { UsersRoutes } from './users' |
11 | import { VideoAbusesRoutes } from './video-abuses' | 11 | import { ModerationRoutes } from '@app/+admin/moderation/moderation.routes' |
12 | import { VideoBlacklistRoutes } from './video-blacklist' | ||
13 | 12 | ||
14 | const adminRoutes: Routes = [ | 13 | const adminRoutes: Routes = [ |
15 | { | 14 | { |
@@ -25,8 +24,7 @@ const adminRoutes: Routes = [ | |||
25 | }, | 24 | }, |
26 | ...FollowsRoutes, | 25 | ...FollowsRoutes, |
27 | ...UsersRoutes, | 26 | ...UsersRoutes, |
28 | ...VideoAbusesRoutes, | 27 | ...ModerationRoutes, |
29 | ...VideoBlacklistRoutes, | ||
30 | ...JobsRoutes, | 28 | ...JobsRoutes, |
31 | ...ConfigRoutes | 29 | ...ConfigRoutes |
32 | ] | 30 | ] |
diff --git a/client/src/app/+admin/admin.component.html b/client/src/app/+admin/admin.component.html index 1b2b89c3a..345fb9f5a 100644 --- a/client/src/app/+admin/admin.component.html +++ b/client/src/app/+admin/admin.component.html | |||
@@ -8,12 +8,8 @@ | |||
8 | Manage follows | 8 | Manage follows |
9 | </a> | 9 | </a> |
10 | 10 | ||
11 | <a i18n *ngIf="hasVideoAbusesRight()" routerLink="/admin/video-abuses" routerLinkActive="active" class="title-page"> | 11 | <a i18n *ngIf="hasVideoAbusesRight() || hasVideoBlacklistRight()" routerLink="/admin/moderation" routerLinkActive="active" class="title-page"> |
12 | Video abuses | 12 | Moderation |
13 | </a> | ||
14 | |||
15 | <a i18n *ngIf="hasVideoBlacklistRight()" routerLink="/admin/video-blacklist" routerLinkActive="active" class="title-page"> | ||
16 | Video blacklist | ||
17 | </a> | 13 | </a> |
18 | 14 | ||
19 | <a i18n *ngIf="hasJobsRight()" routerLink="/admin/jobs" routerLinkActive="active" class="title-page"> | 15 | <a i18n *ngIf="hasJobsRight()" routerLink="/admin/jobs" routerLinkActive="active" class="title-page"> |
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts index 23ca5a6b3..e94aac1eb 100644 --- a/client/src/app/+admin/admin.module.ts +++ b/client/src/app/+admin/admin.module.ts | |||
@@ -11,9 +11,9 @@ import { JobsComponent } from './jobs/job.component' | |||
11 | import { JobsListComponent } from './jobs/jobs-list/jobs-list.component' | 11 | import { JobsListComponent } from './jobs/jobs-list/jobs-list.component' |
12 | import { JobService } from './jobs/shared/job.service' | 12 | import { JobService } from './jobs/shared/job.service' |
13 | import { UserCreateComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users' | 13 | import { UserCreateComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users' |
14 | import { ModerationCommentModalComponent, VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses' | 14 | import { ModerationCommentModalComponent, VideoAbuseListComponent, VideoBlacklistListComponent } from './moderation' |
15 | import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist' | ||
16 | import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-modal.component' | 15 | import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-modal.component' |
16 | import { ModerationComponent } from '@app/+admin/moderation/moderation.component' | ||
17 | 17 | ||
18 | @NgModule({ | 18 | @NgModule({ |
19 | imports: [ | 19 | imports: [ |
@@ -36,10 +36,8 @@ import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-moda | |||
36 | UserListComponent, | 36 | UserListComponent, |
37 | UserBanModalComponent, | 37 | UserBanModalComponent, |
38 | 38 | ||
39 | VideoBlacklistComponent, | 39 | ModerationComponent, |
40 | VideoBlacklistListComponent, | 40 | VideoBlacklistListComponent, |
41 | |||
42 | VideoAbusesComponent, | ||
43 | VideoAbuseListComponent, | 41 | VideoAbuseListComponent, |
44 | ModerationCommentModalComponent, | 42 | ModerationCommentModalComponent, |
45 | 43 | ||
diff --git a/client/src/app/+admin/moderation/index.ts b/client/src/app/+admin/moderation/index.ts new file mode 100644 index 000000000..66e2c6a39 --- /dev/null +++ b/client/src/app/+admin/moderation/index.ts | |||
@@ -0,0 +1,4 @@ | |||
1 | export * from './video-abuse-list' | ||
2 | export * from './video-blacklist-list' | ||
3 | export * from './moderation.component' | ||
4 | export * from './moderation.routes' | ||
diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html new file mode 100644 index 000000000..91e87fcd4 --- /dev/null +++ b/client/src/app/+admin/moderation/moderation.component.html | |||
@@ -0,0 +1,11 @@ | |||
1 | <div class="admin-sub-header"> | ||
2 | <div i18n class="form-sub-title">Moderation</div> | ||
3 | |||
4 | <div class="admin-sub-nav"> | ||
5 | <a *ngIf="hasVideoAbusesRight()" i18n routerLink="video-abuses/list" routerLinkActive="active">Video abuses</a> | ||
6 | |||
7 | <a *ngIf="hasVideoBlacklistRight()" i18n routerLink="video-blacklist/list" routerLinkActive="active">Blacklisted videos</a> | ||
8 | </div> | ||
9 | </div> | ||
10 | |||
11 | <router-outlet></router-outlet> \ No newline at end of file | ||
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss new file mode 100644 index 000000000..766d7853b --- /dev/null +++ b/client/src/app/+admin/moderation/moderation.component.scss | |||
@@ -0,0 +1,4 @@ | |||
1 | .form-sub-title { | ||
2 | flex-grow: 0; | ||
3 | margin-right: 30px; | ||
4 | } | ||
diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts new file mode 100644 index 000000000..0f4efb970 --- /dev/null +++ b/client/src/app/+admin/moderation/moderation.component.ts | |||
@@ -0,0 +1,19 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | import { UserRight } from '../../../../../shared' | ||
3 | import { AuthService } from '@app/core/auth/auth.service' | ||
4 | |||
5 | @Component({ | ||
6 | templateUrl: './moderation.component.html', | ||
7 | styleUrls: [ './moderation.component.scss' ] | ||
8 | }) | ||
9 | export class ModerationComponent { | ||
10 | constructor (private auth: AuthService) {} | ||
11 | |||
12 | hasVideoAbusesRight () { | ||
13 | return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES) | ||
14 | } | ||
15 | |||
16 | hasVideoBlacklistRight () { | ||
17 | return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) | ||
18 | } | ||
19 | } | ||
diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts new file mode 100644 index 000000000..b133152d9 --- /dev/null +++ b/client/src/app/+admin/moderation/moderation.routes.ts | |||
@@ -0,0 +1,42 @@ | |||
1 | import { Routes } from '@angular/router' | ||
2 | import { UserRight } from '../../../../../shared' | ||
3 | import { UserRightGuard } from '@app/core' | ||
4 | import { VideoAbuseListComponent } from '@app/+admin/moderation/video-abuse-list' | ||
5 | import { VideoBlacklistListComponent } from '@app/+admin/moderation/video-blacklist-list' | ||
6 | import { ModerationComponent } from '@app/+admin/moderation/moderation.component' | ||
7 | |||
8 | export const ModerationRoutes: Routes = [ | ||
9 | { | ||
10 | path: 'moderation', | ||
11 | component: ModerationComponent, | ||
12 | children: [ | ||
13 | { | ||
14 | path: '', | ||
15 | redirectTo: 'video-abuses/list', | ||
16 | pathMatch: 'full' | ||
17 | }, | ||
18 | { | ||
19 | path: 'video-abuses/list', | ||
20 | component: VideoAbuseListComponent, | ||
21 | canActivate: [ UserRightGuard ], | ||
22 | data: { | ||
23 | userRight: UserRight.MANAGE_VIDEO_ABUSES, | ||
24 | meta: { | ||
25 | title: 'Video abuses list' | ||
26 | } | ||
27 | } | ||
28 | }, | ||
29 | { | ||
30 | path: 'video-blacklist/list', | ||
31 | component: VideoBlacklistListComponent, | ||
32 | canActivate: [ UserRightGuard ], | ||
33 | data: { | ||
34 | userRight: UserRight.MANAGE_VIDEO_BLACKLIST, | ||
35 | meta: { | ||
36 | title: 'Blacklisted videos' | ||
37 | } | ||
38 | } | ||
39 | } | ||
40 | ] | ||
41 | } | ||
42 | ] | ||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/index.ts b/client/src/app/+admin/moderation/video-abuse-list/index.ts index da7176e52..da7176e52 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/index.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/index.ts | |||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.html b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html index 3a8424f68..3a8424f68 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.html | |||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.scss b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.scss index afcdb9a16..afcdb9a16 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.scss +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.scss | |||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.ts b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts index 7e8af6e5a..34ab384d1 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/moderation-comment-modal.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts | |||
@@ -4,7 +4,7 @@ import { FormReactive, VideoAbuseService, VideoAbuseValidatorsService } from '.. | |||
4 | import { I18n } from '@ngx-translate/i18n-polyfill' | 4 | import { I18n } from '@ngx-translate/i18n-polyfill' |
5 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 5 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
6 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 6 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
7 | import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service' | 7 | import { FormValidatorService } from '../../../shared/forms/form-validators/form-validator.service' |
8 | import { VideoAbuse } from '../../../../../../shared/models/videos' | 8 | import { VideoAbuse } from '../../../../../../shared/models/videos' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index f213ab4b0..722ff7906 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html | |||
@@ -1,7 +1,3 @@ | |||
1 | <div class="admin-sub-header"> | ||
2 | <div i18n class="form-sub-title">Video abuses list</div> | ||
3 | </div> | ||
4 | |||
5 | <p-table | 1 | <p-table |
6 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="videoAbuses" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
7 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" |
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss index 951a3fc92..2391fef8f 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.scss +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @import '_variables'; | 1 | @import 'variables'; |
2 | @import '_mixins'; | 2 | @import 'mixins'; |
3 | 3 | ||
4 | .moderation-comment-label { | 4 | .moderation-comment-label { |
5 | font-weight: $font-semibold; | 5 | font-weight: $font-semibold; |
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index 377e9c80f..b17278b94 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts | |||
@@ -1,14 +1,14 @@ | |||
1 | import { Component, OnInit, ViewChild } from '@angular/core' | 1 | import { Component, OnInit, ViewChild } from '@angular/core' |
2 | import { Account } from '@app/shared/account/account.model' | 2 | import { Account } from '../../../shared/account/account.model' |
3 | import { NotificationsService } from 'angular2-notifications' | 3 | import { NotificationsService } from 'angular2-notifications' |
4 | import { SortMeta } from 'primeng/components/common/sortmeta' | 4 | import { SortMeta } from 'primeng/components/common/sortmeta' |
5 | import { VideoAbuse, VideoAbuseState } from '../../../../../../shared' | 5 | import { VideoAbuse, VideoAbuseState } from '../../../../../../shared' |
6 | import { RestPagination, RestTable, VideoAbuseService } from '../../../shared' | 6 | import { RestPagination, RestTable, VideoAbuseService } from '../../../shared' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' | 8 | import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' |
9 | import { ConfirmService } from '@app/core' | 9 | import { ConfirmService } from '../../../core/index' |
10 | import { ModerationCommentModalComponent } from './moderation-comment-modal.component' | 10 | import { ModerationCommentModalComponent } from './moderation-comment-modal.component' |
11 | import { Video } from '@app/shared/video/video.model' | 11 | import { Video } from '../../../shared/video/video.model' |
12 | 12 | ||
13 | @Component({ | 13 | @Component({ |
14 | selector: 'my-video-abuse-list', | 14 | selector: 'my-video-abuse-list', |
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/index.ts b/client/src/app/+admin/moderation/video-blacklist-list/index.ts index 4daf64187..4daf64187 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/index.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/index.ts | |||
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html index 05b3a300c..dafaeb1e2 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html | |||
@@ -1,7 +1,3 @@ | |||
1 | <div class="admin-sub-header"> | ||
2 | <div i18n class="form-sub-title">Blacklisted videos</div> | ||
3 | </div> | ||
4 | |||
5 | <p-table | 1 | <p-table |
6 | [value]="blacklist" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" | 2 | [value]="blacklist" [lazy]="true" [paginator]="true" [totalRecords]="totalRecords" [rows]="rowsPerPage" |
7 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" | 3 | [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id" |
@@ -41,7 +37,7 @@ | |||
41 | 37 | ||
42 | <ng-template pTemplate="rowexpansion" let-videoBlacklist> | 38 | <ng-template pTemplate="rowexpansion" let-videoBlacklist> |
43 | <tr class="blacklist-reason"> | 39 | <tr class="blacklist-reason"> |
44 | <td colspan="6"> | 40 | <td colspan="7"> |
45 | <span i18n class="blacklist-reason-label">Blacklist reason:</span> | 41 | <span i18n class="blacklist-reason-label">Blacklist reason:</span> |
46 | {{ videoBlacklist.reason }} | 42 | {{ videoBlacklist.reason }} |
47 | </td> | 43 | </td> |
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.scss b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss index 5265536ca..063f6324e 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.scss +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss | |||
@@ -1,5 +1,5 @@ | |||
1 | @import '_variables'; | 1 | @import 'variables'; |
2 | @import '_mixins'; | 2 | @import 'mixins'; |
3 | 3 | ||
4 | .blacklist-reason-label { | 4 | .blacklist-reason-label { |
5 | font-weight: $font-semibold; | 5 | font-weight: $font-semibold; |
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts index 0618252b8..9890d1f90 100644 --- a/client/src/app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts +++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts | |||
@@ -5,8 +5,8 @@ import { ConfirmService } from '../../../core' | |||
5 | import { RestPagination, RestTable, VideoBlacklistService } from '../../../shared' | 5 | import { RestPagination, RestTable, VideoBlacklistService } from '../../../shared' |
6 | import { VideoBlacklist } from '../../../../../../shared' | 6 | import { VideoBlacklist } from '../../../../../../shared' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 7 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { DropdownAction } from '@app/shared/buttons/action-dropdown.component' | 8 | import { DropdownAction } from '../../../shared/buttons/action-dropdown.component' |
9 | import { Video } from '@app/shared/video/video.model' | 9 | import { Video } from '../../../shared/video/video.model' |
10 | 10 | ||
11 | @Component({ | 11 | @Component({ |
12 | selector: 'my-video-blacklist-list', | 12 | selector: 'my-video-blacklist-list', |
diff --git a/client/src/app/+admin/video-abuses/index.ts b/client/src/app/+admin/video-abuses/index.ts deleted file mode 100644 index 395fac2e7..000000000 --- a/client/src/app/+admin/video-abuses/index.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | export * from './video-abuse-list' | ||
2 | export * from './video-abuses.component' | ||
3 | export * from './video-abuses.routes' | ||
diff --git a/client/src/app/+admin/video-abuses/video-abuses.component.ts b/client/src/app/+admin/video-abuses/video-abuses.component.ts deleted file mode 100644 index 9dae5c0b6..000000000 --- a/client/src/app/+admin/video-abuses/video-abuses.component.ts +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | template: '<router-outlet></router-outlet>' | ||
5 | }) | ||
6 | |||
7 | export class VideoAbusesComponent { | ||
8 | } | ||
diff --git a/client/src/app/+admin/video-abuses/video-abuses.routes.ts b/client/src/app/+admin/video-abuses/video-abuses.routes.ts deleted file mode 100644 index 68b756059..000000000 --- a/client/src/app/+admin/video-abuses/video-abuses.routes.ts +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | import { Routes } from '@angular/router' | ||
2 | |||
3 | import { UserRightGuard } from '../../core' | ||
4 | import { UserRight } from '../../../../../shared' | ||
5 | import { VideoAbusesComponent } from './video-abuses.component' | ||
6 | import { VideoAbuseListComponent } from './video-abuse-list' | ||
7 | |||
8 | export const VideoAbusesRoutes: Routes = [ | ||
9 | { | ||
10 | path: 'video-abuses', | ||
11 | component: VideoAbusesComponent, | ||
12 | canActivate: [ UserRightGuard ], | ||
13 | data: { | ||
14 | userRight: UserRight.MANAGE_VIDEO_ABUSES | ||
15 | }, | ||
16 | children: [ | ||
17 | { | ||
18 | path: '', | ||
19 | redirectTo: 'list', | ||
20 | pathMatch: 'full' | ||
21 | }, | ||
22 | { | ||
23 | path: 'list', | ||
24 | component: VideoAbuseListComponent, | ||
25 | data: { | ||
26 | meta: { | ||
27 | title: 'Video abuses list' | ||
28 | } | ||
29 | } | ||
30 | } | ||
31 | ] | ||
32 | } | ||
33 | ] | ||
diff --git a/client/src/app/+admin/video-blacklist/index.ts b/client/src/app/+admin/video-blacklist/index.ts deleted file mode 100644 index a5451e2e1..000000000 --- a/client/src/app/+admin/video-blacklist/index.ts +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | export * from './video-blacklist-list' | ||
2 | export * from './video-blacklist.component' | ||
3 | export * from './video-blacklist.routes' | ||
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist.component.ts b/client/src/app/+admin/video-blacklist/video-blacklist.component.ts deleted file mode 100644 index 24b8c98f8..000000000 --- a/client/src/app/+admin/video-blacklist/video-blacklist.component.ts +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | import { Component } from '@angular/core' | ||
2 | |||
3 | @Component({ | ||
4 | template: '<router-outlet></router-outlet>' | ||
5 | }) | ||
6 | export class VideoBlacklistComponent { | ||
7 | } | ||
diff --git a/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts b/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts deleted file mode 100644 index b1e0e5049..000000000 --- a/client/src/app/+admin/video-blacklist/video-blacklist.routes.ts +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | import { Routes } from '@angular/router' | ||
2 | |||
3 | import { UserRightGuard } from '../../core' | ||
4 | import { UserRight } from '../../../../../shared' | ||
5 | import { VideoBlacklistComponent } from './video-blacklist.component' | ||
6 | import { VideoBlacklistListComponent } from './video-blacklist-list' | ||
7 | |||
8 | export const VideoBlacklistRoutes: Routes = [ | ||
9 | { | ||
10 | path: 'video-blacklist', | ||
11 | component: VideoBlacklistComponent, | ||
12 | canActivate: [ UserRightGuard ], | ||
13 | data: { | ||
14 | userRight: UserRight.MANAGE_VIDEO_BLACKLIST | ||
15 | }, | ||
16 | children: [ | ||
17 | { | ||
18 | path: '', | ||
19 | redirectTo: 'list', | ||
20 | pathMatch: 'full' | ||
21 | }, | ||
22 | { | ||
23 | path: 'list', | ||
24 | component: VideoBlacklistListComponent, | ||
25 | data: { | ||
26 | meta: { | ||
27 | title: 'Blacklisted videos' | ||
28 | } | ||
29 | } | ||
30 | } | ||
31 | ] | ||
32 | } | ||
33 | ] | ||