From 5cac83a78d6ba5212755fafce2ed25f7c74b04e5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 9 Dec 2020 15:00:02 +0100 Subject: [PATCH] Refactor views component --- .../+video-watch/video-watch.component.html | 8 ++------ .../+video-watch/video-watch.module.ts | 4 +++- .../shared-video-miniature.module.ts | 4 +++- .../video-miniature.component.html | 5 ++--- client/src/app/shared/shared-video/index.ts | 1 + .../shared-video/shared-video.module.ts | 19 +++++++++++++++++++ .../video-views-counter.component.html | 9 +++++++++ .../video-views-counter.component.scss | 0 .../video-views-counter.component.ts | 11 +++++++++++ server/tests/api/live/live.ts | 5 ++--- 10 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 client/src/app/shared/shared-video/index.ts create mode 100644 client/src/app/shared/shared-video/shared-video.module.ts create mode 100644 client/src/app/shared/shared-video/video-views-counter.component.html create mode 100644 client/src/app/shared/shared-video/video-views-counter.component.scss create mode 100644 client/src/app/shared/shared-video/video-views-counter.component.ts diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html index 602214ac5..9cabe3bbc 100644 --- a/client/src/app/+videos/+video-watch/video-watch.component.html +++ b/client/src/app/+videos/+video-watch/video-watch.component.html @@ -53,12 +53,8 @@
Published - - - • {{ video.views | myNumberFormatter }} - views - viewers - + • +
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 21aa33b84..fbda9b9c4 100644 --- a/client/src/app/+videos/+video-watch/video-watch.module.ts +++ b/client/src/app/+videos/+video-watch/video-watch.module.ts @@ -5,6 +5,7 @@ import { SharedMainModule } from '@app/shared/shared-main' import { SharedModerationModule } from '@app/shared/shared-moderation' import { SharedShareModal } from '@app/shared/shared-share-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' @@ -32,7 +33,8 @@ import { VideoWatchComponent } from './video-watch.component' SharedModerationModule, SharedGlobalIconModule, SharedVideoCommentModule, - SharedShareModal + SharedShareModal, + SharedVideoModule ], declarations: [ diff --git a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts b/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts index 08c8da3dd..3035bcfb3 100644 --- a/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts +++ b/client/src/app/shared/shared-video-miniature/shared-video-miniature.module.ts @@ -4,6 +4,7 @@ import { SharedFormModule } from '../shared-forms' import { SharedGlobalIconModule } from '../shared-icons' import { SharedMainModule } from '../shared-main/shared-main.module' import { SharedModerationModule } from '../shared-moderation' +import { SharedVideoModule } from '../shared-video' import { SharedThumbnailModule } from '../shared-thumbnail' import { SharedVideoLiveModule } from '../shared-video-live' import { SharedVideoPlaylistModule } from '../shared-video-playlist/shared-video-playlist.module' @@ -20,7 +21,8 @@ import { VideosSelectionComponent } from './videos-selection.component' SharedVideoPlaylistModule, SharedThumbnailModule, SharedGlobalIconModule, - SharedVideoLiveModule + SharedVideoLiveModule, + SharedVideoModule ], declarations: [ diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index 395a4df97..7a6df7b64 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html @@ -28,9 +28,8 @@ • - - {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}} - + + diff --git a/client/src/app/shared/shared-video/index.ts b/client/src/app/shared/shared-video/index.ts new file mode 100644 index 000000000..33a8b560f --- /dev/null +++ b/client/src/app/shared/shared-video/index.ts @@ -0,0 +1 @@ +export * from './shared-video.module' diff --git a/client/src/app/shared/shared-video/shared-video.module.ts b/client/src/app/shared/shared-video/shared-video.module.ts new file mode 100644 index 000000000..dfac4e357 --- /dev/null +++ b/client/src/app/shared/shared-video/shared-video.module.ts @@ -0,0 +1,19 @@ + +import { NgModule } from '@angular/core' +import { SharedMainModule } from '../shared-main/shared-main.module' +import { VideoViewsCounterComponent } from './video-views-counter.component' + +@NgModule({ + imports: [ + SharedMainModule + ], + + declarations: [ + VideoViewsCounterComponent + ], + + exports: [ + VideoViewsCounterComponent + ] +}) +export class SharedVideoModule { } diff --git a/client/src/app/shared/shared-video/video-views-counter.component.html b/client/src/app/shared/shared-video/video-views-counter.component.html new file mode 100644 index 000000000..a6679f74d --- /dev/null +++ b/client/src/app/shared/shared-video/video-views-counter.component.html @@ -0,0 +1,9 @@ + + + {video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}} + + + + {video.views, plural, =1 {1 viewer} other {{{ video.views | myNumberFormatter }} viewers}} + + diff --git a/client/src/app/shared/shared-video/video-views-counter.component.scss b/client/src/app/shared/shared-video/video-views-counter.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/client/src/app/shared/shared-video/video-views-counter.component.ts b/client/src/app/shared/shared-video/video-views-counter.component.ts new file mode 100644 index 000000000..17e6e37b9 --- /dev/null +++ b/client/src/app/shared/shared-video/video-views-counter.component.ts @@ -0,0 +1,11 @@ +import { Component, Input } from '@angular/core' +import { Video } from '../shared-main' + +@Component({ + selector: 'my-video-views-counter', + styleUrls: [ './video-views-counter.component.scss' ], + templateUrl: './video-views-counter.component.html' +}) +export class VideoViewsCounterComponent { + @Input() video: Video +} diff --git a/server/tests/api/live/live.ts b/server/tests/api/live/live.ts index 7ea0ec198..e728fcce0 100644 --- a/server/tests/api/live/live.ts +++ b/server/tests/api/live/live.ts @@ -42,8 +42,7 @@ import { waitJobs, waitUntilLiveEnded, waitUntilLivePublished, - waitUntilLiveSegmentGeneration, - waitUntilLog + waitUntilLiveSegmentGeneration } from '../../../../shared/extra-utils' const expect = chai.expect @@ -329,7 +328,7 @@ describe('Test live', function () { await checkResolutionsInMasterPlaylist(hlsPlaylist.playlistUrl, resolutions) for (let i = 0; i < resolutions.length; i++) { - const segmentNum = 1 + const segmentNum = 2 const segmentName = `${i}-00000${segmentNum}.ts` await waitUntilLiveSegmentGeneration(servers[0], video.uuid, i, segmentNum) -- 2.41.0