From ad6af8e08ca16d7aa5fbc2d350ab0b6994df9cac Mon Sep 17 00:00:00 2001
From: joshJarr <josh.jarvis@potatolondon.com>
Date: Tue, 23 Apr 2019 14:47:57 +0100
Subject: [PATCH] Update header for park view.

---
 src/components/Header.vue           | 46 +++++++++++++++++++++++++----
 src/components/ParkPage.vue         |  4 +--
 src/components/Tmap.vue             |  2 +-
 src/router/index.js                 |  2 --
 src/services/Park.service.js        |  2 --
 src/services/bootstrap-park-data.js |  2 --
 src/store/getters.js                | 10 +++----
 src/store/index.js                  |  2 +-
 src/styles/normalize.scss           | 11 +++++--
 9 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/components/Header.vue b/src/components/Header.vue
index 79b1605..6d58900 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -1,5 +1,5 @@
 <template>
-  <header class="header layer">
+  <header v-if="show" class="header layer">
     <router-link :to="{
       path: hasBack
     }">
@@ -9,6 +9,15 @@
     </router-link>
     <h1 v-if="title">{{ title }}</h1>
   </header>
+  <header v-else-if="!show" class="header header--hidden">
+    <router-link :to="{
+        path: hasBack
+      }">
+      <span title="Back" class="back-btn" v-if="hasBack">
+        <Chevron class="rotate"/>
+      </span>
+    </router-link>
+  </header>
 </template>
 
 <script>
@@ -21,6 +30,10 @@ export default {
       type: String,
       default: ""
     },
+    show: {
+      type: Boolean,
+      default: true
+    },
     hasBack: {
       type: String,
       default: ""
@@ -45,6 +58,18 @@ export default {
   top: 0;
   width: 100%;
   z-index: 99;
+  transition: background .2s ease;
+
+  &--hidden {
+    background: transparent;
+    .back-btn {
+      background: white;
+      box-shadow: 0px 2px 5px 0px rgba(0,0,0,.25);
+      svg #Park-view-with-info {
+        fill: rgb(27, 201, 152) !important;
+      }
+    }
+  }
 
   > h1 {
     color: white;
@@ -52,22 +77,31 @@ export default {
 }
 
 .back-btn {
-  width: 32px;
-  height: 32px;
   position: absolute;
-  top: 10%;
-  left: 1%;
   font-size: 3em;
   color: white;
-
+  top: 0;
+  line-height: 1.5em;
+  height: 2.5rem;
+  width: 2.5rem;
+  left: .25rem;
+  top: .25rem;
+  background: transparent;
+  border-radius: 100%;
+  box-shadow: 0px 2px 5px 0px rgba(0,0,0,0);
+  transition: all .2s ease;
   svg {
     transform: rotate(180deg);
     width: auto;
     height: 18px;
+    position: relative;
+    left: -2px;
+    top: -2px;
 
     // Specific selection to target SVG element
     #Park-view-with-info {
       fill: white !important;
+      transition: fill .2s ease;
     }
   }
 }
diff --git a/src/components/ParkPage.vue b/src/components/ParkPage.vue
index 1209690..1746817 100644
--- a/src/components/ParkPage.vue
+++ b/src/components/ParkPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Header v-bind:title="parkName" v-bind:hasBack="backLink"/>
+    <Header v-bind:show="drawerState" v-bind:title="parkName" v-bind:hasBack="backLink"/>
     <div class="content">
       <Tmap v-if="park" :park="park" :drawerState="drawerState" @close-drawer="mapActive"/>
       <ParkDrawer @toggle-drawer="toggleDrawer" :park="park" ref="parkDrawer"/>
@@ -47,7 +47,7 @@ export default {
 
     toggleDrawer: function(event) {
       // event === true is drawer visible
-      this.drawerState = event;
+      this.drawerState = Boolean(event);
       if (event) {
         this.$log.info("ParkPage: Drawer opened");
       } else {
diff --git a/src/components/Tmap.vue b/src/components/Tmap.vue
index 065917f..7bf1ff7 100644
--- a/src/components/Tmap.vue
+++ b/src/components/Tmap.vue
@@ -236,7 +236,7 @@ export default {
 
 #mapid {
   height: 100vh;
-  height: calc(var(--vh, 1vh) * 90);
+  height: calc(var(--vh, 1vh) * 100);
   width: 100%;
   z-index: 1;
 }
diff --git a/src/router/index.js b/src/router/index.js
index 4aa957d..5b66f15 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,9 +19,7 @@ export default new Router({
             name: 'Parks',
             component: List,
             beforeEnter: (to, from, next) => {
-              console.log('called');
                 apiRequestPromise.then(() => {
-                  console.log('complete')
                   next();
                 })
             }
diff --git a/src/services/Park.service.js b/src/services/Park.service.js
index f8d34fb..ffeb21b 100644
--- a/src/services/Park.service.js
+++ b/src/services/Park.service.js
@@ -14,9 +14,7 @@ export const parkService = {
  * empty if nothing found
  */
 function parks(page = 1) {
-    console.log(Vue.config);
     const url = `http://127.0.0.1:5000/api/v1/parks?page=${page}`;
-    console.log(url);
     return http.get(url)
         .then((resp) => {
             return resp.data;
diff --git a/src/services/bootstrap-park-data.js b/src/services/bootstrap-park-data.js
index 93e04c7..d5ebb4c 100644
--- a/src/services/bootstrap-park-data.js
+++ b/src/services/bootstrap-park-data.js
@@ -9,10 +9,8 @@ export const apiRequestPromise = new Promise((resolve) => {
 });
 
 export default async function bootstrapDataPlugin(store) {
-	console.log(parkService);
 	await parkService.parks()
 		.then((allParksData) => {
-			console.log(allParksData);
 			store.commit(SET_ALL_PARKS, allParksData);
 			resolveApiRequest && resolveApiRequest();
 		});
diff --git a/src/store/getters.js b/src/store/getters.js
index 17c3b10..87f82fd 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,9 +1,9 @@
 const getters = {
-  get: (state, getters) => {
-    return getters.cartProducts.reduce((total, product) => {
-      return total + product.price * product.quantity
-    }, 0)
-  }
+  // get: (state, getters) => {
+  //   return getters.cartProducts.reduce((total, product) => {
+  //     return total + product.price * product.quantity
+  //   }, 0)
+  // }
 }
 
 export default getters;
diff --git a/src/store/index.js b/src/store/index.js
index 7221259..6c72ec1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -18,7 +18,7 @@ export default new Vuex.Store({
   mutations,
   getters,
   plugins: [
-  	boostrapDataPlugin,
+    boostrapDataPlugin,
   ],
   strict: debug,
 })
diff --git a/src/styles/normalize.scss b/src/styles/normalize.scss
index d74298a..8938c1e 100644
--- a/src/styles/normalize.scss
+++ b/src/styles/normalize.scss
@@ -4,8 +4,6 @@ body {
   @supports (font-variation-settings: normal) {
     font-family: 'Inter var', sans-serif;
   }
-  margin-top: 3rem;
-
 }
 
 h1, h2, h3, h4, h5 {
@@ -16,4 +14,11 @@ ul {
   list-style-type: none;
   display: inline;
   padding-inline-start: 0;
-}
\ No newline at end of file
+}
+
+// A couple of overwrites to style leaflet as we want it
+.leaflet-control-scale.leaflet-control,
+.leaflet-control-attribution.leaflet-control,
+.leaflet-top.leaflet-left {
+  display: none !important;
+}