X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=1724bbd1ac440c99ed28b415e752a69c6849069f;hb=f003ef1b54c3eedcc722e00c6a526f2368dd5885;hp=dc4d0bf6a39b94685ebbe418533c2755ab9cf137;hpb=71e318b4fe66175d03c7c82357d60062eb68af81;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index dc4d0bf6a..1724bbd1a 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,13 +1,23 @@ -import { Component, OnInit } from '@angular/core' +import { Component, OnInit, ViewChild } from '@angular/core' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' -import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router' +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, debounceTime } from 'rxjs/operators' -import { HotkeysService, Hotkey } from 'angular2-hotkeys' +import { debounceTime, filter, map, pairwise, skip, switchMap } from 'rxjs/operators' +import { Hotkey, HotkeysService } from 'angular2-hotkeys' import { I18n } from '@ngx-translate/i18n-polyfill' import { fromEvent } from 'rxjs' +import { PlatformLocation, ViewportScroller } from '@angular/common' +import { PluginService } from '@app/core/plugins/plugin.service' +import { HooksService } from '@app/core/plugins/hooks.service' +import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { POP_STATE_MODAL_DISMISS } from '@app/shared/misc/constants' +import { WelcomeModalComponent } from '@app/modal/welcome-modal.component' +import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' +import { UserRole } from '@shared/models' +import { User } from '@app/shared' +import { InstanceService } from '@app/shared/instance/instance.service' @Component({ selector: 'my-app', @@ -15,18 +25,8 @@ import { fromEvent } from 'rxjs' 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 - } + @ViewChild('welcomeModal', { static: false }) welcomeModal: WelcomeModalComponent + @ViewChild('instanceConfigWarningModal', { static: false }) instanceConfigWarningModal: InstanceConfigWarningModalComponent isMenuDisplayed = true isMenuChangedByUser = false @@ -35,14 +35,20 @@ export class AppComponent implements OnInit { constructor ( private i18n: I18n, + private viewportScroller: ViewportScroller, private router: Router, private authService: AuthService, private serverService: ServerService, + private pluginService: PluginService, + private instanceService: InstanceService, private domSanitizer: DomSanitizer, private redirectService: RedirectService, private screenService: ScreenService, private hotkeysService: HotkeysService, - private themeService: ThemeService + private themeService: ThemeService, + private hooks: HooksService, + private location: PlatformLocation, + private modalService: NgbModal ) { } get serverVersion () { @@ -65,14 +71,8 @@ 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.loadPlugins() + this.themeService.initialize() this.authService.loadClientCredentials() @@ -87,21 +87,110 @@ 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()) + + this.location.onPopState(() => this.modalService.dismissAll(POP_STATE_MODAL_DISMISS)) + + this.openModalsIfNeeded() + } + + 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)) + + 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 ]) + } + }) + + const navigationEndEvent = eventsObs.pipe(filter((e: Event): e is NavigationEnd => e instanceof NavigationEnd)) + + // 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)) + + navigationEndEvent.subscribe(e => { + this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url }) + }) + + 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(() => { @@ -116,7 +205,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 @@ -132,57 +223,78 @@ export class AppComponent implements OnInit { this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag) } }) + } + + private async loadPlugins () { + this.pluginService.initializePlugins() + this.hooks.runAction('action:application.init', 'common') + } + + private async openModalsIfNeeded () { + this.serverService.configLoaded + .pipe( + switchMap(() => this.authService.userInformationLoaded), + map(() => this.authService.getUser()), + filter(user => user.role === UserRole.ADMINISTRATOR) + ).subscribe(user => setTimeout(() => this.openAdminModals(user))) // setTimeout because of ngIf in template + } + + private async openAdminModals (user: User) { + if (user.noWelcomeModal !== true) return this.welcomeModal.show() + + const config = this.serverService.getConfig() + if (user.noInstanceConfigWarningModal === true || !config.signup.allowed) return + + this.instanceService.getAbout() + .subscribe(about => { + if ( + config.instance.name.toLowerCase() === 'peertube' || + !about.instance.terms || + !about.instance.administrator || + !about.instance.maintenanceLifetime + ) { + this.instanceConfigWarningModal.show(about) + } + }) + } + + 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')), + }, undefined, this.i18n('Go to the discover videos 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')) + }, undefined, this.i18n('Go to the videos upload page')) ]) - - 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 } }