fix account URI in remote comment modal

[github/Chocobozzz/PeerTube.git] / client / src / app / app.component.ts

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 40eac7fb8df9689347e4c6ae254f227daa77e8e8..7cd0fff1baf041c4246913ea279b691366c22cb8 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,11 +1,12 @@
 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 { AuthService, RedirectService, ServerService, ThemeService } 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'
+import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
   selector: 'my-app',
@@ -31,19 +32,26 @@ export class AppComponent implements OnInit {
   customCSS: SafeHtml
 
   constructor (
+    private i18n: I18n,
     private router: Router,
     private authService: AuthService,
     private serverService: ServerService,
     private domSanitizer: DomSanitizer,
     private redirectService: RedirectService,
     private screenService: ScreenService,
-    private hotkeysService: HotkeysService
+    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
   }
@@ -124,34 +132,38 @@ export class AppComponent implements OnInit {
         })
 
     this.hotkeysService.add([
-      new Hotkey('/', (event: KeyboardEvent): boolean => {
+      new Hotkey(['/', 's'], (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'),
+      }, 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, 'Go to the videos overview page'),
+      }, undefined, this.i18n('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'),
+      }, 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, 'Go to the recently added videos page'),
+      }, 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, 'Go to the local videos page'),
+      }, undefined, this.i18n('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')
+      }, 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'))
     ])
   }