From 4e46674c074d6342c427171bbc833b84f1064a11 Mon Sep 17 00:00:00 2001
From: tim-herbst <herbst.tim@icloud.com>
Date: Sat, 19 Dec 2020 13:25:39 +0100
Subject: [PATCH] add link to wiki in toolbar

* adjust margin and size of map-frame
* add link to gitlab wiki
---
 projects/project-3/frontend/.gitignore        |  4 ++++
 .../project-3/frontend/src/app/app.module.ts  | 19 ++++++++++-------
 .../frontend/src/app/map/map.component.css    | 12 ++++++-----
 .../src/app/map/map.component.css.map         |  2 +-
 .../frontend/src/app/map/map.component.html   | 21 +++++++++++++------
 .../frontend/src/app/map/map.component.scss   | 20 ++++++++++++++----
 .../frontend/src/app/map/map.component.ts     |  1 -
 7 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/projects/project-3/frontend/.gitignore b/projects/project-3/frontend/.gitignore
index 86d943a..e2a50f4 100644
--- a/projects/project-3/frontend/.gitignore
+++ b/projects/project-3/frontend/.gitignore
@@ -7,6 +7,10 @@
 # Only exists if Bazel was run
 /bazel-out
 
+# exclude generated css-files
+/src/app/map/*.css.map
+/src/app/map/*.css
+
 # dependencies
 /node_modules
 
diff --git a/projects/project-3/frontend/src/app/app.module.ts b/projects/project-3/frontend/src/app/app.module.ts
index 59f3fbb..ad12c07 100644
--- a/projects/project-3/frontend/src/app/app.module.ts
+++ b/projects/project-3/frontend/src/app/app.module.ts
@@ -1,12 +1,14 @@
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
+import {BrowserModule} from '@angular/platform-browser';
+import {NgModule} from '@angular/core';
 
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { MapComponent } from './map/map.component';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {AppRoutingModule} from './app-routing.module';
+import {AppComponent} from './app.component';
+import {MapComponent} from './map/map.component';
+import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 import {MatToolbarModule} from '@angular/material/toolbar';
 import {FlexLayoutModule} from '@angular/flex-layout';
+import {MatIconModule} from '@angular/material/icon';
+import {MatButtonModule} from '@angular/material/button';
 
 @NgModule({
   declarations: [
@@ -18,9 +20,12 @@ import {FlexLayoutModule} from '@angular/flex-layout';
     AppRoutingModule,
     BrowserAnimationsModule,
     MatToolbarModule,
+    MatIconModule,
+    MatButtonModule,
     FlexLayoutModule
   ],
   providers: [],
   bootstrap: [AppComponent]
 })
-export class AppModule { }
+export class AppModule {
+}
diff --git a/projects/project-3/frontend/src/app/map/map.component.css b/projects/project-3/frontend/src/app/map/map.component.css
index 84b2d67..928ef2d 100644
--- a/projects/project-3/frontend/src/app/map/map.component.css
+++ b/projects/project-3/frontend/src/app/map/map.component.css
@@ -1,18 +1,20 @@
-.mat-toolbar {
-  display: flex;
+.toolbar-spacer {
+  flex: 1 1 auto;
 }
 
 .map-container {
-  margin: 30px;
-  height: 100%;
+  margin: 0;
+  height: 95%;
 }
 
 .map-frame {
-  height: 90%;
+  height: 100%;
+  width: 100%;
 }
 
 #map {
   height: 100%;
+  width: 100%;
 }
 
 /*# sourceMappingURL=map.component.css.map */
diff --git a/projects/project-3/frontend/src/app/map/map.component.css.map b/projects/project-3/frontend/src/app/map/map.component.css.map
index 8e10507..9711d7d 100644
--- a/projects/project-3/frontend/src/app/map/map.component.css.map
+++ b/projects/project-3/frontend/src/app/map/map.component.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["map.component.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE","file":"map.component.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["map.component.scss"],"names":[],"mappings":"AAAA;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA","file":"map.component.css"}
\ No newline at end of file
diff --git a/projects/project-3/frontend/src/app/map/map.component.html b/projects/project-3/frontend/src/app/map/map.component.html
index f271c49..3457e68 100644
--- a/projects/project-3/frontend/src/app/map/map.component.html
+++ b/projects/project-3/frontend/src/app/map/map.component.html
@@ -1,10 +1,19 @@
-<mat-toolbar class="mat-toolbar" color="primary">
-  <span>My Application</span>
-</mat-toolbar>
+<div class="myApp">
+  <mat-toolbar class="mat-toolbar" color="primary">
+    <span>Bike Stations in London</span>
+    <span class="toolbar-spacer"></span>
+    <a class="button-wiki" color="primary"
+       href="https://gitlab.com/marcel.schwarz/geovisualisierung/-/wikis/Projektarbeit%203" mat-flat-button
+       target="_blank">
+      <mat-icon>library_books</mat-icon>
+      Wiki</a>
+  </mat-toolbar>
 
-<div class="map-container">
-  <div class="map-frame">
-    <div id="map"></div>
+  <div class="map-container">
+    <div class="map-frame">
+      <div id="map"></div>
+    </div>
   </div>
 </div>
 
+
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 6866a90..cb1057b 100644
--- a/projects/project-3/frontend/src/app/map/map.component.scss
+++ b/projects/project-3/frontend/src/app/map/map.component.scss
@@ -1,16 +1,28 @@
+.myApp {
+  margin: 0;
+  height: 100vh;
+  width: 100vw;
+}
+
+.toolbar-spacer {
+  flex: 1 1 auto;
+}
+
 .mat-toolbar {
-  display: flex;
+  height: 4%
 }
 
 .map-container {
-  margin: 30px;
-  height: 100%;
+  margin: 10px;
+  height: 94%;
 }
 
 .map-frame {
-  height: 90%;
+  height: 100%;
+  width: 100%;
 }
 
 #map {
   height: 100%;
+  width: 100%;
 }
diff --git a/projects/project-3/frontend/src/app/map/map.component.ts b/projects/project-3/frontend/src/app/map/map.component.ts
index f834d87..a3ac056 100644
--- a/projects/project-3/frontend/src/app/map/map.component.ts
+++ b/projects/project-3/frontend/src/app/map/map.component.ts
@@ -8,7 +8,6 @@ import {MapService} from '../service/map.service';
   styleUrls: ['./map.component.scss']
 })
 export class MapComponent implements AfterViewInit {
-  private map;
 
   constructor(private service: MapService) {
   }