X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=915466af73a38c331a1de34f2b7cbbbbee011572;hb=3caf77d3b11f2dbc12e52d665183d36604c1dab9;hp=2149768a232accf60c28978cb10d24dcd1864907;hpb=e032aec9b92be25a996923361f83a96a89505254;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 2149768a2..915466af7 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,10 +1,14 @@ import { Component, OnInit } from '@angular/core' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' -import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router' -import { AuthService, RedirectService, ServerService } from '@app/core' +import { Event, GuardsCheckStart, NavigationEnd, Router, Scroll } from '@angular/router' +import { AuthService, RedirectService, ServerService, ThemeService } from '@app/core' import { is18nPath } from '../../../shared/models/i18n' import { ScreenService } from '@app/shared/misc/screen.service' -import { skip } from 'rxjs/operators' +import { debounceTime, filter, map, pairwise, skip } from 'rxjs/operators' +import { Hotkey, HotkeysService } from 'angular2-hotkeys' +import { I18n } from '@ngx-translate/i18n-polyfill' +import { fromEvent } from 'rxjs' +import { ViewportScroller } from '@angular/common' @Component({ selector: 'my-app', @@ -12,36 +16,33 @@ import { skip } from 'rxjs/operators' styleUrls: [ './app.component.scss' ] }) export class AppComponent implements OnInit { - notificationOptions = { - timeOut: 5000, - lastOnBottom: true, - clickToClose: true, - maxLength: 0, - maxStack: 7, - showProgressBar: false, - pauseOnHover: false, - preventDuplicates: false, - preventLastDuplicates: 'visible', - rtl: false - } - isMenuDisplayed = true + isMenuChangedByUser = false customCSS: SafeHtml constructor ( + private i18n: I18n, + private viewportScroller: ViewportScroller, private router: Router, private authService: AuthService, private serverService: ServerService, private domSanitizer: DomSanitizer, private redirectService: RedirectService, - private screenService: ScreenService + private screenService: ScreenService, + private hotkeysService: HotkeysService, + private themeService: ThemeService ) { } get serverVersion () { return this.serverService.getConfig().serverVersion } + get serverCommit () { + const commit = this.serverService.getConfig().serverCommit || '' + return (commit !== '') ? '...' + commit : commit + } + get instanceName () { return this.serverService.getConfig().instance.name } @@ -53,15 +54,6 @@ export class AppComponent implements OnInit { ngOnInit () { document.getElementById('incompatible-browser').className += ' browser-ok' - this.router.events.subscribe(e => { - if (e instanceof NavigationEnd) { - const pathname = window.location.pathname - if (!pathname || pathname === '/' || is18nPath(pathname)) { - this.redirectService.redirectToHomepage(true) - } - } - }) - this.authService.loadClientCredentials() if (this.isUserLoggedIn()) { @@ -75,21 +67,101 @@ export class AppComponent implements OnInit { this.serverService.loadVideoLanguages() this.serverService.loadVideoLicences() this.serverService.loadVideoPrivacies() + this.serverService.loadVideoPlaylistPrivacies() // Do not display menu on small screens if (this.screenService.isInSmallView()) { this.isMenuDisplayed = false } - this.router.events.subscribe( - e => { - // User clicked on a link in the menu, change the page - if (e instanceof GuardsCheckStart && this.screenService.isInSmallView()) { - this.isMenuDisplayed = false - } + this.initRouteEvents() + this.injectJS() + this.injectCSS() + + this.initHotkeys() + + fromEvent(window, 'resize') + .pipe(debounceTime(200)) + .subscribe(() => this.onResize()) + } + + isUserLoggedIn () { + return this.authService.isLoggedIn() + } + + toggleMenu () { + this.isMenuDisplayed = !this.isMenuDisplayed + this.isMenuChangedByUser = true + } + + onResize () { + this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser + } + + private initRouteEvents () { + let resetScroll = true + const eventsObs = this.router.events + + const scrollEvent = eventsObs.pipe(filter((e: Event): e is Scroll => e instanceof Scroll)) + const navigationEndEvent = eventsObs.pipe(filter((e: Event): e is NavigationEnd => e instanceof NavigationEnd)) + + scrollEvent.subscribe(e => { + if (e.position) { + return this.viewportScroller.scrollToPosition(e.position) } - ) + if (e.anchor) { + return this.viewportScroller.scrollToAnchor(e.anchor) + } + + if (resetScroll) { + return this.viewportScroller.scrollToPosition([ 0, 0 ]) + } + }) + + // When we add the a-state parameter, we don't want to alter the scroll + navigationEndEvent.pipe(pairwise()) + .subscribe(([ e1, e2 ]) => { + try { + resetScroll = false + + const previousUrl = new URL(window.location.origin + e1.urlAfterRedirects) + const nextUrl = new URL(window.location.origin + e2.urlAfterRedirects) + + if (previousUrl.pathname !== nextUrl.pathname) { + resetScroll = true + return + } + + const nextSearchParams = nextUrl.searchParams + nextSearchParams.delete('a-state') + + const previousSearchParams = previousUrl.searchParams + + nextSearchParams.sort() + previousSearchParams.sort() + + if (nextSearchParams.toString() !== previousSearchParams.toString()) { + resetScroll = true + } + } catch (e) { + console.error('Cannot parse URL to check next scroll.', e) + resetScroll = true + } + }) + + navigationEndEvent.pipe( + map(() => window.location.pathname), + filter(pathname => !pathname || pathname === '/' || is18nPath(pathname)) + ).subscribe(() => this.redirectService.redirectToHomepage(true)) + + eventsObs.pipe( + filter((e: Event): e is GuardsCheckStart => e instanceof GuardsCheckStart), + filter(() => this.screenService.isInSmallView()) + ).subscribe(() => this.isMenuDisplayed = false) // User clicked on a link in the menu, change the page + } + + private injectJS () { // Inject JS this.serverService.configLoaded .subscribe(() => { @@ -104,7 +176,9 @@ export class AppComponent implements OnInit { } } }) + } + private injectCSS () { // Inject CSS if modified (admin config settings) this.serverService.configLoaded .pipe(skip(1)) // We only want to subscribe to reloads, because the CSS is already injected by the server @@ -122,11 +196,40 @@ export class AppComponent implements OnInit { }) } - isUserLoggedIn () { - return this.authService.isLoggedIn() - } - - toggleMenu () { - this.isMenuDisplayed = !this.isMenuDisplayed + private initHotkeys () { + this.hotkeysService.add([ + new Hotkey(['/', 's'], (event: KeyboardEvent): boolean => { + document.getElementById('search-video').focus() + return false + }, undefined, this.i18n('Focus the search bar')), + new Hotkey('b', (event: KeyboardEvent): boolean => { + this.toggleMenu() + return false + }, undefined, this.i18n('Toggle the left menu')), + new Hotkey('g o', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/overview' ]) + return false + }, undefined, this.i18n('Go to the videos overview page')), + new Hotkey('g t', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/trending' ]) + return false + }, undefined, this.i18n('Go to the trending videos page')), + new Hotkey('g r', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/recently-added' ]) + return false + }, undefined, this.i18n('Go to the recently added videos page')), + new Hotkey('g l', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/local' ]) + return false + }, undefined, this.i18n('Go to the local videos page')), + new Hotkey('g u', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/upload' ]) + return false + }, undefined, this.i18n('Go to the videos upload page')), + new Hotkey('shift+t', (event: KeyboardEvent): boolean => { + this.themeService.toggleDarkTheme() + return false + }, undefined, this.i18n('Toggle Dark theme')) + ]) } }