From: Chocobozzz <me@florianbigard.com>
Date: Wed, 29 May 2019 14:57:43 +0000 (+0200)
Subject: Add ability to subscribe from the channel account page
X-Git-Tag: v1.4.0-rc.1~202
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc01017be99c8d8390f45f82e97ed506b9f1b6a6;p=oweals%2Fpeertube.git

Add ability to subscribe from the channel account page
---

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 @@
           <div>{{ videoChannel.displayName }}</div>
           <div i18n class="followers">{{ videoChannel.followersCount }} subscribers</div>
         </a>
+
+        <my-subscribe-button [videoChannel]="videoChannel"></my-subscribe-button>
       </div>
 
       <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;
     font-size: 24px;
     font-weight: $font-semibold;
     margin-bottom: 30px;
+    display: flex;
+    justify-content: space-between;
 
     a {
       &: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)
     accountId: res.locals.account.id,
     start: req.query.start,
     count: req.query.count,
-    sort: req.query.sort,
+    sort: req.query.sort
   }
 
   const resultList = await VideoChannelModel.listByAccount(options)