fix comment and top-menu placement regressions

[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 0bd127063b2e16a6f313fe79957bc495ee794edb..5086384f46e0c86abe842e1c0fe5ca65e0949a25 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,11 @@
 import { Component, OnInit } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { GuardsCheckStart, Router, NavigationEnd } from '@angular/router'
+import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router'
 import { AuthService, RedirectService, ServerService } from '@app/core'
-import { isInSmallView } from '@app/shared/misc/utils'
+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'
 
 @Component({
   selector: 'my-app',
@@ -32,8 +35,10 @@ export class AppComponent implements OnInit {
     private authService: AuthService,
     private serverService: ServerService,
     private domSanitizer: DomSanitizer,
-    private redirectService: RedirectService
-  ) {}
+    private redirectService: RedirectService,
+    private screenService: ScreenService,
+    private hotkeysService: HotkeysService
+  ) { }
 
   get serverVersion () {
     return this.serverService.getConfig().serverVersion
@@ -53,8 +58,8 @@ export class AppComponent implements OnInit {
     this.router.events.subscribe(e => {
       if (e instanceof NavigationEnd) {
         const pathname = window.location.pathname
-        if (!pathname || pathname === '/') {
-          this.redirectService.redirectToHomepage()
+        if (!pathname || pathname === '/' || is18nPath(pathname)) {
+          this.redirectService.redirectToHomepage(true)
         }
       }
     })
@@ -74,38 +79,84 @@ 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)
 
-        if (config.instance.customizations.javascript) {
-          try {
-            // tslint:disable:no-eval
-            eval(config.instance.customizations.javascript)
-          } catch (err) {
-            console.error('Cannot eval custom JavaScript.', err)
+          const config = this.serverService.getConfig()
+
+          // 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, 'Focus the search bar'),
+      new Hotkey('b', (event: KeyboardEvent): boolean => {
+        this.toggleMenu()
+        return false
+      }, undefined, 'Toggle the left menu'),
+      new Hotkey('g s', (event: KeyboardEvent): boolean => {
+        this.router.navigate([ '/videos/subscriptions' ])
+        return false
+      }, undefined, 'Go to the subscriptions videos page'),
+      new Hotkey('g o', (event: KeyboardEvent): boolean => {
+        this.router.navigate([ '/videos/overview' ])
+        return false
+      }, undefined, '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'),
+      new Hotkey('g r', (event: KeyboardEvent): boolean => {
+        this.router.navigate([ '/videos/recently-added' ])
+        return false
+      }, undefined, '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'),
+      new Hotkey('g u', (event: KeyboardEvent): boolean => {
+        this.router.navigate([ '/videos/upload' ])
+        return false
+      }, undefined, 'Go to the videos upload page')
+    ])
   }
 
   isUserLoggedIn () {
@@ -113,7 +164,6 @@ export class AppComponent implements OnInit {
   }
 
   toggleMenu () {
-    window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed
   }
 }