Handle sort in rss

[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 346e966e5189f665ec14aabd9b08f8c89fa1f60c..18115ae75db4ca9c38667753687ba93fb5a35e73 100644 (file)
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -43,14 +43,21 @@ export class AppComponent implements OnInit {
     return this.serverService.getConfig().instance.name
   }
 
+  get defaultRoute () {
+    return RedirectService.DEFAULT_ROUTE
+  }
+
   ngOnInit () {
-    if (this.router.url === '/') {
+    document.getElementById('incompatible-browser').className += ' browser-ok'
+
+    const pathname = window.location.pathname
+    if (!pathname || 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()
     }
@@ -80,7 +87,7 @@ export class AppComponent implements OnInit {
       .subscribe(() => {
         const config = this.serverService.getConfig()
 
-        // We test customCSS in case or the admin removed the css
+        // 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)
@@ -97,6 +104,10 @@ export class AppComponent implements OnInit {
       })
   }
 
+  isUserLoggedIn () {
+    return this.authService.isLoggedIn()
+  }
+
   toggleMenu () {
     window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed