asdf

kscalelabs · Nov 10, 2024 · 59484a6 · 59484a6
1 parent 45ae77e
commit 59484a6
Show file tree

Hide file tree

Showing 23 changed files with 977 additions and 943 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -80,6 +80,7 @@
     "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7",
     "three": "^0.167.1",
+    "tsd-jsdoc": "^2.5.0",
     "urdf-loader": "^0.12.2",
     "zod": "^3.23.8",
     "zxcvbn": "^4.4.2"

diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -13,7 +13,6 @@ import Navbar from "@/components/nav/Navbar";
 import APIKeys from "@/components/pages/APIKeys";
 import About from "@/components/pages/About";
 import Account from "@/components/pages/Account";
-import ArtifactPlayground from "@/components/pages/ArtifactPlayground";
 import Browse from "@/components/pages/Browse";
 import Create from "@/components/pages/Create";
 import DeleteConnect from "@/components/pages/DeleteConnect";
@@ -27,7 +26,6 @@ import Logout from "@/components/pages/Logout";
 import NotFound from "@/components/pages/NotFound";
 import OrderSuccess from "@/components/pages/OrderSuccess";
 import OrdersPage from "@/components/pages/Orders";
-import Playground from "@/components/pages/Playground";
 import PrivacyPolicy from "@/components/pages/PrivacyPolicy";
 import Profile from "@/components/pages/Profile";
 import ResearchPage from "@/components/pages/ResearchPage";
@@ -58,17 +56,6 @@ const App = () => {
                       <Routes>
                         <Route path={ROUTES.HOME.path} element={<Home />} />
 
-                        {/* Playground */}
-                        <Route
-                          path={ROUTES.PLAYGROUND.path}
-                          element={<Playground />}
-                        >
-                          <Route
-                            path={ROUTES.PLAYGROUND.WITH_ID.path}
-                            element={<ArtifactPlayground />}
-                          />
-                        </Route>
-
                         {/* General pages */}
                         <Route path={ROUTES.ABOUT.path} element={<About />} />
                         <Route
@@ -120,10 +107,11 @@ const App = () => {
                         />
 
                         {/* Seller */}
-                        <Route
-                          path={ROUTES.SELL.path}
-                          element={<SellerDashboard />}
-                        >
+                        <Route path={ROUTES.SELL.path}>
+                          <Route
+                            path={ROUTES.SELL.$.DASHBOARD.relativePath}
+                            element={<SellerDashboard />}
+                          />
                           <Route
                             path={ROUTES.SELL.$.ONBOARDING.relativePath}
                             element={<SellerOnboarding />}

diff --git a/frontend/src/components/files/FileRenderer.tsx b/frontend/src/components/files/FileRenderer.tsx
@@ -1,7 +1,7 @@
-import MJCFRenderer from "./MJCFRenderer";
-import STLRenderer from "./STLRenderer";
-import { UntarredFile } from "./Tarfile";
-import URDFRenderer from "./URDFRenderer";
+import MJCFRenderer from "@/components/files/MJCFRenderer";
+import STLRenderer from "@/components/files/STLRenderer";
+import URDFRenderer from "@/components/files/URDFRenderer";
+import { UntarredFile } from "@/components/files/untar";
 
 const isMJCFFile = (content: string, filename: string): boolean => {
   const extension = filename.split(".").pop()?.toLowerCase();
@@ -23,24 +23,25 @@ const FileRenderer: React.FC<{
     case "urdf":
       return (
         <URDFRenderer
-          urdfContent={new TextDecoder().decode(file.content)}
+          urdfContent={fileContent}
           files={allFiles}
           supportedThemes={["light", "dark"]}
         />
       );
-    case "stl":
-      return <STLRenderer stlContent={file.content.buffer} />;
     case "xml":
     case "mjcf":
       if (isMJCFFile(fileContent, file.name)) {
-        return <MJCFRenderer mjcfContent={fileContent} height="100%" />;
+        // return <MJCFRenderer mjcfContent={fileContent} files={allFiles} />;
+        return <MJCFRenderer />;
       } else {
         return (
           <div className="h-full w-full flex items-center justify-center">
             <p>Invalid MJCF file format</p>
           </div>
         );
       }
+    case "stl":
+      return <STLRenderer stlContent={file.content.buffer} />;
     default:
       return (
         <div className="h-full w-full flex items-center justify-center">