From 300596c6b1af514faeef87a3eee3610da3ce00af Mon Sep 17 00:00:00 2001 From: TZGyn Date: Fri, 24 Nov 2023 00:05:06 +0800 Subject: [PATCH] update visitor chart --- .../routes/(app)/links/[id]/+page.server.ts | 12 ++- .../src/routes/(app)/links/[id]/+page.svelte | 95 ++++++++++++++++++- .../routes/(app)/links/[id]/BarChart.svelte | 72 -------------- 3 files changed, 103 insertions(+), 76 deletions(-) delete mode 100644 frontend/src/routes/(app)/links/[id]/BarChart.svelte diff --git a/frontend/src/routes/(app)/links/[id]/+page.server.ts b/frontend/src/routes/(app)/links/[id]/+page.server.ts index b02075f..8d878d9 100644 --- a/frontend/src/routes/(app)/links/[id]/+page.server.ts +++ b/frontend/src/routes/(app)/links/[id]/+page.server.ts @@ -1,6 +1,8 @@ import { db } from '$lib/db' import { redirect } from '@sveltejs/kit' import type { PageServerLoad } from './$types' +import { sql } from 'drizzle-orm' +import { visitor as visitorSchema } from '$lib/db/schema' export const load = (async (event) => { const user = event.locals.userObject @@ -17,9 +19,17 @@ export const load = (async (event) => { }, }) + const visitor = await db + .select({ + count: sql`cast(count(*) as int)`, + month: sql`cast(to_char(${visitorSchema.createdAt}, 'MM') as int)`, + }) + .from(visitorSchema) + .groupBy(sql`to_char(${visitorSchema.createdAt}, 'MM')`) + if (!shortener) { throw redirect(303, '/') } - return { shortener } + return { shortener, visitor } }) satisfies PageServerLoad diff --git a/frontend/src/routes/(app)/links/[id]/+page.svelte b/frontend/src/routes/(app)/links/[id]/+page.svelte index 5dc0c92..03e3b4d 100644 --- a/frontend/src/routes/(app)/links/[id]/+page.svelte +++ b/frontend/src/routes/(app)/links/[id]/+page.svelte @@ -1,10 +1,99 @@
@@ -13,14 +102,14 @@
- + Clicks Number of visit(s) over this year - +
diff --git a/frontend/src/routes/(app)/links/[id]/BarChart.svelte b/frontend/src/routes/(app)/links/[id]/BarChart.svelte deleted file mode 100644 index fa0dcae..0000000 --- a/frontend/src/routes/(app)/links/[id]/BarChart.svelte +++ /dev/null @@ -1,72 +0,0 @@ - - -