X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fapp.component.ts;h=b1818c298eb0545b31ec433bde20c9a60516e190;hb=0727cab0dfd3d53e5e9c88bfbda6bc0e090d4f12;hp=14870bb5f8c2c876b50d011a8f98732792dd01a0;hpb=67167390827ca0c6c10849f26d0deb8b32186a7e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 14870bb5f..b1818c298 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,9 +1,6 @@
-import { Component, OnInit, ViewContainerRef } from '@angular/core';
-import { Router } from '@angular/router';
-
-import { AuthService, ConfigService } from './core';
-import { VideoService } from './videos';
-import { UserService } from './shared';
+import { Component, OnInit } from '@angular/core'
+import { Router } from '@angular/router'
+import { AuthService, ServerService } from './core'
 
 @Component({
   selector: 'my-app',
@@ -12,7 +9,7 @@ import { UserService } from './shared';
 })
 export class AppComponent implements OnInit {
   notificationOptions = {
-    timeOut: 3000,
+    timeOut: 5000,
     lastOnBottom: true,
     clickToClose: true,
     maxLength: 0,
@@ -22,54 +19,50 @@ export class AppComponent implements OnInit {
     preventDuplicates: false,
     preventLastDuplicates: 'visible',
     rtl: false
-  };
+  }
 
-  isMenuDisplayed = true;
+  isMenuDisplayed = true
 
-  constructor(
+  constructor (
     private router: Router,
     private authService: AuthService,
-    private configService: ConfigService,
-    private userService: UserService,
-    private videoService: VideoService,
-    viewContainerRef: ViewContainerRef
+    private serverService: ServerService
   ) {}
 
-  ngOnInit() {
+  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()
     }
 
-    this.configService.loadConfig();
-    this.videoService.loadVideoCategories();
-    this.videoService.loadVideoLicences();
-    this.videoService.loadVideoLanguages();
-  }
+    // Load custom data from server
+    this.serverService.loadConfig()
+    this.serverService.loadVideoCategories()
+    this.serverService.loadVideoLanguages()
+    this.serverService.loadVideoLicences()
+    this.serverService.loadVideoPrivacies()
 
-  isInAdmin() {
-    return this.router.url.indexOf('/admin/') !== -1;
+    // Do not display menu on small screens
+    if (window.innerWidth < 600) {
+      this.isMenuDisplayed = false
+    }
   }
 
-  toggleMenu() {
-    this.isMenuDisplayed = !this.isMenuDisplayed;
+  isInAdmin () {
+    return this.router.url.indexOf('/admin/') !== -1
   }
 
-  getMainColClasses() {
-    const colSizes = {
-      md: 10,
-      sm: 9,
-      xs: 9
-    }
+  toggleMenu () {
+    window.scrollTo(0, 0)
+    this.isMenuDisplayed = !this.isMenuDisplayed
+  }
 
+  getMainColClasses () {
     // 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 []
   }
 }