aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-06-29 17:18:30 +0200
committerChocobozzz <me@florianbigard.com>2021-06-29 17:18:39 +0200
commit911186dae411d78788ccede093c251303187589a (patch)
tree967a07cd985ae4e2ea5249855726455fe929471d /client
parentb0c43e36dbdc2c964f6828a78b146faebfb75b21 (diff)
downloadPeerTube-911186dae411d78788ccede093c251303187589a.tar.gz
PeerTube-911186dae411d78788ccede093c251303187589a.tar.zst
PeerTube-911186dae411d78788ccede093c251303187589a.zip
Reorganize watch components
Diffstat (limited to 'client')
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/index.ts3
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html (renamed from client/src/app/+videos/+video-watch/comment/video-comment-add.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss (renamed from client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts (renamed from client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html (renamed from client/src/app/+videos/+video-watch/comment/video-comment.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss (renamed from client/src/app/+videos/+video-watch/comment/video-comment.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts (renamed from client/src/app/+videos/+video-watch/comment/video-comment.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html (renamed from client/src/app/+videos/+video-watch/comment/video-comments.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss (renamed from client/src/app/+videos/+video-watch/comment/video-comments.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts (renamed from client/src/app/+videos/+video-watch/comment/video-comments.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/index.ts5
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/index.ts3
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html (renamed from client/src/app/+videos/+video-watch/video-avatar-channel.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss (renamed from client/src/app/+videos/+video-watch/video-avatar-channel.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts (renamed from client/src/app/+videos/+video-watch/video-avatar-channel.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html (renamed from client/src/app/+videos/+video-watch/video-description.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-description.component.scss (renamed from client/src/app/+videos/+video-watch/video-description.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts (renamed from client/src/app/+videos/+video-watch/video-description.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.html (renamed from client/src/app/+videos/+video-watch/video-rate.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.scss (renamed from client/src/app/+videos/+video-watch/video-rate.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.ts (renamed from client/src/app/+videos/+video-watch/video-rate.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/playlist/index.ts1
-rw-r--r--client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html (renamed from client/src/app/+videos/+video-watch/video-watch-playlist.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss (renamed from client/src/app/+videos/+video-watch/video-watch-playlist.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts (renamed from client/src/app/+videos/+video-watch/video-watch-playlist.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/index.ts5
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommendation-info.model.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommendations.service.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.html (renamed from client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.scss (renamed from client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.store.ts (renamed from client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts (renamed from client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts)0
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts2
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.module.ts20
37 files changed, 29 insertions, 10 deletions
diff --git a/client/src/app/+videos/+video-watch/shared/comment/index.ts b/client/src/app/+videos/+video-watch/shared/comment/index.ts
new file mode 100644
index 000000000..2f2c69893
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/shared/comment/index.ts
@@ -0,0 +1,3 @@
1export * from './video-comment-add.component'
2export * from './video-comment.component'
3export * from './video-comments.component'
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html
index 3ee818c8b..3ee818c8b 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.html
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.html
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss
index fb79991db..fb79991db 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.scss
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
index 78efe1684..78efe1684 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment-add.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment-add.component.ts
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html
index d8b944b35..d8b944b35 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.html
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.html
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss
index 87e313d41..87e313d41 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.scss
diff --git a/client/src/app/+videos/+video-watch/comment/video-comment.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
index 04f8f0d58..04f8f0d58 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comment.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comment.component.ts
diff --git a/client/src/app/+videos/+video-watch/comment/video-comments.component.html b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html
index 9e6fde2e0..9e6fde2e0 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.html
diff --git a/client/src/app/+videos/+video-watch/comment/video-comments.component.scss b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss
index 31aa73937..31aa73937 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.scss
diff --git a/client/src/app/+videos/+video-watch/comment/video-comments.component.ts b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
index 2c39e63fb..2c39e63fb 100644
--- a/client/src/app/+videos/+video-watch/comment/video-comments.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/comment/video-comments.component.ts
diff --git a/client/src/app/+videos/+video-watch/shared/index.ts b/client/src/app/+videos/+video-watch/shared/index.ts
new file mode 100644
index 000000000..a6c2d75ad
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/shared/index.ts
@@ -0,0 +1,5 @@
1export * from './comment'
2export * from './metadata'
3export * from './playlist'
4export * from './recommendations'
5export * from './timestamp-route-transformer.directive'
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/index.ts b/client/src/app/+videos/+video-watch/shared/metadata/index.ts
new file mode 100644
index 000000000..ba97f7011
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/shared/metadata/index.ts
@@ -0,0 +1,3 @@
1export * from './video-avatar-channel.component'
2export * from './video-description.component'
3export * from './video-rate.component'
diff --git a/client/src/app/+videos/+video-watch/video-avatar-channel.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html
index 5a7221858..5a7221858 100644
--- a/client/src/app/+videos/+video-watch/video-avatar-channel.component.html
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html
diff --git a/client/src/app/+videos/+video-watch/video-avatar-channel.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss
index 1ff8fb96e..1ff8fb96e 100644
--- a/client/src/app/+videos/+video-watch/video-avatar-channel.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss
diff --git a/client/src/app/+videos/+video-watch/video-avatar-channel.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
index 63edd7bad..63edd7bad 100644
--- a/client/src/app/+videos/+video-watch/video-avatar-channel.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts
diff --git a/client/src/app/+videos/+video-watch/video-description.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html
index 57f682899..57f682899 100644
--- a/client/src/app/+videos/+video-watch/video-description.component.html
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.html
diff --git a/client/src/app/+videos/+video-watch/video-description.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.scss
index fc8b4574c..fc8b4574c 100644
--- a/client/src/app/+videos/+video-watch/video-description.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.scss
diff --git a/client/src/app/+videos/+video-watch/video-description.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
index 2ea3b206f..2ea3b206f 100644
--- a/client/src/app/+videos/+video-watch/video-description.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-description.component.ts
diff --git a/client/src/app/+videos/+video-watch/video-rate.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.html
index 7dd9b3678..7dd9b3678 100644
--- a/client/src/app/+videos/+video-watch/video-rate.component.html
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.html
diff --git a/client/src/app/+videos/+video-watch/video-rate.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.scss
index f4f696f33..f4f696f33 100644
--- a/client/src/app/+videos/+video-watch/video-rate.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.scss
diff --git a/client/src/app/+videos/+video-watch/video-rate.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.ts
index 89a666a62..89a666a62 100644
--- a/client/src/app/+videos/+video-watch/video-rate.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/metadata/video-rate.component.ts
diff --git a/client/src/app/+videos/+video-watch/shared/playlist/index.ts b/client/src/app/+videos/+video-watch/shared/playlist/index.ts
new file mode 100644
index 000000000..539705508
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/shared/playlist/index.ts
@@ -0,0 +1 @@
export * from './video-watch-playlist.component'
diff --git a/client/src/app/+videos/+video-watch/video-watch-playlist.component.html b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html
index c270142a3..c270142a3 100644
--- a/client/src/app/+videos/+video-watch/video-watch-playlist.component.html
+++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.html
diff --git a/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss
index 75ed9d901..75ed9d901 100644
--- a/client/src/app/+videos/+video-watch/video-watch-playlist.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.scss
diff --git a/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
index 0a4d6bfd1..0a4d6bfd1 100644
--- a/client/src/app/+videos/+video-watch/video-watch-playlist.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/playlist/video-watch-playlist.component.ts
diff --git a/client/src/app/+videos/+video-watch/shared/recommendations/index.ts b/client/src/app/+videos/+video-watch/shared/recommendations/index.ts
new file mode 100644
index 000000000..ffcf84585
--- /dev/null
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/index.ts
@@ -0,0 +1,5 @@
1export * from './recent-videos-recommendation.service'
2export * from './recommendation-info.model'
3export * from './recommendations.module'
4export * from './recommended-videos.component'
5export * from './recommended-videos.store'
diff --git a/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts
index 4654da847..4654da847 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recent-videos-recommendation.service.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recent-videos-recommendation.service.ts
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommendation-info.model.ts
index 0233563bb..0233563bb 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommendation-info.model.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommendation-info.model.ts
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts
index 1417f3e2a..1417f3e2a 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommendations.module.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.module.ts
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.service.ts
index 1d79d35f6..1d79d35f6 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommendations.service.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommendations.service.ts
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.html
index e1040fead..e1040fead 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.html
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.scss
index 84ed25ae8..84ed25ae8 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.scss
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.scss
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
index 89b9c01b6..89b9c01b6 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.component.ts
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.store.ts
index 8c3fb6480..8c3fb6480 100644
--- a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.store.ts
+++ b/client/src/app/+videos/+video-watch/shared/recommendations/recommended-videos.store.ts
diff --git a/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts b/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts
index 45e023695..45e023695 100644
--- a/client/src/app/+videos/+video-watch/timestamp-route-transformer.directive.ts
+++ b/client/src/app/+videos/+video-watch/shared/timestamp-route-transformer.directive.ts
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index e6b353220..9bc82d667 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -53,7 +53,7 @@ import {
53} from '../../../assets/player/peertube-player-manager' 53} from '../../../assets/player/peertube-player-manager'
54import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils' 54import { isWebRTCDisabled, timeToInt } from '../../../assets/player/utils'
55import { environment } from '../../../environments/environment' 55import { environment } from '../../../environments/environment'
56import { VideoWatchPlaylistComponent } from './video-watch-playlist.component' 56import { VideoWatchPlaylistComponent } from './shared'
57 57
58type URLOptions = CustomizationOptions & { playerMode: PlayerMode } 58type URLOptions = CustomizationOptions & { playerMode: PlayerMode }
59 59
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 93b143542..f4484f1fe 100644
--- a/client/src/app/+videos/+video-watch/video-watch.module.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.module.ts
@@ -12,16 +12,18 @@ import { SharedVideoMiniatureModule } from '@app/shared/shared-video-miniature'
12import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist' 12import { SharedVideoPlaylistModule } from '@app/shared/shared-video-playlist'
13import { SharedActorImageModule } from '../../shared/shared-actor-image/shared-actor-image.module' 13import { SharedActorImageModule } from '../../shared/shared-actor-image/shared-actor-image.module'
14import { VideoCommentService } from '../../shared/shared-video-comment/video-comment.service' 14import { VideoCommentService } from '../../shared/shared-video-comment/video-comment.service'
15import { VideoCommentAddComponent } from './comment/video-comment-add.component'
16import { VideoCommentComponent } from './comment/video-comment.component'
17import { VideoCommentsComponent } from './comment/video-comments.component'
18import { PlayerStylesComponent } from './player-styles.component' 15import { PlayerStylesComponent } from './player-styles.component'
19import { RecommendationsModule } from './recommendations/recommendations.module' 16import {
20import { TimestampRouteTransformerDirective } from './timestamp-route-transformer.directive' 17 RecommendationsModule,
21import { VideoAvatarChannelComponent } from './video-avatar-channel.component' 18 VideoAvatarChannelComponent,
22import { VideoDescriptionComponent } from './video-description.component' 19 VideoDescriptionComponent,
23import { VideoRateComponent } from './video-rate.component' 20 VideoRateComponent,
24import { VideoWatchPlaylistComponent } from './video-watch-playlist.component' 21 VideoWatchPlaylistComponent
22} from './shared'
23import { VideoCommentAddComponent } from './shared/comment/video-comment-add.component'
24import { VideoCommentComponent } from './shared/comment/video-comment.component'
25import { VideoCommentsComponent } from './shared/comment/video-comments.component'
26import { TimestampRouteTransformerDirective } from './shared/timestamp-route-transformer.directive'
25import { VideoWatchRoutingModule } from './video-watch-routing.module' 27import { VideoWatchRoutingModule } from './video-watch-routing.module'
26import { VideoWatchComponent } from './video-watch.component' 28import { VideoWatchComponent } from './video-watch.component'
27 29