Adds scenes

This commit is contained in:
2025-05-31 18:11:26 -07:00
parent 2c01a80604
commit 0ed2066b17
10 changed files with 230 additions and 54 deletions

15
package-lock.json generated
View File

@@ -12,6 +12,7 @@
"@tanstack/react-router": "^1.114.3", "@tanstack/react-router": "^1.114.3",
"@tanstack/react-router-devtools": "^1.114.3", "@tanstack/react-router-devtools": "^1.114.3",
"@tanstack/router-plugin": "^1.114.3", "@tanstack/router-plugin": "^1.114.3",
"lodash": "^4.17.21",
"pocketbase": "^0.26.0", "pocketbase": "^0.26.0",
"react": "^19.0.0", "react": "^19.0.0",
"react-dom": "^19.0.0", "react-dom": "^19.0.0",
@@ -20,6 +21,7 @@
"devDependencies": { "devDependencies": {
"@testing-library/dom": "^10.4.0", "@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.2.0", "@testing-library/react": "^16.2.0",
"@types/lodash": "^4.17.17",
"@types/react": "^19.0.8", "@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3", "@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-react": "^4.3.4",
@@ -2047,6 +2049,13 @@
"integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@types/lodash": {
"version": "4.17.17",
"resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.17.tgz",
"integrity": "sha512-RRVJ+J3J+WmyOTqnz3PiBLA501eKwXl2noseKOrNo/6+XEHjTAxO4xHvxQB6QuNm+s4WRbn6rSiap8+EA+ykFQ==",
"dev": true,
"license": "MIT"
},
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "19.1.5", "version": "19.1.5",
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.5.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.5.tgz",
@@ -3215,6 +3224,12 @@
"url": "https://opencollective.com/parcel" "url": "https://opencollective.com/parcel"
} }
}, },
"node_modules/lodash": {
"version": "4.17.21",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"license": "MIT"
},
"node_modules/loupe": { "node_modules/loupe": {
"version": "3.1.3", "version": "3.1.3",
"resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",

View File

@@ -19,6 +19,7 @@
"@tanstack/react-router": "^1.114.3", "@tanstack/react-router": "^1.114.3",
"@tanstack/react-router-devtools": "^1.114.3", "@tanstack/react-router-devtools": "^1.114.3",
"@tanstack/router-plugin": "^1.114.3", "@tanstack/router-plugin": "^1.114.3",
"lodash": "^4.17.21",
"pocketbase": "^0.26.0", "pocketbase": "^0.26.0",
"react": "^19.0.0", "react": "^19.0.0",
"react-dom": "^19.0.0", "react-dom": "^19.0.0",
@@ -27,6 +28,7 @@
"devDependencies": { "devDependencies": {
"@testing-library/dom": "^10.4.0", "@testing-library/dom": "^10.4.0",
"@testing-library/react": "^16.2.0", "@testing-library/react": "^16.2.0",
"@types/lodash": "^4.17.17",
"@types/react": "^19.0.8", "@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3", "@types/react-dom": "^19.0.3",
"@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-react": "^4.3.4",

View File

@@ -0,0 +1,45 @@
/// <reference path="../pb_data/types.d.ts" />
migrate((app) => {
const collection = app.findCollectionByNameOrId("pbc_617371094")
// update field
collection.fields.addAt(3, new Field({
"hidden": false,
"id": "select2363381545",
"maxSelect": 1,
"name": "type",
"presentable": false,
"required": false,
"system": false,
"type": "select",
"values": [
"discoveredIn",
"secrets",
"treasures",
"scenes"
]
}))
return app.save(collection)
}, (app) => {
const collection = app.findCollectionByNameOrId("pbc_617371094")
// update field
collection.fields.addAt(3, new Field({
"hidden": false,
"id": "select2363381545",
"maxSelect": 1,
"name": "type",
"presentable": false,
"required": false,
"system": false,
"type": "select",
"values": [
"discoveredIn",
"secrets",
"treasures"
]
}))
return app.save(collection)
})

View File

@@ -1,13 +1,14 @@
import { useEffect, useState } from "react"; import { DocumentList } from "@/components/DocumentList";
import { pb } from "@/lib/pocketbase"; import { pb } from "@/lib/pocketbase";
import type { Document, RelationshipType } from "@/lib/types"; import type { Document, RelationshipType } from "@/lib/types";
import { DocumentList } from "@/components/DocumentList"; import { useState } from "react";
import { Loader } from "./Loader"; import { Loader } from "./Loader";
import { DocumentRow } from "./documents/DocumentRow";
import { DocumentForm } from "./documents/DocumentForm"; import { DocumentForm } from "./documents/DocumentForm";
import { DocumentRow } from "./documents/DocumentRow";
interface RelationshipListProps { interface RelationshipListProps {
root: Document; root: Document;
items: Document[];
relationshipType: RelationshipType; relationshipType: RelationshipType;
} }
@@ -17,50 +18,13 @@ interface RelationshipListProps {
*/ */
export function RelationshipList({ export function RelationshipList({
root, root,
items: initialItems,
relationshipType, relationshipType,
}: RelationshipListProps) { }: RelationshipListProps) {
const [items, setItems] = useState<Document[]>([]); const [items, setItems] = useState<Document[]>(initialItems);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null); const [error, setError] = useState<string | null>(null);
// Fetch related documents on mount or when root/relationshipType changes
useEffect(() => {
let cancelled = false;
async function fetchRelated() {
setLoading(true);
setError(null);
try {
const relationships = await pb
.collection("relationships")
.getList(1, 1, {
filter: `primary = "${root.id}" && type = "${relationshipType}"`,
});
const secondaryIds =
relationships.items.length > 0
? relationships.items[0].secondary
: [];
let docs: Document[] = [];
if (Array.isArray(secondaryIds) && secondaryIds.length > 0) {
docs = (await pb.collection("documents").getFullList({
filter: secondaryIds
.map((id: string) => `id = "${id}"`)
.join(" || "),
})) as Document[];
}
if (!cancelled) setItems(docs);
} catch (e: any) {
if (!cancelled)
setError(e?.message || "Failed to load related documents.");
} finally {
if (!cancelled) setLoading(false);
}
}
fetchRelated();
return () => {
cancelled = true;
};
}, [root.id, relationshipType]);
// Handles creation of a new document and adds it to the relationship // Handles creation of a new document and adds it to the relationship
const handleCreate = async (doc: Document) => { const handleCreate = async (doc: Document) => {
setLoading(true); setLoading(true);

View File

@@ -1,6 +1,7 @@
import { RelationshipType, type CampaignId, type Document } from "@/lib/types"; import { RelationshipType, type CampaignId, type Document } from "@/lib/types";
import { SecretForm } from "./secret/SecretForm"; import { SecretForm } from "./secret/SecretForm";
import { TreasureForm } from "./treasure/TreasureForm"; import { TreasureForm } from "./treasure/TreasureForm";
import { SceneForm } from "./scene/SceneForm";
function assertUnreachable(_x: never): never { function assertUnreachable(_x: never): never {
throw new Error("DocumentForm switch is not exhaustive"); throw new Error("DocumentForm switch is not exhaustive");
@@ -25,6 +26,8 @@ export const DocumentForm = ({
return "Form not supported here"; return "Form not supported here";
case RelationshipType.Treasures: case RelationshipType.Treasures:
return <TreasureForm campaign={campaignId} onCreate={onCreate} />; return <TreasureForm campaign={campaignId} onCreate={onCreate} />;
case RelationshipType.Scenes:
return <SceneForm campaign={campaignId} onCreate={onCreate} />;
} }
return assertUnreachable(relationshipType); return assertUnreachable(relationshipType);

View File

@@ -3,6 +3,7 @@
import { SessionRow } from "@/components/documents/session/SessionRow"; import { SessionRow } from "@/components/documents/session/SessionRow";
import { SecretRow } from "@/components/documents/secret/SecretRow"; import { SecretRow } from "@/components/documents/secret/SecretRow";
import { import {
isScene,
isSecret, isSecret,
isSession, isSession,
isTreasure, isTreasure,
@@ -10,6 +11,7 @@ import {
type Session, type Session,
} from "@/lib/types"; } from "@/lib/types";
import { TreasureRow } from "./treasure/TreasureRow"; import { TreasureRow } from "./treasure/TreasureRow";
import { SceneRow } from "./scene/SceneRow";
/** /**
* Renders a row for any document type. Prioritizes Session, then Secret, then falls back to ID and creation time. * Renders a row for any document type. Prioritizes Session, then Secret, then falls back to ID and creation time.
@@ -29,6 +31,11 @@ export const DocumentRow = ({
if (isSecret(document)) { if (isSecret(document)) {
return <SecretRow secret={document} session={session} />; return <SecretRow secret={document} session={session} />;
} }
if (isScene(document)) {
return <SceneRow scene={document} />;
}
if (isTreasure(document)) { if (isTreasure(document)) {
return <TreasureRow treasure={document} session={session} />; return <TreasureRow treasure={document} session={session} />;
} }

View File

@@ -0,0 +1,66 @@
// SceneForm.tsx
// Form for adding a new scene to a session.
import { useState } from "react";
import type { CampaignId, Scene } from "@/lib/types";
import { pb } from "@/lib/pocketbase";
/**
* Renders a form to add a new scene. Calls onCreate with the new scene document.
*/
export const SceneForm = ({
campaign,
onCreate,
}: {
campaign: CampaignId;
onCreate: (scene: Scene) => Promise<void>;
}) => {
const [text, setText] = useState("");
const [adding, setAdding] = useState(false);
const [error, setError] = useState<string | null>(null);
async function handleSubmit(e: React.FormEvent) {
e.preventDefault();
if (!text.trim()) return;
setAdding(true);
setError(null);
try {
const sceneDoc: Scene = await pb.collection("documents").create({
campaign,
data: {
scene: {
text,
},
},
});
setText("");
await onCreate(sceneDoc);
} catch (e: any) {
setError(e?.message || "Failed to add scene.");
} finally {
setAdding(false);
}
}
return (
<form className="flex items-center gap-2 mt-4" onSubmit={handleSubmit}>
<h3>Create new scene</h3>
<input
type="text"
className="flex-1 px-3 py-2 rounded bg-slate-800 text-slate-100 border border-slate-700 focus:outline-none focus:ring-2 focus:ring-violet-500"
placeholder="Add a new scene..."
value={text}
onChange={(e) => setText(e.target.value)}
disabled={adding}
aria-label="Add new scene"
/>
{error && <div className="text-red-400 mt-2 text-sm">{error}</div>}
<button
type="submit"
className="px-4 py-2 rounded bg-emerald-600 hover:bg-emerald-700 text-white font-semibold transition-colors disabled:opacity-60"
disabled={adding || !text.trim()}
>
{adding ? "Adding..." : "Create"}
</button>
</form>
);
};

View File

@@ -0,0 +1,25 @@
import { AutoSaveTextarea } from "@/components/AutoSaveTextarea";
import { pb } from "@/lib/pocketbase";
import type { Scene } from "@/lib/types";
/**
* Renders an editable scene row
*/
export const SceneRow = ({ scene }: { scene: Scene }) => {
async function saveScene(text: string) {
await pb.collection("documents").update(scene.id, {
data: {
...scene.data,
scene: {
text,
},
},
});
}
return (
<div className="">
<AutoSaveTextarea value={scene.data.scene.text} onSave={saveScene} />
</div>
);
};

View File

@@ -19,8 +19,9 @@ export type Campaign = RecordModel & {
******************************************/ ******************************************/
export const RelationshipType = { export const RelationshipType = {
Secrets: "secrets",
DiscoveredIn: "discoveredIn", DiscoveredIn: "discoveredIn",
Scenes: "scenes",
Secrets: "secrets",
Treasures: "treasures", Treasures: "treasures",
} as const; } as const;
@@ -50,6 +51,8 @@ export type Document = RecordModel & {
updated: ISO8601Date; updated: ISO8601Date;
}; };
/** Session **/
export type Session = Document & export type Session = Document &
DocumentData< DocumentData<
"session", "session",
@@ -62,6 +65,22 @@ export function isSession(doc: Document): doc is Session {
return Object.hasOwn(doc.data, "session"); return Object.hasOwn(doc.data, "session");
} }
/** Scene **/
export type Scene = Document &
DocumentData<
"scene",
{
text: string;
}
>;
export function isScene(doc: Document): doc is Scene {
return Object.hasOwn(doc.data, "scene");
}
/** Secret **/
export type Secret = Document & export type Secret = Document &
DocumentData< DocumentData<
"secret", "secret",
@@ -75,6 +94,8 @@ export function isSecret(doc: Document): doc is Secret {
return Object.hasOwn(doc.data, "secret"); return Object.hasOwn(doc.data, "secret");
} }
/** Treasure **/
export type Treasure = Document & export type Treasure = Document &
DocumentData< DocumentData<
"treasure", "treasure",

View File

@@ -1,19 +1,41 @@
import _ from "lodash";
import { createFileRoute } from "@tanstack/react-router"; import { createFileRoute } from "@tanstack/react-router";
import { pb } from "@/lib/pocketbase"; import { pb } from "@/lib/pocketbase";
import { RelationshipType, type Session } from "@/lib/types"; import {
RelationshipType,
type Relationship,
type Session,
type Document,
} from "@/lib/types";
import { RelationshipList } from "@/components/RelationshipList"; import { RelationshipList } from "@/components/RelationshipList";
import { SessionForm } from "@/components/documents/session/SessionForm"; import { SessionForm } from "@/components/documents/session/SessionForm";
export const Route = createFileRoute("/_authenticated/document/$documentId")({ export const Route = createFileRoute("/_authenticated/document/$documentId")({
loader: async ({ params }) => { loader: async ({ params }) => {
const doc = await pb.collection("documents").getOne(params.documentId); const doc = await pb.collection("documents").getOne(params.documentId);
return { document: doc }; const relationships: Relationship[] = await pb
.collection("relationships")
.getFullList({
filter: `primary = "${params.documentId}"`,
expand: "secondary",
});
console.log("Fetched data: ", relationships);
return {
document: doc,
relationships: _.mapValues(
_.groupBy(relationships, (r) => r.type),
(rs: Relationship[]) => rs.flatMap((r) => r.expand?.secondary),
),
};
}, },
component: RouteComponent, component: RouteComponent,
}); });
function RouteComponent() { function RouteComponent() {
const { document: session }: { document: Session } = Route.useLoaderData(); const { document: session, relationships } = Route.useLoaderData() as {
document: Session;
relationships: Record<RelationshipType, Document[]>;
};
async function handleSaveSession(data: Session["data"]) { async function handleSaveSession(data: Session["data"]) {
await pb.collection("documents").update(session.id, { await pb.collection("documents").update(session.id, {
@@ -21,17 +43,23 @@ function RouteComponent() {
}); });
} }
console.log("Parsed data: ", relationships);
return ( return (
<div className="max-w-xl mx-auto py-8"> <div className="max-w-xl mx-auto py-8">
<SessionForm session={session as Session} onSubmit={handleSaveSession} /> <SessionForm session={session as Session} onSubmit={handleSaveSession} />
{[
RelationshipType.Scenes,
RelationshipType.Secrets,
RelationshipType.Treasures,
].map((relationshipType) => (
<RelationshipList <RelationshipList
key={relationshipType}
root={session} root={session}
relationshipType={RelationshipType.Secrets} relationshipType={relationshipType}
/> items={relationships[relationshipType] ?? []}
<RelationshipList
root={session}
relationshipType={RelationshipType.Treasures}
/> />
))}
</div> </div>
); );
} }