X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=7583fdee88712a0b1e0a5655646b8eaa61100a9d;hb=f8b2c1b4f509c037b9650cca2c5befd21f056df3;hp=0bfe9f91685cd982d88f7999d595fe10191eab38;hpb=7cf26f433f5d93fb5325495bc87bdef87260aada;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 0bfe9f916..7583fdee8 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,9 +1,13 @@
 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 { isInSmallView } from '@app/shared/misc/utils'
+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',
@@ -11,35 +15,32 @@ import { is18nPath } from '../../../shared/models/i18n'
   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
   }
@@ -75,38 +76,88 @@ 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
         }
       }
     )
 
+    // 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 if the admin removed the css
-        if (this.customCSS || config.instance.customizations.css) {
-          const styleTag = '<style>' + config.instance.customizations.css + '</style>'
-          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 = '<style>' + config.instance.customizations.css + '</style>'
+            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 () {
@@ -114,7 +165,11 @@ export class AppComponent implements OnInit {
   }
 
   toggleMenu () {
-    window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed
+    this.isMenuChangedByUser = true
+  }
+
+  onResize () {
+    this.isMenuDisplayed = window.innerWidth >= 800 && !this.isMenuChangedByUser
   }
 }