Merge branch 'next' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / +videos / +video-watch / video-watch.module.ts

diff --git a/client/src/app/+videos/+video-watch/video-watch.module.ts b/client/src/app/+videos/+video-watch/video-watch.module.ts
index 421170d8172786a7b81a14bda753b01342f47c6a..8f5ffdb1d75ef5a1874b38a890dfb1d538b5ad90 100644 (file)
--- a/client/src/app/+videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.module.ts
@@ -1,31 +1,39 @@
-import { QRCodeModule } from 'angularx-qrcode'
 import { NgModule } from '@angular/core'
 import { SharedFormModule } from '@app/shared/shared-forms'
 import { SharedGlobalIconModule } from '@app/shared/shared-icons'
 import { SharedMainModule } from '@app/shared/shared-main'
 import { SharedModerationModule } from '@app/shared/shared-moderation'
+import { SharedShareModal } from '@app/shared/shared-share-modal'
+import { SharedSupportModal } from '@app/shared/shared-support-modal'
 import { SharedUserSubscriptionModule } from '@app/shared/shared-user-subscription'
+import { SharedVideoModule } from '@app/shared/shared-video'
+import { SharedVideoCommentModule } from '@app/shared/shared-video-comment'
 import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
 import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
-import { RecommendationsModule } from './recommendations/recommendations.module'
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
-import { VideoCommentAddComponent } from './comment/video-comment-add.component'
-import { VideoCommentComponent } from './comment/video-comment.component'
-import { VideoCommentService } from './comment/video-comment.service'
-import { VideoCommentsComponent } from './comment/video-comments.component'
-import { VideoShareComponent } from './modal/video-share.component'
-import { VideoSupportComponent } from './modal/video-support.component'
-import { TimestampRouteTransformerDirective } from './timestamp-route-transformer.directive'
-import { VideoDurationPipe } from './video-duration-formatter.pipe'
-import { VideoWatchPlaylistComponent } from './video-watch-playlist.component'
+import { SharedActorImageModule } from '../../shared/shared-actor-image/shared-actor-image.module'
+import { VideoCommentService } from '../../shared/shared-video-comment/video-comment.service'
+import { PlayerStylesComponent } from './player-styles.component'
+import {
+  ActionButtonsComponent,
+  PrivacyConcernsComponent,
+  RecommendationsModule,
+  VideoAlertComponent,
+  VideoAvatarChannelComponent,
+  VideoDescriptionComponent,
+  VideoRateComponent,
+  VideoWatchPlaylistComponent,
+  VideoAttributesComponent
+} from './shared'
+import { VideoCommentAddComponent } from './shared/comment/video-comment-add.component'
+import { VideoCommentComponent } from './shared/comment/video-comment.component'
+import { VideoCommentsComponent } from './shared/comment/video-comments.component'
+import { TimestampRouteTransformerDirective } from './shared/timestamp-route-transformer.directive'
 import { VideoWatchRoutingModule } from './video-watch-routing.module'
 import { VideoWatchComponent } from './video-watch.component'
 
 @NgModule({
   imports: [
     VideoWatchRoutingModule,
-    NgbTooltipModule,
-    QRCodeModule,
     RecommendationsModule,
 
     SharedMainModule,
@@ -34,22 +42,34 @@ import { VideoWatchComponent } from './video-watch.component'
     SharedVideoPlaylistModule,
     SharedUserSubscriptionModule,
     SharedModerationModule,
-    SharedGlobalIconModule
+    SharedGlobalIconModule,
+    SharedVideoCommentModule,
+    SharedShareModal,
+    SharedVideoModule,
+    SharedSupportModal,
+    SharedActorImageModule
   ],
 
   declarations: [
     VideoWatchComponent,
     VideoWatchPlaylistComponent,
+    VideoRateComponent,
+    VideoDescriptionComponent,
+    PrivacyConcernsComponent,
+    ActionButtonsComponent,
+    VideoAlertComponent,
+    VideoAttributesComponent,
 
-    VideoShareComponent,
-    VideoSupportComponent,
     VideoCommentsComponent,
     VideoCommentAddComponent,
     VideoCommentComponent,
+    VideoAvatarChannelComponent,
+
+    VideoAvatarChannelComponent,
 
     TimestampRouteTransformerDirective,
-    VideoDurationPipe,
-    TimestampRouteTransformerDirective
+
+    PlayerStylesComponent
   ],
 
   exports: [