diff options
Diffstat (limited to 'client/src/app/account/account-settings')
3 files changed, 18 insertions, 1 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 0d1637c40..2f41b5ecf 100644 --- a/client/src/app/account/account-settings/account-settings.component.html +++ b/client/src/app/account/account-settings/account-settings.component.html | |||
@@ -13,8 +13,12 @@ | |||
13 | </div> | 13 | </div> |
14 | <div class="file-max-size">(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})</div> | 14 | <div class="file-max-size">(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})</div> |
15 | 15 | ||
16 | <div class="user-quota"> | ||
17 | <span class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ user.videoQuota | bytes: 0 }} | ||
18 | </div> | ||
19 | |||
16 | <div class="account-title">Account settings</div> | 20 | <div class="account-title">Account settings</div> |
17 | <my-account-change-password></my-account-change-password> | 21 | <my-account-change-password></my-account-change-password> |
18 | 22 | ||
19 | <div class="account-title">Videos</div> | 23 | <div class="account-title">Video settings</div> |
20 | <my-account-details [user]="user"></my-account-details> | 24 | <my-account-details [user]="user"></my-account-details> |
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 fbd1cb9f0..aaf9d79f0 100644 --- a/client/src/app/account/account-settings/account-settings.component.scss +++ b/client/src/app/account/account-settings/account-settings.component.scss | |||
@@ -36,6 +36,15 @@ | |||
36 | top: -10px; | 36 | top: -10px; |
37 | } | 37 | } |
38 | 38 | ||
39 | .user-quota { | ||
40 | font-size: 15px; | ||
41 | margin-top: 20px; | ||
42 | |||
43 | .user-quota-label { | ||
44 | font-weight: $font-semibold; | ||
45 | } | ||
46 | } | ||
47 | |||
39 | .account-title { | 48 | .account-title { |
40 | text-transform: uppercase; | 49 | text-transform: uppercase; |
41 | color: $orange-color; | 50 | color: $orange-color; |
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 d5f5ff30f..a375072a0 100644 --- a/client/src/app/account/account-settings/account-settings.component.ts +++ b/client/src/app/account/account-settings/account-settings.component.ts | |||
@@ -14,6 +14,7 @@ export class AccountSettingsComponent implements OnInit { | |||
14 | @ViewChild('avatarfileInput') avatarfileInput | 14 | @ViewChild('avatarfileInput') avatarfileInput |
15 | 15 | ||
16 | user: User = null | 16 | user: User = null |
17 | userVideoQuotaUsed = 0 | ||
17 | 18 | ||
18 | constructor ( | 19 | constructor ( |
19 | private userService: UserService, | 20 | private userService: UserService, |
@@ -24,6 +25,9 @@ export class AccountSettingsComponent implements OnInit { | |||
24 | 25 | ||
25 | ngOnInit () { | 26 | ngOnInit () { |
26 | this.user = this.authService.getUser() | 27 | this.user = this.authService.getUser() |
28 | |||
29 | this.userService.getMyVideoQuotaUsed() | ||
30 | .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed) | ||
27 | } | 31 | } |
28 | 32 | ||
29 | getAvatarUrl () { | 33 | getAvatarUrl () { |