aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/app.component.html2
-rw-r--r--client/src/app/app.component.ts7
-rw-r--r--client/src/app/core/auth/auth.service.ts2
-rw-r--r--client/src/app/shared/misc/utils.ts2
4 files changed, 3 insertions, 10 deletions
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 @@
22 <my-menu></my-menu> 22 <my-menu></my-menu>
23 </div> 23 </div>
24 24
25 <div class="main-col container-fluid" [ngClass]="getMainColClasses()"> 25 <div class="main-col container-fluid" [ngClass]="{ expanded: isMenuDisplayed === false }">
26 26
27 <div class="main-row"> 27 <div class="main-row">
28 <router-outlet></router-outlet> 28 <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 {
112 window.scrollTo(0, 0) 112 window.scrollTo(0, 0)
113 this.isMenuDisplayed = !this.isMenuDisplayed 113 this.isMenuDisplayed = !this.isMenuDisplayed
114 } 114 }
115
116 getMainColClasses () {
117 // Take all width is the menu is not displayed
118 if (this.isMenuDisplayed === false) return [ 'expanded' ]
119
120 return []
121 }
122} 115}
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 {
122 scope: 'upload', 122 scope: 'upload',
123 username, 123 username,
124 password 124 password
125 } 125 }
126 126
127 const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded') 127 const headers = new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded')
128 return this.http.post<UserLogin>(AuthService.BASE_TOKEN_URL, objectToUrlEncoded(body), { headers }) 128 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) {
98 98
99// Try to cache a little bit window.innerWidth 99// Try to cache a little bit window.innerWidth
100let windowInnerWidth = window.innerWidth 100let windowInnerWidth = window.innerWidth
101setInterval(() => windowInnerWidth = window.innerWidth, 500) 101// setInterval(() => windowInnerWidth = window.innerWidth, 500)
102 102
103function isInSmallView () { 103function isInSmallView () {
104 return windowInnerWidth < 600 104 return windowInnerWidth < 600