diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-12-04 10:34:40 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-12-04 10:34:40 +0100 |
commit | 2295ce6c4e7ba805cc100ff961527bebc2cd89e5 (patch) | |
tree | fce0a24074ac119aad730ef5c73c680500ff9578 /client/src/app/account/account-settings | |
parent | 202f6b6c9dcc9b0aec4b0c1b15e455c22a7952a7 (diff) | |
download | PeerTube-2295ce6c4e7ba805cc100ff961527bebc2cd89e5.tar.gz PeerTube-2295ce6c4e7ba805cc100ff961527bebc2cd89e5.tar.zst PeerTube-2295ce6c4e7ba805cc100ff961527bebc2cd89e5.zip |
Add account avatar
Diffstat (limited to 'client/src/app/account/account-settings')
3 files changed, 30 insertions, 5 deletions
diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/account/account-settings/account-settings.component.html index 2509eb5aa..9e9f688d2 100644 --- a/client/src/app/account/account-settings/account-settings.component.html +++ b/client/src/app/account/account-settings/account-settings.component.html | |||
@@ -1,7 +1,13 @@ | |||
1 | <div class="user-info"> | 1 | <div class="user"> |
2 | {{ user.username }} | 2 | <img [src]="getAvatarPath()" alt="Avatar" /> |
3 | |||
4 | <div class="user-info"> | ||
5 | <div class="user-info-username">{{ user.username }}</div> | ||
6 | <div class="user-info-followers">{{ user.account.followersCount }} subscribers</div> | ||
7 | </div> | ||
3 | </div> | 8 | </div> |
4 | 9 | ||
10 | |||
5 | <div class="account-title">Account settings</div> | 11 | <div class="account-title">Account settings</div> |
6 | <my-account-change-password></my-account-change-password> | 12 | <my-account-change-password></my-account-change-password> |
7 | 13 | ||
diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/account/account-settings/account-settings.component.scss index a0822631d..f514809b0 100644 --- a/client/src/app/account/account-settings/account-settings.component.scss +++ b/client/src/app/account/account-settings/account-settings.component.scss | |||
@@ -1,6 +1,21 @@ | |||
1 | .user-info { | 1 | .user { |
2 | font-size: 20px; | 2 | display: flex; |
3 | font-weight: $font-bold; | 3 | |
4 | img { | ||
5 | @include avatar(50px); | ||
6 | margin-right: 15px; | ||
7 | } | ||
8 | |||
9 | .user-info { | ||
10 | .user-info-username { | ||
11 | font-size: 20px; | ||
12 | font-weight: $font-bold; | ||
13 | } | ||
14 | |||
15 | .user-info-followers { | ||
16 | font-size: 15px; | ||
17 | } | ||
18 | } | ||
4 | } | 19 | } |
5 | 20 | ||
6 | .account-title { | 21 | .account-title { |
diff --git a/client/src/app/account/account-settings/account-settings.component.ts b/client/src/app/account/account-settings/account-settings.component.ts index c3b670e02..cba251000 100644 --- a/client/src/app/account/account-settings/account-settings.component.ts +++ b/client/src/app/account/account-settings/account-settings.component.ts | |||
@@ -15,4 +15,8 @@ export class AccountSettingsComponent implements OnInit { | |||
15 | ngOnInit () { | 15 | ngOnInit () { |
16 | this.user = this.authService.getUser() | 16 | this.user = this.authService.getUser() |
17 | } | 17 | } |
18 | |||
19 | getAvatarPath () { | ||
20 | return this.user.getAvatarPath() | ||
21 | } | ||
18 | } | 22 | } |