diff --git a/dashboard/pages/dashboard/events.vue b/dashboard/pages/dashboard/events.vue index eb1cfdf..74483b2 100644 --- a/dashboard/pages/dashboard/events.vue +++ b/dashboard/pages/dashboard/events.vue @@ -43,11 +43,11 @@ const creatingCsv = ref(false); async function downloadCSV() { creatingCsv.value = true; const result = await $fetch(`/api/project/generate_csv?mode=events&slice=${options.indexOf(selectedTimeFrom.value)}`, signHeaders()); - const blob = new Blob([result], { type: 'text/csv' }); + const blob = new Blob([result as any], { type: 'text/csv' }); const url = window.URL.createObjectURL(blob); const a = document.createElement('a'); a.href = url; - a.download = 'ReportVisits.csv'; + a.download = 'ReportEvents.csv'; document.body.appendChild(a); a.click(); document.body.removeChild(a); diff --git a/dashboard/pages/dashboard/visits.vue b/dashboard/pages/dashboard/visits.vue index f766023..533ca91 100644 --- a/dashboard/pages/dashboard/visits.vue +++ b/dashboard/pages/dashboard/visits.vue @@ -47,24 +47,18 @@ onMounted(async () => { const creatingCsv = ref(false); -async function downloadCSV(isGoogle: boolean) { +async function downloadCSV() { creatingCsv.value = true; - const result = await $fetch(`/api/project/generate_csv?mode=visits&slice=${options.indexOf(selectedTimeFrom.value)}`, - signHeaders({ 'x-google-export': isGoogle ? 'true' : 'false' }) - ); - if (!isGoogle) { - const blob = new Blob([result as any], { type: 'text/csv' }); - const url = window.URL.createObjectURL(blob); - const a = document.createElement('a'); - a.href = url; - a.download = 'ReportVisits.csv'; - document.body.appendChild(a); - a.click(); - document.body.removeChild(a); - window.URL.revokeObjectURL(url); - } else { - alert(result); - } + const result = await $fetch(`/api/project/generate_csv?mode=visits&slice=${options.indexOf(selectedTimeFrom.value)}`, signHeaders()); + const blob = new Blob([result as any], { type: 'text/csv' }); + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.href = url; + a.download = 'ReportVisits.csv'; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); + window.URL.revokeObjectURL(url); creatingCsv.value = false; } @@ -107,21 +101,16 @@ function goToUpgrade() { -
Download CSV
- -
- Export CSV to Google Sheets -
- - +