From 56193824ef3473316519d9c8d1aac62c5d29b955 Mon Sep 17 00:00:00 2001 From: Phil Bastian Date: Mon, 30 Jun 2025 13:50:27 +0800 Subject: [PATCH 01/33] introduce fontawesome v6 packages and convert pageheader --- src/Frontend/package-lock.json | 72 +++++++++++++++++++ src/Frontend/package.json | 5 ++ src/Frontend/src/components/FAIcon.vue | 17 +++++ .../src/components/FeedbackButton.vue | 11 ++- .../src/components/audit/AuditMenuItem.vue | 4 +- .../configuration/ConfigurationMenuItem.vue | 4 +- .../customchecks/CustomChecksMenuItem.vue | 4 +- .../dashboard/DashboardMenuItem.vue | 4 +- .../src/components/events/EventsMenuItem.vue | 4 +- .../failedmessages/FailedMessagesMenuItem.vue | 4 +- .../heartbeats/HeartbeatsMenuItem.vue | 4 +- .../monitoring/MonitoringMenuItem.vue | 4 +- .../throughputreport/ThroughputMenuItem.vue | 4 +- 13 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 src/Frontend/src/components/FAIcon.vue diff --git a/src/Frontend/package-lock.json b/src/Frontend/package-lock.json index aa270afc4..f9b134933 100644 --- a/src/Frontend/package-lock.json +++ b/src/Frontend/package-lock.json @@ -12,6 +12,11 @@ "@codemirror/lang-xml": "^6.1.0", "@codemirror/legacy-modes": "^6.5.1", "@dagrejs/dagre": "^1.1.5", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-brands-svg-icons": "^6.7.2", + "@fortawesome/free-regular-svg-icons": "^6.7.2", + "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@fortawesome/vue-fontawesome": "^3.0.8", "@tinyhttp/content-disposition": "^2.2.2", "@vue-flow/controls": "^1.1.2", "@vue-flow/core": "^1.45.0", @@ -1057,6 +1062,73 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.7.2.tgz", + "integrity": "sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz", + "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", + "license": "MIT", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.7.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-brands-svg-icons": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.7.2.tgz", + "integrity": "sha512-zu0evbcRTgjKfrr77/2XX+bU+kuGfjm0LbajJHVIgBWNIDzrhpRxiCPNT8DW5AdmSsq7Mcf9D1bH0aSeSUSM+Q==", + "license": "(CC-BY-4.0 AND MIT)", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.7.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.2.tgz", + "integrity": "sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==", + "license": "(CC-BY-4.0 AND MIT)", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.7.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz", + "integrity": "sha512-GsBrnOzU8uj0LECDfD5zomZJIjrPhIlWU82AHwa2s40FKH+kcxQaBvBo3Z4TxyZHIyX8XTDxsyA33/Vx9eFuQA==", + "license": "(CC-BY-4.0 AND MIT)", + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.7.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/vue-fontawesome": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.8.tgz", + "integrity": "sha512-yyHHAj4G8pQIDfaIsMvQpwKMboIZtcHTUvPqXjOHyldh1O1vZfH4W03VDPv5RvI9P6DLTzJQlmVgj9wCf7c2Fw==", + "license": "MIT", + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "vue": ">= 3.0.0 < 4" + } + }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", diff --git a/src/Frontend/package.json b/src/Frontend/package.json index 8afea7662..a783ab6ed 100644 --- a/src/Frontend/package.json +++ b/src/Frontend/package.json @@ -21,6 +21,11 @@ "@codemirror/lang-xml": "^6.1.0", "@codemirror/legacy-modes": "^6.5.1", "@dagrejs/dagre": "^1.1.5", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-brands-svg-icons": "^6.7.2", + "@fortawesome/free-regular-svg-icons": "^6.7.2", + "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@fortawesome/vue-fontawesome": "^3.0.8", "@tinyhttp/content-disposition": "^2.2.2", "@vue-flow/controls": "^1.1.2", "@vue-flow/core": "^1.45.0", diff --git a/src/Frontend/src/components/FAIcon.vue b/src/Frontend/src/components/FAIcon.vue new file mode 100644 index 000000000..3d12b73d5 --- /dev/null +++ b/src/Frontend/src/components/FAIcon.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/Frontend/src/components/FeedbackButton.vue b/src/Frontend/src/components/FeedbackButton.vue index d7a337776..a4abf866a 100644 --- a/src/Frontend/src/components/FeedbackButton.vue +++ b/src/Frontend/src/components/FeedbackButton.vue @@ -1,10 +1,19 @@ + + diff --git a/src/Frontend/src/components/audit/AuditMenuItem.vue b/src/Frontend/src/components/audit/AuditMenuItem.vue index 285329399..c9b3e540f 100644 --- a/src/Frontend/src/components/audit/AuditMenuItem.vue +++ b/src/Frontend/src/components/audit/AuditMenuItem.vue @@ -1,11 +1,13 @@ diff --git a/src/Frontend/src/components/configuration/ConfigurationMenuItem.vue b/src/Frontend/src/components/configuration/ConfigurationMenuItem.vue index 9ad4074c3..632ce0768 100644 --- a/src/Frontend/src/components/configuration/ConfigurationMenuItem.vue +++ b/src/Frontend/src/components/configuration/ConfigurationMenuItem.vue @@ -9,6 +9,8 @@ import routeLinks from "@/router/routeLinks"; import { displayConnectionsWarning } from "@/components/configuration/displayConnectionsWarning"; import { useThroughputStore } from "@/stores/ThroughputStore"; import { storeToRefs } from "pinia"; +import FAIcon from "../FAIcon.vue"; +import { faGear } from "@fortawesome/free-solid-svg-icons"; const { hasErrors } = storeToRefs(useThroughputStore()); @@ -22,7 +24,7 @@ const displayDanger = computed(() => {