From 024165302177b24ebbcfb75bc5fd083a168fa24a Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Thu, 17 Apr 2025 16:14:29 -0400 Subject: [PATCH] Added the api call to the editor3d page. --- frontend/README.md | 17 +++++++++++++++++ .../app/pages/PageEnigma/PageEditor.tsx | 6 ++++-- frontend/apps/editor3d/tsconfig.json | 10 +++++++++- frontend/clean_modules.sh | 1 + frontend/package-lock.json | 2 -- frontend/tsconfig.json | 3 +++ 6 files changed, 34 insertions(+), 5 deletions(-) diff --git a/frontend/README.md b/frontend/README.md index 8b95a3c2cc..26a5641428 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -27,4 +27,21 @@ Run dev server: nx dev editor3d ``` +``` +call when starting on main or a new branch: +./clean_modules + +The names for @frontend and @storyteller come from the package.json file in the libs folder. +import { Login } from "@frontend/login"; +import { api } from "@storyteller/api"; + +building: +npx nx build editor3d +npx nx build editor2d + +dev: +npx nx dev editor3d +npx nx dev editor2d +``` + diff --git a/frontend/apps/editor3d/app/pages/PageEnigma/PageEditor.tsx b/frontend/apps/editor3d/app/pages/PageEnigma/PageEditor.tsx index 5d09df9268..36176973d2 100644 --- a/frontend/apps/editor3d/app/pages/PageEnigma/PageEditor.tsx +++ b/frontend/apps/editor3d/app/pages/PageEnigma/PageEditor.tsx @@ -27,11 +27,13 @@ import { OnboardingHelper } from "./comps/OnboardingHelper"; import { focalLengthDragging } from "./signals/camera"; import { FocalLengthDisplay } from "./comps/FocalLengthDisplay/FocalLengthDisplay"; -import { Login } from "@frontend/login" +import { Login } from "@frontend/login"; +import { api } from "@storyteller/api"; + export const PageEditor = () => { useSignals(); - + //console.log(api()); //To prevent the click event from propagating to the canvas: TODO: HANDLE THIS BETTER? const handleOverlayClick = (event: React.MouseEvent) => { event.stopPropagation(); diff --git a/frontend/apps/editor3d/tsconfig.json b/frontend/apps/editor3d/tsconfig.json index f00e24b3a8..5c348b8c23 100644 --- a/frontend/apps/editor3d/tsconfig.json +++ b/frontend/apps/editor3d/tsconfig.json @@ -19,5 +19,13 @@ }, // Vite takes care of building everything, not tsc. "noEmit": true - } + }, + "references": [ + { + "path": "../../libs/api" + }, + { + "path": "../../libs/login" + } + ] } diff --git a/frontend/clean_modules.sh b/frontend/clean_modules.sh index e1a5586ac0..3b8aa43f84 100755 --- a/frontend/clean_modules.sh +++ b/frontend/clean_modules.sh @@ -3,6 +3,7 @@ set -euxo pipefail echo "Removing Node Modules..." +npx nx reset rm -rf ./node_modules/ rm -rf ./apps/editor2d/node_modules/ rm -rf ./apps/editor3d/node_modules/ diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 904c5f23a0..bb5b270b8c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1168,7 +1168,6 @@ "@fortawesome/pro-regular-svg-icons": "^6.5.1", "@fortawesome/pro-solid-svg-icons": "^6.5.1", "@fortawesome/react-fontawesome": "^0.2.0", - "@frontend/login": "file:../../libs/login", "@headlessui/react": "^1.7.18", "@mediapipe/tasks-vision": "^0.10.20", "@netlify/edge-functions": "^2.3.1", @@ -1180,7 +1179,6 @@ "@remix-run/react": "^2.8.1", "@remix-run/router": "^1.15.3", "@remix-run/serve": "^2.8.1", - "@storyteller/api": "file:../../libs/api", "@tweenjs/tween.js": "^18.6.4", "@types/lodash": "^4.17.6", "@types/react-virtualized": "^9.22.2", diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 7c25178c3c..aa7754dfd4 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -8,6 +8,9 @@ }, { "path": "./libs/login" + }, + { + "path": "./apps/editor3d" } ] }