Merge remote-tracking branch 'origin/dev' into feature/ms-18

Author: SmallhillCZ

.vscode/settings.json

@@ -9,7 +9,12 @@
     "source.organizeImports": "always",
     "source.fixAll.eslint": "always"
   },
-  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
   "jest.runMode": "on-demand",
   "git-blame.gitWebUrl": ""
-}
+}

studio/app/api/models/[model]/data/[file]/route.ts

@@ -1,15 +1,17 @@
-import { downloadModelArchive } from "@features/models/queries/downloadModelArchive";
+import { getModelArchive } from "@features/models/queries/getModelArchive";
 import mime from "mime";
 
 export async function GET(
-    req: Request,
-    { params }: { params: { model: string} }
-  ) {
-    const fileStream: ReadableStream = await downloadModelArchive(parseInt(params.model));
-  
-    return new Response(fileStream, {
-      headers: {
-        "Content-Type": mime.getType(params.model) ?? "application/octet-stream",
-      },
-    });
-  }
+  req: Request,
+  { params }: { params: { model: string } },
+) {
+  const fileStream: ReadableStream = await getModelArchive(
+    parseInt(params.model),
+  );
+
+  return new Response(fileStream, {
+    headers: {
+      "Content-Type": mime.getType(params.model) ?? "application/octet-stream",
+    },
+  });
+}

studio/app/api/models/[model]/data/route.ts

@@ -0,0 +1,18 @@
+import getProjectVersionFile from "@features/projects-versions/queries/getProjectVersionFile";
+import mime from "mime";
+
+export async function GET(
+  req: Request,
+  { params }: { params: { version: string } },
+) {
+  const fileStream: ReadableStream = await getProjectVersionFile(
+    parseInt(params.version),
+  );
+
+  return new Response(fileStream, {
+    headers: {
+      "Content-Type":
+        mime.getType(params.version) ?? "application/octet-stream",
+    },
+  });
+}

studio/app/api/projectVersions/[version]/data/route.ts

@@ -0,0 +1,22 @@
+import { createProjectVersion } from "@features/projects-versions/mutations/createProjectVersion";
+import { z } from "zod";
+import { zfd } from "zod-form-data";
+
+const postSchema = zfd.formData({
+  file: zfd.file(),
+  projectId: zfd.numeric(),
+});
+
+export async function POST(req: Request) {
+  try {
+    const data = postSchema.parse(await req.formData());
+    const model = await createProjectVersion(data.projectId, data.file);
+
+    return Response.json(model, { status: 201 });
+  } catch (e) {
+    if (e instanceof z.ZodError) {
+      return new Response(e.message, { status: 400 });
+    }
+    throw e;
+  }
+}

studio/app/api/projectVersions/route.ts

@@ -1,24 +1,28 @@
 "use client";
 
-import { Button, Flex } from "@adobe/react-spectrum";
+import { Button, Grid, Heading, View } from "@adobe/react-spectrum";
 import Link from "next/link";
 
 export default function Home() {
   return (
-    <Flex
-      direction="column"
+    <Grid
       width="100%"
       height="100%"
-      maxWidth="size-6000"
-      marginX="auto"
       gap="size-100"
-      justifyContent="center"
-      alignItems="center"
+      justifyContent="start"
+      alignItems="start"
     >
-      <h1>Metacity Studio</h1>
-      <Button href="/projects" variant="accent" elementType={Link}>
-        Log In
-      </Button>
-    </Flex>
+      <View marginX="size-100">
+        <Heading level={1}>Metacity Studio</Heading>
+        <Button
+          href="/projects"
+          variant="accent"
+          style="outline"
+          elementType={Link}
+        >
+          Log In
+        </Button>
+      </View>
+    </Grid>
   );
 }

studio/app/page.tsx

@@ -0,0 +1,35 @@
+"use client";
+
+import { Flex, View } from "@adobe/react-spectrum";
+import { withPageAuthRequired } from "@auth0/nextjs-auth0/client";
+import { withUserEnabled } from "@core/utils/withUserEnabled";
+import Editor from "@features/editor/components/Editor";
+
+import EditorHeader from "@features/editor/components/EditorHeader";
+import { EditorProvider } from "@features/editor/providers/EditorProvider";
+
+type ProjectPageProps = {
+  params: {
+    projectId: string;
+  };
+};
+
+function ProjectPage({ params }: ProjectPageProps) {
+  const projectId = params.projectId;
+  const sanitizedId = parseInt(projectId, 10);
+
+  return (
+    <EditorProvider>
+      <Flex width="100vw" height="100vh" direction="column">
+        <View gridArea="header" width="100%">
+          <EditorHeader sanitizedId={sanitizedId} />
+        </View>
+        <View gridArea="content" overflow="hidden" width="100%" height="100%">
+          <Editor projectId={sanitizedId} />
+        </View>
+      </Flex>
+    </EditorProvider>
+  );
+}
+
+export default withPageAuthRequired(withUserEnabled(ProjectPage));

studio/app/projects/[projectId].tsx

@@ -48,5 +48,4 @@ function ProjectListPage() {
   );
 }
 
-<ModelList />;
 export default withPageAuthRequired(withUserEnabled(ProjectListPage));

studio/app/projects/[projectId]/page.tsx

@@ -1,12 +1,18 @@
 import { Content, Heading, IllustratedMessage } from "@adobe/react-spectrum";
 import NotFound from "@spectrum-icons/illustrations/NotFound";
 
-export const NoData = () => {
+type EmptyProps = {
+  heading?: string;
+  content?: string;
+};
+
+export const NoData = (props: EmptyProps) => {
+  const { heading = "No Data", content = "Nothing to find here" } = props;
   return (
     <IllustratedMessage>
       <NotFound />
-      <Heading>No Data</Heading>
-      <Content>Nothing to find here</Content>
+      <Heading>{heading}</Heading>
+      <Content>{content}</Content>
     </IllustratedMessage>
   );
 };