From eb954cac6c1bae73d4c4954c55fc61cad3e45c50 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 24 Apr 2025 17:36:23 +0200 Subject: [PATCH] update --- .vscode/settings.json | 8 ++ .../components/AdvancedStackedBarChart.vue | 3 +- dashboard/components/FirstInteraction.vue | 104 +++++++++-------- .../events/EventsMetadataAnalyzer.vue | 2 +- .../events/EventsStackedBarChart.vue | 2 +- .../components/selector/ImageSelector.vue | 73 ++++++++++++ dashboard/components/settings/Data.vue | 2 +- dashboard/layouts/dashboard.vue | 1 + dashboard/pages/events.vue | 18 +-- dashboard/pages/report.vue | 93 --------------- dashboard/pages/reports.vue | 108 ++++++++++++++++++ dashboard/public/tech-icons/shopify.png | Bin 0 -> 2307 bytes dashboard/server/api/project/generate_pdf.ts | 33 ++++-- dashboard/server/api/report/customization.ts | 20 ++++ .../api/report/update_customization.post.ts | 26 +++++ scripts/payments/deploy.ts | 2 +- .../report/ReportCustomizationSchema.ts | 21 ++++ 17 files changed, 358 insertions(+), 158 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 dashboard/components/selector/ImageSelector.vue delete mode 100644 dashboard/pages/report.vue create mode 100644 dashboard/pages/reports.vue create mode 100644 dashboard/public/tech-icons/shopify.png create mode 100644 dashboard/server/api/report/customization.ts create mode 100644 dashboard/server/api/report/update_customization.post.ts create mode 100644 shared_global/schema/report/ReportCustomizationSchema.ts diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..173dc8f --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "github.copilot.enable": { + "*": false, + "plaintext": false, + "markdown": true, + "scminput": false + } +} \ No newline at end of file diff --git a/dashboard/components/AdvancedStackedBarChart.vue b/dashboard/components/AdvancedStackedBarChart.vue index c104864..af5c4b7 100644 --- a/dashboard/components/AdvancedStackedBarChart.vue +++ b/dashboard/components/AdvancedStackedBarChart.vue @@ -6,6 +6,7 @@ registerChartComponents(); const props = defineProps<{ datasets: any[], labels: string[], + legendPosition?: "left" | "top" | "right" | "bottom" | "center" | "chartArea" }>(); const chartOptions = ref>({ @@ -40,7 +41,7 @@ const chartOptions = ref>({ plugins: { legend: { display: true, - position: 'right', + position: props.legendPosition ?? 'right', }, title: { display: false }, tooltip: { diff --git a/dashboard/components/FirstInteraction.vue b/dashboard/components/FirstInteraction.vue index e1cc6ff..99a9d59 100644 --- a/dashboard/components/FirstInteraction.vue +++ b/dashboard/components/FirstInteraction.vue @@ -84,23 +84,8 @@ function reloadPage() {
-
- -
- - -
- -
-
- -
+
-
-
- - - -
- - -
-
-
-
@@ -197,6 +169,48 @@ function reloadPage() {
+ +
+ + + + + +
+ +
+
+ + + + +
+ +
+
+ +
diff --git a/dashboard/components/events/EventsMetadataAnalyzer.vue b/dashboard/components/events/EventsMetadataAnalyzer.vue index cc05792..70854ca 100644 --- a/dashboard/components/events/EventsMetadataAnalyzer.vue +++ b/dashboard/components/events/EventsMetadataAnalyzer.vue @@ -72,7 +72,7 @@ const canSearch = computed(() => {