X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fmenu%2Fmenu.component.ts;h=8fa1de3264baeeabbf26c89a4b5b50a8feb9db20;hb=746018f6b81b40e8858303662ac9ec5ce59ac6eb;hp=0ea251f1c602cb7e1132959210a8d8067ecef6c4;hpb=17aa80ed016bafa3ccb071af3f86054033823284;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts index 0ea251f1c..8fa1de326 100644 --- a/client/src/app/menu/menu.component.ts +++ b/client/src/app/menu/menu.component.ts @@ -1,31 +1,43 @@ import { HotkeysService } from 'angular2-hotkeys' +import * as debug from 'debug' +import { switchMap } from 'rxjs/operators' +import { ViewportScroller } from '@angular/common' import { Component, OnInit, ViewChild } from '@angular/core' -import { AuthService, AuthStatus, RedirectService, ScreenService, ServerService, User, UserService } from '@app/core' +import { Router } from '@angular/router' +import { AuthService, AuthStatus, AuthUser, MenuService, RedirectService, ScreenService, ServerService, UserService } from '@app/core' +import { scrollToTop } from '@app/helpers' import { LanguageChooserComponent } from '@app/menu/language-chooser.component' import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { PeertubeModalService } from '@app/shared/shared-main/peertube-modal/peertube-modal.service' +import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' 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 + @ViewChild('dropdown') dropdown: NgbDropdown - user: User + user: AuthUser isLoggedIn: boolean userHasAdminAccess = false helpVisible = false videoLanguages: string[] = [] + nsfwPolicy: string + + currentInterfaceLanguage: string 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_ABUSES]: '/admin/moderation/abuses', @@ -35,25 +47,34 @@ export class MenuComponent implements OnInit { } 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 modalService: PeertubeModalService, + private router: Router ) { } get isInMobileView () { return this.screenService.isInMobileView() } - get placement () { - if (this.isInMobileView) { - return 'left-top auto' - } else { - return 'right-top auto' - } + get dropdownContainer () { + if (this.isInMobileView) return null + + return 'body' as 'body' + } + + get language () { + return this.languageChooserModal.getCurrentLanguage() + } + + get instanceName () { + return this.serverConfig.instance.name } ngOnInit () { @@ -62,21 +83,34 @@ export class MenuComponent implements OnInit { .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.computeNSFWPolicy() + this.computeVideosLink() + } + + this.computeAdminAccess() + + this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage() 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) } @@ -84,39 +118,23 @@ 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 - - this.authService.userInformationLoaded - .subscribe(() => this.buildUserLanguages()) - }) - } - - get language () { - return this.languageChooserModal.getCurrentLanguage() - } + .subscribe(languages => { + this.languages = languages - get nsfwPolicy () { - if (!this.user) return - - switch (this.user.nsfwPolicy) { - case 'do_not_list': - return this.i18n('hide') + this.authService.userInformationLoaded + .subscribe(() => this.buildUserLanguages()) + }) - case 'blur': - return this.i18n('blur') - - case 'display': - return this.i18n('display') - } + this.modalService.openQuickSettingsSubject + .subscribe(() => this.openQuickSettings()) } isRegistrationAllowed () { return this.serverConfig.signup.allowed && - this.serverConfig.signup.allowedForCurrentIP + this.serverConfig.signup.allowedForCurrentIP } getFirstAdminRightAvailable () { @@ -172,15 +190,57 @@ 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() + } + } + + // Lock menu scroll when menu scroll to avoid fleeing / detached dropdown + onMenuScrollEvent () { + document.querySelector('menu').scrollTo(0, 0) + } + + onDropdownOpenChange (opened: boolean) { + if (this.screenService.isInMobileView()) return + + // Close dropdown when window scroll to avoid dropdown quick jump for re-position + const onWindowScroll = () => { + this.dropdown?.close() + window.removeEventListener('scroll', onWindowScroll) + } + + if (opened) { + window.addEventListener('scroll', onWindowScroll) + document.querySelector('menu').scrollTo(0, 0) // Reset menu scroll to easy lock + document.querySelector('menu').addEventListener('scroll', this.onMenuScrollEvent) + } else { + document.querySelector('menu').removeEventListener('scroll', this.onMenuScrollEvent) + } + } + private buildUserLanguages () { if (!this.user) { this.videoLanguages = [] @@ -188,18 +248,49 @@ 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.') + }) + } + + private computeNSFWPolicy () { + if (!this.user) { + this.nsfwPolicy = null + return + } + + switch (this.user.nsfwPolicy) { + case 'do_not_list': + this.nsfwPolicy = $localize`hide` + break + + case 'blur': + this.nsfwPolicy = $localize`blur` + break + + case 'display': + this.nsfwPolicy = $localize`display` + break + } + } }