X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=f6d90cb6488c91a79679ba9e5c019f029c300ac3;hb=25d7cc3cb675de36fe67402e307e1ba02f3316bc;hp=59966243b63ae02fbae0f714c1fbb835ee0ed4a3;hpb=2ad9dcda240ee843c5e4a5b98cc94f7b2aab2c89;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 59966243b..f6d90cb64 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,46 +1,64 @@ -import { Component, OnInit, ViewChild } from '@angular/core' -import { DomSanitizer, SafeHtml } from '@angular/platform-browser' -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 { debounceTime, filter, map, pairwise } 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 { delay, forkJoin } from 'rxjs' +import { filter, first, map } from 'rxjs/operators' +import { DOCUMENT, getLocaleDirection, PlatformLocation } from '@angular/common' +import { AfterViewInit, Component, Inject, LOCALE_ID, OnInit, ViewChild } from '@angular/core' +import { DomSanitizer, SafeHtml } from '@angular/platform-browser' +import { Event, GuardsCheckStart, RouteConfigLoadEnd, RouteConfigLoadStart, Router } from '@angular/router' +import { + AuthService, + MarkdownService, + PeerTubeRouterService, + RedirectService, + ScreenService, + ScrollService, + ServerService, + ThemeService, + User, + UserLocalStorageService +} from '@app/core' 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 { PluginService } from '@app/core/plugins/plugin.service' +import { AccountSetupWarningModalComponent } from '@app/modal/account-setup-warning-modal.component' +import { AdminWelcomeModalComponent } from '@app/modal/admin-welcome-modal.component' +import { CustomModalComponent } from '@app/modal/custom-modal.component' import { InstanceConfigWarningModalComponent } from '@app/modal/instance-config-warning-modal.component' -import { ServerConfig, UserRole } from '@shared/models' -import { User } from '@app/shared' -import { InstanceService } from '@app/shared/instance/instance.service' +import { NgbConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { LoadingBarService } from '@ngx-loading-bar/core' +import { logger } from '@root-helpers/logger' +import { peertubeLocalStorage } from '@root-helpers/peertube-web-storage' +import { getShortLocale } from '@shared/core-utils/i18n' +import { BroadcastMessageLevel, HTMLServerConfig, UserRole } from '@shared/models' +import { MenuService } from './core/menu/menu.service' +import { POP_STATE_MODAL_DISMISS } from './helpers' +import { GlobalIconName } from './shared/shared-icons' +import { InstanceService } from './shared/shared-instance' @Component({ selector: 'my-app', templateUrl: './app.component.html', styleUrls: [ './app.component.scss' ] }) -export class AppComponent implements OnInit { - @ViewChild('welcomeModal') welcomeModal: WelcomeModalComponent - @ViewChild('instanceConfigWarningModal') instanceConfigWarningModal: InstanceConfigWarningModalComponent +export class AppComponent implements OnInit, AfterViewInit { + private static BROADCAST_MESSAGE_KEY = 'app-broadcast-message-dismissed' - isMenuDisplayed = true - isMenuChangedByUser = false + @ViewChild('accountSetupWarningModal') accountSetupWarningModal: AccountSetupWarningModalComponent + @ViewChild('adminWelcomeModal') adminWelcomeModal: AdminWelcomeModalComponent + @ViewChild('instanceConfigWarningModal') instanceConfigWarningModal: InstanceConfigWarningModalComponent + @ViewChild('customModal') customModal: CustomModalComponent customCSS: SafeHtml + broadcastMessage: { message: string, dismissable: boolean, class: string } | null = null - private serverConfig: ServerConfig + private serverConfig: HTMLServerConfig constructor ( - private i18n: I18n, - private viewportScroller: ViewportScroller, + @Inject(DOCUMENT) private document: Document, + @Inject(LOCALE_ID) private localeId: string, private router: Router, private authService: AuthService, private serverService: ServerService, + private peertubeRouter: PeerTubeRouterService, private pluginService: PluginService, private instanceService: InstanceService, private domSanitizer: DomSanitizer, @@ -50,25 +68,29 @@ export class AppComponent implements OnInit { private themeService: ThemeService, private hooks: HooksService, private location: PlatformLocation, - private modalService: NgbModal - ) { } + private modalService: NgbModal, + private markdownService: MarkdownService, + private ngbConfig: NgbConfig, + private loadingBar: LoadingBarService, + private scrollService: ScrollService, + private userLocalStorage: UserLocalStorageService, + public menu: MenuService + ) { + this.ngbConfig.animation = false + } get instanceName () { return this.serverConfig.instance.name } - get defaultRoute () { - return RedirectService.DEFAULT_ROUTE - } - ngOnInit () { document.getElementById('incompatible-browser').className += ' browser-ok' - this.serverConfig = this.serverService.getTmpConfig() - this.serverService.getConfig() - .subscribe(config => this.serverConfig = config) + this.loadUser() + + this.serverConfig = this.serverService.getHTMLConfig() - this.loadPlugins() + this.hooks.runAction('action:application.init', 'common') this.themeService.initialize() this.authService.loadClientCredentials() @@ -78,205 +100,240 @@ export class AppComponent implements OnInit { this.authService.refreshUserInformation() } - // Do not display menu on small screens - if (this.screenService.isInSmallView()) { - this.isMenuDisplayed = false - } - this.initRouteEvents() + this.scrollService.enableScrollRestoration() + this.injectJS() this.injectCSS() + this.injectBroadcastMessage() - this.initHotkeys() + this.serverService.configReloaded + .subscribe(config => { + this.serverConfig = config + + this.injectBroadcastMessage() + this.injectCSS() + + // Don't reinject JS since it could conflict with existing one + }) - fromEvent(window, 'resize') - .pipe(debounceTime(200)) - .subscribe(() => this.onResize()) + this.initHotkeys() this.location.onPopState(() => this.modalService.dismissAll(POP_STATE_MODAL_DISMISS)) this.openModalsIfNeeded() + + this.document.documentElement.lang = getShortLocale(this.localeId) + this.document.documentElement.dir = getLocaleDirection(this.localeId) } - isUserLoggedIn () { - return this.authService.isLoggedIn() + ngAfterViewInit () { + this.pluginService.initializeCustomModal(this.customModal) } - toggleMenu () { - this.isMenuDisplayed = !this.isMenuDisplayed - this.isMenuChangedByUser = true + // --------------------------------------------------------------------------- + + getDefaultRoute () { + return this.redirectService.getDefaultRoute().split('?')[0] } - onResize () { - this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser + getDefaultRouteQuery () { + return this.router.parseUrl(this.redirectService.getDefaultRoute()).queryParams } - private initRouteEvents () { - let resetScroll = true - const eventsObs = this.router.events + // --------------------------------------------------------------------------- - const scrollEvent = eventsObs.pipe(filter((e: Event): e is Scroll => e instanceof Scroll)) + getToggleTitle () { + if (this.menu.isDisplayed()) return $localize`Close the left menu` - scrollEvent.subscribe(e => { - if (e.position) { - return this.viewportScroller.scrollToPosition(e.position) - } + return $localize`Open the left menu` + } - if (e.anchor) { - return this.viewportScroller.scrollToAnchor(e.anchor) - } + isUserLoggedIn () { + return this.authService.isLoggedIn() + } - if (resetScroll) { - return this.viewportScroller.scrollToPosition([ 0, 0 ]) - } - }) + hideBroadcastMessage () { + peertubeLocalStorage.setItem(AppComponent.BROADCAST_MESSAGE_KEY, this.serverConfig.broadcastMessage.message) + + this.broadcastMessage = null + this.screenService.isBroadcastMessageDisplayed = false + } + + getNotificationIcon (message: { severity: 'success' | 'error' | 'info' }): GlobalIconName { + switch (message.severity) { + case 'error': + return 'cross' + case 'success': + return 'tick' + case 'info': + return 'help' + } + } - const navigationEndEvent = eventsObs.pipe(filter((e: Event): e is NavigationEnd => e instanceof NavigationEnd)) + private initRouteEvents () { + const eventsObs = this.router.events - // When we add the a-state parameter, we don't want to alter the scroll - navigationEndEvent.pipe(pairwise()) - .subscribe(([ e1, e2 ]) => { - try { - resetScroll = false + // Plugin hooks + this.peertubeRouter.getNavigationEndEvents().subscribe(e => { + this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url }) + }) - const previousUrl = new URL(window.location.origin + e1.urlAfterRedirects) - const nextUrl = new URL(window.location.origin + e2.urlAfterRedirects) + // Automatically hide/display the menu + eventsObs.pipe( + filter((e: Event): e is GuardsCheckStart => e instanceof GuardsCheckStart), + filter(() => this.screenService.isInSmallView() || this.screenService.isInTouchScreen()) + ).subscribe(() => this.menu.setMenuDisplay(false)) // User clicked on a link in the menu, change the page - if (previousUrl.pathname !== nextUrl.pathname) { - resetScroll = true - return - } + // Handle lazy loaded module + eventsObs.pipe( + filter((e: Event): e is RouteConfigLoadStart => e instanceof RouteConfigLoadStart) + ).subscribe(() => this.loadingBar.useRef().start()) - const nextSearchParams = nextUrl.searchParams - nextSearchParams.delete('a-state') + eventsObs.pipe( + filter((e: Event): e is RouteConfigLoadEnd => e instanceof RouteConfigLoadEnd) + ).subscribe(() => this.loadingBar.useRef().complete()) + } - const previousSearchParams = previousUrl.searchParams + private async injectBroadcastMessage () { + this.broadcastMessage = null + this.screenService.isBroadcastMessageDisplayed = false - nextSearchParams.sort() - previousSearchParams.sort() + const messageConfig = this.serverConfig.broadcastMessage - if (nextSearchParams.toString() !== previousSearchParams.toString()) { - resetScroll = true - } - } catch (e) { - console.error('Cannot parse URL to check next scroll.', e) - resetScroll = true - } - }) + if (messageConfig.enabled) { + // Already dismissed this message? + if (messageConfig.dismissable && localStorage.getItem(AppComponent.BROADCAST_MESSAGE_KEY) === messageConfig.message) { + return + } - navigationEndEvent.pipe( - map(() => window.location.pathname), - filter(pathname => !pathname || pathname === '/' || is18nPath(pathname)) - ).subscribe(() => this.redirectService.redirectToHomepage(true)) + const classes: { [id in BroadcastMessageLevel]: string } = { + info: 'alert-info', + warning: 'alert-warning', + error: 'alert-danger' + } - navigationEndEvent.subscribe(e => { - this.hooks.runAction('action:router.navigation-end', 'common', { path: e.url }) - }) + this.broadcastMessage = { + message: await this.markdownService.markdownToUnsafeHTML({ markdown: messageConfig.message }), + dismissable: messageConfig.dismissable, + class: classes[messageConfig.level] + } - 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 + this.screenService.isBroadcastMessageDisplayed = true + } } private injectJS () { // Inject JS - this.serverService.getConfig() - .subscribe(config => { - if (config.instance.customizations.javascript) { - try { - // tslint:disable:no-eval - eval(config.instance.customizations.javascript) - } catch (err) { - console.error('Cannot eval custom JavaScript.', err) - } - } - }) + if (this.serverConfig.instance.customizations.javascript) { + try { + /* eslint-disable no-eval */ + eval(this.serverConfig.instance.customizations.javascript) + } catch (err) { + logger.error('Cannot eval custom JavaScript.', err) + } + } } private injectCSS () { - // Inject CSS if modified (admin config settings) - this.serverService.configReloaded - .subscribe(() => { - const headStyle = document.querySelector('style.custom-css-style') - if (headStyle) headStyle.parentNode.removeChild(headStyle) - - // We test customCSS if the admin removed the css - if (this.customCSS || this.serverConfig.instance.customizations.css) { - const styleTag = '' - this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag) - } - }) - } + const headStyle = document.querySelector('style.custom-css-style') + if (headStyle) headStyle.parentNode.removeChild(headStyle) - private async loadPlugins () { - this.pluginService.initializePlugins() - - this.hooks.runAction('action:application.init', 'common') + // We test customCSS if the admin removed the css + if (this.customCSS || this.serverConfig.instance.customizations.css) { + const styleTag = '' + this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag) + } } - private async openModalsIfNeeded () { - this.authService.userInformationLoaded + private openModalsIfNeeded () { + const userSub = this.authService.userInformationLoaded .pipe( - map(() => this.authService.getUser()), - filter(user => user.role === UserRole.ADMINISTRATOR) - ).subscribe(user => setTimeout(() => this._openAdminModalsIfNeeded(user))) // setTimeout because of ngIf in template + delay(0), // Wait for modals creations + map(() => this.authService.getUser()) + ) + + // Admin modal + userSub.pipe( + filter(user => user.role.id === UserRole.ADMINISTRATOR) + ).subscribe(user => this.openAdminModalsIfNeeded(user)) + + // Account modal + userSub.pipe( + filter(user => user.role.id !== UserRole.ADMINISTRATOR) + ).subscribe(user => this.openAccountModalsIfNeeded(user)) } - private async _openAdminModalsIfNeeded (user: User) { - if (user.noWelcomeModal !== true) return this.welcomeModal.show() - - if (user.noInstanceConfigWarningModal === true || !this.serverConfig.signup.allowed) return - - this.instanceService.getAbout() - .subscribe(about => { - if ( - this.serverConfig.instance.name.toLowerCase() === 'peertube' || - !about.instance.terms || - !about.instance.administrator || - !about.instance.maintenanceLifetime - ) { - this.instanceConfigWarningModal.show(about) - } - }) + private openAdminModalsIfNeeded (user: User) { + if (this.adminWelcomeModal.shouldOpen(user)) { + return this.adminWelcomeModal.show() + } + + if (!this.instanceConfigWarningModal.shouldOpenByUser(user)) return + + forkJoin([ + this.serverService.getConfig().pipe(first()), + this.instanceService.getAbout().pipe(first()) + ]).subscribe(([ config, about ]) => { + if (this.instanceConfigWarningModal.shouldOpen(config, about)) { + this.instanceConfigWarningModal.show(about) + } + }) + } + + private openAccountModalsIfNeeded (user: User) { + if (this.accountSetupWarningModal.shouldOpen(user)) { + this.accountSetupWarningModal.show(user) + } } private initHotkeys () { this.hotkeysService.add([ - new Hotkey(['/', 's'], (event: KeyboardEvent): boolean => { + new Hotkey([ '/', 's' ], (event: KeyboardEvent): boolean => { document.getElementById('search-video').focus() return false - }, undefined, this.i18n('Focus the search bar')), + }, undefined, $localize`Focus the search bar`), new Hotkey('b', (event: KeyboardEvent): boolean => { - this.toggleMenu() + this.menu.toggleMenu() return false - }, undefined, this.i18n('Toggle the left menu')), + }, undefined, $localize`Toggle the left menu`), new Hotkey('g o', (event: KeyboardEvent): boolean => { this.router.navigate([ '/videos/overview' ]) return false - }, undefined, this.i18n('Go to the discover videos page')), + }, undefined, $localize`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')), + }, undefined, $localize`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')), + }, undefined, $localize`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')), + }, undefined, $localize`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')) + }, undefined, $localize`Go to the videos upload page`) ]) } + + private loadUser () { + const tokens = this.userLocalStorage.getTokens() + if (!tokens) return + + const user = this.userLocalStorage.getLoggedInUser() + if (!user) return + + // Initialize user + this.authService.buildAuthUser(user, tokens) + } }