diff options
author | Chocobozzz <me@florianbigard.com> | 2018-10-05 16:56:14 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-10-05 17:02:10 +0200 |
commit | 79bd2632d62f2f600d663815fcc00a01ca981aa1 (patch) | |
tree | 2a6b5df65fdd6025dda16cf7cd743c4530c63bf6 /client/src/app/+accounts | |
parent | e724fa93c71d76d709e819a05e5e2904a3c4205b (diff) | |
download | PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.tar.gz PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.tar.zst PeerTube-79bd2632d62f2f600d663815fcc00a01ca981aa1.zip |
Add user moderation in the account page
Diffstat (limited to 'client/src/app/+accounts')
-rw-r--r-- | client/src/app/+accounts/accounts.component.html | 5 | ||||
-rw-r--r-- | client/src/app/+accounts/accounts.component.scss | 12 | ||||
-rw-r--r-- | client/src/app/+accounts/accounts.component.ts | 48 |
3 files changed, 60 insertions, 5 deletions
diff --git a/client/src/app/+accounts/accounts.component.html b/client/src/app/+accounts/accounts.component.html index 69f648269..036e794d2 100644 --- a/client/src/app/+accounts/accounts.component.html +++ b/client/src/app/+accounts/accounts.component.html | |||
@@ -8,6 +8,11 @@ | |||
8 | <div class="actor-names"> | 8 | <div class="actor-names"> |
9 | <div class="actor-display-name">{{ account.displayName }}</div> | 9 | <div class="actor-display-name">{{ account.displayName }}</div> |
10 | <div class="actor-name">{{ account.nameWithHost }}</div> | 10 | <div class="actor-name">{{ account.nameWithHost }}</div> |
11 | |||
12 | <span *ngIf="user?.blocked" [ngbTooltip]="user.blockedReason" class="badge badge-danger" i18n>Banned</span> | ||
13 | |||
14 | <my-user-moderation-dropdown buttonSize="small" [user]="user" (userChanged)="onUserChanged()" (userDeleted)="onUserDeleted()"> | ||
15 | </my-user-moderation-dropdown> | ||
11 | </div> | 16 | </div> |
12 | <div i18n class="actor-followers">{{ account.followersCount }} subscribers</div> | 17 | <div i18n class="actor-followers">{{ account.followersCount }} subscribers</div> |
13 | </div> | 18 | </div> |
diff --git a/client/src/app/+accounts/accounts.component.scss b/client/src/app/+accounts/accounts.component.scss index 909b65bc7..3cedda889 100644 --- a/client/src/app/+accounts/accounts.component.scss +++ b/client/src/app/+accounts/accounts.component.scss | |||
@@ -3,4 +3,16 @@ | |||
3 | 3 | ||
4 | .sub-menu { | 4 | .sub-menu { |
5 | @include sub-menu-with-actor; | 5 | @include sub-menu-with-actor; |
6 | } | ||
7 | |||
8 | my-user-moderation-dropdown, | ||
9 | .badge { | ||
10 | margin-left: 10px; | ||
11 | |||
12 | position: relative; | ||
13 | top: 3px; | ||
14 | } | ||
15 | |||
16 | .badge { | ||
17 | font-size: 13px; | ||
6 | } \ No newline at end of file | 18 | } \ No newline at end of file |
diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index af0451e91..e19927d6b 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts | |||
@@ -1,10 +1,14 @@ | |||
1 | import { Component, OnInit, OnDestroy } from '@angular/core' | 1 | import { Component, OnDestroy, OnInit } from '@angular/core' |
2 | import { ActivatedRoute } from '@angular/router' | 2 | import { ActivatedRoute } from '@angular/router' |
3 | import { AccountService } from '@app/shared/account/account.service' | 3 | import { AccountService } from '@app/shared/account/account.service' |
4 | import { Account } from '@app/shared/account/account.model' | 4 | import { Account } from '@app/shared/account/account.model' |
5 | import { RestExtractor } from '@app/shared' | 5 | import { RestExtractor, UserService } from '@app/shared' |
6 | import { catchError, switchMap, distinctUntilChanged, map } from 'rxjs/operators' | 6 | import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators' |
7 | import { Subscription } from 'rxjs' | 7 | import { Subscription } from 'rxjs' |
8 | import { NotificationsService } from 'angular2-notifications' | ||
9 | import { User, UserRight } from '../../../../shared' | ||
10 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
11 | import { AuthService, RedirectService } from '@app/core' | ||
8 | 12 | ||
9 | @Component({ | 13 | @Component({ |
10 | templateUrl: './accounts.component.html', | 14 | templateUrl: './accounts.component.html', |
@@ -12,13 +16,19 @@ import { Subscription } from 'rxjs' | |||
12 | }) | 16 | }) |
13 | export class AccountsComponent implements OnInit, OnDestroy { | 17 | export class AccountsComponent implements OnInit, OnDestroy { |
14 | account: Account | 18 | account: Account |
19 | user: User | ||
15 | 20 | ||
16 | private routeSub: Subscription | 21 | private routeSub: Subscription |
17 | 22 | ||
18 | constructor ( | 23 | constructor ( |
19 | private route: ActivatedRoute, | 24 | private route: ActivatedRoute, |
25 | private userService: UserService, | ||
20 | private accountService: AccountService, | 26 | private accountService: AccountService, |
21 | private restExtractor: RestExtractor | 27 | private notificationsService: NotificationsService, |
28 | private restExtractor: RestExtractor, | ||
29 | private redirectService: RedirectService, | ||
30 | private authService: AuthService, | ||
31 | private i18n: I18n | ||
22 | ) {} | 32 | ) {} |
23 | 33 | ||
24 | ngOnInit () { | 34 | ngOnInit () { |
@@ -27,12 +37,40 @@ export class AccountsComponent implements OnInit, OnDestroy { | |||
27 | map(params => params[ 'accountId' ]), | 37 | map(params => params[ 'accountId' ]), |
28 | distinctUntilChanged(), | 38 | distinctUntilChanged(), |
29 | switchMap(accountId => this.accountService.getAccount(accountId)), | 39 | switchMap(accountId => this.accountService.getAccount(accountId)), |
40 | tap(account => this.getUserIfNeeded(account)), | ||
30 | catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) | 41 | catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) |
31 | ) | 42 | ) |
32 | .subscribe(account => this.account = account) | 43 | .subscribe( |
44 | account => this.account = account, | ||
45 | |||
46 | err => this.notificationsService.error(this.i18n('Error'), err.message) | ||
47 | ) | ||
33 | } | 48 | } |
34 | 49 | ||
35 | ngOnDestroy () { | 50 | ngOnDestroy () { |
36 | if (this.routeSub) this.routeSub.unsubscribe() | 51 | if (this.routeSub) this.routeSub.unsubscribe() |
37 | } | 52 | } |
53 | |||
54 | onUserChanged () { | ||
55 | this.getUserIfNeeded(this.account) | ||
56 | } | ||
57 | |||
58 | onUserDeleted () { | ||
59 | this.redirectService.redirectToHomepage() | ||
60 | } | ||
61 | |||
62 | private getUserIfNeeded (account: Account) { | ||
63 | if (!account.userId) return | ||
64 | if (!this.authService.isLoggedIn()) return | ||
65 | |||
66 | const user = this.authService.getUser() | ||
67 | if (user.hasRight(UserRight.MANAGE_USERS)) { | ||
68 | this.userService.getUser(account.userId) | ||
69 | .subscribe( | ||
70 | user => this.user = user, | ||
71 | |||
72 | err => this.notificationsService.error(this.i18n('Error'), err.message) | ||
73 | ) | ||
74 | } | ||
75 | } | ||
38 | } | 76 | } |