Merge branch 'release/4.2.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 732914e34987663d7be6e483035520ef0a1b1df1..89f43239fb7f651bfa1037e0e873131ed352766c 100644 (file)
--- a/client/src/app/shared/shared-main/shared-main.module.ts
+++ b/client/src/app/shared/shared-main/shared-main.module.ts
@@ -1,8 +1,4 @@
-import { BytesPipe, KeysPipe, NgPipesModule } from 'ngx-pipes'
 import { SharedModule as PrimeSharedModule } from 'primeng/api'
-import { InputMaskModule } from 'primeng/inputmask'
-import { InputSwitchModule } from 'primeng/inputswitch'
-import { MultiSelectModule } from 'primeng/multiselect'
 import { ClipboardModule } from '@angular/cdk/clipboard'
 import { CommonModule, DatePipe } from '@angular/common'
 import { HttpClientModule } from '@angular/common/http'
@@ -10,6 +6,7 @@ import { NgModule } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { RouterModule } from '@angular/router'
 import {
+  NgbButtonsModule,
   NgbCollapseModule,
   NgbDropdownModule,
   NgbModalModule,
@@ -17,20 +14,40 @@ import {
   NgbPopoverModule,
   NgbTooltipModule
 } from '@ng-bootstrap/ng-bootstrap'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { LoadingBarModule } from '@ngx-loading-bar/core'
+import { LoadingBarHttpClientModule } from '@ngx-loading-bar/http-client'
 import { SharedGlobalIconModule } from '../shared-icons'
-import { AccountService, ActorAvatarInfoComponent, AvatarComponent } from './account'
-import { FromNowPipe, InfiniteScrollerDirective, NumberFormatterPipe, PeerTubeTemplateDirective } from './angular'
+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 } from './misc'
-import { UserHistoryService, UserNotificationsComponent, UserNotificationService } from './users'
-import { RedundancyService, VideoImportService, VideoOwnershipService, VideoService } from './video'
+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 { EmbedComponent, RedundancyService, VideoImportService, VideoOwnershipService, VideoResolver, VideoService } from './video'
 import { VideoCaptionService } from './video-caption'
 import { VideoChannelService } from './video-channel'
-import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
 
 @NgModule({
   imports: [
@@ -40,32 +57,35 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
     RouterModule,
     HttpClientModule,
 
+    LoadingBarHttpClientModule,
+    LoadingBarModule,
+
     NgbDropdownModule,
     NgbModalModule,
     NgbPopoverModule,
     NgbNavModule,
     NgbTooltipModule,
     NgbCollapseModule,
+    NgbButtonsModule,
 
     ClipboardModule,
 
     PrimeSharedModule,
-    InputMaskModule,
-    NgPipesModule,
-    MultiSelectModule,
-    InputSwitchModule,
 
     SharedGlobalIconModule
   ],
 
   declarations: [
-    AvatarComponent,
-    ActorAvatarInfoComponent,
-
     FromNowPipe,
-    InfiniteScrollerDirective,
     NumberFormatterPipe,
+    BytesPipe,
+    DurationFormatterPipe,
+    AutofocusDirective,
+    DeferLoadingDirective,
+
+    InfiniteScrollerDirective,
     PeerTubeTemplateDirective,
+    LinkComponent,
 
     ActionDropdownComponent,
     ButtonComponent,
@@ -77,13 +97,20 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
     FeedComponent,
 
     LoaderComponent,
-    SmallLoaderComponent,
 
+    ChannelsSetupMessageComponent,
     HelpComponent,
     ListOverflowComponent,
     TopMenuDropdownComponent,
+    SimpleSearchInputComponent,
+
+    UserQuotaComponent,
+    UserNotificationsComponent,
+
+    EmbedComponent,
 
-    UserNotificationsComponent
+    PluginPlaceholderComponent,
+    PluginSelectorDirective
   ],
 
   exports: [
@@ -93,28 +120,31 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
     RouterModule,
     HttpClientModule,
 
+    LoadingBarHttpClientModule,
+    LoadingBarModule,
+
     NgbDropdownModule,
     NgbModalModule,
     NgbPopoverModule,
     NgbNavModule,
     NgbTooltipModule,
     NgbCollapseModule,
+    NgbButtonsModule,
 
     ClipboardModule,
 
     PrimeSharedModule,
-    InputMaskModule,
-    BytesPipe,
-    KeysPipe,
-    MultiSelectModule,
-
-    AvatarComponent,
-    ActorAvatarInfoComponent,
 
     FromNowPipe,
-    InfiniteScrollerDirective,
+    BytesPipe,
     NumberFormatterPipe,
+    DurationFormatterPipe,
+    AutofocusDirective,
+    DeferLoadingDirective,
+
+    InfiniteScrollerDirective,
     PeerTubeTemplateDirective,
+    LinkComponent,
 
     ActionDropdownComponent,
     ButtonComponent,
@@ -126,18 +156,23 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
     FeedComponent,
 
     LoaderComponent,
-    SmallLoaderComponent,
 
+    ChannelsSetupMessageComponent,
     HelpComponent,
     ListOverflowComponent,
     TopMenuDropdownComponent,
+    SimpleSearchInputComponent,
+
+    UserQuotaComponent,
+    UserNotificationsComponent,
+
+    EmbedComponent,
 
-    UserNotificationsComponent
+    PluginPlaceholderComponent,
+    PluginSelectorDirective
   ],
 
   providers: [
-    I18n,
-
     DatePipe,
 
     FromNowPipe,
@@ -153,10 +188,15 @@ import { AUTH_INTERCEPTOR_PROVIDER } from './auth'
     VideoImportService,
     VideoOwnershipService,
     VideoService,
+    VideoResolver,
 
     VideoCaptionService,
 
-    VideoChannelService
+    VideoChannelService,
+
+    CustomPageService,
+
+    ActorRedirectGuard
   ]
 })
 export class SharedMainModule { }