X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=494cd9ea618d9c79f36c767f8933efe8ad25f7b7;hb=bbe0f0645ca958d33a3f409b15166609733b663f;hp=220b104b7f12f9ebdc0969fd91a0c764216fbaa7;hpb=3290f37c76784f1b96cefb5d389e48db56033b0a;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index 220b104b7..494cd9ea6 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,7 +1,9 @@ import { Component, OnInit } from '@angular/core' +import { DomSanitizer, SafeHtml } from '@angular/platform-browser' import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router' -import { AuthService, ServerService } from '@app/core' -import { isInSmallView } from '@app/shared/misc/utils' +import { AuthService, RedirectService, ServerService } from '@app/core' +import { is18nPath } from '../../../shared/models/i18n' +import { ScreenService } from '@app/shared/misc/screen.service' @Component({ selector: 'my-app', @@ -24,11 +26,16 @@ export class AppComponent implements OnInit { isMenuDisplayed = true + customCSS: SafeHtml + constructor ( private router: Router, private authService: AuthService, - private serverService: ServerService - ) {} + private serverService: ServerService, + private domSanitizer: DomSanitizer, + private redirectService: RedirectService, + private screenService: ScreenService + ) { } get serverVersion () { return this.serverService.getConfig().serverVersion @@ -38,10 +45,25 @@ export class AppComponent implements OnInit { 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.authService.refreshUserInformation() } @@ -54,29 +76,46 @@ export class AppComponent implements OnInit { this.serverService.loadVideoPrivacies() // Do not display menu on small screens - if (isInSmallView()) { + 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 && isInSmallView()) { + if (e instanceof GuardsCheckStart && this.screenService.isInSmallView()) { this.isMenuDisplayed = false } } ) + + this.serverService.configLoaded + .subscribe(() => { + const config = this.serverService.getConfig() + + // We test customCSS if the admin removed the css + if (this.customCSS || config.instance.customizations.css) { + const styleTag = '' + this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag) + } + + if (config.instance.customizations.javascript) { + try { + // tslint:disable:no-eval + eval(config.instance.customizations.javascript) + } catch (err) { + console.error('Cannot eval custom JavaScript.', err) + } + } + }) + } + + isUserLoggedIn () { + return this.authService.isLoggedIn() } toggleMenu () { window.scrollTo(0, 0) this.isMenuDisplayed = !this.isMenuDisplayed } - - getMainColClasses () { - // Take all width is the menu is not displayed - if (this.isMenuDisplayed === false) return [ 'expanded' ] - - return [] - } }