Big progress! gets data from pocketbase
Some checks failed
Rebuild signaller for deprived.dev to rebuild site / test_service (push) Failing after 0s

This commit is contained in:
BOTAlex 2025-08-14 06:05:23 +02:00
parent dfc823fe1f
commit a4e20f5ff3
13 changed files with 232 additions and 15 deletions

12
.prettierrc Normal file
View file

@ -0,0 +1,12 @@
{
"plugins": ["prettier-plugin-svelte"],
"overrides": [
{
"files": "*.svelte",
"options": {
"parser": "svelte",
"svelteIndentScriptAndStyle": true
}
}
]
}

View file

@ -26,6 +26,12 @@
], ],
"@static/*": [ "@static/*": [
"./static/*" "./static/*"
],
"@ts/*": [
"./src/ts/*"
],
"@stores": [
"./src/ts/store.ts"
] ]
} }
} }

36
package-lock.json generated
View file

@ -11,6 +11,7 @@
"@lucide/svelte": "^0.487.0", "@lucide/svelte": "^0.487.0",
"@tailwindcss/vite": "^4.1.3", "@tailwindcss/vite": "^4.1.3",
"lucide-svelte": "^0.475.0", "lucide-svelte": "^0.475.0",
"pocketbase": "^0.26.2",
"svelte-katex": "^0.1.2", "svelte-katex": "^0.1.2",
"svelte-media-queries": "^1.6.2", "svelte-media-queries": "^1.6.2",
"theme-change": "^2.5.0" "theme-change": "^2.5.0"
@ -23,6 +24,8 @@
"@tailwindcss/typography": "^0.5.15", "@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"daisyui": "^5.0.12", "daisyui": "^5.0.12",
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"sass": "^1.77.4", "sass": "^1.77.4",
"svelte": "^5.25.7", "svelte": "^5.25.7",
"svelte-check": "^3.8.6", "svelte-check": "^3.8.6",
@ -3137,6 +3140,12 @@
"url": "https://github.com/sponsors/jonschlinkert" "url": "https://github.com/sponsors/jonschlinkert"
} }
}, },
"node_modules/pocketbase": {
"version": "0.26.2",
"resolved": "https://registry.npmjs.org/pocketbase/-/pocketbase-0.26.2.tgz",
"integrity": "sha512-WA8EOBc3QnSJh8rJ3iYoi9DmmPOMFIgVfAmIGux7wwruUEIzXgvrO4u0W2htfQjGIcyezJkdZOy5Xmh7SxAftw==",
"license": "MIT"
},
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.6", "version": "8.5.6",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
@ -3183,6 +3192,33 @@
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
"dev": true "dev": true
}, },
"node_modules/prettier": {
"version": "3.6.2",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
"integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
"dev": true,
"license": "MIT",
"bin": {
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/prettier-plugin-svelte": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.4.0.tgz",
"integrity": "sha512-pn1ra/0mPObzqoIQn/vUTR3ZZI6UuZ0sHqMK5x2jMLGrs53h0sXhkVuDcrlssHwIMk7FYrMjHBPoUSyyEEDlBQ==",
"dev": true,
"license": "MIT",
"peerDependencies": {
"prettier": "^3.0.0",
"svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0"
}
},
"node_modules/readdirp": { "node_modules/readdirp": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",

View file

@ -17,6 +17,8 @@
"@tailwindcss/typography": "^0.5.15", "@tailwindcss/typography": "^0.5.15",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"daisyui": "^5.0.12", "daisyui": "^5.0.12",
"prettier": "^3.6.2",
"prettier-plugin-svelte": "^3.4.0",
"sass": "^1.77.4", "sass": "^1.77.4",
"svelte": "^5.25.7", "svelte": "^5.25.7",
"svelte-check": "^3.8.6", "svelte-check": "^3.8.6",
@ -31,6 +33,7 @@
"@lucide/svelte": "^0.487.0", "@lucide/svelte": "^0.487.0",
"@tailwindcss/vite": "^4.1.3", "@tailwindcss/vite": "^4.1.3",
"lucide-svelte": "^0.475.0", "lucide-svelte": "^0.475.0",
"pocketbase": "^0.26.2",
"svelte-katex": "^0.1.2", "svelte-katex": "^0.1.2",
"svelte-media-queries": "^1.6.2", "svelte-media-queries": "^1.6.2",
"theme-change": "^2.5.0" "theme-change": "^2.5.0"

8
pnpm-lock.yaml generated
View file

@ -17,6 +17,9 @@ importers:
lucide-svelte: lucide-svelte:
specifier: ^0.475.0 specifier: ^0.475.0
version: 0.475.0(svelte@5.25.7) version: 0.475.0(svelte@5.25.7)
pocketbase:
specifier: ^0.26.2
version: 0.26.2
svelte-katex: svelte-katex:
specifier: ^0.1.2 specifier: ^0.1.2
version: 0.1.2 version: 0.1.2
@ -1150,6 +1153,9 @@ packages:
resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
engines: {node: '>=12'} engines: {node: '>=12'}
pocketbase@0.26.2:
resolution: {integrity: sha512-WA8EOBc3QnSJh8rJ3iYoi9DmmPOMFIgVfAmIGux7wwruUEIzXgvrO4u0W2htfQjGIcyezJkdZOy5Xmh7SxAftw==}
postcss-selector-parser@6.0.10: postcss-selector-parser@6.0.10:
resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==} resolution: {integrity: sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==}
engines: {node: '>=4'} engines: {node: '>=4'}
@ -2281,6 +2287,8 @@ snapshots:
picomatch@4.0.2: {} picomatch@4.0.2: {}
pocketbase@0.26.2: {}
postcss-selector-parser@6.0.10: postcss-selector-parser@6.0.10:
dependencies: dependencies:
cssesc: 3.0.0 cssesc: 3.0.0

View file

@ -1,14 +1,29 @@
<script> <script lang="ts">
import { onMount } from "svelte";
import ShopItemCard from "./comps/ShopItemCard.svelte"; import ShopItemCard from "./comps/ShopItemCard.svelte";
import { api } from "@stores";
import { ShopItem } from "@src/ts/api/classes/ShopItem";
let allItems: undefined | ShopItem[] = undefined;
onMount(async () => {
allItems = await api.GetAllShopItems();
console.log(allItems);
});
</script> </script>
<div class="p-8 flex w-full justify-center"> <div class="p-8 flex w-full justify-center">
<div class="text-4xl cozette">Items</div> <div class="text-4xl cozette">Items</div>
</div> </div>
<div class="flex w-full justify-center"> <div class="flex w-full justify-center">
<div class="grid grid-cols-2 gap-4"> <div class="grid grid-cols-2 gap-4">
{#each { length: 5 } as _, i} {#if allItems != undefined}
<ShopItemCard/> {#each allItems as item, i}
<ShopItemCard bind:shopItem={item} />
{/each} {/each}
{:else}
<div></div>
{/if}
</div> </div>
</div> </div>

View file

@ -1,14 +1,22 @@
<script> <script lang="ts">
import type { ShopItem } from "@src/ts/api/classes/ShopItem";
export let shopItem: ShopItem;
</script> </script>
<div> <div>
<div class="group relative w-64 h-64 bg-slate-300"> <div class="group relative w-64 h-64 bg-slate-300">
<div class="w-full h-full"> <div class="w-full h-full">
<img class="object-cover w-full h-full peer" src="/images/Zhen/Infomatik/PressurePlate.png" alt=""> <img
class="object-cover w-full h-full peer"
src={shopItem.preview_image}
alt=""
/>
</div> </div>
<div class="absolute hidden group-hover:flex w-full h-full top-0 bg-black opacity-50"> <div
class="absolute hidden group-hover:flex w-full h-full top-0 bg-black opacity-50"
>
Baller Baller
</div> </div>
</div> </div>

View file

@ -26,7 +26,7 @@
afterNavigate(() => { afterNavigate(() => {
const params = new URLSearchParams(window.location.search); const params = new URLSearchParams(window.location.search);
hideOnPrint = params.get("hideOnPrint") === "1"; hideOnPrint = params.get("hideOnPrint") === "1";
console.log(hideOnPrint); // console.log(hideOnPrint);
}); });
import { onMount } from "svelte"; import { onMount } from "svelte";
@ -105,7 +105,8 @@
<a <a
href="/zhen/cv/rev3?hideOnPrint=1" href="/zhen/cv/rev3?hideOnPrint=1"
target="_blank" target="_blank"
style="width: 7.5rem;" class="text-center justify-center">Zhen CV</a style="width: 7.5rem;"
class="text-center justify-center">Zhen CV</a
> >
<!-- <a href="/tools" style="width: 7.5rem;" class="text-center">Tools</a> --> <!-- <a href="/tools" style="width: 7.5rem;" class="text-center">Tools</a> -->
<a href="https://botalex.itch.io/" target="_blank">Games</a> <a href="https://botalex.itch.io/" target="_blank">Games</a>
@ -142,7 +143,11 @@
href="https://botalex.itch.io/" href="https://botalex.itch.io/"
target="_blank">Games</a target="_blank">Games</a
> >
<a href="/zhen/cv/rev3?hideOnPrint=1" target="_blank" class="justify-center">Zhen's CV</a> <a
href="/zhen/cv/rev3?hideOnPrint=1"
target="_blank"
class="justify-center">Zhen's CV</a
>
<!-- <a onclick={resetNavBar} href="/posts">Blog</a> <!-- <a onclick={resetNavBar} href="/posts">Blog</a>
<a onclick={resetNavBar} href="/about">About</a> --> <a onclick={resetNavBar} href="/about">About</a> -->
</div> </div>

57
src/ts/Helper.ts Normal file
View file

@ -0,0 +1,57 @@
import { PUBLIC_URL_BASE } from "$env/static/public";
// Absolute vibe coded. Idk if it works or not. Not important anyways
// Assumes PUBLIC_URL_BASE is something like "https://deprived.dev"
const ABSOLUTE_RE = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//;
function withTrailingSlash(s: string): string {
return s.replace(/\/+$/, "") + "/";
}
export function ParseAssetUrl(url: string, base?: string): string {
// Handle empty/undefined url: if a base is given, return the base itself
if (!url) {
const origin =
(typeof PUBLIC_URL_BASE !== "undefined" && PUBLIC_URL_BASE) || "";
if (!base) return ""; // no filename, no base → nothing to resolve
try {
// Make base absolute
const absoluteBase = ABSOLUTE_RE.test(base)
? withTrailingSlash(base)
: new URL(withTrailingSlash(base), withTrailingSlash(origin)).href;
return absoluteBase; // e.g. "https://deprived.dev/assets/shop/preview-images/"
} catch {
return "";
}
}
// Already absolute
if (ABSOLUTE_RE.test(url)) {
try {
return new URL(url).href;
} catch {
return url;
}
}
const origin =
(typeof PUBLIC_URL_BASE !== "undefined" && PUBLIC_URL_BASE) || "";
let absoluteBase = "";
try {
if (base) {
absoluteBase = ABSOLUTE_RE.test(base)
? withTrailingSlash(base)
: new URL(withTrailingSlash(base), withTrailingSlash(origin)).href;
} else {
if (!origin) return url;
absoluteBase = withTrailingSlash(origin);
}
return new URL(url, absoluteBase).href;
} catch {
return url;
}
}

18
src/ts/api/api.ts Normal file
View file

@ -0,0 +1,18 @@
// This files is meant for interaction with pocketbase. I might split this into multiple files later
// It is meant to be called from stores.ts
import PocketBase from "pocketbase";
import { ShopItem } from "./classes/ShopItem";
import { PUBLIC_POCKET_URL, PUBLIC_ASSETS_URL_BASE } from "$env/static/public";
export let pb = new PocketBase(PUBLIC_POCKET_URL);
console.log(PUBLIC_POCKET_URL);
export class ApiService {
// read function name
static async GetAllShopItems(): Promise<ShopItem[]> {
const list = await pb.collection("shopItems").getList(1, 50, {});
return list.items.map((rec: any) => ShopItem.fromJSON(rec));
}
}

View file

@ -0,0 +1,46 @@
import { PUBLIC_POCKET_URL, PUBLIC_URL_BASE } from "$env/static/public";
import { ParseAssetUrl } from "@src/ts/Helper";
export class ShopItem {
item_name: string;
preview_image: string;
page_url: string; // the url used for the item
images_root: string; // might not be optimal to include this, in the same class, but should be fine, for now at least
category: string[];
sold_quantity: number;
stock: number;
unlisted: boolean;
constructor(
item_name: string,
preview_image: string,
redirect: string,
images_root: string,
category: string[],
sold_quantity: number,
stock: number,
unlisted: boolean,
) {
this.item_name = item_name;
this.preview_image = preview_image;
this.page_url = redirect;
this.images_root = images_root;
this.category = category;
this.sold_quantity = sold_quantity;
this.stock = stock;
this.unlisted = unlisted;
}
static fromJSON(json: any): ShopItem {
return new ShopItem(
json.item_name,
ParseAssetUrl(json.preview_image, "/assets/shop/preview-images"),
json.page_url,
ParseAssetUrl(json.images_root, "/assets/shop/" + json.item_name + "/"), // Please use better paths
json.category,
json.sold_quantity,
json.stock,
json.unlisted,
);
}
}

View file

@ -1,2 +1,3 @@
import PocketBase from "pocketbase"; import { ApiService } from "./api/api";
export let pb = new PocketBase("https://pocket.deprived.dev");
export let api = ApiService;

View file

@ -24,7 +24,9 @@ export default defineConfig({
"@src": path.resolve("./src"), "@src": path.resolve("./src"),
"@static": path.resolve("./static"), "@static": path.resolve("./static"),
"@pages": path.resolve("./src/pages"), "@pages": path.resolve("./src/pages"),
"@ts": path.resolve("./src/ts"),
"@shop": path.resolve("./src/pages/shop"), "@shop": path.resolve("./src/pages/shop"),
"@stores": path.resolve("./src/ts/store.ts"),
}, },
}, },
server: { server: {