diff --git a/package-lock.json b/package-lock.json index 9df74ac..2321edc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,9 +11,11 @@ "@popperjs/core": "^2.11.6", "axios": "^1.3.1", "bootstrap": "^5.2.3", + "chart.js": "^4.2.1", "firebase": "^9.17.1", "ol": "^7.2.2", "vue": "^3.2.45", + "vue-chartjs": "^5.2.0", "vue-loading-overlay": "^6.0.3", "vue-marquee-text-component": "^2.0.1", "vue-router": "^4.1.6", @@ -952,6 +954,11 @@ "node": ">=6" } }, + "node_modules/@kurkle/color": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/@kurkle/color/-/color-0.3.2.tgz", + "integrity": "sha512-fuscdXJ9G1qb7W8VdHi+IwRqij3lBkosAm4ydQtEmbY58OzHXqQhvlxqEkoz0yssNVn38bcpRWgA9PP+OGoisw==" + }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", @@ -1300,6 +1307,17 @@ "node": ">=10.0.0" } }, + "node_modules/chart.js": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-4.2.1.tgz", + "integrity": "sha512-6YbpQ0nt3NovAgOzbkSSeeAQu/3za1319dPUQTXn9WcOpywM8rGKxJHrhS8V8xEkAlk8YhEfjbuAPfUyp6jIsw==", + "dependencies": { + "@kurkle/color": "^0.3.0" + }, + "engines": { + "pnpm": "^7.0.0" + } + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -2225,6 +2243,15 @@ "@vue/shared": "3.2.45" } }, + "node_modules/vue-chartjs": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.2.0.tgz", + "integrity": "sha512-d3zpKmGZr2OWHQ1xmxBcAn5ShTG917+/UCLaSpaCDDqT0U7DBsvFzTs69ZnHCgKoXT55GZDW8YEj9Av+dlONLA==", + "peerDependencies": { + "chart.js": "^4.1.1", + "vue": "^3.0.0-0 || ^2.7.0" + } + }, "node_modules/vue-loading-overlay": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/vue-loading-overlay/-/vue-loading-overlay-6.0.3.tgz", diff --git a/package.json b/package.json index f78bdb7..6c60e65 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,11 @@ "@popperjs/core": "^2.11.6", "axios": "^1.3.1", "bootstrap": "^5.2.3", + "chart.js": "^4.2.1", "firebase": "^9.17.1", "ol": "^7.2.2", "vue": "^3.2.45", + "vue-chartjs": "^5.2.0", "vue-loading-overlay": "^6.0.3", "vue-marquee-text-component": "^2.0.1", "vue-router": "^4.1.6", diff --git a/src/components/BarChart.vue b/src/components/BarChart.vue new file mode 100644 index 0000000..ce6773f --- /dev/null +++ b/src/components/BarChart.vue @@ -0,0 +1,65 @@ + + + + + \ No newline at end of file diff --git a/src/components/pieChart.vue b/src/components/pieChart.vue new file mode 100644 index 0000000..c6f9de6 --- /dev/null +++ b/src/components/pieChart.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/pages/InsightsPage.vue b/src/pages/InsightsPage.vue index 4faa62e..3772ae4 100644 --- a/src/pages/InsightsPage.vue +++ b/src/pages/InsightsPage.vue @@ -1,20 +1,46 @@ \ No newline at end of file diff --git a/src/pages/MapPage.vue b/src/pages/MapPage.vue index f3a482b..d407498 100644 --- a/src/pages/MapPage.vue +++ b/src/pages/MapPage.vue @@ -284,10 +284,10 @@ export default { #sidebar{ position: absolute; - height: 85%; + height: 80%; width: 20%; left: 2%; - top: 12%; + top: 14%; z-index: 2; text-align: center; animation: gradient 15s ease infinite;