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

diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index b8b732169..220b104b7 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -1,9 +1,7 @@
-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 { GuardsCheckStart, NavigationEnd, Router } from '@angular/router'
+import { AuthService, ServerService } from '@app/core'
+import { isInSmallView } from '@app/shared/misc/utils'
 
 @Component({
   selector: 'my-app',
@@ -12,7 +10,7 @@ import { UserService } from './shared';
 })
 export class AppComponent implements OnInit {
   notificationOptions = {
-    timeOut: 3000,
+    timeOut: 5000,
     lastOnBottom: true,
     clickToClose: true,
     maxLength: 0,
@@ -22,59 +20,63 @@ 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() {
+  get serverVersion () {
+    return this.serverService.getConfig().serverVersion
+  }
+
+  get instanceName () {
+    return this.serverService.getConfig().instance.name
+  }
+
+  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()
 
     // Do not display menu on small screens
-    if (window.innerWidth < 600) {
-      this.isMenuDisplayed = false;
+    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() {
-    this.isMenuDisplayed = !this.isMenuDisplayed;
+  toggleMenu () {
+    window.scrollTo(0, 0)
+    this.isMenuDisplayed = !this.isMenuDisplayed
   }
 
-  getMainColClasses() {
-    const colSizes = {
-      md: 10,
-      sm: 9,
-      xs: 9
-    };
-
+  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 []
   }
 }