From 951a0b52564b84fef95aa02a1588edc6ad2b7708 Mon Sep 17 00:00:00 2001
From: Stan Runge <stan@stanrunge.dev>
Date: Fri, 24 Jan 2025 12:33:10 +0100
Subject: [PATCH] show topics on all tasks

---
 packages/web/src/routes/progress/+page.server.ts | 10 +++++++++-
 packages/web/src/routes/progress/+page.svelte    | 13 ++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/web/src/routes/progress/+page.server.ts b/packages/web/src/routes/progress/+page.server.ts
index 3f4d1fd..aa67dc0 100755
--- a/packages/web/src/routes/progress/+page.server.ts
+++ b/packages/web/src/routes/progress/+page.server.ts
@@ -2,7 +2,15 @@ import { db } from '$lib/db';
 
 export const load = async ({ cookies }) => {
 	return {
-		tasks: await db.query.tasks.findMany(),
+		tasks: await db.query.tasks.findMany({
+			with: {
+				tasksToTopics: {
+					with: {
+						topic: true
+					}
+				}
+			}
+		}),
 		editable: cookies.get('token')
 	};
 };
diff --git a/packages/web/src/routes/progress/+page.svelte b/packages/web/src/routes/progress/+page.svelte
index 9f2acc3..3a75edb 100755
--- a/packages/web/src/routes/progress/+page.svelte
+++ b/packages/web/src/routes/progress/+page.svelte
@@ -22,7 +22,7 @@
 				<thead>
 					<tr class="border-b border-white">
 						<th class="px-6 py-3 text-left text-sm font-semibold">Name</th>
-						<th class="px-6 py-3 text-left text-sm font-semibold">Type</th>
+						<th class="px-6 py-3 text-left text-sm font-semibold">Topics</th>
 						<th class="px-6 py-3 text-left text-sm font-semibold">Progress</th>
 						<th class="px-6 py-3 text-left text-sm font-semibold">Actions</th>
 					</tr>
@@ -36,8 +36,15 @@
 								</a>
 							</td>
 							<td class="px-6 py-2 border-b">
-								<a href={`/progress/${task.id}`} class="text-blue-500 hover:underline">
-									{task.type}
+								<a href={`/progress/${task.id}`} class="flex gap-2 flex-wrap">
+									{#each task.tasksToTopics as topic}
+										<div
+											class="relative bg-blue-500 text-white rounded-full px-2 py-1 shadow font-medium hover:bg-blue-600 transition cursor-pointer group"
+											title="Click for more details about {topic.topic.name}"
+										>
+											{topic.topic.name}
+										</div>
+									{/each}
 								</a>
 							</td>