aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-05-29 16:57:43 +0200
committerChocobozzz <me@florianbigard.com>2019-05-29 17:00:40 +0200
commitbc01017be99c8d8390f45f82e97ed506b9f1b6a6 (patch)
treee511a42a0dc3841319b4fb727f2bafc22d8f2af7
parentc8487f3f63c90fbfddaa906b3cbd90fb209ab1bb (diff)
downloadPeerTube-bc01017be99c8d8390f45f82e97ed506b9f1b6a6.tar.gz
PeerTube-bc01017be99c8d8390f45f82e97ed506b9f1b6a6.tar.zst
PeerTube-bc01017be99c8d8390f45f82e97ed506b9f1b6a6.zip
Add ability to subscribe from the channel account page
-rw-r--r--client/src/app/+accounts/account-video-channels/account-video-channels.component.html2
-rw-r--r--client/src/sass/include/_miniature.scss2
-rw-r--r--server/controllers/api/accounts.ts2
3 files changed, 5 insertions, 1 deletions
diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
index 63f0514fd..25b74027e 100644
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.html
@@ -9,6 +9,8 @@
9 <div>{{ videoChannel.displayName }}</div> 9 <div>{{ videoChannel.displayName }}</div>
10 <div i18n class="followers">{{ videoChannel.followersCount }} subscribers</div> 10 <div i18n class="followers">{{ videoChannel.followersCount }} subscribers</div>
11 </a> 11 </a>
12
13 <my-subscribe-button [videoChannel]="videoChannel"></my-subscribe-button>
12 </div> 14 </div>
13 15
14 <my-video-miniature *ngFor="let video of getVideosOf(videoChannel)" [video]="video" [user]="user" [displayVideoActions]="false"></my-video-miniature> 16 <my-video-miniature *ngFor="let video of getVideosOf(videoChannel)" [video]="video" [user]="user" [displayVideoActions]="false"></my-video-miniature>
diff --git a/client/src/sass/include/_miniature.scss b/client/src/sass/include/_miniature.scss
index 3afcca310..0c2ee2d0d 100644
--- a/client/src/sass/include/_miniature.scss
+++ b/client/src/sass/include/_miniature.scss
@@ -156,6 +156,8 @@ $play-overlay-width: 18px;
156 font-size: 24px; 156 font-size: 24px;
157 font-weight: $font-semibold; 157 font-weight: $font-semibold;
158 margin-bottom: 30px; 158 margin-bottom: 30px;
159 display: flex;
160 justify-content: space-between;
159 161
160 a { 162 a {
161 &:hover, &:focus:not(.focus-visible), &:active { 163 &:hover, &:focus:not(.focus-visible), &:active {
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 9b3489120..5a1d652f2 100644
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -117,7 +117,7 @@ async function listAccountChannels (req: express.Request, res: express.Response)
117 accountId: res.locals.account.id, 117 accountId: res.locals.account.id,
118 start: req.query.start, 118 start: req.query.start,
119 count: req.query.count, 119 count: req.query.count,
120 sort: req.query.sort, 120 sort: req.query.sort
121 } 121 }
122 122
123 const resultList = await VideoChannelModel.listByAccount(options) 123 const resultList = await VideoChannelModel.listByAccount(options)