X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=0bd127063b2e16a6f313fe79957bc495ee794edb;hb=230de99e7146f75b0af056a42c54161597c03002;hp=ef85972033e8afa0d0b4c759111ea6f4d5509f35;hpb=4cb6d4578893db310297d7e118ce2fb7ecb952a3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts index ef8597203..0bd127063 100644 --- a/client/src/app/app.component.ts +++ b/client/src/app/app.component.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core' -import { Router } from '@angular/router' -import { AuthService, ServerService } from '@app/core' +import { DomSanitizer, SafeHtml } from '@angular/platform-browser' +import { GuardsCheckStart, Router, NavigationEnd } from '@angular/router' +import { AuthService, RedirectService, ServerService } from '@app/core' +import { isInSmallView } from '@app/shared/misc/utils' @Component({ selector: 'my-app', @@ -23,16 +25,43 @@ 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 ) {} + 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 === '/') { + this.redirectService.redirectToHomepage() + } + } + }) + 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() } @@ -45,20 +74,46 @@ export class AppComponent implements OnInit { this.serverService.loadVideoPrivacies() // Do not display menu on small screens - if (window.innerWidth < 600) { + if (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()) { + 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 [] - } }