From dc1a16ed5c065486b5edd24623489b935c7ed4d3 Mon Sep 17 00:00:00 2001
From: Ralph Slooten <axllent@gmail.com>
Date: Sun, 1 Sep 2024 22:08:18 +1200
Subject: [PATCH] Chore: Upgrade vue-css-donut-chart & related charts

---
 package-lock.json                                 | 6 +++---
 server/ui-src/app.js                              | 1 +
 server/ui-src/components/message/HTMLCheck.vue    | 8 ++++----
 server/ui-src/components/message/SpamAssassin.vue | 8 ++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad63e80..e7d0858 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3133,9 +3133,9 @@
       }
     },
     "node_modules/vue-css-donut-chart": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/vue-css-donut-chart/-/vue-css-donut-chart-2.0.0.tgz",
-      "integrity": "sha512-rT7Ytk2IYBLS3hfWSiTWaY+kVS649+ZwAQofl1Xq1wOhH5FgmcjT0a/whu67bVQ59aTVGX45MGvGppweu+u3Cw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vue-css-donut-chart/-/vue-css-donut-chart-2.1.0.tgz",
+      "integrity": "sha512-Xs71IJ5DbRMaVaei7cGV0xeihRHEnTAarKZIczNtlQKH4Llj+ikvBdtCZFV1stt6NNmRN6G8oLsOrEVHNYMm/w==",
       "peerDependencies": {
         "vue": "^3"
       }
diff --git a/server/ui-src/app.js b/server/ui-src/app.js
index c33a0ed..7288cbe 100644
--- a/server/ui-src/app.js
+++ b/server/ui-src/app.js
@@ -6,6 +6,7 @@ import mitt from 'mitt';
 import './assets/styles.scss'
 import 'bootstrap-icons/font/bootstrap-icons.scss'
 import 'bootstrap'
+import 'vue-css-donut-chart/src/styles/main.css'
 
 const app = createApp(App)
 
diff --git a/server/ui-src/components/message/HTMLCheck.vue b/server/ui-src/components/message/HTMLCheck.vue
index d124730..a96b593 100644
--- a/server/ui-src/components/message/HTMLCheck.vue
+++ b/server/ui-src/components/message/HTMLCheck.vue
@@ -1,5 +1,5 @@
 <script>
-import Donut from 'vue-css-donut-chart/src/components/Donut.vue'
+import { VcDonut } from 'vue-css-donut-chart'
 import axios from 'axios'
 import commonMixins from '../../mixins/CommonMixins'
 import { Tooltip } from 'bootstrap'
@@ -10,7 +10,7 @@ export default {
 	},
 
 	components: {
-		Donut,
+		VcDonut,
 	},
 
 	emits: ["setHtmlScore", "setBadgeStyle"],
@@ -299,7 +299,7 @@ export default {
 		<div class="mt-5 mb-3">
 			<div class="row w-100">
 				<div class="col-md-8">
-					<Donut :sections="graphSections" background="var(--bs-body-bg)" :size="180" unit="px"
+					<vc-donut :sections="graphSections" background="var(--bs-body-bg)" :size="180" unit="px"
 						:thickness="20" has-legend legend-placement="bottom" :total="100" :start-angle="0"
 						:auto-adjust-text-size="true" @section-click="scrollToWarnings">
 						<h2 class="m-0" :class="scoreColor" @click="scrollToWarnings">
@@ -327,7 +327,7 @@ export default {
 								calculated from {{ formatNumber(check.Total.Tests) }} tests
 							</p>
 						</template>
-					</Donut>
+					</vc-donut>
 
 					<div class="input-group justify-content-center mb-3">
 						<button class="btn btn-outline-secondary" data-bs-toggle="modal"
diff --git a/server/ui-src/components/message/SpamAssassin.vue b/server/ui-src/components/message/SpamAssassin.vue
index 101ad89..c7e0dda 100644
--- a/server/ui-src/components/message/SpamAssassin.vue
+++ b/server/ui-src/components/message/SpamAssassin.vue
@@ -1,5 +1,5 @@
 <script>
-import Donut from 'vue-css-donut-chart/src/components/Donut.vue'
+import { VcDonut } from 'vue-css-donut-chart'
 import axios from 'axios'
 import commonMixins from '../../mixins/CommonMixins'
 
@@ -9,7 +9,7 @@ export default {
 	},
 
 	components: {
-		Donut,
+		VcDonut,
 	},
 
 	emits: ["setSpamScore", "setBadgeStyle"],
@@ -156,7 +156,7 @@ export default {
 	<template v-else-if="check">
 		<div class="row w-100 mt-5">
 			<div class="col-xl-5 mb-2">
-				<Donut :sections="graphSections" background="var(--bs-body-bg)" :size="230" unit="px" :thickness="20"
+				<vc-donut :sections="graphSections" background="var(--bs-body-bg)" :size="230" unit="px" :thickness="20"
 					:total="100" :start-angle="270" :auto-adjust-text-size="true" foreground="#198754">
 					<h2 class="m-0" :class="scoreColor" @click="scrollToWarnings">
 						{{ check.Score }} / 5
@@ -165,7 +165,7 @@ export default {
 						<span v-if="check.IsSpam" class="text-white badge rounded-pill bg-danger p-2">Spam</span>
 						<span v-else class="badge rounded-pill p-2" :class="badgeStyle()">Not spam</span>
 					</div>
-				</Donut>
+				</vc-donut>
 			</div>
 			<div class="col-xl-7">
 				<div class="row w-100 py-2 border-bottom">