From c8a66d847111317265ae6b14dafdbbd6a44bf6af Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 12:21:11 +0200 Subject: [PATCH 01/15] feat: preparing evaluation --- app/evaluation/[...ical-link]/page.tsx | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 app/evaluation/[...ical-link]/page.tsx diff --git a/app/evaluation/[...ical-link]/page.tsx b/app/evaluation/[...ical-link]/page.tsx new file mode 100644 index 0000000..3ade0a3 --- /dev/null +++ b/app/evaluation/[...ical-link]/page.tsx @@ -0,0 +1,20 @@ +interface PageProps { + params: Promise<{ + 'ical-link': string[]; + }>; +} + +export default async function EvaluationPage({ params }: PageProps) { + const resolvedParams = await params; + const pathSegments = resolvedParams['ical-link']; + + let rawUrl = pathSegments.join('/'); + + rawUrl = decodeURIComponent(rawUrl); + + const icalUrl = rawUrl.replace(/^(https?):\/+/, '$1://'); + + return ( +

iCal-Adresse: {icalUrl}

+ ); +} \ No newline at end of file From 1b2df1912ac944469367e9f2d333d81d9f2e1b55 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 12:22:32 +0200 Subject: [PATCH 02/15] update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1874f3..9a86b8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "temp-next", - "version": "0.1.0", + "version": "0.2.0", "private": true, "scripts": { "dev": "next dev", From e3072755e79f39ed2d5e716a964572e0ee2000d8 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 12:52:33 +0200 Subject: [PATCH 03/15] feat: fetch and read calendar --- app/evaluation/[...ical-link]/page.tsx | 66 ++++++++++++++++++++++++-- package.json | 1 + pnpm-lock.yaml | 37 +++++++++++++++ 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/app/evaluation/[...ical-link]/page.tsx b/app/evaluation/[...ical-link]/page.tsx index 3ade0a3..65c69b1 100644 --- a/app/evaluation/[...ical-link]/page.tsx +++ b/app/evaluation/[...ical-link]/page.tsx @@ -1,20 +1,78 @@ +import ical, { VEvent } from 'node-ical'; interface PageProps { params: Promise<{ 'ical-link': string[]; }>; } +function getIcalText(field: any): string { + if (!field) return ''; + if (typeof field === 'string') return field; + if (typeof field === 'object' && 'val' in field) return field.val as string; + return String(field); +} + +function getIcalDate(dateValue: any): Date { + if (!dateValue) return new Date(0); // Fallback: 01.01.1970, falls kein Datum da ist + if (dateValue instanceof Date) return dateValue; + return new Date(dateValue); +} + export default async function EvaluationPage({ params }: PageProps) { + // get the URL from the own URL (/evaluation/) const resolvedParams = await params; const pathSegments = resolvedParams['ical-link']; - let rawUrl = pathSegments.join('/'); - rawUrl = decodeURIComponent(rawUrl); - const icalUrl = rawUrl.replace(/^(https?):\/+/, '$1://'); + // fetch the file + const response = await fetch(icalUrl, { next: { revalidate: 3600 } }); + if (!response.ok) { + return
Fehler beim Laden der Kalenderdaten. Status: {response.status}
; + } + + 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' + ); + + + return ( -

iCal-Adresse: {icalUrl}

+
+

Meine Kalender-Events

+ + {events.length === 0 ? ( +

Keine Termine gefunden.

+ ) : ( +
    + {events.map((event, index) => { + const startDate = getIcalDate(event.start); + const endDate = getIcalDate(event.end); + + return ( +
  • + {/* HIER WENDEN WIR DIE HILFSFUNKTION AN */} +

    {getIcalText(event.summary)}

    +

    + Start: {startDate.toLocaleString('de-DE')}
    + Ende: {endDate.toLocaleString('de-DE')} +

    + {event.location && ( +

    Ort: {getIcalText(event.location)}

    + )} + {event.description && ( +

    Beschreibung: {getIcalText(event.description)}

    + )} +
  • + ); + })} +
+ )} +
); } \ No newline at end of file diff --git a/package.json b/package.json index 9a86b8d..75d819b 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ }, "dependencies": { "next": "16.2.12", + "node-ical": "^0.27.1", "react": "19.2.4", "react-dom": "19.2.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 973b73b..0bf95e2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,6 +11,9 @@ importers: next: specifier: 16.2.12 version: 16.2.12(@babel/core@7.29.7(supports-color@7.2.0))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) + node-ical: + specifier: ^0.27.1 + version: 0.27.1 react: specifier: 19.2.4 version: 19.2.4 @@ -1598,6 +1601,10 @@ packages: resolution: {integrity: sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag==} engines: {node: '>= 0.4'} + node-ical@0.27.1: + resolution: {integrity: sha512-5fiKuh/h2HrWKzFt20LtRQdjtjdGfijGfDnCfdAEc++SFX9gA6sa7xwj7/BJmRfWtW/NJWBenN4tOJhg0vM3pg==} + engines: {node: '>=22'} + node-releases@2.0.51: resolution: {integrity: sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==} engines: {node: '>=18'} @@ -1738,6 +1745,9 @@ packages: resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} + rrule-temporal@2.0.2: + resolution: {integrity: sha512-pwe7+pWXKUotQgdudN8W36tFHWf8eH+FbcB5Tl4Zftb4RYpl1hnqMRapizv0s8QlOlC6GEKcVSmITurpSOVZfQ==} + run-parallel@1.2.0: resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==} @@ -1875,6 +1885,15 @@ packages: resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==} engines: {node: '>=6'} + temporal-polyfill@1.0.2: + resolution: {integrity: sha512-pTyp/7kfStJQbJ8YOHmcJItkxvOGCZHu3PaVgLvLnxFS7O12EPiWLElnRre/rw77z4TGZX/gvdqMXWn6ispQvA==} + + temporal-spec@1.0.1: + resolution: {integrity: sha512-wxVoanmDeavXie1vu2JaQ3WIc3JZnWAOYFBsJyATaVsXsycKYUflGsyBmrRSnoCpZJpwPyr38VpgSUlQ8CbFxg==} + + temporal-utils@1.0.1: + resolution: {integrity: sha512-HAixuesxFQIUaQk3ptX2jhfO/FsOkgVkDDMawvp6n/fkB1q6BKfs3lURw9I+pK/2e2e/q/vrLrxmeqauBoyGMQ==} + tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} @@ -3618,6 +3637,11 @@ snapshots: object.entries: 1.1.9 semver: 6.3.1 + node-ical@0.27.1: + dependencies: + rrule-temporal: 2.0.2 + temporal-polyfill: 1.0.2 + node-releases@2.0.51: {} object-assign@4.1.1: {} @@ -3772,6 +3796,10 @@ snapshots: reusify@1.1.0: {} + rrule-temporal@2.0.2: + dependencies: + temporal-spec: 1.0.1 + run-parallel@1.2.0: dependencies: queue-microtask: 1.2.3 @@ -3970,6 +3998,15 @@ snapshots: tapable@2.3.3: {} + temporal-polyfill@1.0.2: + dependencies: + temporal-spec: 1.0.1 + temporal-utils: 1.0.1 + + temporal-spec@1.0.1: {} + + temporal-utils@1.0.1: {} + tinyglobby@0.2.17: dependencies: fdir: 6.5.0(picomatch@4.0.5) From 176602d9bbe6ab0780d12dbd1f6dc14a9718580e Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 12:57:58 +0200 Subject: [PATCH 04/15] feat: accept amount of days to fetch --- .../{ => [days]}/[...ical-link]/page.tsx | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) rename app/evaluation/{ => [days]}/[...ical-link]/page.tsx (77%) 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 (
From ade29ee5a8967df2a9b290c088e3405093bf86c9 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 13:01:48 +0200 Subject: [PATCH 05/15] fix: small issues --- app/evaluation/[days]/[...ical-link]/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index f1630df..840bc07 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -1,7 +1,7 @@ import ical, { VEvent } from 'node-ical'; interface PageProps { params: Promise<{ - 'days': number + 'days': string; 'ical-link': string[]; }>; } @@ -68,7 +68,7 @@ export default async function EvaluationPage({ params }: PageProps) { const endDate = getIcalDate(event.end); return ( -
  • +
  • {/* HIER WENDEN WIR DIE HILFSFUNKTION AN */}

    {getIcalText(event.summary)}

    From 0b71bdd3487e17d85a18450c3e25285b9e29f2f8 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 16:44:36 +0200 Subject: [PATCH 06/15] chore: remove unnecessary comment --- app/evaluation/[days]/[...ical-link]/page.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 840bc07..cc904ca 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -69,7 +69,6 @@ export default async function EvaluationPage({ params }: PageProps) { return (

  • - {/* HIER WENDEN WIR DIE HILFSFUNKTION AN */}

    {getIcalText(event.summary)}

    Start: {startDate.toLocaleString('de-DE')}
    From 0712cf2f5f249921ba47761a46e49bdff117e06e Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 16:47:06 +0200 Subject: [PATCH 07/15] update version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 75d819b..15555a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "temp-next", - "version": "0.2.0", + "version": "0.3.0", "private": true, "scripts": { "dev": "next dev", From adf4446f8aa914e5f777bfe79d7c21fab2634177 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 16:48:56 +0200 Subject: [PATCH 08/15] feat: display categories on events --- app/evaluation/[days]/[...ical-link]/page.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index cc904ca..7a8dca1 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -80,6 +80,9 @@ export default async function EvaluationPage({ params }: PageProps) { {event.description && (

    Beschreibung: {getIcalText(event.description)}

    )} + {event.categories && ( +

    Kategorien: {getIcalText(event.categories)}

    + )}
  • ); })} From 811277d1498fa025d4d7bb7ba478e7182c0acf90 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 17:13:54 +0200 Subject: [PATCH 09/15] feat: display per categorie informations --- app/evaluation/[days]/[...ical-link]/page.tsx | 43 ++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 7a8dca1..0dc7cfd 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -1,4 +1,5 @@ import ical, { VEvent } from 'node-ical'; + interface PageProps { params: Promise<{ 'days': string; @@ -19,7 +20,19 @@ function getIcalDate(dateValue: any): Date { return new Date(dateValue); } +function getCategories(categoriesField: any): string[] { + if (!categoriesField) return []; + if (Array.isArray(categoriesField)) { + return categoriesField.map((cat) => getIcalText(cat)); + } + return [getIcalText(categoriesField)]; +} + +type TimeMap = Record + export default async function EvaluationPage({ params }: PageProps) { + let times: TimeMap = {}; + // get all params const resolvedParams = await params; @@ -54,10 +67,38 @@ export default async function EvaluationPage({ params }: PageProps) { return startDate >= cutoffDate && startDate <= now; }) .sort((a, b) => getIcalDate(b.start).getTime() - getIcalDate(a.start).getTime()); // newest first + + // read time per categorie + events.map((event, index) => { + const startDate = getIcalDate(event.start); + const endDate = getIcalDate(event.end); + const durationInMs = endDate.getTime() - startDate.getTime(); + const durationInMinutes = durationInMs / (1000 * 60); + const categories = getCategories(event.categories); + + categories.forEach((cat) => { + times[cat] = (times[cat] || 0) + durationInMinutes + }) + }) return ( -
    +

    Meine Kalender-Events

    + +
    +

    Gesamtdauer pro Kategorie

    + {Object.keys(times).length === 0 ? ( +

    Keine Zeiten erfasst.

    + ) : ( +
      + {Object.entries(times).map(([category, minutes]) => ( +
    • + {category}: {Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt) +
    • + ))} +
    + )} +
    {events.length === 0 ? (

    Keine Termine gefunden.

    From d74e8b3fcf6d9e3f17d6e9508d8da18b15ff60ed Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:01:27 +0200 Subject: [PATCH 10/15] style: support multiple categories --- app/evaluation/[days]/[...ical-link]/page.tsx | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 0dc7cfd..cea05d0 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -83,8 +83,6 @@ export default async function EvaluationPage({ params }: PageProps) { return (
    -

    Meine Kalender-Events

    -

    Gesamtdauer pro Kategorie

    {Object.keys(times).length === 0 ? ( @@ -122,7 +120,24 @@ export default async function EvaluationPage({ params }: PageProps) {

    Beschreibung: {getIcalText(event.description)}

    )} {event.categories && ( -

    Kategorien: {getIcalText(event.categories)}

    +
    + Kategorien: + {getCategories(event.categories).map((cat, i) => ( + + {cat} + + ))} +
    )} ); From 95e09c6d21a64246b12edc86890eac31a407915f Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:06:01 +0200 Subject: [PATCH 11/15] feat: add total to timeMap --- app/evaluation/[days]/[...ical-link]/page.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index cea05d0..e1819f5 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -31,7 +31,9 @@ function getCategories(categoriesField: any): string[] { type TimeMap = Record export default async function EvaluationPage({ params }: PageProps) { - let times: TimeMap = {}; + let times: TimeMap = { + total: 0 + }; // get all params const resolvedParams = await params; @@ -77,6 +79,7 @@ export default async function EvaluationPage({ params }: PageProps) { const categories = getCategories(event.categories); categories.forEach((cat) => { + times["total"] = (times["total"] || 0) + durationInMinutes times[cat] = (times[cat] || 0) + durationInMinutes }) }) From 7104dd077188eeb69b5f426afe2486d3136e810f Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:22:20 +0200 Subject: [PATCH 12/15] style: move total to own variable and table footer --- app/evaluation/[days]/[...ical-link]/page.tsx | 46 ++++++++++++++----- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index e1819f5..21839bc 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -31,9 +31,8 @@ function getCategories(categoriesField: any): string[] { type TimeMap = Record export default async function EvaluationPage({ params }: PageProps) { - let times: TimeMap = { - total: 0 - }; + let times: TimeMap = {}; + let total: number = 0; // get all params const resolvedParams = await params; @@ -79,9 +78,10 @@ export default async function EvaluationPage({ params }: PageProps) { const categories = getCategories(event.categories); categories.forEach((cat) => { - times["total"] = (times["total"] || 0) + durationInMinutes times[cat] = (times[cat] || 0) + durationInMinutes }) + + total = (total || 0) + durationInMinutes }) return ( @@ -91,13 +91,37 @@ export default async function EvaluationPage({ params }: PageProps) { {Object.keys(times).length === 0 ? (

    Keine Zeiten erfasst.

    ) : ( -
      - {Object.entries(times).map(([category, minutes]) => ( -
    • - {category}: {Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt) -
    • - ))} -
    + //
      + // {Object.entries(times).map(([category, minutes]) => ( + //
    • + // {category}: {Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt) + //
    • + // ))} + //
    + + + + + + + + + + {Object.entries(times).map(([category, minutes]) => ( + + + + + + ))} + + + + + + + +
    CategorieTimePercentage
    {category}{Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt){Math.round(minutes / total *100 *10)/10}
    Total{Math.floor(total / 60)} Std. {total % 60} Min. ({total} Min. gesamt)
    )}
    From 2ed6c7fca9971c2f71d501ccdcff1fd4c989f0aa Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:27:18 +0200 Subject: [PATCH 13/15] chore: remove unnecessary comments --- app/evaluation/[days]/[...ical-link]/page.tsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 21839bc..171f8fd 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -91,13 +91,6 @@ export default async function EvaluationPage({ params }: PageProps) { {Object.keys(times).length === 0 ? (

    Keine Zeiten erfasst.

    ) : ( - //
      - // {Object.entries(times).map(([category, minutes]) => ( - //
    • - // {category}: {Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt) - //
    • - // ))} - //
    From c67080a3ef72c4ebc44734db2c5b5461b80c6c32 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:42:37 +0200 Subject: [PATCH 14/15] feat: add chart --- app/evaluation/[days]/[...ical-link]/page.tsx | 130 +++++++++--------- components/CategoryChart.tsx | 62 +++++++++ package.json | 2 + pnpm-lock.yaml | 30 ++++ 4 files changed, 160 insertions(+), 64 deletions(-) create mode 100644 components/CategoryChart.tsx diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 171f8fd..1f5ff79 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -1,4 +1,5 @@ import ical, { VEvent } from 'node-ical'; +import CategoryChart from '@/components/CategoryChart'; // <-- Importieren interface PageProps { params: Promise<{ @@ -15,7 +16,7 @@ function getIcalText(field: any): string { } function getIcalDate(dateValue: any): Date { - if (!dateValue) return new Date(0); // Fallback: 01.01.1970, falls kein Datum da ist + if (!dateValue) return new Date(0); if (dateValue instanceof Date) return dateValue; return new Date(dateValue); } @@ -28,25 +29,20 @@ function getCategories(categoriesField: any): string[] { return [getIcalText(categoriesField)]; } -type TimeMap = Record +type TimeMap = Record; export default async function EvaluationPage({ params }: PageProps) { - let times: TimeMap = {}; - let total: number = 0; + const times: TimeMap = {}; + let total = 0; - // get all params const resolvedParams = await params; + const daysToFetch = Number(resolvedParams['days']) || 7; - // 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); const icalUrl = rawUrl.replace(/^(https?):\/+/, '$1://'); - // fetch the file const response = await fetch(icalUrl, { next: { revalidate: 3600 } }); if (!response.ok) { return
    Fehler beim Laden der Kalenderdaten. Status: {response.status}
    ; @@ -55,103 +51,109 @@ export default async function EvaluationPage({ params }: PageProps) { const icalData = await response.text(); const parsedData = ical.sync.parseICS(icalData); - // 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 - - // read time per categorie - events.map((event, index) => { + .sort((a, b) => getIcalDate(b.start).getTime() - getIcalDate(a.start).getTime()); + + events.forEach((event) => { const startDate = getIcalDate(event.start); const endDate = getIcalDate(event.end); const durationInMs = endDate.getTime() - startDate.getTime(); const durationInMinutes = durationInMs / (1000 * 60); const categories = getCategories(event.categories); - - categories.forEach((cat) => { - times[cat] = (times[cat] || 0) + durationInMinutes - }) - total = (total || 0) + durationInMinutes - }) + categories.forEach((cat) => { + times[cat] = (times[cat] || 0) + durationInMinutes; + }); + + total += durationInMinutes; + }); return ( -
    -
    +
    +

    Gesamtdauer pro Kategorie

    {Object.keys(times).length === 0 ? (

    Keine Zeiten erfasst.

    ) : ( -
    - - - - - - - - - {Object.entries(times).map(([category, minutes]) => ( - - - - + <> + + +
    CategorieTimePercentage
    {category}{Math.floor(minutes / 60)} Std. {minutes % 60} Min. ({minutes} Min. gesamt){Math.round(minutes / total *100 *10)/10}
    + + + + + - ))} - - - - - - - -
    KategorieDauerAnteil
    Total{Math.floor(total / 60)} Std. {total % 60} Min. ({total} Min. gesamt)
    + + + {Object.entries(times).map(([category, minutes]) => ( + + {category} + + {Math.floor(minutes / 60)} Std. {Math.round(minutes % 60)} Min. ({Math.round(minutes)} Min. gesamt) + + + {total > 0 ? Math.round((minutes / total) * 1000) / 10 : 0}% + + + ))} + + + + Total + + {Math.floor(total / 60)} Std. {Math.round(total % 60)} Min. ({Math.round(total)} Min. gesamt) + + 100% + + + + )} - + +

    Termine ({events.length})

    {events.length === 0 ? (

    Keine Termine gefunden.

    ) : ( -
      +
        {events.map((event, index) => { const startDate = getIcalDate(event.start); const endDate = getIcalDate(event.end); return (
      • -

        {getIcalText(event.summary)}

        +

        {getIcalText(event.summary)}

        Start: {startDate.toLocaleString('de-DE')}
        Ende: {endDate.toLocaleString('de-DE')}

        - {event.location && ( -

        Ort: {getIcalText(event.location)}

        - )} - {event.description && ( -

        Beschreibung: {getIcalText(event.description)}

        - )} + {event.location &&

        Ort: {getIcalText(event.location)}

        } + {event.description &&

        Beschreibung: {getIcalText(event.description)}

        } {event.categories && (
        Kategorien: {getCategories(event.categories).map((cat, i) => ( - {cat} diff --git a/components/CategoryChart.tsx b/components/CategoryChart.tsx new file mode 100644 index 0000000..2af171e --- /dev/null +++ b/components/CategoryChart.tsx @@ -0,0 +1,62 @@ +'use client'; + +import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js'; +import { Doughnut } from 'react-chartjs-2'; + +// Chart.js Module registrieren (wichtig in v3/v4) +ChartJS.register(ArcElement, Tooltip, Legend); + +interface CategoryChartProps { + times: Record; +} + +export default function CategoryChart({ times }: CategoryChartProps) { + const labels = Object.keys(times); + const dataValues = Object.values(times); + + const data = { + labels, + datasets: [ + { + label: 'Dauer (in Minuten)', + data: dataValues, + backgroundColor: [ + '#3b82f6', // Blau + '#10b981', // Grün + '#f59e0b', // Orange + '#ef4444', // Rot + '#8b5cf6', // Violett + '#ec4899', // Pink + '#64748b', // Grau + ], + borderColor: '#ffffff', + borderWidth: 2, + }, + ], + }; + + const options = { + responsive: true, + plugins: { + legend: { + position: 'bottom' as const, + }, + tooltip: { + callbacks: { + label: (context: any) => { + const minutes = context.raw || 0; + const hours = Math.floor(minutes / 60); + const remainingMins = Math.round(minutes % 60); + return ` ${context.label}: ${hours} Std. ${remainingMins} Min. (${minutes} Min.)`; + }, + }, + }, + }, + }; + + return ( +
        + +
        + ); +} \ No newline at end of file diff --git a/package.json b/package.json index 15555a6..060069d 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,11 @@ "lint": "eslint" }, "dependencies": { + "chart.js": "^4.5.1", "next": "16.2.12", "node-ical": "^0.27.1", "react": "19.2.4", + "react-chartjs-2": "^5.3.1", "react-dom": "19.2.4" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0bf95e2..81aeb6a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,9 @@ importers: .: dependencies: + chart.js: + specifier: ^4.5.1 + version: 4.5.1 next: specifier: 16.2.12 version: 16.2.12(@babel/core@7.29.7(supports-color@7.2.0))(react-dom@19.2.4(react@19.2.4))(react@19.2.4) @@ -17,6 +20,9 @@ importers: react: specifier: 19.2.4 version: 19.2.4 + react-chartjs-2: + specifier: ^5.3.1 + version: 5.3.1(chart.js@4.5.1)(react@19.2.4) react-dom: specifier: 19.2.4 version: 19.2.4(react@19.2.4) @@ -358,6 +364,9 @@ packages: '@jridgewell/trace-mapping@0.3.31': resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==} + '@kurkle/color@0.3.4': + resolution: {integrity: sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w==} + '@napi-rs/wasm-runtime@1.2.2': resolution: {integrity: sha512-JfB4kuJQjaoHuCTseIINHtHWeJnvgEcxjwA5t/Y00ZgaOO1Crz3fjT/p8kT28zA/Caz7oiUMn3d6H2yOVCVwuw==} engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} @@ -865,6 +874,10 @@ packages: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} + chart.js@4.5.1: + resolution: {integrity: sha512-GIjfiT9dbmHRiYi6Nl2yFCq7kkwdkp1W/lp2J99rX0yo9tgJGn3lKQATztIjb5tVtevcBtIdICNWqlq5+E8/Pw==} + engines: {pnpm: '>=8'} + client-only@0.0.1: resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==} @@ -1709,6 +1722,12 @@ packages: queue-microtask@1.2.3: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} + react-chartjs-2@5.3.1: + resolution: {integrity: sha512-h5IPXKg9EXpjoBzUfyWJvllMjG2mQ4EiuHQFhms/AjUm0XSZHhyRy2xVmLXHKrtcdrPO4mnGqRtYoD0vp95A0A==} + peerDependencies: + chart.js: ^4.1.1 + react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom@19.2.4: resolution: {integrity: sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==} peerDependencies: @@ -2309,6 +2328,8 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.5 + '@kurkle/color@0.3.4': {} + '@napi-rs/wasm-runtime@1.2.2(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)': dependencies: '@emnapi/core': 1.10.0 @@ -2772,6 +2793,10 @@ snapshots: ansi-styles: 4.3.0 supports-color: 7.2.0 + chart.js@4.5.1: + dependencies: + '@kurkle/color': 0.3.4 + client-only@0.0.1: {} color-convert@2.0.1: @@ -3752,6 +3777,11 @@ snapshots: queue-microtask@1.2.3: {} + react-chartjs-2@5.3.1(chart.js@4.5.1)(react@19.2.4): + dependencies: + chart.js: 4.5.1 + react: 19.2.4 + react-dom@19.2.4(react@19.2.4): dependencies: react: 19.2.4 From cfa35036ef470b0374631e089abb335b7711ee99 Mon Sep 17 00:00:00 2001 From: Robin Schanbacher Date: Mon, 3 Aug 2026 18:46:30 +0200 Subject: [PATCH 15/15] style: fixed issues on mobiles --- app/evaluation/[days]/[...ical-link]/page.tsx | 128 ++++++++++++------ 1 file changed, 84 insertions(+), 44 deletions(-) diff --git a/app/evaluation/[days]/[...ical-link]/page.tsx b/app/evaluation/[days]/[...ical-link]/page.tsx index 1f5ff79..e717b0c 100644 --- a/app/evaluation/[days]/[...ical-link]/page.tsx +++ b/app/evaluation/[days]/[...ical-link]/page.tsx @@ -1,5 +1,5 @@ import ical, { VEvent } from 'node-ical'; -import CategoryChart from '@/components/CategoryChart'; // <-- Importieren +import CategoryChart from '@/components/CategoryChart'; interface PageProps { params: Promise<{ @@ -45,7 +45,11 @@ export default async function EvaluationPage({ params }: PageProps) { const response = await fetch(icalUrl, { next: { revalidate: 3600 } }); if (!response.ok) { - return
        Fehler beim Laden der Kalenderdaten. Status: {response.status}
        ; + return ( +
        + Fehler beim Laden der Kalenderdaten. Status: {response.status} +
        + ); } const icalData = await response.text(); @@ -78,51 +82,63 @@ export default async function EvaluationPage({ params }: PageProps) { }); return ( -
        +
        -

        Gesamtdauer pro Kategorie

        +

        Gesamtdauer pro Kategorie

        {Object.keys(times).length === 0 ? (

        Keine Zeiten erfasst.

        ) : ( <> - - - - - - - - - - {Object.entries(times).map(([category, minutes]) => ( - - - - + {/* Responsive Container für die Tabelle */} +
        +
        KategorieDauerAnteil
        {category} - {Math.floor(minutes / 60)} Std. {Math.round(minutes % 60)} Min. ({Math.round(minutes)} Min. gesamt) - - {total > 0 ? Math.round((minutes / total) * 1000) / 10 : 0}% -
        + + + + + - ))} - - - - - - - - -
        KategorieDauerAnteil
        Total - {Math.floor(total / 60)} Std. {Math.round(total % 60)} Min. ({Math.round(total)} Min. gesamt) - 100%
        + + + {Object.entries(times).map(([category, minutes]) => ( + + {category} + + {Math.floor(minutes / 60)} Std. {Math.round(minutes % 60)} Min. ({Math.round(minutes)} Min. gesamt) + + + {total > 0 ? Math.round((minutes / total) * 1000) / 10 : 0}% + + + ))} + + + + Total + + {Math.floor(total / 60)} Std. {Math.round(total % 60)} Min. ({Math.round(total)} Min. gesamt) + + 100% + + + +
        )} -

        Termine ({events.length})

        +

        Termine ({events.length})

        {events.length === 0 ? (

        Keine Termine gefunden.

        ) : ( @@ -132,27 +148,51 @@ export default async function EvaluationPage({ params }: PageProps) { const endDate = getIcalDate(event.end); return ( -
      • -

        {getIcalText(event.summary)}

        -

        +

      • +

        {getIcalText(event.summary)}

        +

        Start: {startDate.toLocaleString('de-DE')}
        Ende: {endDate.toLocaleString('de-DE')}

        - {event.location &&

        Ort: {getIcalText(event.location)}

        } - {event.description &&

        Beschreibung: {getIcalText(event.description)}

        } + {event.location && ( +

        + Ort: {getIcalText(event.location)} +

        + )} + {event.description && ( +

        + Beschreibung: {getIcalText(event.description)} +

        + )} {event.categories && ( -
        +
        Kategorien: {getCategories(event.categories).map((cat, i) => (