Merge pull request #453 from tp-link-extender/main

Merge main into ledgertests

Author: Heliodex

Site/bun.lock

@@ -15,36 +15,39 @@
 		"logs": "bun x pm2 logs"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "^2.4.10",
-		"@types/bun": "^1.3.11",
+		"@biomejs/biome": "^2.4.15",
+		"@types/bun": "^1.3.14",
 		"@types/d3-interpolate": "^3.0.4",
 		"@types/nodemailer": "^8.0.0",
 		"@types/nprogress": "^0.2.3",
-		"svelte-check": "^4.4.6",
+		"svelte-check": "^4.4.8",
 		"vite-plugin-devtools-json": "^1.0.0"
 	},
 	"type": "module",
 	"dependencies": {
 		"@sveltejs/adapter-node": "^5.5.4",
-		"@sveltejs/kit": "^2.55.0",
-		"@sveltejs/vite-plugin-svelte": "^7.0.0",
-		"@unocss/extractor-svelte": "^66.6.7",
-		"@unocss/preset-tagify": "^66.6.7",
-		"@unocss/transformer-directives": "^66.6.7",
-		"@unocss/transformer-variant-group": "^66.6.7",
+		"@sveltejs/kit": "^2.60.1",
+		"@sveltejs/vite-plugin-svelte": "^7.1.2",
+		"@threlte/core": "^8.5.14",
+		"@threlte/extras": "^9.19.0",
+		"@unocss/extractor-svelte": "^66.6.8",
+		"@unocss/preset-tagify": "^66.6.8",
+		"@unocss/transformer-directives": "^66.6.8",
+		"@unocss/transformer-variant-group": "^66.6.8",
 		"arktype": "^2.2.0",
 		"d3-interpolate": "^3.0.1",
 		"melt": "^0.44.0",
-		"nodemailer": "^8.0.4",
+		"nodemailer": "^8.0.7",
 		"nprogress": "^0.2.0",
 		"picocolors": "^1.1.1",
 		"sharp": "^0.34.5",
 		"surrealdb": "^2.0.3",
-		"svelte": "^5.55.1",
+		"svelte": "^5.55.8",
+		"svelte-inview": "^4.0.4",
 		"sveltekit-superforms": "^2.30.1",
-		"typescript": "^6.0.2",
-		"unocss": "^66.6.7",
-		"vite": "^8.0.3"
+		"typescript": "^6.0.3",
+		"unocss": "^66.6.8",
+		"vite": "^8.0.13"
 	},
 	"trustedDependencies": [
 		"@biomejs/biome",

Site/package.json

@@ -25,7 +25,8 @@
 			{/if}
 		</div>
 		<div class="sm:text-right <sm:pt-4">
-			<div class="flex <sm:flex-col sm:gap-3 justify-end pb-2">
+			<div class="flex <sm:flex-col sm:gap-4 justify-end pb-2">
+				<a class="light-text" href="/about">About</a>
 				{#if data.user && data.pages.includes("Statistics")}
 					<a class="light-text" href="/statistics">Statistics</a>
 				{/if}

Site/src/components/Footer.svelte

@@ -1,4 +1,4 @@
-import sharp, { type ResizeOptions } from "sharp"
+import sharp from "sharp"
 
 /**
  * Creates an image asset based off a file object
@@ -10,19 +10,17 @@ import sharp, { type ResizeOptions } from "sharp"
  * const id = // Load from database
  * save(id)
  */
-export async function imageAsset(file: File, sharpOptions?: ResizeOptions) {
-	const { buffer } = await sharp(await file.arrayBuffer())
-		.resize(256, 256, {
-			fit: "contain",
-			...sharpOptions,
-		})
-		.png()
-		.toBuffer()
-		.catch(() => {
-			throw new Error("Image asset failed to upload")
-		})
-
-	return (id: number) => Bun.write(`../data/assets/${id}`, buffer)
+export async function imageAsset(file: File) {
+	try {
+		const img = new Bun.Image(file)
+			.resize(256, 256, { fit: "inside" })
+			.png()
+		return (id: number) => img.write(`../data/assets/${id}`)
+	} catch (err) {
+		const e = err as Error
+		console.error(e)
+		throw new Error("Image asset failed to upload")
+	}
 }
 
 /**
@@ -35,19 +33,15 @@ export async function imageAsset(file: File, sharpOptions?: ResizeOptions) {
  * const id = // Load from database
  * save(id)
  */
-export async function clothingAsset(file: File, sharpOptions?: ResizeOptions) {
-	const { buffer } = await sharp(await file.arrayBuffer())
-		.resize(585, 559, {
-			fit: "fill",
-			...sharpOptions,
-		})
-		.png()
-		.toBuffer()
-		.catch(() => {
-			throw new Error("Image asset failed to upload")
-		})
-
-	return (id: number) => Bun.write(`../data/assets/${id}`, buffer)
+export async function clothingAsset(file: File) {
+	try {
+		const img = new Bun.Image(file).resize(585, 559, { fit: "fill" }).png()
+		return (id: number) => img.write(`../data/assets/${id}`)
+	} catch (err) {
+		const e = err as Error
+		console.error(e)
+		throw new Error("Clothing asset failed to upload")
+	}
 }
 
 /**
@@ -60,19 +54,15 @@ export async function clothingAsset(file: File, sharpOptions?: ResizeOptions) {
  * const id = // Load from database
  * save(id)
  */
-export async function thumbnail(b: ArrayBuffer, sharpOptions?: ResizeOptions) {
-	const { buffer } = await sharp(b)
-		.resize(420, 420, {
-			fit: "fill",
-			...sharpOptions,
-		})
-		.webp() // sorry avif, but webp is just magic (just here)
-		.toBuffer()
-		.catch(() => {
-			throw new Error("Thumbnail failed to upload")
-		})
-
-	return (id: number) => Bun.write(`../data/thumbnails/${id}`, buffer)
+export async function thumbnail(b: ArrayBuffer) {
+	try {
+		const img = new Bun.Image(b).resize(420, 420, { fit: "fill" }).webp()
+		return (id: number) => img.write(`../data/thumbnails/${id}`)
+	} catch (err) {
+		const e = err as Error
+		console.error(e)
+		throw new Error("Thumbnail failed to upload")
+	}
 }
 
 const tShirtOpts = Object.freeze({