X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=40eac7fb8df9689347e4c6ae254f227daa77e8e8;hb=20d211990425af8d9bb5c8eba204d2b485bcd19a;hp=57bf64f69d8455e1336d0fcad9e204420778ef43;hpb=d592e0a9b2931c7c9cbedb27fb8efc9aaacad9bb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 57bf64f69..40eac7fb8 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,9 +1,11 @@ -import { Component, OnInit, ViewContainerRef } from '@angular/core' -import { Router } from '@angular/router' - -import { AuthService, ConfigService } from './core' -import { VideoService } from './videos' -import { UserService } from './shared' +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 { is18nPath } from '../../../shared/models/i18n' +import { ScreenService } from '@app/shared/misc/screen.service' +import { skip } from 'rxjs/operators' +import { HotkeysService, Hotkey } from 'angular2-hotkeys' @Component({ selector: 'my-app', @@ -12,7 +14,7 @@ import { UserService } from './shared' }) export class AppComponent implements OnInit { notificationOptions = { - timeOut: 3000, + timeOut: 5000, lastOnBottom: true, clickToClose: true, maxLength: 0, @@ -26,57 +28,138 @@ export class AppComponent implements OnInit { isMenuDisplayed = true + customCSS: SafeHtml + constructor ( private router: Router, private authService: AuthService, - private configService: ConfigService, - private userService: UserService, - private videoService: VideoService, - viewContainerRef: ViewContainerRef - ) {} + private serverService: ServerService, + private domSanitizer: DomSanitizer, + private redirectService: RedirectService, + private screenService: ScreenService, + private hotkeysService: HotkeysService + ) { } + + get serverVersion () { + return this.serverService.getConfig().serverVersion + } + + get instanceName () { + return this.serverService.getConfig().instance.name + } + + get defaultRoute () { + return RedirectService.DEFAULT_ROUTE + } 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.authService.isLoggedIn()) { + if (this.isUserLoggedIn()) { // The service will automatically redirect to the login page if the token is not valid anymore - this.userService.checkTokenValidity() + this.authService.refreshUserInformation() } - this.configService.loadConfig() - this.videoService.loadVideoCategories() - this.videoService.loadVideoLicences() - this.videoService.loadVideoLanguages() + // Load custom data from server + this.serverService.loadConfig() + this.serverService.loadVideoCategories() + this.serverService.loadVideoLanguages() + this.serverService.loadVideoLicences() + this.serverService.loadVideoPrivacies() // Do not display menu on small screens - if (window.innerWidth < 600) { + if (this.screenService.isInSmallView()) { this.isMenuDisplayed = false } - } - isInAdmin () { - return this.router.url.indexOf('/admin/') !== -1 - } + 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 + } + } + ) - toggleMenu () { - this.isMenuDisplayed = !this.isMenuDisplayed - } + // Inject JS + this.serverService.configLoaded + .subscribe(() => { + const config = this.serverService.getConfig() - getMainColClasses () { - const colSizes = { - md: 10, - sm: 9, - xs: 9 - } + if (config.instance.customizations.javascript) { + try { + // tslint:disable:no-eval + eval(config.instance.customizations.javascript) + } catch (err) { + console.error('Cannot eval custom JavaScript.', err) + } + } + }) - // Take all width is the menu is not displayed - if (this.isMenuDisplayed === false) { - Object.keys(colSizes).forEach(col => colSizes[col] = 12) - } + // 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 + .subscribe(() => { + const headStyle = document.querySelector('style.custom-css-style') + if (headStyle) headStyle.parentNode.removeChild(headStyle) + + const config = this.serverService.getConfig() - const classes = [ 'main-col' ] - Object.keys(colSizes).forEach(col => classes.push(`col-${col}-${colSizes[col]}`)) + // We test customCSS if the admin removed the css + if (this.customCSS || config.instance.customizations.css) { + const styleTag = '' + this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag) + } + }) - return classes + this.hotkeysService.add([ + new Hotkey('/', (event: KeyboardEvent): boolean => { + document.getElementById('search-video').focus() + return false // Prevent bubbling + }, undefined, 'Focus the search bar'), + new Hotkey('g s', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/subscriptions' ]) + return false + }, undefined, 'Go to the subscriptions videos page'), + new Hotkey('g o', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/overview' ]) + return false + }, undefined, 'Go to the videos overview page'), + new Hotkey('g t', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/trending' ]) + return false + }, undefined, 'Go to the trending videos page'), + new Hotkey('g r', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/recently-added' ]) + return false + }, undefined, 'Go to the recently added videos page'), + new Hotkey('g l', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/local' ]) + return false + }, undefined, 'Go to the local videos page'), + new Hotkey('g u', (event: KeyboardEvent): boolean => { + this.router.navigate([ '/videos/upload' ]) + return false + }, undefined, 'Go to the videos upload page') + ]) + } + + isUserLoggedIn () { + return this.authService.isLoggedIn() + } + + toggleMenu () { + this.isMenuDisplayed = !this.isMenuDisplayed } }