X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=b1818c298eb0545b31ec433bde20c9a60516e190;hb=50d6de9c286abcb34ff4234d56d9cbb803db7665;hp=82e647c98d5e7f386bab71f98c4bd12931a59144;hpb=a685e25ca05f08ad1b3f7fbaccc8744727bd8d27;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 82e647c98..b1818c298 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,8 +1,6 @@
-import { Component, OnInit, ViewContainerRef } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { Router } from '@angular/router'
-
-import { AuthService, ConfigService } from './core'
-import { UserService } from './shared'
+import { AuthService, ServerService } from './core'
 
 @Component({
   selector: 'my-app',
@@ -11,7 +9,7 @@ import { UserService } from './shared'
 })
 export class AppComponent implements OnInit {
   notificationOptions = {
-    timeOut: 3000,
+    timeOut: 5000,
     lastOnBottom: true,
     clickToClose: true,
     maxLength: 0,
@@ -28,8 +26,7 @@ export class AppComponent implements OnInit {
   constructor (
     private router: Router,
     private authService: AuthService,
-    private configService: ConfigService,
-    private userService: UserService
+    private serverService: ServerService
   ) {}
 
   ngOnInit () {
@@ -37,10 +34,15 @@ export class AppComponent implements OnInit {
 
     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()
     }
 
-    this.configService.loadConfig()
+    // Load custom data from server
+    this.serverService.loadConfig()
+    this.serverService.loadVideoCategories()
+    this.serverService.loadVideoLanguages()
+    this.serverService.loadVideoLicences()
+    this.serverService.loadVideoPrivacies()
 
     // Do not display menu on small screens
     if (window.innerWidth < 600) {
@@ -53,24 +55,14 @@ export class AppComponent implements OnInit {
   }
 
   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 []
   }
 }