X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=97a3b6d24ea3081781a9f880c4b1c082d79b4035;hb=07098c33df3f5e00c2a150d3025abb779d0edb6c;hp=015c14bce70aee2cb83ffe0a1d2e9c23a53c7058;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts index 015c14bce..97a3b6d24 100644 --- a/client/src/app/menu/menu.component.ts +++ b/client/src/app/menu/menu.component.ts @@ -1,25 +1,27 @@ +import { ViewportScroller } from '@angular/common' +import { HotkeysService } from 'angular2-hotkeys' +import * as debug from 'debug' +import { switchMap } from 'rxjs/operators' import { Component, OnInit, ViewChild } from '@angular/core' -import { UserRight } from '../../../../shared/models/users/user-right.enum' -import { AuthService, AuthStatus, RedirectService, ServerService } from '../core' -import { User } from '@app/shared/users/user.model' -import { UserService } from '@app/shared/users/user.service' +import { Router } from '@angular/router' +import { scrollToTop } from '@app/helpers' +import { AuthService, AuthStatus, AuthUser, MenuService, RedirectService, ScreenService, ServerService, UserService } from '@app/core' import { LanguageChooserComponent } from '@app/menu/language-chooser.component' -import { HotkeysService } from 'angular2-hotkeys' -import { ServerConfig, VideoConstant } from '@shared/models' import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { ScreenService } from '@app/shared/misc/screen.service' +import { ServerConfig, UserRight, VideoConstant } from '@shared/models' + +const logger = debug('peertube:menu:MenuComponent') @Component({ selector: 'my-menu', templateUrl: './menu.component.html', - styleUrls: [ './menu.component.scss' ] + styleUrls: ['./menu.component.scss'] }) export class MenuComponent implements OnInit { @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent @ViewChild('quickSettingsModal', { static: true }) quickSettingsModal: QuickSettingsModalComponent - user: User + user: AuthUser isLoggedIn: boolean userHasAdminAccess = false @@ -29,23 +31,25 @@ export class MenuComponent implements OnInit { private languages: VideoConstant[] = [] private serverConfig: ServerConfig - private routesPerRight: { [ role in UserRight ]?: string } = { + private routesPerRight: { [role in UserRight]?: string } = { [UserRight.MANAGE_USERS]: '/admin/users', [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends', - [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/moderation/video-abuses', - [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blacklist', + [UserRight.MANAGE_ABUSES]: '/admin/moderation/abuses', + [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blocks', [UserRight.MANAGE_JOBS]: '/admin/jobs', [UserRight.MANAGE_CONFIGURATION]: '/admin/config' } constructor ( + private viewportScroller: ViewportScroller, private authService: AuthService, private userService: UserService, private serverService: ServerService, private redirectService: RedirectService, private hotkeysService: HotkeysService, private screenService: ScreenService, - private i18n: I18n + private menuService: MenuService, + private router: Router ) { } get isInMobileView () { @@ -60,27 +64,59 @@ export class MenuComponent implements OnInit { } } + get language () { + return this.languageChooserModal.getCurrentLanguage() + } + + get nsfwPolicy () { + if (!this.user) return + + switch (this.user.nsfwPolicy) { + case 'do_not_list': + return $localize`hide` + + case 'blur': + return $localize`blur` + + case 'display': + return $localize`display` + } + } + + get instanceName () { + return this.serverConfig.instance.name + } + ngOnInit () { this.serverConfig = this.serverService.getTmpConfig() this.serverService.getConfig() .subscribe(config => this.serverConfig = config) this.isLoggedIn = this.authService.isLoggedIn() - if (this.isLoggedIn === true) this.user = this.authService.getUser() - this.computeIsUserHasAdminAccess() + if (this.isLoggedIn === true) { + this.user = this.authService.getUser() + this.computeVideosLink() + } + + this.computeAdminAccess() this.authService.loginChangedSource.subscribe( status => { if (status === AuthStatus.LoggedIn) { this.isLoggedIn = true this.user = this.authService.getUser() - this.computeIsUserHasAdminAccess() - console.log('Logged in.') + + this.computeAdminAccess() + this.computeVideosLink() + + logger('Logged in.') } else if (status === AuthStatus.LoggedOut) { this.isLoggedIn = false this.user = undefined - this.computeIsUserHasAdminAccess() - console.log('Logged out.') + + this.computeAdminAccess() + + logger('Logged out.') } else { console.error('Unknown auth status: ' + status) } @@ -88,39 +124,20 @@ export class MenuComponent implements OnInit { ) this.hotkeysService.cheatSheetToggle - .subscribe(isOpen => this.helpVisible = isOpen) + .subscribe(isOpen => this.helpVisible = isOpen) this.serverService.getVideoLanguages() - .subscribe(languages => { - this.languages = languages + .subscribe(languages => { + this.languages = languages - this.authService.userInformationLoaded - .subscribe(() => this.buildUserLanguages()) - }) - } - - get language () { - return this.languageChooserModal.getCurrentLanguage() - } - - get nsfwPolicy () { - if (!this.user) return - - switch (this.user.nsfwPolicy) { - case 'do_not_list': - return this.i18n('hide') - - case 'blur': - return this.i18n('blur') - - case 'display': - return this.i18n('display') - } + this.authService.userInformationLoaded + .subscribe(() => this.buildUserLanguages()) + }) } isRegistrationAllowed () { return this.serverConfig.signup.allowed && - this.serverConfig.signup.allowedForCurrentIP + this.serverConfig.signup.allowedForCurrentIP } getFirstAdminRightAvailable () { @@ -130,7 +147,7 @@ export class MenuComponent implements OnInit { const adminRights = [ UserRight.MANAGE_USERS, UserRight.MANAGE_SERVER_FOLLOW, - UserRight.MANAGE_VIDEO_ABUSES, + UserRight.MANAGE_ABUSES, UserRight.MANAGE_VIDEO_BLACKLIST, UserRight.MANAGE_JOBS, UserRight.MANAGE_CONFIGURATION @@ -176,15 +193,34 @@ export class MenuComponent implements OnInit { this.user.webTorrentEnabled = !this.user.webTorrentEnabled this.userService.updateMyProfile({ webTorrentEnabled: this.user.webTorrentEnabled }) - .subscribe(() => this.authService.refreshUserInformation()) + .subscribe(() => this.authService.refreshUserInformation()) } langForLocale (localeId: string) { - if (localeId === '_unknown') return this.i18n('Unknown') + if (localeId === '_unknown') return $localize`Unknown` return this.languages.find(lang => lang.id === localeId).label } + onActiveLinkScrollToAnchor (link: HTMLAnchorElement) { + const linkURL = link.getAttribute('href') + const linkHash = link.getAttribute('fragment') + + // On same url without fragment restore top scroll position + if (!linkHash && this.router.url.includes(linkURL)) { + scrollToTop('smooth') + } + + // On same url with fragment restore anchor scroll position + if (linkHash && this.router.url === linkURL) { + this.viewportScroller.scrollToAnchor(linkHash) + } + + if (this.screenService.isInSmallView()) { + this.menuService.toggleMenu() + } + } + private buildUserLanguages () { if (!this.user) { this.videoLanguages = [] @@ -192,18 +228,28 @@ export class MenuComponent implements OnInit { } if (!this.user.videoLanguages) { - this.videoLanguages = [ this.i18n('any language') ] + this.videoLanguages = [$localize`any language`] return } this.videoLanguages = this.user.videoLanguages - .map(locale => this.langForLocale(locale)) - .map(value => value === undefined ? '?' : value) + .map(locale => this.langForLocale(locale)) + .map(value => value === undefined ? '?' : value) } - private computeIsUserHasAdminAccess () { + private computeAdminAccess () { const right = this.getFirstAdminRightAvailable() this.userHasAdminAccess = right !== undefined } + + private computeVideosLink () { + this.authService.userInformationLoaded + .pipe( + switchMap(() => this.user.computeCanSeeVideosLink(this.userService.getMyVideoQuotaUsed())) + ).subscribe(res => { + if (res === true) logger('User can see videos link.') + else logger('User cannot see videos link.') + }) + } }