switch from "Unterwegs" to "Snack"

.gitea/workflows/upload.yml

@@ -0,0 +1,33 @@
+name: CI
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push to master (including merged PRs)
+  push:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  update:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    - name: Updating website.
+      uses: appleboy/ssh-action@master
+      with:
+        host: bocken.org
+        username: homepage
+        key: ${{ secrets.homepage_ssh }}
+        passphrase: ${{ secrets.homepage_pass }}
+        port: 22
+        script: |
+          cd /usr/share/webapps/homepage
+          git pull --force https://Alexander:${{ secrets.homepage_gitea_token }}@git.bocken.org/Alexander/homepage
+          npm run build
+          sudo systemctl restart homepage.service

package.json

@@ -22,14 +22,10 @@
 		"vite": "^5.0.0"
 	},
 	"dependencies": {
-		"@auth/sveltekit": "^0.12.3",
+		"@auth/sveltekit": "^0.14.0",
 		"@sveltejs/adapter-node": "^2.0.0",
-		"argon2": "^0.30.3",
 		"cheerio": "1.0.0-rc.12",
-		"jsonwebtoken": "^9.0.1",
 		"mongoose": "^7.4.0",
-		"sharp": "^0.32.3",
-		"svelte-cookie": "^1.0.1",
-		"sveltekit-oidc": "^0.0.8"
+		"sharp": "^0.32.3"
 	}
 }

src/hooks.server.ts

@@ -1,4 +1,3 @@
-import { authenticateUser } from "$lib/js/authenticate"
 import type { Handle } from "@sveltejs/kit"
 import { redirect } from "@sveltejs/kit"
 import { error } from "@sveltejs/kit"
@@ -13,13 +12,13 @@ async function authorization({ event, resolve }) {
 	if (event.url.pathname.startsWith('/rezepte/edit') || event.url.pathname.startsWith('/rezepte/add')) {
    const session = await event.locals.getSession();
 		if (!session) {
-			throw redirect(303, '/auth/signin');
+			redirect(303, '/auth/signin');
 		}
 		else if (! session.user.groups.includes('rezepte_users')) {
 			// strip last dir from url
 			// TODO: give indication of why access failed
 			const new_url = event.url.pathname.split('/').slice(0, -1).join('/');
-			throw redirect(303, new_url);
+			redirect(303, new_url);
 		}
 	}
 

src/lib/components/Card.svelte

@@ -7,6 +7,11 @@ import "$lib/css/nordtheme.css";
 import "$lib/css/shake.css";
 import "$lib/css/icon.css";
 export let do_margin_right = false;
+// to manually override lazy loading for top cards
+export let loading_strat : "lazy" | "eager" | undefined;
+if(loading_strat === undefined){
+	loading_strat = "lazy"
+}
 
 if(icon_override){
 	current_month = recipe.season[0]
@@ -45,6 +50,9 @@ const img_name=recipe.short_name + ".webp?v=" + recipe.dateModified
 	background-color:  var(--blue);
 	box-shadow: 0em 0em 2em 0.1em rgba(0, 0, 0, 0.3);
 }
+.icon{
+	font-family: "Noto Color Emoji", emoji, sans-serif;
+}
 #image{
 	width: 300px;
 	height: 255px;
@@ -179,9 +187,9 @@ const img_name=recipe.short_name + ".webp?v=" + recipe.dateModified
 	<div class=div_div_image >
 		<div class=div_image style="background-image:url(https://bocken.org/static/rezepte/placeholder/{img_name})">
 			<noscript>
-				<img id=image class="backdrop_blur" src="https://bocken.org/static/rezepte/thumb/{img_name}" loading=lazy  alt="{recipe.alt}"/>
+				<img id=image class="backdrop_blur" src="https://bocken.org/static/rezepte/thumb/{img_name}" loading={loading_strat} alt="{recipe.alt}"/>
 			</noscript>
-			<img class:blur={!isloaded} id=image class="backdrop_blur" src={'https://bocken.org/static/rezepte/thumb/' + recipe.short_name + '.webp'} loading=lazy  alt="{recipe.alt}" on:load={() => isloaded=true}/>
+			<img class:blur={!isloaded} id=image class="backdrop_blur" src={'https://bocken.org/static/rezepte/thumb/' + recipe.short_name + '.webp'} loading={loading_strat} alt="{recipe.alt}" on:load={() => isloaded=true}/>
 		</div>
 	</div>
 	{#if icon_override || recipe.season.includes(current_month)}
@@ -191,7 +199,7 @@ const img_name=recipe.short_name + ".webp?v=" + recipe.dateModified
 		<a class=category href="/rezepte/category/{recipe.category}" >{recipe.category}</a>
 		<div>
 			<div class=name>{@html recipe.name}</div>
-			<div class=description>{recipe.description}</div>
+			<div class=description>{@html recipe.description}</div>
 		</div>
 		<div class=tags>
 		{#each recipe.tags as tag}

src/lib/components/CreateIngredientList.svelte

@@ -455,9 +455,13 @@ h3{
 			</button>
 		</div>
 		<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<div on:click={() => show_modal_edit_ingredient(list_index, ingredient_index)} >{ingredient.amount} {ingredient.unit}</div>
+		<div on:click={() => show_modal_edit_ingredient(list_index, ingredient_index)} >
+			{ingredient.amount} {ingredient.unit}
+		</div>
 		<!-- svelte-ignore a11y-click-events-have-key-events -->
-		<div class=force_wrap on:click={() => show_modal_edit_ingredient(list_index, ingredient_index)} >{ingredient.name}</div>
+		<div class=force_wrap on:click={() => show_modal_edit_ingredient(list_index, ingredient_index)} >
+			{@html ingredient.name}
+		</div>
 		<div class=mod_icons><button class="action_button button_subtle" on:click={() => show_modal_edit_ingredient(list_index, ingredient_index)}>
 			<Pen fill=var(--nord1) height=1em width=1em></Pen></button>
 			<button class="action_button button_subtle" on:click="{() => remove_ingredient(list_index, ingredient_index)}"><Cross fill=var(--nord1) height=1em width=1em></Cross></button></div>

src/lib/components/CreateStepList.svelte

@@ -509,7 +509,9 @@ h3{
 				</button>
 			</div>
 			<div>
-				<div on:click={() => show_modal_edit_step(list_index, step_index)}>{step}</div>
+				<div on:click={() => show_modal_edit_step(list_index, step_index)}>
+					{@html step}
+				</div>
 			<div><button class="action_button button_subtle" on:click={() => show_modal_edit_step(list_index, step_index)}>
 				<Pen fill=var(--nord1)></Pen>
 		</button>

src/lib/components/Header.svelte

@@ -29,6 +29,7 @@ nav{
 	justify-content: space-between !important;
 	align-items: center;
 	box-shadow: 0 1em 1rem 0rem rgba(0,0,0,0.4);
+	height: 4rem;
 }
 nav[hidden]{
 	display:block;
@@ -80,16 +81,16 @@ nav[hidden]{
 	padding-inline: 0.5rem;
 }
 :global(svg.symbol){
-	height: 3.5rem;
-	width: 3.5rem;
+	height: 4rem;
+	width: 4rem;
 	border-radius: 10000px;
 }
-:global(a:has(svg.symbol)){
+/*:global(a:has(svg.symbol)){
 	padding: 0 !important;
-	width: 3.5rem;
-	height: 3.5rem;
+	width: 4rem;
+	height: 4rem;
 	margin-left: 1rem;
-}
+}*/
 .wrapper{
 	display:flex;
 	flex-direction: column;
@@ -110,7 +111,7 @@ footer{
 		position: sticky;
 		background-color: var(--nord0);
 		width: 100%;
-		height: 3rem;
+		height: 4rem;
 		top: 0;
 		z-index: 9999;
 	}
@@ -119,8 +120,8 @@ footer{
 		background-color: unset;
 		display: block;
 		fill: white;
-		margin-inline: 1rem;
-		width: 2.5rem;
+		margin-inline: 0.5rem;
+		width: 2rem;
 		aspect-ratio: 1;
 	}
 	.nav_button svg{

src/lib/components/Icon.svelte

@@ -5,6 +5,7 @@
 </script>
 <style>
 	a{
+		font-family: "Noto Color Emoji", emoji;
 		font-size: 2rem;
 		text-decoration: none;
 		padding: 0.5em;

src/lib/components/IconLayout.svelte

@@ -8,6 +8,7 @@
 
 <style>
 	a{
+		font-family: "Noto Color Emoji", emoji, sans-serif;
 		font-size: 2rem;
 		text-decoration: none;
 		padding: 0.5em;

src/lib/components/IngredientsPage.svelte

@@ -1,7 +1,8 @@
 <script>
 import { onMount } from 'svelte';
+import { onNavigate } from "$app/navigation";
 export let data
-let multiplier = 1
+let multiplier;
 let custom_mul = "…"
 
 onMount(() => {
@@ -9,6 +10,10 @@ onMount(() => {
 	const urlParams = new URLSearchParams(window.location.search);
 	multiplier = urlParams.get('multiplier') || 1;
 })
+onNavigate(() => {
+	const urlParams = new URLSearchParams(window.location.search);
+	multiplier = urlParams.get('multiplier') || 1;
+})
 
 function convertFloatsToFractions(inputString) {
   // Split the input string into individual words
@@ -227,7 +232,7 @@ span
 {/if}
 <div class=ingredients_grid>
 	{#each list.list as item}
-		<div class=amount>{@html adjust_amount(item.amount, multiplier)} {item.unit}</div><div class=name>{@html item.name.replace("{{multiplier}}", multiplier)}</div>
+		<div class=amount>{@html adjust_amount(item.amount, multiplier)} {item.unit}</div><div class=name>{@html item.name.replace("{{multiplier}}", multiplier * item.amount)}</div>
 	{/each}
 </div>
 {/each}

src/lib/components/Symbol.svelte

@@ -7,6 +7,7 @@
 	}
 	svg{
 		transition: 100ms;
+		height: 3em;
 	}
 	svg:hover,
 	svg:focus-visible
@@ -29,14 +30,9 @@
 </style>
 
 <svg
-   width="calc(45.742325px/ 1.3)"
-   height="calc(80.310539px / 1.3)"
    viewBox="0 0 45.742326 80.310541"
    version="1.1"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
+   xmlns="http://www.w3.org/2000/svg">
   <g class=stroke
      id="branches"
      transform="translate(-42.033271,-37.145192)" >

src/lib/components/TitleImgParallax.svelte

@@ -11,9 +11,7 @@
 		}
 		fetch(src, { method: 'HEAD' })
 		  .then(response => {
-			  if(response.redirected){
-				isredirected = true
-			  }
+			isredirected = response.redirected
 		    })
 	})
 

src/lib/js/authenticate.ts

@@ -1,41 +0,0 @@
-import type { RequestEvent } from "@sveltejs/kit";
-import { COOKIE_SECRET } from "$env/static/private";
-import pkg from 'jsonwebtoken';
-const { verify } = pkg;
-import { error } from "@sveltejs/kit";
-import { dbConnect, dbDisconnect } from "../../utils/db";
-import { User } from "../../models/User";;
-
-export async function authenticateUser(cookies){
-// Set your master secret key (replace with your own secret)
-	const masterSecret = COOKIE_SECRET;
-	const secretKey = masterSecret
-	let decoded
-	try{
-		const cookie : string = cookies.get("UserSession")
-		if(cookie){
-			decoded = await verify(cookie, secretKey);
-		}
-
-	}
-	catch(e){
-		return null
-	}
-
-	if(decoded){
-		await dbConnect()
-		let res = await User.findOne({username: decoded.username}, 'access').lean();
-		await dbDisconnect()
-		if(!res){
-			throw error(404, "User for this Cookie does no longer exist")
-		}
-		return {
-			username: decoded.username,
-			access: res.access,
-			_id: res._id.toString(),
-		}
-	}
-	else{
-		return null
-	}
-}

src/lib/js/get_username.ts

@@ -1,33 +0,0 @@
-import type { RequestEvent } from "@sveltejs/kit";
-import { COOKIE_SECRET } from "$env/static/private";
-import pkg from 'jsonwebtoken';
-const { verify } = pkg;
-import { error } from "@sveltejs/kit";
-import { dbConnect, dbDisconnect } from "../../utils/db";
-import { User } from "../../models/User";;
-
-export async function get_username(cookies){
-	// Set your master secret key (replace with your own secret)
-	const masterSecret = COOKIE_SECRET;
-	const secretKey = masterSecret
-	let decoded
-	try{
-		const cookie : string = cookies.get("UserSession")
-		if(cookie){
-			decoded = await verify(cookie, secretKey);
-		}
-
-	}
-	catch(e){
-		return null
-	}
-
-	if(decoded){
-		return {
-			username: decoded.username,
-		}
-	}
-	else{
-		return null
-	}
-}

src/lib/js/hashPassword.js

@@ -1,10 +0,0 @@
-import { hash } from 'argon2'
-export async function hashPassword(password, salt) {
-  try {
-    const hashedPassword = await hash(password, salt); // Hash the password with the salt and pepper
-    return hashedPassword;
-  } catch (error) {
-    console.error('Error hashing password:', error);
-  }
-}
-

src/lib/js/randomize.js

@@ -1,6 +1,4 @@
-const time = new Date()
 const MS_PER_DAY = 86400000
-let seed = Math.floor(time.getTime()/MS_PER_DAY)
 function mulberry32(a) {
 	return function() {
 	  var t = a += 0x6D2B79F5;
@@ -11,6 +9,8 @@ function mulberry32(a) {
 }
 
 export function rand_array(array){
+	let time = new Date()
+	const seed = Math.floor(time.getTime()/MS_PER_DAY)
 	let rand = mulberry32(seed)
 	array.sort((a,b) => 0.5 - rand())
 	return array

src/models/User.ts

@@ -1,12 +0,0 @@
-import mongoose from 'mongoose';
-
-const UserSchema = new mongoose.Schema(
-  {
-     username: {type: String, required: true, unique: true},
-     pass_hash: {type: String, required: true},
-     salt : {type: String, required: true},
-     access: [String], //rezepte, flims, abrechnung, ...
-     }, {timestamps: true}
-);
-
-export const User = mongoose.model("User", UserSchema);

src/routes/(main)/+layout.server.ts

@@ -1,8 +1,6 @@
-import { get_username } from '$lib/js/get_username';;
-import type { Actions, PageServerLoad } from "./$types"
-import { error } from "@sveltejs/kit"
+import type { PageServerLoad } from "./$types"
 
-export const load = (async ({cookies, locals}) => {
+export const load : PageServerLoad = (async ({locals}) => {
 	return {
 		session: await locals.auth(),
 	}

src/routes/(main)/+page.svelte

@@ -1,8 +1,7 @@
-<script>
+<script lang="ts">
 	import "$lib/css/nordtheme.css";
 	import LinksGrid from "$lib/components/LinksGrid.svelte";
 	export let data;
-	import { page } from "$app/stores"
 </script>
 <style>
 .hero{
@@ -68,7 +67,7 @@ section h2{
 	Alles ist selbst gehostet bei mir daheim auf einem kleinen Mini-Server (Arch, btw).
 </p>
 <p>
-	Zu empfeheln ist meine stetig wachsende Rezeptsammlung. Dort findest du viele leckere Rezepte, die ich selbst ausprobiert habe und ständig weiterfeilsche.
+	Zu empfehlen ist meine stetig wachsende Rezeptsammlung. Dort findest du viele leckere Rezepte, die ich selbst ausprobiert habe und ständig weiterfeilsche.
 	Zudem kannst du gerne meine Suchmaschine oder auch Jitsi-instanz für Videokonferenzen nutzen.
 	Einiges ist hinter einem Login versteckt, anderes ist öffentlich zugänglich.
 	Wer sich ein bisschen mit Programmieren auskennt, kann auch gerne in meinen Git-Repositories stöbern.
@@ -132,5 +131,27 @@ section h2{
 		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M288 32c0-17.7-14.3-32-32-32s-32 14.3-32 32V274.7l-73.4-73.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3l128 128c12.5 12.5 32.8 12.5 45.3 0l128-128c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L288 274.7V32zM64 352c-35.3 0-64 28.7-64 64v32c0 35.3 28.7 64 64 64H448c35.3 0 64-28.7 64-64V416c0-35.3-28.7-64-64-64H346.5l-45.3 45.3c-25 25-65.5 25-90.5 0L165.5 352H64zm368 56a24 24 0 1 1 0 48 24 24 0 1 1 0-48z"/></svg>
 		<h3>Transmission</h3>
 	</a>
+	<!-- instead of redirect_to_docs(), use a normal link with internal checks for data.session -->
+	{#if !data.session}
+		<a href="/auth/signin">
+			<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m106 512h300c24.814 0 45-20.186 45-45v-317h-105c-24.814 0-45-20.186-45-45v-105h-195c-24.814 0-45 20.186-45 45v422c0 24.814 20.186 45 45 45zm60-301h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h120c8.291 0 15 6.709 15 15s-6.709 15-15 15h-120c-8.291 0-15-6.709-15-15s6.709-15 15-15z"/><path d="m346 120h96.211l-111.211-111.211v96.211c0 8.276 6.724 15 15 15z"/></svg>
+			<h3>Dokumente</h3>
+		</a>
+	{:else if data.session.user.groups.includes("paperless_users")}
+		<a href="https://docs.bocken.org">
+			<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m106 512h300c24.814 0 45-20.186 45-45v-317h-105c-24.814 0-45-20.186-45-45v-105h-195c-24.814 0-45 20.186-45 45v422c0 24.814 20.186 45 45 45zm60-301h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h120c8.291 0 15 6.709 15 15s-6.709 15-15 15h-120c-8.291 0-15-6.709-15-15s6.709-15 15-15z"/><path d="m346 120h96.211l-111.211-111.211v96.211c0 8.276 6.724 15 15 15z"/></svg>
+			<h3>Dokumente</h3>
+		</a>
+	{:else if data.session.user.groups.includes("paperless_eltern_users")}
+		<a href="https://dokumente.bocken.org">
+			<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m106 512h300c24.814 0 45-20.186 45-45v-317h-105c-24.814 0-45-20.186-45-45v-105h-195c-24.814 0-45 20.186-45 45v422c0 24.814 20.186 45 45 45zm60-301h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h180c8.291 0 15 6.709 15 15s-6.709 15-15 15h-180c-8.291 0-15-6.709-15-15s6.709-15 15-15zm0 60h120c8.291 0 15 6.709 15 15s-6.709 15-15 15h-120c-8.291 0-15-6.709-15-15s6.709-15 15-15z"/><path d="m346 120h96.211l-111.211-111.211v96.211c0 8.276 6.724 15 15 15z"/></svg>
+			<h3>Dokumente</h3>
+		</a>
+	{/if}
+
+	<a href=https://audio.bocken.org>
+		<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M256 80C149.9 80 62.4 159.4 49.6 262c9.4-3.8 19.6-6 30.4-6c26.5 0 48 21.5 48 48l0 128c0 26.5-21.5 48-48 48c-44.2 0-80-35.8-80-80l0-16 0-48 0-48C0 146.6 114.6 32 256 32s256 114.6 256 256l0 48 0 48 0 16c0 44.2-35.8 80-80 80c-26.5 0-48-21.5-48-48l0-128c0-26.5 21.5-48 48-48c10.8 0 21 2.1 30.4 6C449.6 159.4 362.1 80 256 80z"/></svg>
+		<h3>Hörbücher & Podcasts</h3>
+	</a>
 </LinksGrid>
 </section>

src/routes/api/user/admin/users/+server.ts

@@ -1,23 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import { error } from '@sveltejs/kit';
-
-import { dbConnect, dbDisconnect } from '../../../../../utils/db';
-import { User } from '../../../../../models/User';
-import { get_username } from '$lib/js/get_username';
-
-// header: use for bearer token for now
-// recipe json in body
-export const POST: RequestHandler = async ({cookies}) => {
-	const requesting_user = await get_username(cookies)
-	await dbConnect()
-	let res = await User.findOne({username: requesting_user}, 'access').lean()
-	if(!res.access.contains("admin")){
-		await dbDisconnect()
-		throw error(401, {message: "Your user does not have the permissions to do this"})
-	}
-	else{
-		let res = await User.find({}, 'username access').lean()
-		await dbDisconnect()
-		return { res }
-	}
-};

src/routes/api/user/change_pw/+server.ts

@@ -1,36 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import { error } from '@sveltejs/kit';
-import { verify }  from 'argon2';
-import { hashPassword } from '$lib/js/hashPassword'
-import {randomBytes} from 'crypto'
-
-import { PEPPER } from '$env/static/private';
-
-import { User } from '../../../../models/User';
-import { dbConnect, dbDisconnect } from '../../../../utils/db';
-
-// header: use for bearer token for now
-// recipe json in body
-export const POST: RequestHandler = async ({request}) => {
-	const {username, old_password, new_password, new_password_rep} = await request.json()
-  if(new_password != new_password_rep){
-    throw error(400, 'new passwords do not match!')
-  }
-	await dbConnect();
-	const user = await User.findOne({username: username});
-  console.log("Found user:", user)
-  const isMatch = await verify(user.pass_hash, old_password + PEPPER, {salt: user.salt})
-  console.log("isMatch:", isMatch)
-  if(isMatch){
-		const salt = randomBytes(32).toString('hex'); // Generate a random salt
-    const pass_hash = await hashPassword(new_password + PEPPER, salt)
-    await User.findOneAndUpdate({username: username}, {pass_hash: pass_hash, salt: salt})
-    await dbDisconnect()
-	  return new Response(JSON.stringify({message: "Password updated successfully"}),
-                        {status: 200})
-  }
-  else{
-	  await dbDisconnect();
-    throw error(401, "Wrong old password")
-	}
-};

src/routes/api/user/login/+server.ts

@@ -1,46 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import { error } from '@sveltejs/kit';
-import pkg from 'jsonwebtoken';
-const { sign } = pkg;
-import { verify} from 'argon2';
-import { COOKIE_SECRET } from '$env/static/private'
-import { PEPPER } from '$env/static/private'
-
-import { dbConnect, dbDisconnect } from '../../../../utils/db';
-import { User } from '../../../../models/User';
-
-// header: use for bearer token for now
-// recipe json in body
-export const POST: RequestHandler = async ({request}) => {
-	const {username, password} = await request.json()
-	await dbConnect()
-	let res = await User.findOne({username: username}, 'pass_hash salt').lean()
-	await dbDisconnect()
-	if(!res){
-		console.log("NOT FOUND")
-		throw error(401, {message: "wrong password or user does not exist"})
-	}
-
-	const stored_pw = res.pass_hash
-	const salt = res.salt
-
-	const isMatch = await verify(stored_pw, password + PEPPER, {salt})
-	if(!isMatch){
-		throw error(401, {message: "wrong password or user does not exist"})
-	}
-
-	res = await createJWT(username)
-	return new Response(JSON.stringify(res))
-};
-
-async function createJWT(username) {
-	const payload = {
-  	  username: username,
-  	};
-
-  	const masterSecret = COOKIE_SECRET;
-  	const secretKey = masterSecret;
-  	const jwt = sign(payload, secretKey);
-	console.log(jwt)
-  	return jwt
-}

src/routes/api/user/register/+server.ts

@@ -1,41 +0,0 @@
-import type { RequestHandler } from '@sveltejs/kit';
-import { error } from '@sveltejs/kit';
-import { randomBytes } from 'crypto';
-import { ALLOW_REGISTRATION } from '$env/static/private';
-import { PEPPER } from '$env/static/private';
-import {hashPassword} from '$lib/js/hashPassword'
-
-import { User } from '../../../../models/User';
-import { dbConnect, dbDisconnect } from '../../../../utils/db';
-
-// header: use for bearer token for now
-// recipe json in body
-export const POST: RequestHandler = async ({request}) => {
-	if(ALLOW_REGISTRATION){
-		const {username, password} = await request.json()
-		const salt = randomBytes(32).toString('hex'); // Generate a random salt
-
-		const pass_hash =  await hashPassword(password + PEPPER, salt)
-		await dbConnect();
-		try{
-			await User.create({
-					username: username,
-					pass_hash: pass_hash,
-					salt: salt,
-					access: [],
-			})
-		}catch(e){
-			await dbDisconnect();
-			throw error(400, e);
-		}
-		await dbDisconnect();
-		return new Response(JSON.stringify({message: "User added successfully"}),
-				    	{status: 200}
-			);
-	}
-	else{
-		throw error(401, "user registration currently closed")
-	}
-
-
-};

src/routes/glaube/+layout.server.ts

@@ -1,7 +1,7 @@
-import { get_username } from '$lib/js/get_username';;
-import type { Actions, PageServerLoad } from "./$types"
-import { error } from "@sveltejs/kit"
+import type { PageServerLoad } from "./$types"
 
-export const load = (async ({cookies}) => {
-	return { user: await get_username(cookies) }
+export const load : PageServerLoad = (async ({locals}) => {
+	return {
+		session: await locals.auth(),
+	}
 });

src/routes/glaube/+page.svelte

@@ -70,6 +70,6 @@
 			<path d="m377.943 50.035v-35.035c0-8.284-6.716-15-15-15h-76.926c-11.523 0-22.046 4.357-30.017 11.505-7.971-7.148-18.494-11.505-30.018-11.505h-76.926c-8.284 0-15 6.716-15 15v35.035z"/>
 			</g>
 		</svg>
-	<h3>Predigten<h3>
+	<h3>Predigten</h3>
 	</a>
 </LinksGrid>

src/routes/glaube/rosenkranz/+page.svelte

@@ -463,19 +463,19 @@ Der unten abgebildete Rosenkranz zeigt die aktuellen Gehmeinisse des Tages nach
 			</g>
 			<g id=lbead5>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 			<g id=lbead4>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 			<g id=lbead3>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 			<g id=lbead6>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 		</g>
 		<g class=beforedecades>
@@ -490,11 +490,11 @@ Der unten abgebildete Rosenkranz zeigt die aktuellen Gehmeinisse des Tages nach
 			</g>
 			<g id=lbead1>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 			<g id=lbead2>
 				<circle class=lbead />
-				<circle class=hitbox onclick="" />
+				<circle class=hitbox onclick="{true}" />
 			</g>
 		</g>
 	</g>
@@ -511,7 +511,7 @@ Dieser Plan ist wie folgt:
 <div class=table >
 <table>
 	<tbody>
-	<thead>
+	<tr>
 		<td>Mo</td>
 		<td>Di</td>
 		<td>Mi</td>
@@ -519,7 +519,7 @@ Dieser Plan ist wie folgt:
 		<td>Fr</td>
 		<td>Sa</td>
 		<td>So</td>
-	</thead>
+	</tr>
 	<tr>
 		<td>freudenreich</td>
 		<td>schmerzhaft</td>
@@ -546,7 +546,7 @@ Der Plan ohne lichtreiche Geheimnisse ist wie folgt:
 <div class=table>
 <table>
 	<tbody>
-	<thead>
+	<tr>
 		<td>Mo</td>
 		<td>Di</td>
 		<td>Mi</td>
@@ -554,7 +554,7 @@ Der Plan ohne lichtreiche Geheimnisse ist wie folgt:
 		<td>Fr</td>
 		<td>Sa</td>
 		<td>So</td>
-	</thead>
+	</tr>
 	<tr>
 		<td>freudenreich</td>
 		<td>schmerzhaft</td>

src/routes/rezepte/+layout.server.ts

@@ -1,5 +1,4 @@
 import type { PageServerLoad } from "./$types"
-import { error } from "@sveltejs/kit"
 
 export const load : PageServerLoad = async ({locals}) => {
 	return {

src/routes/rezepte/+layout.svelte

@@ -15,6 +15,7 @@ if(data.session){
 	<li><a href="/rezepte/category">Kategorie</a></li>
 	<li><a href="/rezepte/icon">Icon</a></li>
 	<li><a href="/rezepte/tag">Stichwörter</a></li>
+	<li><a href="/rezepte/tips-and-tricks">Tipps</a></li>
 	</ul>
 	<UserHeader slot=right_side {user}></UserHeader>
 	<slot></slot>

src/routes/rezepte/+page.svelte

@@ -6,7 +6,7 @@
     	import Search from '$lib/components/Search.svelte';
     	export let data: PageData;
     	export let current_month = new Date().getMonth() + 1
-	const categories = ["Hauptspeise", "Nudel", "Brot", "Dessert", "Suppe", "Beilage", "Salat", "Kuchen", "Frühstück", "Sauce", "Zutat", "Getränk", "Aufstrich", "Guetzli", "Unterwegs"]
+	const categories = ["Hauptspeise", "Nudel", "Brot", "Dessert", "Suppe", "Beilage", "Salat", "Kuchen", "Frühstück", "Sauce", "Zutat", "Getränk", "Aufstrich", "Guetzli", "Snack"]
 </script>
 <style>
 h1{
@@ -36,7 +36,7 @@ h1{
 
 <MediaScroller title="In Saison">
 {#each data.season as recipe}
-	<Card {recipe} {current_month} do_margin_right={true}></Card>
+	<Card {recipe} {current_month} loading_strat={"eager"} do_margin_right={true}></Card>
 {/each}
 </MediaScroller>
 

src/routes/rezepte/[name]/+page.svelte

@@ -185,6 +185,7 @@ h1{
 }
 
 .icon{
+	font-family: "Noto Color Emoji", emoji;
 	position: absolute;
 	top: -1em;
 	right: -0.75em;
@@ -292,7 +293,9 @@ h4{
 			<h4>Saison:</h4>
 			{#each season_iv as season}
 				<a class=tag href="/rezepte/season/{season[0]}">
+					{#if season[0]}
 						{months[season[0] - 1]}
+					{/if}
 					{#if season[1]}
 						- {months[season[1] - 1]}
 					{/if}

src/routes/rezepte/add/+page.svelte

@@ -85,7 +85,7 @@
 		console.log(img_local)
         	const data = {
 			image: img_local,
-			name: short_name,
+			name: short_name.trim(),
 		}
         	await fetch(`/api/rezepte/img/add`, {
         	    method: 'POST',
@@ -108,9 +108,9 @@
 				recipe: {
 					...card_data,
 					...add_info,
-					images: {mediapath: short_name + '.webp', alt: "", caption: ""}, // TODO
+					images: {mediapath: short_name.trim() + '.webp', alt: "", caption: ""}, // TODO
 					season: season_local,
-					short_name,
+					short_name : short_name.trim(),
 					portions: portions_local,
 					datecreated,
 					datemodified,

src/routes/rezepte/edit/[name]/+page.svelte

@@ -10,7 +10,7 @@
     	export let data: PageData;
 	let preamble = data.recipe.preamble
 	let addendum = data.recipe.addendum
-	let image_preview_url="https://bocken.org/static/rezepte/thumb/" + data.recipe.short_name + ".webp"
+	let image_preview_url="https://bocken.org/static/rezepte/thumb/" + data.recipe.short_name + ".webp?v=" + data.recipe.dateModified;
 	let note = data.recipe.note
 
 	import { season } from '$lib/js/season_store';
@@ -160,7 +160,7 @@
 			async function upload_img(){
         			const data = {
 					image: img_local,
-					name: short_name,
+					name: short_name.trim(),
 				}
         			const res = await fetch(`/api/rezepte/img/add`, {
         			    method: 'POST',
@@ -191,7 +191,7 @@
         			    },
 				body: JSON.stringify({
 					old_name: old_short_name,
-					new_name: short_name,
+					new_name: short_name.trim(),
 				})
 			})
 			if(!res_img.ok){
@@ -208,7 +208,7 @@
 					...add_info,
 					images, // TODO
 					season: season_local,
-					short_name,
+					short_name: short_name.trim(),
 					datecreated,
 					portions: portions_local,
 					datemodified,
@@ -228,7 +228,7 @@
 		if(res.ok){
 			const url = location.href.split('/');
 			url.splice(url.length -2, 2);
-			url.push(short_name);
+			url.push(short_name.trim());
 			location.assign(url.join('/'))
 		}
 		else{

src/routes/rezepte/icon/+page.svelte

@@ -10,6 +10,7 @@
 </script>
 <style>
 	a{
+		font-family: "Noto Color Emoji", emoji, sans-serif;
 		--padding: 0.5em;
 		font-size: 3rem;
 		text-decoration: none;

src/routes/rezepte/tips-and-tricks/+page.svelte

@@ -0,0 +1,62 @@
+<script lang="ts">
+	import type { PageData } from './$types';
+    	import AddButton from '$lib/components/AddButton.svelte';
+	import Converter from './Converter.svelte';
+</script>
+<style>
+h1{
+	text-align: center;
+	margin-bottom: 0;
+	font-size: 4rem;
+}
+.subheading{
+	text-align: center;
+	margin-top: 0;
+	font-size: 1.5rem;
+}
+.content{
+	max-width: 800px;
+	margin: 0 auto;
+	background-color: var(--nord0);
+	padding: 1rem;
+	margin-block: 1rem;
+}
+</style>
+<svelte:head>
+	<title>Bocken Rezepte</title>
+	<meta name="description" content="Eine stetig wachsende Ansammlung an Rezepten aus der Bockenschen Küche." />
+	<meta property="og:image" content="https://bocken.org/static/rezepte/thumb/ragu_aus_rindsrippen.webp" />
+	<meta property="og:image:secure_url" content="https://bocken.org/static/rezepte/thumb/ragu_aus_rindsrippen.webp" />
+	<meta property="og:image:type" content="image/webp" />
+	<meta property="og:image:alt" content="Pasta al Ragu mit Linguine" />
+</svelte:head>
+
+<h1>Tipps & Tricks</h1>
+
+<div class=content>
+<h2>Trockenhefe vs. Frischhefe</h2>
+<Converter></Converter>
+<p>
+	Frischhefe ist mit Trockenhefe ersetzbar, jedoch muss man ein paar Kleinigkeiten beachten:
+</p>
+
+<ol>
+	<li>Nur ein Drittel der Menge verwenden.</li>
+	<li>Falls ein kalter Teig zubereitet wird, die Trockenhefe umbedingt zuerst zur Gärprobe in warmer Flüssigkeit (je nach Rezept z.B. Milch oder Wasser) mit einem TL Zucker für ~10 Minuten <q>aufwachen</q> lassen.</li>
+	<li>Generell ist die Meinung das Trockenhefe etwas <q>energischer</q> ist am Anfang der Gärung und etwas langsamer am Ende der Gare. Dementsprechend eventuell die Stock- und Stückgare verkürzen bzw. verlängern.</li>
+</ol>
+</div>
+
+<div class=content>
+<h2>Fensterprobe</h2>
+
+<p>
+	Die Fensterprobe ist eine Methode um den optimalen Knetzustand eines Teiges zu bestimmen.
+	Dazu wird ein kleines, ca. Walnussgrosses Stück Teig zwischen den Fingern auseinandergezogen. Ist der Teig elastisch und reißt nicht bis der Teig so dünn ist, dass man leicht licht durchsehen kann, so ist der Teig optimal verknetet.
+</p>
+<p>
+	Teig lässt sich leichter verkneten wenn er noch trockener ist. Daher lohnt es sich zunächst etwa 10% der Flüssigkeit zurückzuhalten und erst nach und nach zuzugeben nachdem der Teig bereits für einige Minuten geknetet wurde.
+</p>
+</div>
+
+<AddButton></AddButton>

src/routes/rezepte/tips-and-tricks/Converter.svelte

@@ -0,0 +1,68 @@
+<script>
+	class HefeConverter {
+		constructor(trockenhefe = 1) {
+			this._trockenhefe = trockenhefe;
+			this._frischhefe = this._trockenhefe * 3;
+		}
+
+		get trockenhefe() {
+			return Math.round(this._trockenhefe * 100) / 100 + "g";
+		}
+
+		set trockenhefe(value) {
+			this._trockenhefe = value.replace(/\D/g, '');
+			this._frischhefe = this._trockenhefe * 3;
+		}
+
+		get frischhefe() {
+			return this._frischhefe+"g";
+		}
+
+		set frischhefe(value) {
+			this._frischhefe = value.replace(/\D/g, '');
+			this._trockenhefe = this._frischhefe / 3;
+		}
+	}
+
+	const hefeConverter = new HefeConverter();
+
+</script>
+<style>
+	.converter_container {
+		width: fit-content;
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		gap: 2rem;
+		background-color: var(--blue);
+		padding: 2rem;
+		margin-inline: auto;
+		align-items: center;
+	}
+	input {
+		width: 5rem;
+		height: 2rem;
+		font-size: 1rem;
+		text-align: center;
+	}
+	.flex_column {
+		display: flex;
+		flex-direction: column;
+	}
+	label {
+		margin-bottom: 0.25rem;
+	}
+</style>
+<div class=converter_container>
+	<div class="flex_column">
+		<label for="trockenhefe">Trockenhefe</label>
+		<input type="text" bind:value={hefeConverter.trockenhefe} min="0" />
+	</div>
+	<div>
+		=
+	</div>
+	<div class="flex_column">
+		<label for="frischhefe">Frischhefe</label>
+		<input type="text" bind:value={hefeConverter.frischhefe} min="0"/>
+	</div>
+</div>

static/other/jellyfin.css

@@ -3,12 +3,6 @@ This file styles jellyfin and can be imported by adding:
 @import url("https://bocken.org/other/jellyfin.css");
 under Server -> General -> Custom CSS Code
 */
-/* jellyscrub default: width: 15vw, annoying for smaller screen sizes */
-.chapterThumbContainer{
-     width: min(80vw, 500px, 50vh);
-}
-/* Attempt to change accent color */
-
 :root{
 --nord0: #2E3440;
 --blue: #5E81AC;
@@ -86,8 +80,10 @@ border-color: var(--blue);
 .defaultCardBackground3,
 .defaultCardBackground4,
 .defaultCardBackground5,
-.emby-checkbox:checked + span + .checkboxOutline, .itemProgressBarForeground,
-.taskProgressInner
+.emby-checkbox:checked + span + .checkboxOutline,
+.itemProgressBarForeground,
+.taskProgressInner,
+.sliderMarker.watched
 {
     background-color: var(--blue) !important;
 }
@@ -131,6 +127,9 @@ scale: 1.05;
     font-size: initial !important;
 }
 }
-.emby-scroller{
-   overflow: visible !important;
+.backgroundContainer{
+    background-color:  #21201b;
+}
+.pageTitleWithDefaultLogo {
+    background-image: url(https://bocken.org/static/css/logos/logo_text_light.png);
 }

static/robots.txt

@@ -0,0 +1,5 @@
+User-agent: GPTBot
+Disallow: /
+
+User-agent: *
+Disallow: /static/