Landing page redacted!

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 @@
             </a>
             <div class="nav-spacer" />
 
-            <!-- <a href="/">Home</a> -->
-            <!-- <a href="/zhen/notes/physics/1?hideOnPrint=1" target="_blank" style="width: 7.5rem;">Notes</a> -->
-
             {@render SwitchThemeButton()}
 
             <a
               href="/cv?hideOnPrint=1"
               target="_blank"
               style="width: 7.5rem;"
-              class="text-center justify-center">Zhen CV</a
+              class="text-center justify-center text-md"
+              >{$re?.nick ?? "Alex"}'s CV</a
             >
             <!-- <a href="/tools" style="width: 7.5rem;" class="text-center">Tools</a> -->
             <a href="https://botalex.itch.io/" target="_blank">Games</a>

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"
       >
         <Profile
-          name="Zhen / Alex"
+          name={$re?.nick ? $re?.nick + "/Alex" : "Alex"}
           tags={["Programmer", "3D artist", "UX Designer"]}
           isMobile={mobile}
         >
           <span>
             <p>
-              Hi, I am Alex/Zhen, {@html !mobile ? "" : "<br/>"} I'm that chinese
-              guy.
+              Hi, I am {$re?.nick ? $re?.nick + "/Alex" : "Alex"}, {@html !mobile
+                ? ""
+                : "<br/>"} I'm that chinese guy.
             </p>
             <p>
               Here's my CV: <a href="/cv?hideOnPrint=1" style="color:lightblue;"
@@ -203,7 +205,6 @@
   </div>
 
   <div class="py-4"></div>
-
   <div
     class="grid place-content-center place-items-center pointer-events-auto font-mono"
   >

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 @@
 />
 
 <div class="{hideOnPrint ? 'hide-on-print' : ''} w-full">
-  <!-- Keep scrolling thing -->
-  <div class="hidden h-64 w-full flex flex-col justify-center items-center">
-    <div>Keep scrolling to veiw Zhen's portfolio site!</div>
-    <div class="flex justify-center">
-      <ArrowBigDown />
-      <ArrowBigDown />
-      <ArrowBigDown />
-      <ArrowBigDown />
-    </div>
-  </div>
+  <!-- <!-- Keep scrolling thing --> -->
+  <!-- <div class="hidden h-64 w-full flex flex-col justify-center items-center"> -->
+  <!--   <div>Keep scrolling to veiw [Redacted]'s portfolio site!</div> -->
+  <!--   <div class="flex justify-center"> -->
+  <!--     <ArrowBigDown /> -->
+  <!--     <ArrowBigDown /> -->
+  <!--     <ArrowBigDown /> -->
+  <!--     <ArrowBigDown /> -->
+  <!--   </div> -->
+  <!-- </div> -->
 
   <div
     class="hidden h-64 w-full flex flex-col justify-end items-center"
@@ -193,7 +194,7 @@
           <br />
           <span>Snorre Ettrup Altschul</span>
           <br />
-          <span>Zhentao Wei</span>
+          <span>{$re?.name ?? "BOT Alex"}</span>
         </div>
         <div class="flex flex-col items-center">
           <h3><b>About this website</b></h3>
@@ -221,7 +222,9 @@
         </div>
         <div class="flex flex-col items-center">
           <h3><b>Contact</b></h3>
-          <a href="mailto:zhen@deprived.dev">zhen@deprived.dev</a>
+          <a href="mailto:{$re?.email ?? 'Alex@deprived.dev'}"
+            >{$re?.email ?? "alex@deprived.dev"}</a
+          >
           <div class="mt-2"></div>
           <a
             href="https://discord.gg/awatEEqc3M"

src/ts/Redaction/Profile.ts

@@ -19,6 +19,7 @@ const EducationLoose = z.object({
 
 const ProfileSchema = z.object({
   name: z.string().min(1),
+  nick: z.string().min(1),
   shortProfileHiddenContent: z.array(z.string()),
   email: z.string().email(),
   phone: z.string().min(1),

src/ts/Redaction/Redactor.ts

@@ -1,56 +1,62 @@
+// redactor.ts
 import { parseProfile, type Profile } from "./Profile";
-import env from "@ts/EnvHandler";
-import { initEnv } from "@ts/EnvHandler";
+import env, { initEnv } from "@ts/EnvHandler";
+import type { Readable, Subscriber, Unsubscriber } from "svelte/store";
 
-class Redactor {
+class Redactor implements Readable<Profile | undefined> {
   public unredactedProfile: Profile | undefined = undefined;
 
+  private subs = new Set<Subscriber<Profile | undefined>>();
+  subscribe(run: Subscriber<Profile | undefined>): 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<Profile> {
-    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<string> {
+  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<any>((o, k) => o?.[k], src);
-
-      return (value ?? "") !== "" ? String(value) : fallback;
+      const src = this.unredactedProfile as Record<string, unknown> | undefined;
+      if (!src) return fallback;
+      const v = path.split(".").reduce<any>((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;