aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-06-16 14:13:01 +0200
committerChocobozzz <me@florianbigard.com>2020-06-16 14:13:01 +0200
commit1ba471c55fdbf05ef2c10152b3e4b0c5d8da3213 (patch)
tree0f231073a848f3089752fda5fe378ff5b64c229b /client/src
parentaf75e2d8df92d5d602e11353536ec6804a25f16f (diff)
downloadPeerTube-1ba471c55fdbf05ef2c10152b3e4b0c5d8da3213.tar.gz
PeerTube-1ba471c55fdbf05ef2c10152b3e4b0c5d8da3213.tar.zst
PeerTube-1ba471c55fdbf05ef2c10152b3e4b0c5d8da3213.zip
Add videos count in channels list
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html2
-rw-r--r--client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts4
-rw-r--r--client/src/app/shared/confirm/confirm.component.scss4
-rw-r--r--client/src/app/shared/video-channel/video-channel.model.ts6
4 files changed, 14 insertions, 2 deletions
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html
index 2499b6ed5..bf4fa9396 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.html
@@ -20,6 +20,8 @@
20 20
21 <div i18n class="video-channel-followers">{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div> 21 <div i18n class="video-channel-followers">{videoChannel.followersCount, plural, =1 {1 subscriber} other {{{ videoChannel.followersCount }} subscribers}}</div>
22 22
23 <div i18n class="video-channel-videos">{videoChannel.videosCount, plural, =0 {No videos} =1 {1 video} other {{{ videoChannel.videosCount }} videos}}</div>
24
23 <div class="video-channel-buttons"> 25 <div class="video-channel-buttons">
24 <my-edit-button [routerLink]="[ 'update', videoChannel.nameWithHost ]"></my-edit-button> 26 <my-edit-button [routerLink]="[ 'update', videoChannel.nameWithHost ]"></my-edit-button>
25 <my-delete-button (click)="deleteVideoChannel(videoChannel)"></my-delete-button> 27 <my-delete-button (click)="deleteVideoChannel(videoChannel)"></my-delete-button>
diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
index 75d6d8acd..9caefe5b1 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts
@@ -96,8 +96,8 @@ export class MyAccountVideoChannelsComponent implements OnInit {
96 const res = await this.confirmService.confirmWithInput( 96 const res = await this.confirmService.confirmWithInput(
97 this.i18n( 97 this.i18n(
98 // tslint:disable 98 // tslint:disable
99 'Do you really want to delete {{channelDisplayName}}? It will delete all videos uploaded in this channel, and you will not be able to create another channel with the same name ({{channelName}})!', 99 'Do you really want to delete {{channelDisplayName}}? It will delete {{videosCount}} videos uploaded in this channel, and you will not be able to create another channel with the same name ({{channelName}})!',
100 { channelDisplayName: videoChannel.displayName, channelName: videoChannel.name } 100 { channelDisplayName: videoChannel.displayName, videosCount: videoChannel.videosCount, channelName: videoChannel.name }
101 ), 101 ),
102 this.i18n( 102 this.i18n(
103 'Please type the display name of the video channel ({{displayName}}) to confirm', 103 'Please type the display name of the video channel ({{displayName}}) to confirm',
diff --git a/client/src/app/shared/confirm/confirm.component.scss b/client/src/app/shared/confirm/confirm.component.scss
index 93dd7926b..ed226bc09 100644
--- a/client/src/app/shared/confirm/confirm.component.scss
+++ b/client/src/app/shared/confirm/confirm.component.scss
@@ -1,6 +1,10 @@
1@import '_variables'; 1@import '_variables';
2@import '_mixins'; 2@import '_mixins';
3 3
4.modal-body {
5 font-size: 15px;
6}
7
4.button { 8.button {
5 padding: 0 13px; 9 padding: 0 13px;
6} 10}
diff --git a/client/src/app/shared/video-channel/video-channel.model.ts b/client/src/app/shared/video-channel/video-channel.model.ts
index 617d6d44d..2f4597343 100644
--- a/client/src/app/shared/video-channel/video-channel.model.ts
+++ b/client/src/app/shared/video-channel/video-channel.model.ts
@@ -9,9 +9,13 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
9 isLocal: boolean 9 isLocal: boolean
10 nameWithHost: string 10 nameWithHost: string
11 nameWithHostForced: string 11 nameWithHostForced: string
12
12 ownerAccount?: Account 13 ownerAccount?: Account
13 ownerBy?: string 14 ownerBy?: string
14 ownerAvatarUrl?: string 15 ownerAvatarUrl?: string
16
17 videosCount?: number
18
15 viewsPerDay?: ViewsPerDate[] 19 viewsPerDay?: ViewsPerDate[]
16 20
17 constructor (hash: ServerVideoChannel) { 21 constructor (hash: ServerVideoChannel) {
@@ -24,6 +28,8 @@ export class VideoChannel extends Actor implements ServerVideoChannel {
24 this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host) 28 this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
25 this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true) 29 this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true)
26 30
31 this.videosCount = hash.videosCount
32
27 if (hash.viewsPerDay) { 33 if (hash.viewsPerDay) {
28 this.viewsPerDay = hash.viewsPerDay.map(v => ({ ...v, date: new Date(v.date) })) 34 this.viewsPerDay = hash.viewsPerDay.map(v => ({ ...v, date: new Date(v.date) }))
29 } 35 }