Merge branch 'release/4.3.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-main / shared-main.module.ts

diff --git a/client/src/app/shared/shared-main/shared-main.module.ts b/client/src/app/shared/shared-main/shared-main.module.ts
index 3e21d491a21acd2843f7cad5264f69138466a5c4..c1523bc5021af307a2c5c6bea32943e5d7190df1 100644 (file)
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ b/client/src/app/shared/shared-main/shared-main.module.ts
@@ -11,30 +11,48 @@ import {
   NgbModalModule,
   NgbNavModule,
   NgbPopoverModule,
-  NgbTooltipModule,
-  NgbButtonsModule
+  NgbTooltipModule
 } from '@ng-bootstrap/ng-bootstrap'
 import { LoadingBarModule } from '@ngx-loading-bar/core'
 import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
 import { SharedGlobalIconModule } from '../shared-icons'
-import { AccountService, ActorAvatarInfoComponent, VideoAvatarChannelComponent } from './account'
+import { AccountService } from './account'
 import {
   AutofocusDirective,
   BytesPipe,
+  DeferLoadingDirective,
   DurationFormatterPipe,
   FromNowPipe,
   InfiniteScrollerDirective,
+  LinkComponent,
   NumberFormatterPipe,
   PeerTubeTemplateDirective
 } from './angular'
 import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
 import { ActionDropdownComponent, ButtonComponent, DeleteButtonComponent, EditButtonComponent } from './buttons'
+import { CustomPageService } from './custom-page'
 import { DateToggleComponent } from './date'
 import { FeedComponent } from './feeds'
-import { LoaderComponent, SmallLoaderComponent } from './loaders'
-import { HelpComponent, ListOverflowComponent, TopMenuDropdownComponent, SimpleSearchInputComponent } from './misc'
+import { LoaderComponent } from './loaders'
+import {
+  ChannelsSetupMessageComponent,
+  HelpComponent,
+  ListOverflowComponent,
+  SimpleSearchInputComponent,
+  TopMenuDropdownComponent
+} from './misc'
+import { PluginPlaceholderComponent, PluginSelectorDirective } from './plugins'
+import { ActorRedirectGuard } from './router'
 import { UserHistoryService, UserNotificationsComponent, UserNotificationService, UserQuotaComponent } from './users'
-import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video'
+import {
+  EmbedComponent,
+  RedundancyService,
+  VideoFileTokenService,
+  VideoImportService,
+  VideoOwnershipService,
+  VideoResolver,
+  VideoService
+} from './video'
 import { VideoCaptionService } from './video-caption'
 import { VideoChannelService } from './video-channel'
 
@@ -55,7 +73,6 @@ import { VideoChannelService } from './video-channel'
     NgbNavModule,
     NgbTooltipModule,
     NgbCollapseModule,
-    NgbButtonsModule,
 
     ClipboardModule,
 
@@ -65,17 +82,16 @@ import { VideoChannelService } from './video-channel'
   ],
 
   declarations: [
-    VideoAvatarChannelComponent,
-    ActorAvatarInfoComponent,
-
     FromNowPipe,
     NumberFormatterPipe,
     BytesPipe,
     DurationFormatterPipe,
     AutofocusDirective,
+    DeferLoadingDirective,
 
     InfiniteScrollerDirective,
     PeerTubeTemplateDirective,
+    LinkComponent,
 
     ActionDropdownComponent,
     ButtonComponent,
@@ -87,15 +103,20 @@ import { VideoChannelService } from './video-channel'
     FeedComponent,
 
     LoaderComponent,
-    SmallLoaderComponent,
 
+    ChannelsSetupMessageComponent,
     HelpComponent,
     ListOverflowComponent,
     TopMenuDropdownComponent,
     SimpleSearchInputComponent,
 
     UserQuotaComponent,
-    UserNotificationsComponent
+    UserNotificationsComponent,
+
+    EmbedComponent,
+
+    PluginPlaceholderComponent,
+    PluginSelectorDirective
   ],
 
   exports: [
@@ -114,23 +135,21 @@ import { VideoChannelService } from './video-channel'
     NgbNavModule,
     NgbTooltipModule,
     NgbCollapseModule,
-    NgbButtonsModule,
 
     ClipboardModule,
 
     PrimeSharedModule,
 
-    VideoAvatarChannelComponent,
-    ActorAvatarInfoComponent,
-
     FromNowPipe,
     BytesPipe,
     NumberFormatterPipe,
     DurationFormatterPipe,
     AutofocusDirective,
+    DeferLoadingDirective,
 
     InfiniteScrollerDirective,
     PeerTubeTemplateDirective,
+    LinkComponent,
 
     ActionDropdownComponent,
     ButtonComponent,
@@ -142,15 +161,20 @@ import { VideoChannelService } from './video-channel'
     FeedComponent,
 
     LoaderComponent,
-    SmallLoaderComponent,
 
+    ChannelsSetupMessageComponent,
     HelpComponent,
     ListOverflowComponent,
     TopMenuDropdownComponent,
     SimpleSearchInputComponent,
 
     UserQuotaComponent,
-    UserNotificationsComponent
+    UserNotificationsComponent,
+
+    EmbedComponent,
+
+    PluginPlaceholderComponent,
+    PluginSelectorDirective
   ],
 
   providers: [
@@ -169,10 +193,16 @@ import { VideoChannelService } from './video-channel'
     VideoImportService,
     VideoOwnershipService,
     VideoService,
+    VideoFileTokenService,
+    VideoResolver,
 
     VideoCaptionService,
 
-    VideoChannelService
+    VideoChannelService,
+
+    CustomPageService,
+
+    ActorRedirectGuard
   ]
 })
 export class SharedMainModule { }