X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=inline;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=6087dbf8038bf337022495dde014f3e4336458f9;hb=989e526abf0c0dd7958deb630df009608561bb67;hp=0ea3c1389404a651bc703993e360d6e2190616f8;hpb=c263f3b425354cb0114d8fc22b8c4a96c3865c0b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 0ea3c1389..6087dbf80 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,9 @@
 import { Component, OnInit } from '@angular/core'
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser'
-import { GuardsCheckStart, Router } 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'
 
 @Component({
   selector: 'my-app',
@@ -33,7 +34,7 @@ export class AppComponent implements OnInit {
     private serverService: ServerService,
     private domSanitizer: DomSanitizer,
     private redirectService: RedirectService
-  ) {}
+  ) { }
 
   get serverVersion () {
     return this.serverService.getConfig().serverVersion
@@ -50,14 +51,18 @@ export class AppComponent implements OnInit {
   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()
+        }
+      }
+    })
 
     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()
     }
@@ -104,15 +109,12 @@ export class AppComponent implements OnInit {
       })
   }
 
+  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 []
-  }
 }