Fix/bugs #34 & #37 (#624)

epicmaxco · Aug 1, 2019 · 47d3b15 · 47d3b15
1 parent c0a6292
commit 47d3b15
Show file tree

Hide file tree

Showing 5 changed files with 311 additions and 287 deletions.
diff --git a/src/components/dashboard/DashboardMap.vue b/src/components/dashboard/DashboardMap.vue
@@ -1,31 +1,31 @@
-<template>
-  <va-card :title="$t('dashboard.currentVisitors')">
-    <line-map
-      class="dashboard-map"
-      :map-data="lineMapData"
-    />
-  </va-card>
-</template>
-
-<script>
-import LineMap from '@/components/maps/line-maps/LineMap'
-import LineMapData from '@/data/maps/LineMapData'
-
-export default {
-  name: 'dashboard-map',
-  components: {
-    LineMap,
-  },
-  data () {
-    return {
-      lineMapData: LineMapData,
-    }
-  },
-}
-</script>
-
-<style>
-  .dashboard-map {
-    height: 380px;
-  }
-</style>
+<template>
+  <va-card :title="$t('dashboard.currentVisitors')">
+    <line-map
+      class="dashboard-map"
+      :map-data="lineMapData"
+    />
+  </va-card>
+</template>
+
+<script>
+import LineMap from '@/components/maps/line-maps/LineMap'
+import { getLineMapData } from '../../data/maps/LineMapData'
+
+export default {
+  name: 'dashboard-map',
+  components: {
+    LineMap,
+  },
+  computed: {
+    lineMapData () {
+      return getLineMapData(this.$themes)
+    },
+  },
+}
+</script>
+
+<style>
+  .dashboard-map {
+    height: 380px;
+  }
+</style>
diff --git a/src/components/maps/line-maps/LineMap.vue b/src/components/maps/line-maps/LineMap.vue
@@ -17,7 +17,14 @@ export default {
   name: 'line-map',
 
   props: ['mapData'],
-
+  watch: {
+    mapData: {
+      handler () {
+        this.drawMap()
+      },
+      deep: true,
+    },
+  },
   methods: {
     drawMap () {
       /* global AmCharts */
@@ -35,12 +42,12 @@ export default {
         outlineThickness: 2,
       }
       map.imagesSettings = {
-        color: '#6bbfe4',
-        rollOverColor: '#6bbfe4',
-        selectedColor: '#6be59c',
+        color: this.$themes['info'],
+        rollOverColor: this.$themes['info'],
+        selectedColor: this.$themes['primary'],
       }
       map.linesSettings = {
-        color: '#6bbfe4',
+        color: this.$themes['info'],
         alpha: 0.4,
       }
 
@@ -53,7 +60,6 @@ export default {
       map.write(this.$el)
     },
   },
-
   mounted () {
     this.drawMap()
   },

diff --git a/src/components/maps/line-maps/LineMapsPage.vue b/src/components/maps/line-maps/LineMapsPage.vue
@@ -18,17 +18,17 @@
 
 <script>
 import LineMap from './LineMap'
-import LineMapData from 'data/maps/LineMapData'
+import { getLineMapData } from '../../../data/maps/LineMapData'
 
 export default {
   name: 'line-maps-page',
   components: {
     LineMap,
   },
-  data () {
-    return {
-      lineMapData: LineMapData,
-    }
+  computed: {
+    lineMapData () {
+      return getLineMapData(this.$themes)
+    },
   },
 }
 </script>
diff --git a/src/components/ui/popovers/Popovers.vue b/src/components/ui/popovers/Popovers.vue
@@ -28,7 +28,7 @@
           />
           <div class="row popover-example mt-5">
             <va-popover
-              :icon="popover.icon"
+              :icon="popover.icon.icon"
               :color="popover.color"
               :title="popover.title"
               :message="popover.message"
@@ -111,7 +111,10 @@ export default {
       popover: {
         title: 'Hey folks!',
         message: 'This tooltip is amazing:D',
-        icon: 'fa fa-print',
+        icon: {
+          icon: 'fa fa-print',
+          text: 'print',
+        },
         color: 'warning',
       },
     }