X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=c5c5a8f668703dda6121343790cd3e8565b3387e;hb=7e73f07131a6738b299311448ab4491eb532838a;hp=84435b5dbddcfddc2ab03228bc3b3adcb859c7b9;hpb=b3eeb529d92dd5eb5563f0e2bb9f08cda8407513;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 84435b5db..c5c5a8f66 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,13 @@
import { Component, OnInit } from '@angular/core'
import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { GuardsCheckStart, Router } from '@angular/router'
-import { AuthService, RedirectService, ServerService } from '@app/core'
-import { isInSmallView } from '@app/shared/misc/utils'
+import { GuardsCheckStart, NavigationEnd, Router } 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 { I18n } from '@ngx-translate/i18n-polyfill'
+import { fromEvent } from 'rxjs'
@Component({
selector: 'my-app',
@@ -10,50 +15,55 @@ import { isInSmallView } from '@app/shared/misc/utils'
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
- }
-
isMenuDisplayed = true
+ isMenuChangedByUser = false
customCSS: SafeHtml
constructor (
+ private i18n: I18n,
private router: Router,
private authService: AuthService,
private serverService: ServerService,
private domSanitizer: DomSanitizer,
- private redirectService: RedirectService
- ) {}
+ private redirectService: RedirectService,
+ private screenService: ScreenService,
+ private hotkeysService: HotkeysService,
+ private themeService: ThemeService
+ ) { }
get serverVersion () {
return this.serverService.getConfig().serverVersion
}
+ get serverCommit () {
+ const commit = this.serverService.getConfig().serverCommit || ''
+ return (commit !== '') ? '...' + commit : commit
+ }
+
get instanceName () {
return this.serverService.getConfig().instance.name
}
+ get defaultRoute () {
+ return RedirectService.DEFAULT_ROUTE
+ }
+
ngOnInit () {
document.getElementById('incompatible-browser').className += ' browser-ok'
- const pathname = window.location.pathname
- if (!pathname || pathname === '/') {
- this.redirectService.redirectToHomepage()
- }
+ 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()
}
@@ -64,51 +74,103 @@ 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 (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
}
}
)
+ // Inject JS
this.serverService.configLoaded
- .subscribe(() => {
- const config = this.serverService.getConfig()
+ .subscribe(() => {
+ const config = this.serverService.getConfig()
+
+ if (config.instance.customizations.javascript) {
+ try {
+ // tslint:disable:no-eval
+ eval(config.instance.customizations.javascript)
+ } catch (err) {
+ console.error('Cannot eval custom JavaScript.', err)
+ }
+ }
+ })
- // We test customCSS in case or the admin removed the css
- if (this.customCSS || config.instance.customizations.css) {
- const styleTag = ''
- this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag)
- }
+ // 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()
- if (config.instance.customizations.javascript) {
- try {
- // tslint:disable:no-eval
- eval(config.instance.customizations.javascript)
- } catch (err) {
- console.error('Cannot eval custom JavaScript.', err)
+ // We test customCSS if the admin removed the css
+ if (this.customCSS || config.instance.customizations.css) {
+ const styleTag = ''
+ this.customCSS = this.domSanitizer.bypassSecurityTrustHtml(styleTag)
}
- }
- })
+ })
+
+ 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')),
+ 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'))
+ ])
+
+ fromEvent(window, 'resize')
+ .pipe(debounceTime(200))
+ .subscribe(() => this.onResize())
+ }
+
+ isUserLoggedIn () {
+ return this.authService.isLoggedIn()
}
toggleMenu () {
- window.scrollTo(0, 0)
this.isMenuDisplayed = !this.isMenuDisplayed
+ this.isMenuChangedByUser = true
}
- getMainColClasses () {
- // Take all width is the menu is not displayed
- if (this.isMenuDisplayed === false) return [ 'expanded' ]
-
- return []
+ onResize () {
+ this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser
}
}