Feature - Integrated Fusion Charts Maps , added NavBar

CUBigDataClass · Apr 9, 2019 · 4e71b0e · 4e71b0e
1 parent 701e446
commit 4e71b0e
Show file tree

Hide file tree

Showing 8 changed files with 727 additions and 37 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /node_modules
 /vscode
-/.vscode
+/.vscode
+/dist
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,9 +9,11 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "fusioncharts": "^3.13.4",
     "mapbox-gl": "^0.53.1",
     "vue": "^2.6.6",
     "vue-chartkick": "^0.5.0",
+    "vue-fusioncharts": "^3.0.2",
     "vuetify": "^1.5.6"
   },
   "devDependencies": {

diff --git a/public/index.html b/public/index.html
@@ -5,10 +5,8 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <link href='https://api.mapbox.com/mapbox-gl-js/v0.53.0/mapbox-gl.css' rel='stylesheet' />
     <link href='https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons' rel="stylesheet">
     <title>BigMood</title>
-    <script src="https://www.gstatic.com/charts/loader.js"></script>
   </head>
   <body>
     <noscript>

diff --git a/src/App.vue b/src/App.vue
@@ -1,16 +1,18 @@
 <template>
   <div id="app">
+    <NavBar/>
     <GeoMap/>
   </div>
 </template>
 
 <script>
 import GeoMap from './components/GeoMap.vue'
-
+import NavBar from './components/NavBar.vue'
 export default {
   name: 'app',
   components: {
-    GeoMap
+    GeoMap, 
+    NavBar
   }
 }
 </script>
@@ -22,6 +24,6 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
-  margin-top: 60px;
+  /* margin-top: 60px; */
 }
 </style>