From 35eac53b9df8088ba1566c4901331ad66fd68679 Mon Sep 17 00:00:00 2001 From: BFlat Date: Thu, 17 Apr 2025 17:14:02 +0700 Subject: [PATCH] shared component starting with toaster (#521) - share the toaster component between both editor2d and editor 3d --- frontend/apps/editor2d/package.json | 1 + frontend/apps/editor2d/src/app/index.tsx | 6 +- .../editor2d/src/app/pages/main/index.tsx | 5 +- .../src/components/ui/Activity/Activity.tsx | 4 +- frontend/apps/editor2d/tsconfig.app.json | 3 +- .../app/components/signaled/TopBar/TopBar.tsx | 2 +- .../app/pages/PageEnigma/PageEnigma.tsx | 11 +- .../comps/GenerateModals/Activity.tsx | 216 ++++++++++-------- .../PageEnigma/comps/PromptBox/PromptBox.tsx | 4 +- frontend/apps/editor3d/package.json | 19 +- frontend/apps/editor3d/tsconfig.json | 18 +- frontend/package-lock.json | 123 ++++++---- frontend/pnpm-workspace.yaml | 6 +- frontend/shared/components/Toaster/index.tsx | 23 ++ frontend/shared/components/index.ts | 1 + frontend/shared/contexts/.gitkeep | 1 + frontend/shared/package.json | 19 ++ frontend/shared/tsconfig.json | 12 + frontend/tsconfig.base.json | 3 +- 19 files changed, 293 insertions(+), 184 deletions(-) create mode 100644 frontend/shared/components/Toaster/index.tsx create mode 100644 frontend/shared/components/index.ts create mode 100644 frontend/shared/contexts/.gitkeep create mode 100644 frontend/shared/package.json create mode 100644 frontend/shared/tsconfig.json diff --git a/frontend/apps/editor2d/package.json b/frontend/apps/editor2d/package.json index 53d5b1f078..205b93adfe 100644 --- a/frontend/apps/editor2d/package.json +++ b/frontend/apps/editor2d/package.json @@ -15,6 +15,7 @@ "preview": "vite preview" }, "dependencies": { + "@storyteller/shared": "file:../../shared/*", "@devnomic/marquee": "^1.0.3", "@fortawesome/fontawesome-svg-core": "^6.7.2", "@fortawesome/free-brands-svg-icons": "^6.7.2", diff --git a/frontend/apps/editor2d/src/app/index.tsx b/frontend/apps/editor2d/src/app/index.tsx index ae1aa6847e..39ae69862d 100644 --- a/frontend/apps/editor2d/src/app/index.tsx +++ b/frontend/apps/editor2d/src/app/index.tsx @@ -5,7 +5,7 @@ import { RouterProvider } from "react-router-dom"; import { router } from "./router"; import { posthog } from "posthog-js"; import { PostHogProvider } from "posthog-js/react"; -import { Toaster } from "~/components/ui/Toast"; +import { Toaster } from "@storyteller/shared/components"; import { JobProvider } from "~/components/JobContext"; import "./global.css"; import { useRenderCounter } from "~/hooks/useRenderCounter"; @@ -33,7 +33,7 @@ const App = () => { - + @@ -43,7 +43,7 @@ const App = () => { <> - + ); diff --git a/frontend/apps/editor2d/src/app/pages/main/index.tsx b/frontend/apps/editor2d/src/app/pages/main/index.tsx index b7c5a398b5..168a7b3d76 100644 --- a/frontend/apps/editor2d/src/app/pages/main/index.tsx +++ b/frontend/apps/editor2d/src/app/pages/main/index.tsx @@ -77,8 +77,9 @@ export const Main = withProtectionRoute(() => { - {appModeValue === "gallery" && - ()} + {appModeValue === "gallery" && ( + + )} ); }); diff --git a/frontend/apps/editor2d/src/components/ui/Activity/Activity.tsx b/frontend/apps/editor2d/src/components/ui/Activity/Activity.tsx index ce4a7ebf36..b3b2d13085 100644 --- a/frontend/apps/editor2d/src/components/ui/Activity/Activity.tsx +++ b/frontend/apps/editor2d/src/components/ui/Activity/Activity.tsx @@ -6,7 +6,7 @@ import { CompletedCard } from "./CompletedCard"; import { InProgressCard } from "./InProgressCard"; import { useJobContext } from "~/components/JobContext"; import { Api } from "~/KonvaApp/Api"; -import { toast } from "sonner"; +import { toast } from "@storyteller/shared/components"; // Dummy data types interface CompletedItem { @@ -199,7 +199,7 @@ export function Activity() { ) : completedItems.length === 0 && jobs.length === 0 ? (
-

No activities yet

+

No activities yet

) : (
diff --git a/frontend/apps/editor2d/tsconfig.app.json b/frontend/apps/editor2d/tsconfig.app.json index e6618427ac..9dac6c6420 100644 --- a/frontend/apps/editor2d/tsconfig.app.json +++ b/frontend/apps/editor2d/tsconfig.app.json @@ -21,7 +21,8 @@ "noFallthroughCasesInSwitch": true, "paths": { "~/*": ["./src/*"], - "@ApiManager/*": ["./src/Classes/ApiManager/*"] + "@ApiManager/*": ["./src/Classes/ApiManager/*"], + "@storyteller/shared/*": ["../../shared/*"] } }, "include": ["src"] diff --git a/frontend/apps/editor3d/app/components/signaled/TopBar/TopBar.tsx b/frontend/apps/editor3d/app/components/signaled/TopBar/TopBar.tsx index 9c01ec5344..3f2a7346bc 100644 --- a/frontend/apps/editor3d/app/components/signaled/TopBar/TopBar.tsx +++ b/frontend/apps/editor3d/app/components/signaled/TopBar/TopBar.tsx @@ -52,7 +52,7 @@ export const TopBar = ({ pageName }: Props) => {
-
+