diff --git a/app/evaluation/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx similarity index 77% rename from app/evaluation/[...ical-link]/page.tsx rename to app/evaluation/[days]/[...ical-link]/page.tsx index 65c69b1..f1630df 100644 --- a/app/evaluation/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -1,6 +1,7 @@ import ical, { VEvent } from 'node-ical'; interface PageProps { params: Promise<{ + 'days': number 'ical-link': string[]; }>; } @@ -19,8 +20,13 @@ function getIcalDate(dateValue: any): Date { } export default async function EvaluationPage({ params }: PageProps) { - // get the URL from the own URL (/evaluation/) + // get all params const resolvedParams = await params; + + // get amount of days to fetch + const daysToFetch = Number(resolvedParams['days']) || 7; //fallback to 7 days + + // get the URL from the own URL (/evaluation/) const pathSegments = resolvedParams['ical-link']; let rawUrl = pathSegments.join('/'); rawUrl = decodeURIComponent(rawUrl); @@ -35,12 +41,19 @@ export default async function EvaluationPage({ params }: PageProps) { const icalData = await response.text(); const parsedData = ical.sync.parseICS(icalData); - // filter data (needed: "VEVENT") - const events = Object.values(parsedData).filter( - (item): item is VEvent => item !== undefined && item.type === 'VEVENT' - ); - + // calculate range of time + const now = new Date(); + const cutoffDate = new Date(); + cutoffDate.setDate(now.getDate() - daysToFetch); + // filter and sort data (needed: "VEVENT"; time range) + const events = Object.values(parsedData) + .filter((item): item is VEvent => item !== undefined && item.type === 'VEVENT') + .filter((event) => { + const startDate = getIcalDate(event.start); + return startDate >= cutoffDate && startDate <= now; + }) + .sort((a, b) => getIcalDate(b.start).getTime() - getIcalDate(a.start).getTime()); // newest first return (