diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 5ca6bd1..0e675f0 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -4,7 +4,7 @@ import fly from "@e/fly"; import MediaQuery from "svelte-media-queries"; import Dices from "@lucide/svelte/icons/dices"; - import { re } from "@ts/Redaction/Redactor"; + import re from "@ts/Redaction/Redactor"; let hideOnPrint: boolean = $state(false); let { children } = $props(); @@ -115,16 +115,14 @@
- - - {@render SwitchThemeButton()} Zhen CV{$re?.nick ?? "Alex"}'s CV Games diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 3304501..f92d9cd 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -28,8 +28,9 @@ // import NameAndTag from "./comps/NameAndTag.svelte"; import Profile from "./comps/Profile.svelte"; import DeprivedTrackerSection from "./comps/DeprivedTrackerSection.svelte"; + import re from "@src/ts/Redaction/Redactor"; - const mobileThreshold: string = "600px"; // was 1000px. zhen testing + const mobileThreshold: string = "600px"; // was 1000px. let mobile: boolean; let debug = false; @@ -102,14 +103,15 @@ class="grid max-lg:grid-cols-1 sm:grid-cols-2 gap-4 p-4 max-lg:px-0 w-full" >

- Hi, I am Alex/Zhen, {@html !mobile ? "" : "
"} I'm that chinese - guy. + Hi, I am {$re?.nick ? $re?.nick + "/Alex" : "Alex"}, {@html !mobile + ? "" + : "
"} I'm that chinese guy.

Here's my CV:

-
diff --git a/src/routes/comps/Zooter.svelte b/src/routes/comps/Zooter.svelte index ecead51..5d2bda9 100644 --- a/src/routes/comps/Zooter.svelte +++ b/src/routes/comps/Zooter.svelte @@ -4,6 +4,7 @@ import onDestroy from "@e/onDestroy"; import ArrowBigDown from "lucide-svelte/icons/arrow-big-down"; import fly from "@e/fly"; + import re from "@ts/Redaction/Redactor"; const buildTime = __BUILD_TIME__; let scrollY = 0; @@ -156,16 +157,16 @@ />
- - + --> + + + + + + + + +

About this website

@@ -221,7 +222,9 @@

Contact

- zhen@deprived.dev + {$re?.email ?? "alex@deprived.dev"}
{ public unredactedProfile: Profile | undefined = undefined; + private subs = new Set>(); + subscribe(run: Subscriber): Unsubscriber { + this.subs.add(run); + run(this.unredactedProfile); + return () => this.subs.delete(run); + } + private notify() { + this.subs.forEach((s) => s(this.unredactedProfile)); + } + async TryGetUnredacter(): Promise { - if (!!this.unredactedProfile) return this.unredactedProfile; + if (this.unredactedProfile) return this.unredactedProfile; const storedKey = localStorage.getItem("key"); if (!storedKey) throw new Error("Missing key"); - let jsonKey = JSON.stringify({ key: storedKey }); - console.log("Requesting unredactor.json with: " + jsonKey); - const hashResJson = await ( await fetch("https://api.deprived.dev/unredact", { method: "POST", headers: { "Content-Type": "application/json" }, - body: jsonKey, + body: JSON.stringify({ key: storedKey }), }) ).json(); const unredactHash = hashResJson.response; - console.log('Trying unredact hash: "' + unredactHash + '"'); - initEnv(); - const url = `${env.POCKETBASE_URL}/api/files/redacted_content/${unredactHash}/redacted_cv_info_ha08bbn520.json`; + const url = `${env.POCKETBASE_URL}/api/files/redacted_content/${unredactHash}/redacted_cv_info_amhz90nhr7.json`; const res = await fetch(url, { method: "GET", headers: { Accept: "application/json" }, }); - if (!res.ok) throw new Error(`HTTP ${res.status}`); + const data = await res.json(); - return parseProfile(data); + this.unredactedProfile = parseProfile(data); + this.notify(); // <-- tell Svelte to update + return this.unredactedProfile; } - async t(unredactPath: string, fallback: string): Promise { + t(path: string, fallback: string): string { try { - if (!this.unredactedProfile) await this.TryGetUnredacter(); - const src = this.unredactedProfile ?? {}; - - // safe dot-path lookup - const value = unredactPath.split(".").reduce((o, k) => o?.[k], src); - - return (value ?? "") !== "" ? String(value) : fallback; + const src = this.unredactedProfile as Record | undefined; + if (!src) return fallback; + const v = path.split(".").reduce((o, k) => (o as any)?.[k], src); + return (v ?? "") !== "" ? String(v) : fallback; } catch { return fallback; } } } -export let re = new Redactor(); +export const re = new Redactor(); +export default re;