X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=220b104b7f12f9ebdc0969fd91a0c764216fbaa7;hb=6ff9c676e9a7be29a21734f74b66300bde47b1c9;hp=bef1599fc0dc3b675ebbbcb00cb9cd689566ac43;hpb=fd45e8f43c2638478599ca75632518054461da85;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index bef1599fc..220b104b7 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit } from '@angular/core'
-import { Router } from '@angular/router'
-
-import { AuthService, ServerService } from './core'
-import { UserService } from './shared'
+import { GuardsCheckStart, NavigationEnd, Router } from '@angular/router'
+import { AuthService, ServerService } from '@app/core'
+import { isInSmallView } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-app',
@@ -31,6 +30,14 @@ export class AppComponent implements OnInit {
     private serverService: ServerService
   ) {}
 
+  get serverVersion () {
+    return this.serverService.getConfig().serverVersion
+  }
+
+  get instanceName () {
+    return this.serverService.getConfig().instance.name
+  }
+
   ngOnInit () {
     this.authService.loadClientCredentials()
 
@@ -47,34 +54,29 @@ export class AppComponent implements OnInit {
     this.serverService.loadVideoPrivacies()
 
     // Do not display menu on small screens
-    if (window.innerWidth < 600) {
+    if (isInSmallView()) {
       this.isMenuDisplayed = false
     }
-  }
 
-  isInAdmin () {
-    return this.router.url.indexOf('/admin/') !== -1
+    this.router.events.subscribe(
+      e => {
+        // User clicked on a link in the menu, change the page
+        if (e instanceof GuardsCheckStart && isInSmallView()) {
+          this.isMenuDisplayed = false
+        }
+      }
+    )
   }
 
   toggleMenu () {
+    window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed
   }
 
   getMainColClasses () {
-    const colSizes = {
-      md: 10,
-      sm: 9,
-      xs: 9
-    }
-
     // Take all width is the menu is not displayed
-    if (this.isMenuDisplayed === false) {
-      Object.keys(colSizes).forEach(col => colSizes[col] = 12)
-    }
-
-    const classes = [ 'main-col' ]
-    Object.keys(colSizes).forEach(col => classes.push(`col-${col}-${colSizes[col]}`))
+    if (this.isMenuDisplayed === false) return [ 'expanded' ]
 
-    return classes
+    return []
   }
 }