Settings
diff --git a/dashboard/server/pdf/pdf_fonts/Poppins-Bold.ttf b/dashboard/public/pdf/pdf_fonts/Poppins-Bold.ttf
similarity index 100%
rename from dashboard/server/pdf/pdf_fonts/Poppins-Bold.ttf
rename to dashboard/public/pdf/pdf_fonts/Poppins-Bold.ttf
diff --git a/dashboard/server/pdf/pdf_fonts/Poppins-Italic.ttf b/dashboard/public/pdf/pdf_fonts/Poppins-Italic.ttf
similarity index 100%
rename from dashboard/server/pdf/pdf_fonts/Poppins-Italic.ttf
rename to dashboard/public/pdf/pdf_fonts/Poppins-Italic.ttf
diff --git a/dashboard/server/pdf/pdf_fonts/Poppins-Medium.ttf b/dashboard/public/pdf/pdf_fonts/Poppins-Medium.ttf
similarity index 100%
rename from dashboard/server/pdf/pdf_fonts/Poppins-Medium.ttf
rename to dashboard/public/pdf/pdf_fonts/Poppins-Medium.ttf
diff --git a/dashboard/server/pdf/pdf_fonts/Poppins-Regular.ttf b/dashboard/public/pdf/pdf_fonts/Poppins-Regular.ttf
similarity index 100%
rename from dashboard/server/pdf/pdf_fonts/Poppins-Regular.ttf
rename to dashboard/public/pdf/pdf_fonts/Poppins-Regular.ttf
diff --git a/dashboard/server/pdf/pdf_fonts/Poppins-SemiBold.ttf b/dashboard/public/pdf/pdf_fonts/Poppins-SemiBold.ttf
similarity index 100%
rename from dashboard/server/pdf/pdf_fonts/Poppins-SemiBold.ttf
rename to dashboard/public/pdf/pdf_fonts/Poppins-SemiBold.ttf
diff --git a/dashboard/server/pdf/pdf_images/c.png b/dashboard/public/pdf/pdf_images/c.png
similarity index 100%
rename from dashboard/server/pdf/pdf_images/c.png
rename to dashboard/public/pdf/pdf_images/c.png
diff --git a/dashboard/server/pdf/pdf_images/d.png b/dashboard/public/pdf/pdf_images/d.png
similarity index 100%
rename from dashboard/server/pdf/pdf_images/d.png
rename to dashboard/public/pdf/pdf_images/d.png
diff --git a/dashboard/server/pdf/pdf_images/logo.png b/dashboard/public/pdf/pdf_images/logo.png
similarity index 100%
rename from dashboard/server/pdf/pdf_images/logo.png
rename to dashboard/public/pdf/pdf_images/logo.png
diff --git a/dashboard/server/api/pay/customer_info.ts b/dashboard/server/api/pay/customer_info.ts
index e0a857c..790df04 100644
--- a/dashboard/server/api/pay/customer_info.ts
+++ b/dashboard/server/api/pay/customer_info.ts
@@ -3,7 +3,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project } = data;
diff --git a/dashboard/server/api/pay/invoices.ts b/dashboard/server/api/pay/invoices.ts
index 6ca2a60..e8cc59c 100644
--- a/dashboard/server/api/pay/invoices.ts
+++ b/dashboard/server/api/pay/invoices.ts
@@ -12,7 +12,7 @@ export type InvoiceData = {
}
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project, pid } = data;
diff --git a/dashboard/server/api/pay/redeem_appsumo_code.post.ts b/dashboard/server/api/pay/redeem_appsumo_code.post.ts
index 3b15a58..b91ce34 100644
--- a/dashboard/server/api/pay/redeem_appsumo_code.post.ts
+++ b/dashboard/server/api/pay/redeem_appsumo_code.post.ts
@@ -22,7 +22,7 @@ function getPlanToActivate(current_plan_id: number) {
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false, allowGuests: false, allowLitlyx: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project, pid, user } = data;
diff --git a/dashboard/server/api/pay/update_customer.post.ts b/dashboard/server/api/pay/update_customer.post.ts
index f7ac53d..32e72a6 100644
--- a/dashboard/server/api/pay/update_customer.post.ts
+++ b/dashboard/server/api/pay/update_customer.post.ts
@@ -4,7 +4,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project } = data;
diff --git a/dashboard/server/api/project/generate_pdf.ts b/dashboard/server/api/project/generate_pdf.ts
index 94058cc..a347db1 100644
--- a/dashboard/server/api/project/generate_pdf.ts
+++ b/dashboard/server/api/project/generate_pdf.ts
@@ -33,17 +33,19 @@ function formatNumberK(value: string | number, decimals: number = 1) {
const LINE_SPACING = 0.5;
+const resourcePath = process.env.MODE === 'TEST' ? './public/pdf/' : '../public/pdf/';
+
function createPdf(data: PDFGenerationData) {
const pdf = new pdfkit({ size: 'A4', margins: { top: 50, bottom: 50, left: 50, right: 50 }, });
pdf.fillColor('#ffffff').rect(0, 0, pdf.page.width, pdf.page.height).fill('#000000');
- pdf.font('./server/pdf/pdf_fonts/Poppins-Bold.ttf').fontSize(16).fillColor('#ffffff');
+ pdf.font(resourcePath + 'pdf_fonts/Poppins-Bold.ttf').fontSize(16).fillColor('#ffffff');
pdf.text(`Project name: ${data.projectName}`, { align: 'left' }).moveDown(LINE_SPACING);
pdf.text(`Timeframe name: ${data.snapshotName}`, { align: 'left' }).moveDown(LINE_SPACING);
- pdf.font('./server/pdf/pdf_fonts/Poppins-Regular.ttf').fontSize(12).fillColor('#ffffff')
+ pdf.font(resourcePath + 'pdf_fonts/Poppins-Regular.ttf').fontSize(12).fillColor('#ffffff')
pdf.text(`Total visits: ${data.totalVisits}`, { align: 'left' }).moveDown(LINE_SPACING);
pdf.text(`Average visits per day: ${data.avgVisitsDay}`, { align: 'left' }).moveDown(LINE_SPACING);
@@ -64,16 +66,16 @@ function createPdf(data: PDFGenerationData) {
pdf.text('Average growth:', { align: 'left' }).moveDown(LINE_SPACING);
pdf.text(`${data.avgGrowthText}`, { align: 'left' }).moveDown(LINE_SPACING);
- pdf.font('./server/pdf/pdf_fonts/Poppins-Italic.ttf')
+ pdf.font(resourcePath + 'pdf_fonts/Poppins-Italic.ttf')
.text('This gives you an idea of the average growth your website is experiencing over time.', { align: 'left' })
.moveDown(LINE_SPACING);
- pdf.font('./server/pdf/pdf_fonts/Poppins-Regular.ttf')
+ pdf.font(resourcePath + 'pdf_fonts/Poppins-Regular.ttf')
.fontSize(10)
.fillColor('#ffffff')
.text('Created with Litlyx.com', 50, 760, { align: 'center' });
- pdf.image('./server/pdf/pdf_images/logo.png', 460, 700, { width: 100 });
+ pdf.image(resourcePath + 'pdf_images/logo.png', 460, 700, { width: 100 });
pdf.end();
return pdf;
diff --git a/dashboard/server/api/project/plan.ts b/dashboard/server/api/project/plan.ts
index aef4ab5..aa5b2ab 100644
--- a/dashboard/server/api/project/plan.ts
+++ b/dashboard/server/api/project/plan.ts
@@ -3,7 +3,7 @@ import StripeService from '~/server/services/StripeService';
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false, allowLitlyx: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project, project_id } = data;
diff --git a/dashboard/server/api/settings/delete_all.delete.ts b/dashboard/server/api/settings/delete_all.delete.ts
index ad5b2ab..ea26417 100644
--- a/dashboard/server/api/settings/delete_all.delete.ts
+++ b/dashboard/server/api/settings/delete_all.delete.ts
@@ -3,11 +3,10 @@ import { EventModel } from "@schema/metrics/EventSchema";
import { SessionModel } from "@schema/metrics/SessionSchema";
import { VisitModel } from "@schema/metrics/VisitSchema";
import { Types } from "mongoose";
-import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project_id } = data;
diff --git a/dashboard/server/api/settings/delete_domain.delete.ts b/dashboard/server/api/settings/delete_domain.delete.ts
index 9ddbd41..2e16b06 100644
--- a/dashboard/server/api/settings/delete_domain.delete.ts
+++ b/dashboard/server/api/settings/delete_domain.delete.ts
@@ -3,11 +3,10 @@ import { EventModel } from "@schema/metrics/EventSchema";
import { SessionModel } from "@schema/metrics/SessionSchema";
import { VisitModel } from "@schema/metrics/VisitSchema";
import { Types } from "mongoose";
-import { getRequestDataOld } from "~/server/utils/getRequestData";
export default defineEventHandler(async event => {
- const data = await getRequestDataOld(event, { requireSchema: false });
+ const data = await getRequestData(event, []);
if (!data) return;
const { project_id } = data;