From 795599ad465c73e507bb40edb263f4691c44e70d Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 20 Sep 2021 18:23:05 +0200 Subject: [PATCH] Client - add total label on chart --- fittrackee_client/package.json | 1 + .../components/Common/StatsChart/Chart.vue | 30 +++++++++++++++++-- .../components/Common/StatsChart/index.vue | 12 ++------ .../components/Dashboard/UserMonthStats.vue | 30 ++++++++++++++----- fittrackee_client/src/views/DashBoard.vue | 6 ++-- fittrackee_client/yarn.lock | 5 ++++ 6 files changed, 62 insertions(+), 22 deletions(-) diff --git a/fittrackee_client/package.json b/fittrackee_client/package.json index 57631498..68e23e8f 100644 --- a/fittrackee_client/package.json +++ b/fittrackee_client/package.json @@ -12,6 +12,7 @@ "dependencies": { "axios": "^0.21.1", "chart.js": "^3.5.1", + "chartjs-plugin-datalabels": "^2.0.0", "core-js": "^3.6.5", "date-fns": "^2.23.0", "date-fns-tz": "^1.1.6", diff --git a/fittrackee_client/src/components/Common/StatsChart/Chart.vue b/fittrackee_client/src/components/Common/StatsChart/Chart.vue index 64d01f18..5f18fb97 100644 --- a/fittrackee_client/src/components/Common/StatsChart/Chart.vue +++ b/fittrackee_client/src/components/Common/StatsChart/Chart.vue @@ -1,11 +1,12 @@ - diff --git a/fittrackee_client/src/views/DashBoard.vue b/fittrackee_client/src/views/DashBoard.vue index 0e9fb554..c9049267 100644 --- a/fittrackee_client/src/views/DashBoard.vue +++ b/fittrackee_client/src/views/DashBoard.vue @@ -6,7 +6,7 @@
- +
@@ -21,7 +21,7 @@ import Timeline from '@/components/Dashboard/Timeline/index.vue' import UserCalendar from '@/components/Dashboard/UserCalendar/index.vue' - // import UserMonthStats from '@/components/Dashboard/UserMonthStats.vue' + import UserMonthStats from '@/components/Dashboard/UserMonthStats.vue' // import UserRecords from '@/components/Dashboard/UserRecords.vue' import UserStatsCards from '@/components/Dashboard/UserStartsCards/index.vue' import { USER_STORE } from '@/store/constants' @@ -33,7 +33,7 @@ components: { Timeline, UserCalendar, - // UserMonthStats, + UserMonthStats, // UserRecords, UserStatsCards, }, diff --git a/fittrackee_client/yarn.lock b/fittrackee_client/yarn.lock index 5d6207cb..5affad44 100644 --- a/fittrackee_client/yarn.lock +++ b/fittrackee_client/yarn.lock @@ -2836,6 +2836,11 @@ chart.js@^3.5.1: resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.1.tgz#73e24d23a4134a70ccdb5e79a917f156b6f3644a" integrity sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ== +chartjs-plugin-datalabels@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.0.0.tgz#caacefb26803d968785071eab012dde8746c5939" + integrity sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA== + check-error@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"