toast messages

upgrades prisma, adds jotai
new tags, migration
2024-08-15 04:11:57 -06:00 · 2024-08-15 04:11:42 -06:00 · 2024-08-15 04:11:20 -06:00
14 changed files with 514 additions and 156 deletions
--- a/app/client.tsx
+++ b/app/client.tsx
@ -1,16 +1,21 @@
 "use client";

+import { useToast } from "@/components/toast";
 import { TTCMD } from "@/components/ttcmd";
+import { useEffect } from "react";
 import { FC, use } from "react";

 export const HomeClient: FC<{ body: Promise<string> }> = ({ body }) => {
  const text = use(body);

-  return (
-    <TTCMD
-      body={text}
-      parserId="home"
-      title="home"
-    />
-  );
+  const { createToast } = useToast();
+  useEffect(() => {
+    createToast({
+      fading: false,
+      msg: "TEST TOAST",
+      type: "error",
+    });
+  }, [createToast]);
+
+  return <TTCMD body={text} parserId="home" title="home" />;
 };
--- a/app/globals.css
+++ b/app/globals.css
@ -93,6 +93,12 @@
  }
 }

+@layer utilities {
+  .fade-toast {
+    animation: fadeOut 300ms forwards;
+  }
+}
+
@keyframes identifier {
 }

@ -102,3 +108,12 @@
    list-style: square;
  }
 }
+
+@keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
--- a/app/layout.tsx
+++ b/app/layout.tsx
@ -11,6 +11,8 @@ import {
 import Link from "next/link";
 import { DevToolboxContextProvider } from "@/components/devtools/context";
 import { RecoilRootClient } from "@/components/recoilRoot";
+import { JotaiProvider } from "@/components/jotaiProvider";
+import { Toaster } from "@/components/toast";

 const roboto = Roboto({ subsets: ["latin"], weight: "400" });

@ -74,13 +76,14 @@ export default function RootLayout({
          </ul>
        </nav>
        <RecoilRootClient>
-          <DevToolboxContextProvider
-            isDev={process.env.NODE_ENV !== "production"}
-          >
-            <main className="p-8 w-full overflow-visible">
-              {children}
-            </main>
-          </DevToolboxContextProvider>
+          <JotaiProvider>
+            <DevToolboxContextProvider
+              isDev={process.env.NODE_ENV !== "production"}
+            >
+              <main className="p-8 w-full overflow-visible">{children}</main>
+              <Toaster />
+            </DevToolboxContextProvider>
+          </JotaiProvider>
        </RecoilRootClient>
        <div id="root-portal"></div>
      </body>
--- a/app/page.tsx
+++ b/app/page.tsx
@ -11,8 +11,7 @@ export default function Home() {
        <h2 className="strapline">Tabletop Commander</h2>
        <h1>How does it work?</h1>
      </section>
-      {
-        /* <section className="w-full my-6">
+      {/* <section className="w-full my-6">
        <div className="card">
          <p>
            Tabletop Commander (TC) is a rules-and-tools app for tabletop games
@ -131,8 +130,7 @@ export default function Home() {
          will be done. If this makes it to production, tell Emma she forgot to
          turn the home page into magic
        </cite>
-      </section> */
-      }
+      </section> */}
      <Suspense fallback={<MDSkeletonLoader />}>
        <HomeClient body={body} />
      </Suspense>
--- a/components/jotaiProvider.tsx
+++ b/components/jotaiProvider.tsx
@ -0,0 +1,7 @@
+"use client";
+
+import { Provider } from "jotai";
+
+export function JotaiProvider(props: React.PropsWithChildren) {
+  return <Provider>{props.children}</Provider>;
+}
--- a/components/schema/index.tsx
+++ b/components/schema/index.tsx
@ -12,6 +12,7 @@ import { TemplateEditor } from "./template-editor";
 import { Icon } from "@/components/Icon";
 import { useParams } from "next/navigation";
 import { FieldTypes } from "./fieldtypes";
+import { prisma } from "@/prisma/prismaClient";

 export const SchemaBuilder: FC = () => {
  const [schema, setSchema] = useRecoilState(SchemaEditAtom);
@ -19,10 +20,16 @@ export const SchemaBuilder: FC = () => {
  const { update: updateSchema, bindProperty: bindSchemaProperty } =
    useObjectStateWrapper<Schema>(schema, setSchema);

-  const { schemaId } = useParams<{ schemaId: string }>();
+  const { schemaId, gameSystemId } = useParams<{
+    schemaId: string;
+    gameSystemId?: string;
+  }>();

-  const { value: typeName, bind: bindTypeName, reset: resetTypeName } =
-    useInput("");
+  const {
+    value: typeName,
+    bind: bindTypeName,
+    reset: resetTypeName,
+  } = useInput("");

  const [pageNumber, setPageNumber] = useState(0);

@ -30,23 +37,36 @@ export const SchemaBuilder: FC = () => {

  const [selectedType, setSelectedType] = useState("");

-  const saveType = useCallback((name: string, type: TypeType) => {
-    updateSchema((e) => ({
-      types: {
-        ...e.types,
-        [name]: type,
-      },
-    }));
-    resetTypeName();
-    setPageNumber(0);
-    setSelectedType("");
-  }, [resetTypeName, updateSchema]);
+  const saveType = useCallback(
+    (name: string, type: TypeType) => {
+      updateSchema((e) => ({
+        types: {
+          ...e.types,
+          [name]: type,
+        },
+      }));
+      resetTypeName();
+      setPageNumber(0);
+      setSelectedType("");
+    },
+    [resetTypeName, updateSchema]
+  );

  const saveSchema = useCallback(async () => {
-    setLastSaved(schema);
-    // const sid = await GameSystemsService.saveSchema(schema);
-    // if (schemaId === 'new') navigate('/schema/'+sid)
-  }, [schema]);
+    // "use server";
+    // setLastSaved(schema);
+    // await prisma.schema.upsert({
+    //   where: { id: schema.id },
+    //   update: { ...schema },
+    //   create: {
+    //     name: schema.name,
+    //     schema: schema.schema,
+    //     types: schema.types,
+    //     version: 0,
+    //     gameSystemId,
+    //   },
+    // });
+  }, [schema, gameSystemId]);

  const selectTypeForEdit = useCallback((typeKey: string) => {
    setSelectedType(typeKey);
@ -71,22 +91,28 @@ export const SchemaBuilder: FC = () => {
    resetSchemaFieldName();
  }, [resetSchemaFieldName, schemaFieldName, updateSchema]);

-  const updateSchemaField = useCallback((key: string, template: Template) => {
-    updateSchema((s) => ({
-      schema: {
-        ...s.schema,
-        [key]: template,
-      },
-    }));
-  }, [updateSchema]);
+  const updateSchemaField = useCallback(
+    (key: string, template: Template) => {
+      updateSchema((s) => ({
+        schema: {
+          ...s.schema,
+          [key]: template,
+        },
+      }));
+    },
+    [updateSchema]
+  );

-  const deleteType = useCallback((key: string) => {
-    updateSchema((s) => {
-      const types = { ...s.types };
-      delete types[key];
-      return { types };
-    });
-  }, [updateSchema]);
+  const deleteType = useCallback(
+    (key: string) => {
+      updateSchema((s) => {
+        const types = { ...s.types };
+        delete types[key];
+        return { types };
+      });
+    },
+    [updateSchema]
+  );

  return (
    <div className="flex gap-4 p-8">
@ -107,16 +133,16 @@ export const SchemaBuilder: FC = () => {
            </button>
          </div>
          <ul className="rounded-lg overflow-hidden">
-            {Object.entries(schema.schema).map((
-              [schemaFieldKey, schemaField],
-            ) => (
-              <TemplateEditor
-                key={schemaFieldKey}
-                templateKey={schemaFieldKey}
-                template={schemaField}
-                update={updateSchemaField}
-              />
-            ))}
+            {Object.entries(schema.schema).map(
+              ([schemaFieldKey, schemaField]) => (
+                <TemplateEditor
+                  key={schemaFieldKey}
+                  templateKey={schemaFieldKey}
+                  template={schemaField}
+                  update={updateSchemaField}
+                />
+              )
+            )}
          </ul>
        </div>
        <hr />
@ -136,9 +162,11 @@ export const SchemaBuilder: FC = () => {
            <TypeEditor
              name={selectedType || typeName}
              saveType={saveType}
-              type={selectedType
-                ? schema.types[selectedType as keyof typeof schema.types]
-                : undefined}
+              type={
+                selectedType
+                  ? schema.types[selectedType as keyof typeof schema.types]
+                  : undefined
+              }
            />
          </AnimatedPageContainer>
          <ul className="mt-3 w-96">
--- a/components/toast/index.tsx
+++ b/components/toast/index.tsx
@ -0,0 +1,111 @@
+"use client";
+
+import { Portal } from "@/lib/portal/components";
+import { atom, useAtom } from "jotai";
+import React, { useCallback, useEffect, useState } from "react";
+import { ReactNode } from "react";
+
+type toastMessage = {
+  msg: ReactNode;
+  type?: "error" | "default";
+  fading: boolean;
+  duration?: number;
+};
+
+type IDToastMessage = toastMessage & {
+  id: string;
+};
+
+const toastAtom = atom<IDToastMessage[]>([]);
+
+export function useToast() {
+  const [_, setToasts] = useAtom(toastAtom);
+
+  const createToast = useCallback(
+    (t: toastMessage) => {
+      const idd = { ...t, id: crypto.randomUUID() };
+      setToasts((toasts) => {
+        return [...toasts, idd];
+      });
+
+      return idd;
+    },
+    [setToasts]
+  );
+
+  const clearToast = useCallback(
+    (t: toastMessage) => setToasts((toasts) => toasts.filter((to) => to != t)),
+    [setToasts]
+  );
+
+  return {
+    createToast,
+    clearToast,
+  };
+}
+
+export function Toaster() {
+  const [toasts, setToasts] = useAtom(toastAtom);
+
+  const clearToast = useCallback(
+    (t: toastMessage) => {
+      setToasts((toasts) => {
+        return toasts.filter((to) => to !== t);
+      });
+    },
+    [setToasts]
+  );
+
+  if (!toasts.length) return <></>;
+  return (
+    <Portal>
+      <div className="fixed bottom-12 left-1/2 -translate-x-1/2 max-w-[95vw] flex flex-col gap-4">
+        {toasts.map((t) => (
+          <Toast key={"toast " + t.id} toast={t} clearToast={clearToast} />
+        ))}
+      </div>
+    </Portal>
+  );
+}
+
+function Toast(props: {
+  toast: toastMessage;
+  clearToast: (t: toastMessage) => void;
+}) {
+  const { toast, clearToast } = props;
+  const [fading, setFading] = useState(false);
+
+  const clear = useCallback(() => {
+    setFading(true);
+    setTimeout(() => {
+      clearToast(toast);
+    }, 300);
+  }, [clearToast, toast]);
+
+  const fadeOut = useCallback(() => {
+    setTimeout(clear, toast.duration ?? 3000);
+  }, [clear, toast]);
+
+  useEffect(() => {
+    if (!toast.fading) return;
+    fadeOut();
+  }, [fadeOut, toast]);
+
+  return (
+    <div
+      data-fading={fading}
+      data-type={toast.type}
+      className="relative p-6 px-16 toast data-[fading=true]:fade-toast rounded-md bg-mixed-300 data-[type=error]:bg-red-900 border-2 border-mixed-400 data-[type=error]:border-red-700"
+    >
+      {toast.msg}
+      {!toast.fading && (
+        <button
+          className="top-2 right-2 text-xs absolute"
+          onClick={() => clear()}
+        >
+          Dismiss
+        </button>
+      )}
+    </div>
+  );
+}
--- a/lib/tcmd/Resolver.tsx
+++ b/lib/tcmd/Resolver.tsx
@ -30,7 +30,6 @@ export function OnDemandResolver({
    const stackIdxs = Array.from(new Set(template.match(/\$\d/g)));
    for (const idx of stackIdxs) {
      let thing = res.current.getFromStack(idx);
-      debugger;
      if (Array.isArray(thing)) thing = thing.at(0);
      if (typeof thing === "function") thing = thing();
      content = content.replaceAll(idx, thing as string);
--- a/lib/tcmd/TokenIdentifiers.tsx
+++ b/lib/tcmd/TokenIdentifiers.tsx
@ -239,7 +239,6 @@ export const buildOnlyDefaultElements = () => {
    "ordered-list",
    /(?<=\n\n|^)\s*\d+\.\s([\s\S]*?)(?=\n\n|$)/g,
    (s, rx) => {
-      // debugger;
      return {
        content:
          s.match(new RegExp(rx, ""))?.at(0) || "Unable to parse ordered list",
@ -254,7 +253,6 @@ export const buildOnlyDefaultElements = () => {
    },
    (token) => {
      const { children } = token;
-      debugger;
      return (
        <>
          <ol
--- a/lib/ttcQuery/TTCResolvers.ts
+++ b/lib/ttcQuery/TTCResolvers.ts
@ -27,7 +27,6 @@ export class TTCQueryResolver {
    const last = this.stack.at(-1);
    if (typeof last === "function" && !onDemand) return last();

-    if (onDemand) debugger;
    return last;
  }

--- a/package-lock.json
+++ b/package-lock.json
@ -9,10 +9,10 @@
      "version": "0.1.0",
      "dependencies": {
        "@heroicons/react": "^2.1.1",
-        "@prisma/client": "^5.11.0",
+        "@prisma/client": "^5.18.0",
        "isomorphic-dompurify": "^2.4.0",
-        "next": "14.1.0",
-        "prisma": "^5.11.0",
+        "jotai": "^2.9.3",
+        "next": "^14.2.5",
        "react": "^18",
        "react-dom": "^18",
        "recoil": "^0.7.7"
@ -26,6 +26,7 @@
        "eslint": "^8",
        "eslint-config-next": "14.1.0",
        "postcss": "^8",
+        "prisma": "^5.18.0",
        "tailwindcss": "^3.3.0",
        "typescript": "^5",
        "typescript-eslint": "^7.2.0"
@ -2278,7 +2279,9 @@
      }
    },
    "node_modules/@next/env": {
-      "version": "14.1.0",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.5.tgz",
+      "integrity": "sha512-/zZGkrTOsraVfYjGP8uM0p6r0BDT6xWpkjdVbcz66PJVSpwXX3yNiRycxAuDfBKGWBrZBXRuK/YVlkNgxHGwmA==",
      "license": "MIT"
    },
    "node_modules/@next/eslint-plugin-next": {
@ -2290,12 +2293,13 @@
      }
    },
    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz",
-      "integrity": "sha512-nUDn7TOGcIeyQni6lZHfzNoo9S0euXnu0jhsbMOmMJUBfgsnESdjN97kM7cBqQxZa8L/bM9om/S5/1dzCrW6wQ==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.5.tgz",
+      "integrity": "sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==",
      "cpu": [
        "arm64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "darwin"
@ -2305,12 +2309,13 @@
      }
    },
    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.1.0.tgz",
-      "integrity": "sha512-1jgudN5haWxiAl3O1ljUS2GfupPmcftu2RYJqZiMJmmbBT5M1XDffjUtRUzP4W3cBHsrvkfOFdQ71hAreNQP6g==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.5.tgz",
+      "integrity": "sha512-vXHOPCwfDe9qLDuq7U1OYM2wUY+KQ4Ex6ozwsKxp26BlJ6XXbHleOUldenM67JRyBfVjv371oneEvYd3H2gNSA==",
      "cpu": [
        "x64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "darwin"
@ -2320,12 +2325,13 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.1.0.tgz",
-      "integrity": "sha512-RHo7Tcj+jllXUbK7xk2NyIDod3YcCPDZxj1WLIYxd709BQ7WuRYl3OWUNG+WUfqeQBds6kvZYlc42NJJTNi4tQ==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.5.tgz",
+      "integrity": "sha512-vlhB8wI+lj8q1ExFW8lbWutA4M2ZazQNvMWuEDqZcuJJc78iUnLdPPunBPX8rC4IgT6lIx/adB+Cwrl99MzNaA==",
      "cpu": [
        "arm64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "linux"
@ -2335,12 +2341,13 @@
      }
    },
    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.1.0.tgz",
-      "integrity": "sha512-v6kP8sHYxjO8RwHmWMJSq7VZP2nYCkRVQ0qolh2l6xroe9QjbgV8siTbduED4u0hlk0+tjS6/Tuy4n5XCp+l6g==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.5.tgz",
+      "integrity": "sha512-NpDB9NUR2t0hXzJJwQSGu1IAOYybsfeB+LxpGsXrRIb7QOrYmidJz3shzY8cM6+rO4Aojuef0N/PEaX18pi9OA==",
      "cpu": [
        "arm64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "linux"
@ -2350,7 +2357,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.1.0",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.5.tgz",
+      "integrity": "sha512-8XFikMSxWleYNryWIjiCX+gU201YS+erTUidKdyOVYi5qUQo/gRxv/3N1oZFCgqpesN6FPeqGM72Zve+nReVXQ==",
      "cpu": [
        "x64"
      ],
@ -2364,7 +2373,9 @@
      }
    },
    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.1.0",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.5.tgz",
+      "integrity": "sha512-6QLwi7RaYiQDcRDSU/os40r5o06b5ue7Jsk5JgdRBGGp8l37RZEh9JsLSM8QF0YDsgcosSeHjglgqi25+m04IQ==",
      "cpu": [
        "x64"
      ],
@ -2378,12 +2389,13 @@
      }
    },
    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.1.0.tgz",
-      "integrity": "sha512-o1N5TsYc8f/HpGt39OUQpQ9AKIGApd3QLueu7hXk//2xq5Z9OxmV6sQfNp8C7qYmiOlHYODOGqNNa0e9jvchGQ==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.5.tgz",
+      "integrity": "sha512-1GpG2VhbspO+aYoMOQPQiqc/tG3LzmsdBH0LhnDS3JrtDx2QmzXe0B6mSZZiN3Bq7IOMXxv1nlsjzoS1+9mzZw==",
      "cpu": [
        "arm64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "win32"
@ -2393,12 +2405,13 @@
      }
    },
    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.1.0.tgz",
-      "integrity": "sha512-XXIuB1DBRCFwNO6EEzCTMHT5pauwaSj4SWs7CYnME57eaReAKBXCnkUE80p/pAZcewm7hs+vGvNqDPacEXHVkw==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.5.tgz",
+      "integrity": "sha512-Igh9ZlxwvCDsu6438FXlQTHlRno4gFpJzqPjSIBZooD22tKeI4fE/YMRoHVJHmrQ2P5YL1DoZ0qaOKkbeFWeMg==",
      "cpu": [
        "ia32"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "win32"
@ -2408,12 +2421,13 @@
      }
    },
    "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.1.0.tgz",
-      "integrity": "sha512-9WEbVRRAqJ3YFVqEZIxUqkiO8l1nool1LmNxygr5HWF8AcSYsEpneUDhmjUVJEzO2A04+oPtZdombzzPPkTtgg==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.5.tgz",
+      "integrity": "sha512-tEQ7oinq1/CjSG9uSTerca3v4AZ+dFa+4Yu6ihaG8Ud8ddqLQgFGcnwYls13H5X5CPDPZJdYxyeMui6muOLd4g==",
      "cpu": [
        "x64"
      ],
+      "license": "MIT",
      "optional": true,
      "os": [
        "win32"
@ -2464,10 +2478,11 @@
      }
    },
    "node_modules/@prisma/client": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.11.0.tgz",
-      "integrity": "sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.18.0.tgz",
+      "integrity": "sha512-BWivkLh+af1kqC89zCJYkHsRcyWsM8/JHpsDMM76DjP3ZdEquJhXa4IeX+HkWPnwJ5FanxEJFZZDTWiDs/Kvyw==",
      "hasInstallScript": true,
+      "license": "Apache-2.0",
      "engines": {
        "node": ">=16.13"
      },
@ -2481,43 +2496,53 @@
      }
    },
    "node_modules/@prisma/debug": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.11.0.tgz",
-      "integrity": "sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A=="
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.18.0.tgz",
+      "integrity": "sha512-f+ZvpTLidSo3LMJxQPVgAxdAjzv5OpzAo/eF8qZqbwvgi2F5cTOI9XCpdRzJYA0iGfajjwjOKKrVq64vkxEfUw==",
+      "devOptional": true,
+      "license": "Apache-2.0"
    },
    "node_modules/@prisma/engines": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.11.0.tgz",
-      "integrity": "sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.18.0.tgz",
+      "integrity": "sha512-ofmpGLeJ2q2P0wa/XaEgTnX/IsLnvSp/gZts0zjgLNdBhfuj2lowOOPmDcfKljLQUXMvAek3lw5T01kHmCG8rg==",
+      "devOptional": true,
      "hasInstallScript": true,
+      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.11.0",
-        "@prisma/engines-version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",
-        "@prisma/fetch-engine": "5.11.0",
-        "@prisma/get-platform": "5.11.0"
+        "@prisma/debug": "5.18.0",
+        "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
+        "@prisma/fetch-engine": "5.18.0",
+        "@prisma/get-platform": "5.18.0"
      }
    },
    "node_modules/@prisma/engines-version": {
-      "version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",
-      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz",
-      "integrity": "sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA=="
+      "version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
+      "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169.tgz",
+      "integrity": "sha512-a/+LpJj8vYU3nmtkg+N3X51ddbt35yYrRe8wqHTJtYQt7l1f8kjIBcCs6sHJvodW/EK5XGvboOiwm47fmNrbgg==",
+      "devOptional": true,
+      "license": "Apache-2.0"
    },
    "node_modules/@prisma/fetch-engine": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz",
-      "integrity": "sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.18.0.tgz",
+      "integrity": "sha512-I/3u0x2n31rGaAuBRx2YK4eB7R/1zCuayo2DGwSpGyrJWsZesrV7QVw7ND0/Suxeo/vLkJ5OwuBqHoCxvTHpOg==",
+      "devOptional": true,
+      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.11.0",
-        "@prisma/engines-version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",
-        "@prisma/get-platform": "5.11.0"
+        "@prisma/debug": "5.18.0",
+        "@prisma/engines-version": "5.18.0-25.4c784e32044a8a016d99474bd02a3b6123742169",
+        "@prisma/get-platform": "5.18.0"
      }
    },
    "node_modules/@prisma/get-platform": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.11.0.tgz",
-      "integrity": "sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.18.0.tgz",
+      "integrity": "sha512-Tk+m7+uhqcKDgnMnFN0lRiH7Ewea0OEsZZs9pqXa7i3+7svS3FSCqDBCaM9x5fmhhkufiG0BtunJVDka+46DlA==",
+      "devOptional": true,
+      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/debug": "5.11.0"
+        "@prisma/debug": "5.18.0"
      }
    },
    "node_modules/@rushstack/eslint-patch": {
@ -2782,10 +2807,19 @@
        "url": "https://github.com/sponsors/gregberge"
      }
    },
+    "node_modules/@swc/counter": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
+      "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
+      "license": "Apache-2.0"
+    },
    "node_modules/@swc/helpers": {
-      "version": "0.5.2",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.5.tgz",
+      "integrity": "sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==",
      "license": "Apache-2.0",
      "dependencies": {
+        "@swc/counter": "^0.1.3",
        "tslib": "^2.4.0"
      }
    },
@ -2825,12 +2859,12 @@
    },
    "node_modules/@types/prop-types": {
      "version": "15.7.11",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/@types/react": {
      "version": "18.2.58",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT",
      "dependencies": {
        "@types/prop-types": "*",
@ -2848,7 +2882,7 @@
    },
    "node_modules/@types/scheduler": {
      "version": "0.16.8",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/@types/semver": {
@ -3878,11 +3912,13 @@
      }
    },
    "node_modules/braces": {
-      "version": "3.0.2",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
      },
      "engines": {
        "node": ">=8"
@ -4239,7 +4275,7 @@
    },
    "node_modules/csstype": {
      "version": "3.1.3",
-      "dev": true,
+      "devOptional": true,
      "license": "MIT"
    },
    "node_modules/damerau-levenshtein": {
@ -5091,7 +5127,9 @@
      }
    },
    "node_modules/fill-range": {
-      "version": "7.0.1",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@ -5186,6 +5224,21 @@
      "dev": true,
      "license": "ISC"
    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
    "node_modules/function-bind": {
      "version": "1.1.2",
      "dev": true,
@ -5754,6 +5807,8 @@
    },
    "node_modules/is-number": {
      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
      "dev": true,
      "license": "MIT",
      "engines": {
@ -5955,6 +6010,27 @@
        "jiti": "bin/jiti.js"
      }
    },
+    "node_modules/jotai": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.9.3.tgz",
+      "integrity": "sha512-IqMWKoXuEzWSShjd9UhalNsRGbdju5G2FrqNLQJT+Ih6p41VNYe2sav5hnwQx4HJr25jq9wRqvGSWGviGG6Gjw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20.0"
+      },
+      "peerDependencies": {
+        "@types/react": ">=17.0.0",
+        "react": ">=17.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "react": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/js-tokens": {
      "version": "4.0.0",
      "license": "MIT"
@ -6276,11 +6352,13 @@
      "license": "MIT"
    },
    "node_modules/next": {
-      "version": "14.1.0",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.5.tgz",
+      "integrity": "sha512-0f8aRfBVL+mpzfBjYfQuLWh2WyAwtJXCRfkPF4UJ5qd2YwrHczsrSzXU4tRMV0OAxR8ZJZWPFn6uhSC56UTsLA==",
      "license": "MIT",
      "dependencies": {
-        "@next/env": "14.1.0",
-        "@swc/helpers": "0.5.2",
+        "@next/env": "14.2.5",
+        "@swc/helpers": "0.5.5",
        "busboy": "1.6.0",
        "caniuse-lite": "^1.0.30001579",
        "graceful-fs": "^4.2.11",
@ -6294,18 +6372,19 @@
        "node": ">=18.17.0"
      },
      "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.1.0",
-        "@next/swc-darwin-x64": "14.1.0",
-        "@next/swc-linux-arm64-gnu": "14.1.0",
-        "@next/swc-linux-arm64-musl": "14.1.0",
-        "@next/swc-linux-x64-gnu": "14.1.0",
-        "@next/swc-linux-x64-musl": "14.1.0",
-        "@next/swc-win32-arm64-msvc": "14.1.0",
-        "@next/swc-win32-ia32-msvc": "14.1.0",
-        "@next/swc-win32-x64-msvc": "14.1.0"
+        "@next/swc-darwin-arm64": "14.2.5",
+        "@next/swc-darwin-x64": "14.2.5",
+        "@next/swc-linux-arm64-gnu": "14.2.5",
+        "@next/swc-linux-arm64-musl": "14.2.5",
+        "@next/swc-linux-x64-gnu": "14.2.5",
+        "@next/swc-linux-x64-musl": "14.2.5",
+        "@next/swc-win32-arm64-msvc": "14.2.5",
+        "@next/swc-win32-ia32-msvc": "14.2.5",
+        "@next/swc-win32-x64-msvc": "14.2.5"
      },
      "peerDependencies": {
        "@opentelemetry/api": "^1.1.0",
+        "@playwright/test": "^1.41.2",
        "react": "^18.2.0",
        "react-dom": "^18.2.0",
        "sass": "^1.3.0"
@ -6314,6 +6393,9 @@
        "@opentelemetry/api": {
          "optional": true
        },
+        "@playwright/test": {
+          "optional": true
+        },
        "sass": {
          "optional": true
        }
@ -6850,12 +6932,14 @@
      }
    },
    "node_modules/prisma": {
-      "version": "5.11.0",
-      "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.11.0.tgz",
-      "integrity": "sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.18.0.tgz",
+      "integrity": "sha512-+TrSIxZsh64OPOmaSgVPH7ALL9dfU0jceYaMJXsNrTkFHO7/3RANi5K2ZiPB1De9+KDxCWn7jvRq8y8pvk+o9g==",
+      "devOptional": true,
      "hasInstallScript": true,
+      "license": "Apache-2.0",
      "dependencies": {
-        "@prisma/engines": "5.11.0"
+        "@prisma/engines": "5.18.0"
      },
      "bin": {
        "prisma": "build/index.js"
@ -7672,6 +7756,8 @@
    },
    "node_modules/to-regex-range": {
      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@ -8301,7 +8387,9 @@
      "license": "ISC"
    },
    "node_modules/ws": {
-      "version": "8.16.0",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
      "license": "MIT",
      "engines": {
        "node": ">=10.0.0"
--- a/package.json
+++ b/package.json
@ -10,10 +10,10 @@
  },
  "dependencies": {
    "@heroicons/react": "^2.1.1",
-    "@prisma/client": "^5.11.0",
+    "@prisma/client": "^5.18.0",
    "isomorphic-dompurify": "^2.4.0",
-    "next": "14.1.0",
-    "prisma": "^5.11.0",
+    "jotai": "^2.9.3",
+    "next": "^14.2.5",
    "react": "^18",
    "react-dom": "^18",
    "recoil": "^0.7.7"
@ -27,6 +27,7 @@
    "eslint": "^8",
    "eslint-config-next": "14.1.0",
    "postcss": "^8",
+    "prisma": "^5.18.0",
    "tailwindcss": "^3.3.0",
    "typescript": "^5",
    "typescript-eslint": "^7.2.0"
--- a/prisma/migrations/20240815100640_retagging/migration.sql
+++ b/prisma/migrations/20240815100640_retagging/migration.sql
@ -0,0 +1,83 @@
+/*
+  Warnings:
+
+  - Added the required column `authorId` to the `GameSystem` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `authorId` to the `Publication` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `authorId` to the `Schema` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `originalId` to the `Schema` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `name` to the `Tag` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE `Schema` DROP FOREIGN KEY `Schema_gameSystemId_fkey`;
+
+-- DropForeignKey
+ALTER TABLE `Tag` DROP FOREIGN KEY `Tag_publicationId_fkey`;
+
+-- AlterTable
+ALTER TABLE `GameSystem` ADD COLUMN `authorId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Publication` ADD COLUMN `authorId` VARCHAR(191) NOT NULL;
+
+-- AlterTable
+ALTER TABLE `Schema` ADD COLUMN `authorId` VARCHAR(191) NOT NULL,
+    ADD COLUMN `originalId` VARCHAR(191) NOT NULL,
+    MODIFY `gameSystemId` VARCHAR(191) NULL;
+
+-- AlterTable
+ALTER TABLE `Tag` ADD COLUMN `name` VARCHAR(191) NOT NULL,
+    MODIFY `publicationId` VARCHAR(191) NULL;
+
+-- CreateTable
+CREATE TABLE `TagsOnPublications` (
+    `publicationId` VARCHAR(191) NOT NULL,
+    `tagId` VARCHAR(191) NOT NULL,
+
+    PRIMARY KEY (`publicationId`, `tagId`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `TagsOnTags` (
+    `parentTagId` VARCHAR(191) NOT NULL,
+    `childTagId` VARCHAR(191) NOT NULL,
+
+    PRIMARY KEY (`parentTagId`, `childTagId`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- CreateTable
+CREATE TABLE `User` (
+    `id` VARCHAR(191) NOT NULL,
+    `username` VARCHAR(191) NOT NULL,
+    `email` VARCHAR(191) NOT NULL,
+
+    UNIQUE INDEX `User_email_key`(`email`),
+    PRIMARY KEY (`id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `GameSystem` ADD CONSTRAINT `GameSystem_authorId_fkey` FOREIGN KEY (`authorId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `Schema` ADD CONSTRAINT `Schema_gameSystemId_fkey` FOREIGN KEY (`gameSystemId`) REFERENCES `GameSystem`(`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `Schema` ADD CONSTRAINT `Schema_authorId_fkey` FOREIGN KEY (`authorId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `Publication` ADD CONSTRAINT `Publication_authorId_fkey` FOREIGN KEY (`authorId`) REFERENCES `User`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `TagsOnPublications` ADD CONSTRAINT `TagsOnPublications_publicationId_fkey` FOREIGN KEY (`publicationId`) REFERENCES `Publication`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `TagsOnPublications` ADD CONSTRAINT `TagsOnPublications_tagId_fkey` FOREIGN KEY (`tagId`) REFERENCES `Tag`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `Tag` ADD CONSTRAINT `Tag_publicationId_fkey` FOREIGN KEY (`publicationId`) REFERENCES `Publication`(`id`) ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `TagsOnTags` ADD CONSTRAINT `TagsOnTags_parentTagId_fkey` FOREIGN KEY (`parentTagId`) REFERENCES `Tag`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE `TagsOnTags` ADD CONSTRAINT `TagsOnTags_childTagId_fkey` FOREIGN KEY (`childTagId`) REFERENCES `Tag`(`id`) ON DELETE RESTRICT ON UPDATE CASCADE;
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@ -25,8 +25,8 @@ model GameSystem {

 model Schema {
  id           String        @id @default(cuid())
-  gameSystem   GameSystem    @relation(fields: [gameSystemId], references: [id])
-  gameSystemId String
+  gameSystem   GameSystem?   @relation(fields: [gameSystemId], references: [id])
+  gameSystemId String?
  publications Publication[]
  author       User          @relation(fields: [authorId], references: [id])
  authorId     String
@ -46,14 +46,37 @@ model Publication {
  author   User   @relation(fields: [authorId], references: [id])
  authorId String

-  name String
-  data Json
+  name               String
+  data               Json
+  TagsOnPublications TagsOnPublications[]
+}
+
+model TagsOnPublications {
+  publication   Publication @relation(fields: [publicationId], references: [id])
+  publicationId String
+  tagId         String
+  tag           Tag         @relation(fields: [tagId], references: [id])
+
+  @@id([publicationId, tagId])
 }

 model Tag {
-  id            String      @id @default(cuid())
-  publication   Publication @relation(fields: [publicationId], references: [id])
-  publicationId String
+  id                 String               @id @default(cuid())
+  name               String
+  Publication        Publication?         @relation(fields: [publicationId], references: [id])
+  publicationId      String?
+  TagsOnPublications TagsOnPublications[]
+  childTagsOnTags    TagsOnTags[]         @relation("childTag")
+  parentTagsOnTags   TagsOnTags[]         @relation("parentTag")
+}
+
+model TagsOnTags {
+  parentTagId String
+  parentTag   Tag    @relation(fields: [parentTagId], references: [id], "parentTag")
+  childTagId  String
+  childTag    Tag    @relation(fields: [childTagId], references: [id], "childTag")
+
+  @@id([parentTagId, childTagId])
 }

 model User {
Author	SHA1	Message	Date
Emma	b9b744e97f	toast messages	2024-08-15 04:11:57 -06:00
Emma	9838324b35	upgrades prisma, adds jotai	2024-08-15 04:11:42 -06:00
Emma	9e2184352f	new tags, migration	2024-08-15 04:11:20 -06:00