X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=d2678096f7887b6bed4e0c621095f39ba4f4354c;hb=6693df9dd60e6966186bcb7765218596de7b65c0;hp=68719f73d284d236ac8ddb244fdca7a9213fbaa9;hpb=db7af09bd8e9de57cdda88c2e32387551235b3a4;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 68719f73d..d2678096f 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,7 @@
-import { Component, OnInit, ViewContainerRef } from '@angular/core'
-import { Router } from '@angular/router'
-
-import { AuthService, ServerService } from './core'
-import { UserService } from './shared'
+import { Component, OnInit } from '@angular/core'
+import { NavigationEnd, Router } from '@angular/router'
+import { AuthService, ServerService } from '@app/core'
+import { isInMobileView } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-app',
@@ -11,7 +10,7 @@ import { UserService } from './shared'
 })
 export class AppComponent implements OnInit {
   notificationOptions = {
-    timeOut: 3000,
+    timeOut: 5000,
     lastOnBottom: true,
     clickToClose: true,
     maxLength: 0,
@@ -28,16 +27,19 @@ export class AppComponent implements OnInit {
   constructor (
     private router: Router,
     private authService: AuthService,
-    private serverService: ServerService,
-    private userService: UserService
+    private serverService: ServerService
   ) {}
 
+  get serverVersion () {
+    return this.serverService.getConfig().serverVersion
+  }
+
   ngOnInit () {
     this.authService.loadClientCredentials()
 
     if (this.authService.isLoggedIn()) {
       // The service will automatically redirect to the login page if the token is not valid anymore
-      this.userService.checkTokenValidity()
+      this.authService.refreshUserInformation()
     }
 
     // Load custom data from server
@@ -45,36 +47,32 @@ export class AppComponent implements OnInit {
     this.serverService.loadVideoCategories()
     this.serverService.loadVideoLanguages()
     this.serverService.loadVideoLicences()
+    this.serverService.loadVideoPrivacies()
 
     // Do not display menu on small screens
-    if (window.innerWidth < 600) {
+    if (isInMobileView()) {
       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 NavigationEnd && isInMobileView()) {
+          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 []
   }
 }