Add watermarking service, fix everything

3 files changed, 25 insertions, 6 deletions

diff --git a/app/src/routes/assignments/+page.svelte b/app/src/routes/assignments/+page.svelte
index f43767d..5a3a4cb 100644
--- a/app/src/routes/assignments/+page.svelte
+++ b/app/src/routes/assignments/+page.svelte
@@ -1,15 +1,19 @@
 <!-- The /assignments index page gives an overview of assignments -->
 
 <script lang="ts">
+	import { canBeFinished } from "$lib/common/assignments";
 	import type { PageProps } from "./$types";
 
 	const { data }: PageProps = $props();
+	const unfinishedAssignments = $derived(data.assignments.filter(canBeFinished));
+	const finishedAssignments = $derived(data.assignments.filter((a) => !canBeFinished(a)));
 </script>
 
-<h1>Kommende opgaver for {data.user.firstName}</h1>
+<h1>{data.user.firstName}s opgaver</h1>
 
+<h2>Kommende opgaver</h2>
 <ol>
-	{#each data.assignments as assignment}
+	{#each unfinishedAssignments as assignment}
 		<li>
 			<span>{assignment.date}</span>
 			<a href={`/assignments/${assignment.id}`}>Mere info</a>
@@ -17,5 +21,12 @@
 	{/each}
 </ol>
 
-<style>
-</style>
+<h2>Færdiggjorte opgaver</h2>
+<ol>
+	{#each finishedAssignments as assignment}
+		<li>
+			<span>{assignment.date}</span>
+			<a href={`/assignments/${assignment.id}`}>Mere info</a>
+		</li>
+	{/each}
+</ol>
diff --git a/app/src/routes/assignments/[assignmentId]/+page.server.ts b/app/src/routes/assignments/[assignmentId]/+page.server.ts
index 3b53a7c..b6634f0 100644
--- a/app/src/routes/assignments/[assignmentId]/+page.server.ts
+++ b/app/src/routes/assignments/[assignmentId]/+page.server.ts
@@ -42,7 +42,13 @@ export const actions = {
 			})),
 		);
 
-		await finishAssignment(locals.dbClient, locals.s3Client, {
+		const { beanstalkdClient, dbClient, s3Client } = locals;
+
+		await finishAssignment({
+			beanstalkdClient,
+			dbClient,
+			s3Client,
+
 			images,
 			note,
 			assignmentId: +params.assignmentId, // We have parsing at home...
diff --git a/app/src/routes/assignments/[assignmentId]/+page.svelte b/app/src/routes/assignments/[assignmentId]/+page.svelte
index 6b24f38..bf955f9 100644
--- a/app/src/routes/assignments/[assignmentId]/+page.svelte
+++ b/app/src/routes/assignments/[assignmentId]/+page.svelte
@@ -30,7 +30,9 @@
 		</label>
 		<label>
 			Ekstra bemærkninger:
-			<textarea name="notes" placeholder="F.eks.: Vi løb tør for roser (?). De kommer i overmorgen :)"
+			<textarea
+				name="notes"
+				placeholder="F.eks.: Vi løb tør for roser (?). De kommer i overmorgen :)"
 			></textarea>
 		</label>
 		<button>Færddigør job</button>