Merge branch 'master' into develop

[github/Chocobozzz/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 db1ce2d7f90a85041570526f39e64b5fc033c44c..71a4dfc4a588d547bc18ecd165b588fe38e93080 100644 (file)
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -1,35 +1,64 @@
-import { NgModule } from '@angular/core';
-
-import { AdminComponent } from './admin.component';
-import { AdminRoutingModule } from './admin-routing.module';
-import { FriendsComponent, FriendAddComponent, FriendListComponent, FriendService } from './friends';
-import { RequestsComponent, RequestStatsComponent, RequestService } from './requests';
-import { UsersComponent, UserAddComponent, UserListComponent, UserService } from './users';
-import { VideoAbusesComponent, VideoAbuseListComponent } from './video-abuses';
-import { SharedModule } from '../shared';
+import { NgModule } from '@angular/core'
+import { ConfigComponent, EditCustomConfigComponent } from '@app/+admin/config'
+import { ConfigService } from '@app/+admin/config/shared/config.service'
+import { TableModule } from 'primeng/table'
+import { SharedModule } from '../shared'
+import { AdminRoutingModule } from './admin-routing.module'
+import { AdminComponent } from './admin.component'
+import { FollowersListComponent, FollowingAddComponent, FollowsComponent, FollowService } from './follows'
+import { FollowingListComponent } from './follows/following-list/following-list.component'
+import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersComponent, UserUpdateComponent } from './users'
+import {
+  ModerationCommentModalComponent,
+  VideoAbuseListComponent,
+  VideoAutoBlacklistListComponent,
+  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'
+import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist'
+import { JobsComponent } from '@app/+admin/system/jobs/jobs.component'
+import { JobService, LogsComponent, LogsService, SystemComponent } from '@app/+admin/system'
+import { DebugComponent, DebugService } from '@app/+admin/system/debug'
 
 @NgModule({
   imports: [
     AdminRoutingModule,
+    TableModule,
     SharedModule
   ],
 
   declarations: [
     AdminComponent,
 
-    FriendsComponent,
-    FriendAddComponent,
-    FriendListComponent,
-
-    RequestsComponent,
-    RequestStatsComponent,
+    FollowsComponent,
+    FollowingAddComponent,
+    FollowersListComponent,
+    FollowingListComponent,
+    RedundancyCheckboxComponent,
 
     UsersComponent,
-    UserAddComponent,
+    UserCreateComponent,
+    UserUpdateComponent,
+    UserPasswordComponent,
     UserListComponent,
 
-    VideoAbusesComponent,
-    VideoAbuseListComponent
+    ModerationComponent,
+    VideoBlacklistListComponent,
+    VideoAbuseListComponent,
+    VideoAutoBlacklistListComponent,
+    ModerationCommentModalComponent,
+    InstanceServerBlocklistComponent,
+    InstanceAccountBlocklistComponent,
+
+    SystemComponent,
+    JobsComponent,
+    LogsComponent,
+    DebugComponent,
+
+    ConfigComponent,
+    EditCustomConfigComponent
   ],
 
   exports: [
@@ -37,9 +66,12 @@ import { SharedModule } from '../shared';
   ],
 
   providers: [
-    FriendService,
-    RequestService,
-    UserService
+    FollowService,
+    RedundancyService,
+    JobService,
+    LogsService,
+    DebugService,
+    ConfigService
   ]
 })
 export class AdminModule { }