chore: add docker-hub login to pipeline

Reviewed-on: #18

.gitea/workflows/commit.yaml

@@ -3,7 +3,9 @@ name: Commit
 on:
   push:
     # only trigger on branches, not on tags
-    branches: '**'
+    branches:
+      - 'main'
+      - 'dev'
 
 jobs:
   # Job 1: Lint and Test (Type Check)
@@ -34,3 +36,6 @@ jobs:
       - name: Type Check (Svelte Check)
         # Based on your package.json "check" script
         run: pnpm check
+
+      - name: Run Tests (Vitest)
+        run: pnpm run test

.gitea/workflows/pr.yaml

@@ -17,8 +17,10 @@ jobs:
               http = true
               insecure = true
 
-      - name: login
+      - name: login gitea registry
         run: docker login -u schreifuchs -p ${{ secrets.REGISTRY_TOKEN }} git.schreifuchs.ch
+      - name: login dockerhub
+        run: docker login -u aktitiel -p ${{ secrets.DOCKER_HUB_TOKEN}}
       - name: Build and push Docker image
         uses: https://github.com/docker/build-push-action@v5
         with:

.gitea/workflows/release.yaml

@@ -18,8 +18,10 @@ jobs:
               http = true
               insecure = true
 
-      - name: login
+      - name: login gitea registry
         run: docker login -u schreifuchs -p ${{ secrets.REGISTRY_TOKEN }} git.schreifuchs.ch
+      - name: login dockerhub
+        run: docker login -u aktitiel -p ${{ secrets.DOCKER_HUB_TOKEN}}
       - name: Build and push Docker image
         uses: https://github.com/docker/build-push-action@v5
         with:

.husky/pre-commit

@@ -1,2 +1,3 @@
 pnpm run format
 pnpm run lint
+pnpm run test

package.json

@@ -10,6 +10,8 @@
 		"prepare": "husky",
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+		"test": "vitest run",
+		"test:watch": "vitest",
 		"format": "prettier --write .",
 		"lint": "prettier --check . && eslint .",
 		"db:start": "docker compose up",
@@ -28,8 +30,11 @@
 		"@sveltejs/kit": "^2.49.0",
 		"@sveltejs/vite-plugin-svelte": "^6.2.1",
 		"@tailwindcss/vite": "^4.1.17",
+		"@testing-library/jest-dom": "^6.9.1",
+		"@testing-library/svelte": "^5.3.1",
 		"@tiptap/core": "3.7.2",
 		"@types/node": "^20.19.25",
+		"@types/sanitize-html": "^2.16.1",
 		"drizzle-kit": "^0.31.7",
 		"drizzle-orm": "^0.44.7",
 		"eslint": "^9.39.1",
@@ -39,6 +44,7 @@
 		"flowbite-svelte-icons": "^3.0.0",
 		"globals": "^16.5.0",
 		"husky": "^9.1.7",
+		"jsdom": "^29.0.1",
 		"lowlight": "^3.3.0",
 		"prettier": "^3.6.2",
 		"prettier-plugin-svelte": "^3.4.0",
@@ -47,7 +53,8 @@
 		"tailwindcss": "^4.1.17",
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.47.0",
-		"vite": "^7.2.4"
+		"vite": "^7.2.4",
+		"vitest": "^4.1.2"
 	},
 	"dependencies": {
 		"@auth/drizzle-adapter": "^1.11.1",

src/app.d.ts

@@ -1,3 +1,5 @@
+import { DefaultSession } from '@auth/sveltekit';
+
 // See https://svelte.dev/docs/kit/types#app.d.ts
 // for information about these interfaces
 declare global {
@@ -10,4 +12,13 @@ declare global {
 	}
 }
 
+declare module '@auth/sveltekit' {
+	interface Session {
+		user: {
+			id: string;
+			email: string;
+		} & DefaultSession['user'];
+	}
+}
+
 export {};

src/lib/extractFormData.test.ts

@@ -0,0 +1,46 @@
+import { describe, it, expect } from 'vitest';
+import { extractFormData } from './extractFormData';
+import * as v from 'valibot';
+
+describe('extractFormData', () => {
+	it('should successfully extract and validate correct form data', async () => {
+		const formData = new FormData();
+		formData.append('name', 'John Doe');
+		formData.append('age', '30');
+
+		const request = new Request('http://localhost', {
+			method: 'POST',
+			body: formData
+		});
+
+		const schema = v.object({
+			name: v.string(),
+			age: v.string()
+		});
+
+		const result = await extractFormData(request, schema);
+
+		expect(result.error).toBeNull();
+		expect(result.data).toEqual({ name: 'John Doe', age: '30' });
+	});
+
+	it('should fail validation with missing required fields', async () => {
+		const formData = new FormData();
+		formData.append('age', '30');
+
+		const request = new Request('http://localhost', {
+			method: 'POST',
+			body: formData
+		});
+
+		const schema = v.object({
+			name: v.string(),
+			age: v.string()
+		});
+
+		const result = await extractFormData(request, schema);
+
+		expect(result.data).toBeUndefined();
+		expect(result.error).toBeTypeOf('string');
+	});
+});

src/lib/server/db/queries.ts

@@ -0,0 +1,18 @@
+import { db } from '$lib/server/db';
+import { aktis, ratings } from '$lib/server/db/schema';
+import { avg, eq } from 'drizzle-orm';
+
+export async function getAktisWithAvgRating(limit = 20, offset = 0) {
+	return await db
+		.select({
+			id: aktis.id,
+			title: aktis.title,
+			summary: aktis.summary,
+			rating: avg(ratings.rating)
+		})
+		.from(aktis)
+		.leftJoin(ratings, eq(aktis.id, ratings.aktiId))
+		.groupBy(aktis.id, aktis.title, aktis.summary)
+		.limit(limit)
+		.offset(offset);
+}

src/lib/server/session.ts

@@ -1,39 +1,36 @@
-import type { Session, User } from '@auth/sveltekit';
+import type { Session } from '@auth/sveltekit';
 import { error } from '@sveltejs/kit';
-import { db } from './server/db';
-import { users } from './server/db/schema';
+import { db } from './db';
+import { users } from './db/schema';
 import { eq } from 'drizzle-orm';
 interface Event {
 	locals: {
 		auth(): Promise<Session | null>;
 	};
 }
-interface UserWithId extends User {
-	id: string;
-	email: string;
-}
 
-export async function ensureAuth(event: Event): Promise<UserWithId> {
+export async function ensureAuth(event: Event): Promise<Session['user']> {
 	const session = await getSession(event);
 	if (!session) error(401, { message: 'Du muesch di zersch iiloge' });
 
-	const user = session?.user;
+	const user = session.user;
 	if (!user || !user.email || !user.id) {
 		error(401, { message: 'Du muesch di zersch iiloge' });
 	}
 
-	return { ...user, id: user.id, email: user.email }; // weird thingamajig so that ts compiler is happy
+	return user;
 }
 export async function getSession(event: Event) {
 	const session = await event.locals.auth();
 	if (!session) return null;
 	if (!session.user) error(403, { message: 'Di gits garnid. Vilich nomau usloge u iiloge?' });
+	if (!session?.user?.email) return null;
 
 	const res = await db
 		.select({ id: users.id })
 		.from(users)
 		.limit(1)
-		.where(eq(users.email, session.user.email ?? 'eaf9302d-9525-4f3e-8147-9620d2076f67')); //uuid as default to find nothing
+		.where(eq(users.email, session.user.email));
 
 	if (!res[0]?.id) {
 		error(403, { message: 'Di gits garnid. Vilich nomau usloge u iiloge?' });

src/routes/+layout.server.ts

@@ -1,4 +1,4 @@
-import { getSession as getSession } from '$lib/auth';
+import { getSession } from '$lib/server/session';
 import type { LayoutServerLoad } from './$types';
 
 export const load: LayoutServerLoad = async (event) => {

src/routes/+page.server.ts

@@ -1,19 +1,11 @@
-import { db } from '$lib/server/db';
-import { aktis, ratings } from '$lib/server/db/schema';
-import { avg, eq } from 'drizzle-orm';
+import { getAktisWithAvgRating } from '$lib/server/db/queries';
 import type { PageServerLoad } from './$types';
 
-export const load: PageServerLoad = async () => {
-	const a = await db
-		.select({
-			id: aktis.id,
-			title: aktis.title,
-			summary: aktis.summary,
-			rating: avg(ratings.rating)
-		})
-		.from(aktis)
-		.leftJoin(ratings, eq(aktis.id, ratings.aktiId))
-		.groupBy(aktis.id, aktis.title, aktis.summary);
+export const load: PageServerLoad = async ({ url }) => {
+	const offset = Number(url.searchParams.get('offset')) || 0;
+	const limit = 20;
+
+	const a = await getAktisWithAvgRating(limit, offset);
 
 	return {
 		aktis: a.map((a) => ({ ...a, rating: a.rating ? parseFloat(a.rating) : undefined }))

src/routes/+page.svelte

@@ -1,12 +1,55 @@
 <script lang="ts">
 	import AktiCard from '$lib/components/akti/AktiCard.svelte';
 	import type { PageProps } from './$types';
+	import { Spinner } from 'flowbite-svelte';
 
 	let { data }: PageProps = $props();
+
+	let aktis = $state(data.aktis);
+	let offset = $state(data.aktis.length);
+	let loading = $state(false);
+	let hasMore = $state(data.aktis.length >= 20);
+
+	async function loadMore() {
+		if (loading || !hasMore) return;
+		loading = true;
+		const res = await fetch(`/api/aktis?offset=${offset}`);
+		const newAktis = await res.json();
+
+		if (newAktis.length < 20) {
+			hasMore = false;
+		}
+
+		aktis = [...aktis, ...newAktis];
+		offset += newAktis.length;
+		loading = false;
+	}
+
+	function infiniteScroll(node: HTMLElement) {
+		const observer = new IntersectionObserver((entries) => {
+			if (entries[0].isIntersecting) {
+				loadMore();
+			}
+		});
+		observer.observe(node);
+		return {
+			destroy() {
+				observer.disconnect();
+			}
+		};
+	}
 </script>
 
 <div class="grid gap-5 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 3xl:grid-cols-5">
-	{#each data.aktis as akti (akti.id)}
+	{#each aktis as akti (akti.id)}
 		<AktiCard {akti}></AktiCard>
 	{/each}
 </div>
+
+<div class="mt-10 flex justify-center h-20">
+	{#if loading}
+		<Spinner />
+	{:else if hasMore}
+		<div use:infiniteScroll></div>
+	{/if}
+</div>

src/routes/akti/+page.server.ts

@@ -4,9 +4,10 @@ import { extractFormData } from '$lib/extractFormData';
 import { resolve } from '$app/paths';
 
 import * as v from 'valibot';
-import { ensureAuth } from '$lib/auth';
+import { ensureAuth } from '$lib/server/session';
 import { db } from '$lib/server/db';
 import { aktis } from '$lib/server/db/schema';
+import sanitizeHtml from 'sanitize-html';
 export const load: PageServerLoad = async (event) => {
 	await ensureAuth(event);
 	return {};
@@ -28,6 +29,8 @@ export const actions = {
 
 		if (!akti) return {};
 
+		akti.body = sanitizeHtml(akti.body);
+
 		const res = await db
 			.insert(aktis)
 			.values({ ...akti, author: user.id! })

src/routes/akti/[aktiId]/+page.server.ts

@@ -1,23 +1,25 @@
 import { db } from '$lib/server/db';
 import { aktis, ratings } from '$lib/server/db/schema';
-import { error, redirect, type Actions } from '@sveltejs/kit';
+import { error, fail, redirect, type Actions } from '@sveltejs/kit';
 import { and, eq } from 'drizzle-orm';
 import type { PageServerLoad } from './$types';
-import { ensureAuth } from '$lib/auth';
+import { ensureAuth } from '$lib/server/session';
 import { extractFormData } from '$lib/extractFormData';
 import * as v from 'valibot';
 import { resolve } from '$app/paths';
+import sanitizeHtml from 'sanitize-html';
 
 export const load: PageServerLoad = async (event) => {
-	const akti = await db.query.aktis.findFirst({
-		where: eq(aktis.id, event.params.aktiId),
-		with: { author: true }
-	});
-
-	const r = await db.query.ratings.findMany({
-		with: { user: true },
-		where: eq(ratings.aktiId, event.params.aktiId)
-	});
+	const [akti, r] = await Promise.all([
+		db.query.aktis.findFirst({
+			where: eq(aktis.id, event.params.aktiId),
+			with: { author: true }
+		}),
+		db.query.ratings.findMany({
+			with: { user: true },
+			where: eq(ratings.aktiId, event.params.aktiId)
+		})
+	]);
 
 	if (!akti) {
 		error(404, { message: 'Die Akti gits garnid, sorry...' });
@@ -54,7 +56,9 @@ export const actions = {
 			)
 		).data;
 
-		if (!changeRequest) return error(400);
+		if (!changeRequest) return fail(400, { message: 'Invalid data' });
+
+		changeRequest.body = sanitizeHtml(changeRequest.body);
 
 		await db
 			.update(aktis)

src/routes/akti/[aktiId]/comment/+page.server.ts

@@ -1,6 +1,6 @@
 import type { PageServerLoad } from './$types';
-import { ensureAuth } from '$lib/auth';
-import { error, redirect, type Actions } from '@sveltejs/kit';
+import { ensureAuth } from '$lib/server/session';
+import { error, fail, redirect, type Actions } from '@sveltejs/kit';
 import { extractFormData } from '$lib/extractFormData';
 import { aktis, ratings } from '$lib/server/db/schema';
 import { eq } from 'drizzle-orm';
@@ -54,7 +54,7 @@ export const actions = {
 			)
 		).data;
 
-		if (!rating) return error(400);
+		if (!rating) return fail(400, { message: 'Invalid data' });
 
 		await db.insert(ratings).values({
 			...rating,

src/routes/api/aktis/+server.ts

@@ -0,0 +1,11 @@
+import { getAktisWithAvgRating } from '$lib/server/db/queries';
+import { json, type RequestHandler } from '@sveltejs/kit';
+
+export const GET: RequestHandler = async ({ url }) => {
+	const offset = Number(url.searchParams.get('offset')) || 0;
+	const limit = 20;
+
+	const a = await getAktisWithAvgRating(limit, offset);
+
+	return json(a.map((a) => ({ ...a, rating: a.rating ? parseFloat(a.rating) : undefined })));
+};

vitest-setup.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom/vitest';

vitest.config.ts

@@ -0,0 +1,12 @@
+import { defineConfig } from 'vitest/config';
+import { sveltekit } from '@sveltejs/kit/vite';
+import { svelteTesting } from '@testing-library/svelte/vite';
+
+export default defineConfig({
+	plugins: [sveltekit(), svelteTesting()],
+	test: {
+		include: ['src/**/*.{test,spec}.{js,ts}'],
+		environment: 'jsdom',
+		setupFiles: ['./vitest-setup.ts']
+	}
+});