urdf uploading (#283)

* urdf uploading * urdf uploading + cleanup * stuff * lint * lint
kscalelabs · Aug 10, 2024 · e54e3b2 · e54e3b2
1 parent 6a6e6ff
commit e54e3b2
Show file tree

Hide file tree

Showing 17 changed files with 423 additions and 212 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -48,6 +48,7 @@
     "remark-gfm": "^4.0.0",
     "tailwind-merge": "^2.4.0",
     "three": "^0.167.1",
+    "urdf-loader": "^0.12.1",
     "zod": "^3.23.8",
     "zxcvbn": "^4.4.2"
   },

diff --git a/frontend/prettier.config.js b/frontend/prettier.config.js
@@ -3,7 +3,6 @@ module.exports = {
   tabWidth: 2,
   trailingComma: "all",
   singleQuote: false,
-  jsxBracketSameLine: true,
   semi: true,
   plugins: ["@trivago/prettier-plugin-sort-imports"],
   importOrder: [

diff --git a/frontend/src/components/Editor.tsx b/frontend/src/components/Editor.tsx
diff --git a/frontend/src/components/Image.tsx → frontend/src/components/ImagePlaceholder.tsx b/frontend/src/components/Image.tsx → frontend/src/components/ImagePlaceholder.tsx
@@ -1,7 +1,7 @@
-const Image = () => {
+const ImagePlaceholder = () => {
   return (
     <div className="animate-pulse bg-gray-200 dark:bg-gray-800 w-full aspect-square" />
   );
 };
 
-export default Image;
+export default ImagePlaceholder;
diff --git a/frontend/src/components/MultiLeva.tsx b/frontend/src/components/MultiLeva.tsx
diff --git a/frontend/src/components/Stls.tsx b/frontend/src/components/Stls.tsx
diff --git a/frontend/src/components/listing/ListingArtifacts.tsx b/frontend/src/components/listing/ListingArtifacts.tsx
@@ -8,6 +8,7 @@ import Spinner from "components/ui/Spinner";
 
 import ListingImages from "./ListingImages";
 import ListingSTLs from "./ListingSTLs";
+import ListingURDFs from "./ListingURDFs";
 
 interface Props {
   listingId: string;
@@ -56,6 +57,11 @@ const ListingArtifacts = (props: Props) => {
         edit={edit}
         allArtifacts={artifacts}
       />
+      <ListingURDFs
+        listingId={listingId}
+        edit={edit}
+        allArtifacts={artifacts}
+      />
       <ListingSTLs listingId={listingId} edit={edit} allArtifacts={artifacts} />
     </div>
   );

diff --git a/frontend/src/components/listing/ListingSTLs.tsx b/frontend/src/components/listing/ListingSTLs.tsx
@@ -1,55 +1,15 @@
-/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
-// @ts-nocheck
+import { useEffect, useState } from "react";
+import { FaCaretSquareDown, FaCaretSquareUp } from "react-icons/fa";
 
-/* eslint-disable react/no-unknown-property */
-import { Suspense, useState } from "react";
-import { FaCaretSquareDown, FaCaretSquareUp, FaTimes } from "react-icons/fa";
-
-import { OrbitControls, PerspectiveCamera } from "@react-three/drei";
-import { Canvas } from "@react-three/fiber";
 import { cx } from "class-variance-authority";
 import { components } from "gen/api";
 import { useAlertQueue } from "hooks/useAlertQueue";
 import { useAuthentication } from "hooks/useAuth";
-import { Object3D } from "three";
 
-import Editor from "components/Editor";
-import Loader from "components/Loader";
-import { Panel } from "components/MultiLeva";
 import ListingFileUpload from "components/listing/ListingFileUpload";
+import StlRenderer from "components/listing/renderers/StlRenderer";
 import { Button } from "components/ui/Button/Button";
 
-interface SingleStlViewerProps {
-  url: string;
-}
-
-const SingleStlViewer = (props: SingleStlViewerProps) => {
-  const { url } = props;
-  const [selected, setSelected] = useState<Object3D[]>();
-
-  return (
-    <>
-      <Canvas>
-        <Suspense fallback={<Loader />}>
-          <PerspectiveCamera
-            makeDefault
-            fov={50}
-            aspect={window.innerWidth / window.innerHeight}
-            position={[10, 8, 25]}
-            near={0.1}
-            far={500}
-          ></PerspectiveCamera>
-          <Editor setSelected={setSelected} url={url} />
-          <directionalLight color={0xeb4634} position={[1, 0.75, 0.5]} />
-          <directionalLight color={0xccccff} position={[-1, 0.75, -0.5]} />
-        </Suspense>
-        <OrbitControls />
-      </Canvas>
-      <Panel selected={selected} />
-    </>
-  );
-};
-
 interface Props {
   listingId: string;
   edit: boolean;
@@ -65,12 +25,24 @@ const ListingSTLs = (props: Props) => {
   const [stls, setStls] = useState<
     components["schemas"]["ListArtifactsResponse"]["artifacts"]
   >(allArtifacts.filter((a) => a.artifact_type === "stl"));
+  const [stl, setStl] = useState<
+    components["schemas"]["ListArtifactsResponse"]["artifacts"][0] | null
+  >(null);
   const [deletingIds, setDeletingIds] = useState<string[]>([]);
   const [collapsed, setCollapsed] = useState<boolean>(true);
+  const [currentId, setCurrentId] = useState<number>(0);
+
+  useEffect(() => {
+    if (stl !== null) {
+      return;
+    }
 
-  const [currentIdUnchecked, setCurrentId] = useState<number>(0);
-  const currentId = Math.min(Math.max(currentIdUnchecked, 0), stls.length - 1);
-  const stl = stls.length === 0 ? null : stls[currentId];
+    if (currentId >= stls.length || currentId < 0) {
+      setCurrentId(Math.min(Math.max(currentId, 0), stls.length - 1));
+    } else {
+      setStl(stls[currentId]);
+    }
+  }, [stl, stls, currentId]);
 
   const onDelete = async (stlId: string) => {
     setDeletingIds([...deletingIds, stlId]);
@@ -87,10 +59,8 @@ const ListingSTLs = (props: Props) => {
     if (error) {
       addErrorAlert(error);
     } else {
-      if (currentId >= stls.length) {
-        setCurrentId(stls.length - 1);
-      }
       setStls(stls.filter((stl) => stl.artifact_id !== stlId));
+      setStl(null);
       setDeletingIds(deletingIds.filter((id) => id !== stlId));
     }
   };
@@ -126,7 +96,10 @@ const ListingSTLs = (props: Props) => {
                     "px-4 py-2 text-sm font-medium border-t border-b border-gray-200 hover:bg-gray-100",
                   )}
                   key={stl.artifact_id}
-                  onClick={() => setCurrentId(idx)}
+                  onClick={() => {
+                    setCurrentId(idx);
+                    setStl(null);
+                  }}
                 >
                   {idx + 1}
                 </button>
@@ -139,17 +112,12 @@ const ListingSTLs = (props: Props) => {
                 key={stl.artifact_id}
                 className="bg-background rounded-lg p-2 relative"
               >
-                <SingleStlViewer url={stl.url} />
-                {edit && (
-                  <Button
-                    onClick={() => onDelete(stl.artifact_id)}
-                    variant="destructive"
-                    className="absolute top-5 right-5 rounded-full"
-                    disabled={deletingIds.includes(stl.artifact_id)}
-                  >
-                    <FaTimes />
-                  </Button>
-                )}
+                <StlRenderer
+                  url={stl.url}
+                  edit={edit}
+                  onDelete={() => onDelete(stl.artifact_id)}
+                  disabled={deletingIds.includes(stl.artifact_id)}
+                />
               </div>
             </div>
           )}