From f954b5da2a9a5960d7c9563522f1ac0b2c10f96c Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 22 May 2018 09:42:05 +0200
Subject: Fix change detection in app component

---
 client/src/app/app.component.html          | 2 +-
 client/src/app/app.component.ts            | 7 -------
 client/src/app/core/auth/auth.service.ts   | 2 +-
 client/src/app/shared/misc/utils.ts        | 2 +-
 client/src/environments/environment.hmr.ts | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'client')

diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index a7128d4fa..e50546633 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -22,7 +22,7 @@
         <my-menu></my-menu>
     </div>
 
-    <div class="main-col container-fluid" [ngClass]="getMainColClasses()">
+    <div class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
 
       <div class="main-row">
         <router-outlet></router-outlet>
diff --git a/client/src/app/app.component.ts b/client/src/app/app.component.ts
index 18115ae75..d5ba24e23 100644
--- a/client/src/app/app.component.ts
+++ b/client/src/app/app.component.ts
@@ -112,11 +112,4 @@ export class AppComponent implements OnInit {
     window.scrollTo(0, 0)
     this.isMenuDisplayed = !this.isMenuDisplayed
   }
-
-  getMainColClasses () {
-    // Take all width is the menu is not displayed
-    if (this.isMenuDisplayed === false) return [ 'expanded' ]
-
-    return []
-  }
 }
diff --git a/client/src/app/core/auth/auth.service.ts b/client/src/app/core/auth/auth.service.ts
index 4213da20c..c3879d570 100644
--- a/client/src/app/core/auth/auth.service.ts
+++ b/client/src/app/core/auth/auth.service.ts
@@ -122,7 +122,7 @@ export class AuthService {
       scope: 'upload',
       username,
       password
-  }
+    }
 
     const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
     return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers })
diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts
index 79c93c1b3..727e33935 100644
--- a/client/src/app/shared/misc/utils.ts
+++ b/client/src/app/shared/misc/utils.ts
@@ -98,7 +98,7 @@ function lineFeedToHtml (obj: object, keyToNormalize: string) {
 
 // Try to cache a little bit window.innerWidth
 let windowInnerWidth = window.innerWidth
-setInterval(() => windowInnerWidth = window.innerWidth, 500)
+// setInterval(() => windowInnerWidth = window.innerWidth, 500)
 
 function isInSmallView () {
   return windowInnerWidth < 600
diff --git a/client/src/environments/environment.hmr.ts b/client/src/environments/environment.hmr.ts
index 78cc8a992..20e2b8fcd 100644
--- a/client/src/environments/environment.hmr.ts
+++ b/client/src/environments/environment.hmr.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: false,
   hmr: true,
-  apiUrl: 'http://192.168.1.42:9000'
+  apiUrl: 'http://localhost:9000'
 }
-- 
cgit v1.2.3