From 46c5d2192af79daf2e0ea6b231e6c36fbc622d9a Mon Sep 17 00:00:00 2001 From: Tim Herbst Date: Sun, 27 Dec 2020 17:47:04 +0100 Subject: [PATCH] correct api-call for accidents * possible map-fix with height/width * adjust flex-layout dependency --- projects/project-3/frontend/package-lock.json | 6 +++--- projects/project-3/frontend/package.json | 2 +- .../frontend/src/app/dashboard/dashboard.component.scss | 4 ++++ projects/project-3/frontend/src/app/map/map.component.scss | 3 +-- projects/project-3/frontend/src/app/service/map.service.ts | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/project-3/frontend/package-lock.json b/projects/project-3/frontend/package-lock.json index 3c34130..6565771 100644 --- a/projects/project-3/frontend/package-lock.json +++ b/projects/project-3/frontend/package-lock.json @@ -481,9 +481,9 @@ } }, "@angular/flex-layout": { - "version": "11.0.0-beta.33", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-11.0.0-beta.33.tgz", - "integrity": "sha512-unfhw3abZuKtdwQicRStHCYGbANPTHYg4WNRQk/RC5Mxq+4WOp4Q8HI7GqRHCGUYDCGUP7w1sU/oDt8f09nM8w==", + "version": "10.0.0-beta.32", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-10.0.0-beta.32.tgz", + "integrity": "sha512-JvuY4dUoy5jyCTIrFiq7n30Znakh1pD3nbg0h0hs2r3t1OiDQb0ZSI1wcumosG/vYHsuJQTuNhbfaIZzA1x8nA==", "requires": { "tslib": "^2.0.0" } diff --git a/projects/project-3/frontend/package.json b/projects/project-3/frontend/package.json index 8cad135..52b0abd 100644 --- a/projects/project-3/frontend/package.json +++ b/projects/project-3/frontend/package.json @@ -16,7 +16,7 @@ "@angular/common": "~10.2.0", "@angular/compiler": "~10.2.0", "@angular/core": "~10.2.0", - "@angular/flex-layout": "^11.0.0-beta.33", + "@angular/flex-layout": "^10.0.0-beta.32", "@angular/forms": "~10.2.0", "@angular/material": "^10.2.7", "@angular/platform-browser": "~10.2.0", diff --git a/projects/project-3/frontend/src/app/dashboard/dashboard.component.scss b/projects/project-3/frontend/src/app/dashboard/dashboard.component.scss index d078d2f..ee6593f 100644 --- a/projects/project-3/frontend/src/app/dashboard/dashboard.component.scss +++ b/projects/project-3/frontend/src/app/dashboard/dashboard.component.scss @@ -14,6 +14,10 @@ a { background: #086ed2; } +#chart { + margin-right: 16px; +} + #submit-date-span { padding: 10px; } diff --git a/projects/project-3/frontend/src/app/map/map.component.scss b/projects/project-3/frontend/src/app/map/map.component.scss index ccfddca..857c089 100644 --- a/projects/project-3/frontend/src/app/map/map.component.scss +++ b/projects/project-3/frontend/src/app/map/map.component.scss @@ -1,7 +1,6 @@ .myApp { margin: 0; - height: 100vh; - width: 100vw; + height: 100%; } .toolbar-spacer { diff --git a/projects/project-3/frontend/src/app/service/map.service.ts b/projects/project-3/frontend/src/app/service/map.service.ts index d49ed23..c8a85fb 100644 --- a/projects/project-3/frontend/src/app/service/map.service.ts +++ b/projects/project-3/frontend/src/app/service/map.service.ts @@ -137,6 +137,6 @@ export class MapService { } private fetchAccidentGeoData(): Promise { - return this.client.get(environment.apiUrl + 'latest/accidents/').toPromise(); + return this.client.get(environment.apiUrl + 'latest/accidents/2019').toPromise(); } }