Merge branch 'release/v1.0.0' into develop

[oweals/peertube.git] / client / src / app / +admin / admin.module.ts

diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index 04b7ec5c1c724c776128fced562cdf712318f5c0..8c6db98d9f4a1d222b2e56e3b76753004bd671c9 100644 (file)
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -10,10 +10,11 @@ import { FollowingListComponent } from './follows/following-list/following-list.
 import { JobsComponent } from './jobs/job.component'
 import { JobsListComponent } from './jobs/jobs-list/jobs-list.component'
 import { JobService } from './jobs/shared/job.service'
-import { UserCreateComponent, UserListComponent, UsersComponent, UserService, UserUpdateComponent } from './users'
-import { VideoAbuseListComponent, VideoAbusesComponent } from './video-abuses'
-import { VideoBlacklistComponent, VideoBlacklistListComponent } from './video-blacklist'
-import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-modal.component'
+import { UserCreateComponent, UserListComponent, UsersComponent, UserUpdateComponent } from './users'
+import { ModerationCommentModalComponent, VideoAbuseListComponent, VideoBlacklistListComponent } from './moderation'
+import { ModerationComponent } from '@app/+admin/moderation/moderation.component'
+import { RedundancyCheckboxComponent } from '@app/+admin/follows/shared/redundancy-checkbox.component'
+import { RedundancyService } from '@app/+admin/follows/shared/redundancy.service'
 
 @NgModule({
   imports: [
@@ -29,18 +30,17 @@ import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-moda
     FollowingAddComponent,
     FollowersListComponent,
     FollowingListComponent,
+    RedundancyCheckboxComponent,
 
     UsersComponent,
     UserCreateComponent,
     UserUpdateComponent,
     UserListComponent,
-    UserBanModalComponent,
 
-    VideoBlacklistComponent,
+    ModerationComponent,
     VideoBlacklistListComponent,
-
-    VideoAbusesComponent,
     VideoAbuseListComponent,
+    ModerationCommentModalComponent,
 
     JobsComponent,
     JobsListComponent,
@@ -55,7 +55,7 @@ import { UserBanModalComponent } from '@app/+admin/users/user-list/user-ban-moda
 
   providers: [
     FollowService,
-    UserService,
+    RedundancyService,
     JobService,
     ConfigService
   ]