Update imports

MuckRock · Apr 2, 2024 · 132829f · 132829f
1 parent eefe60f
commit 132829f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 72 deletions.
diff --git a/src/lib/components/forms/DocumentUpload.svelte b/src/lib/components/forms/DocumentUpload.svelte
@@ -2,17 +2,18 @@
   import { filesize } from "filesize";
   import { _ } from "svelte-i18n";
   import { File16, File24, Upload16, XCircleFill24 } from "svelte-octicons";
-  import Dropzone from "../common/Dropzone.svelte";
-  import Flex from "../common/Flex.svelte";
-  import Field from "../common/Field.svelte";
-  import FieldLabel from "../common/FieldLabel.svelte";
-  import InputSelect from "../common/InputSelect.svelte";
-  import Switch from "../common/Switch.svelte";
-  import Premium from "../common/Premium.svelte";
+
   import Button from "../common/Button.svelte";
+  import Dropzone from "./Dropzone.svelte";
   import Empty from "../common/Empty.svelte";
-  import InputText from "../common/InputText.svelte";
-  import InputFile from "../common/InputFile.svelte";
+  import Field from "./Field.svelte";
+  import FieldLabel from "./FieldLabel.svelte";
+  import Flex from "$lib/components/common/Flex.svelte";
+  import InputFile from "./InputFile.svelte";
+  import InputSelect from "./InputSelect.svelte";
+  import InputText from "./InputText.svelte";
+  import Premium from "../common/Premium.svelte";
+  import Switch from "$lib/components/common/Switch.svelte";
   import { removeUnsupportedTypes } from "@/lib/utils/validateFiles";
   import AccessLevel from "../documents/AccessLevel.svelte";
 

diff --git a/src/lib/components/common/Dropzone.svelte → src/lib/components/forms/Dropzone.svelte b/src/lib/components/common/Dropzone.svelte → src/lib/components/forms/Dropzone.svelte
diff --git a/...ts/common/stories/Dropzone.stories.svelte → ...nts/forms/stories/Dropzone.stories.svelte b/...ts/common/stories/Dropzone.stories.svelte → ...nts/forms/stories/Dropzone.stories.svelte
@@ -10,7 +10,7 @@
   };
 
   export const meta = {
-    title: "Components / Common / Dropzone",
+    title: "Components / Forms / Dropzone",
     component: Dropzone,
     tags: ["autodocs"],
     parameters: { layout: "centered" },

diff --git a/src/routes/app/upload/+page.svelte b/src/routes/app/upload/+page.svelte
@@ -5,7 +5,8 @@
 
   import { getContext } from "svelte";
 
-  import { DOCUMENT_TYPES } from "@/config/config.js";
+  import DocumentUpload from "$lib/components/forms/DocumentUpload.svelte";
+  import { create, upload, process } from "$lib/api/documents";
 
   const me: Writable<User> = getContext("me");
 
@@ -14,16 +15,9 @@
 
   $: documents = Array.from(files || []).map((file) => {
     return {
-      id: null,
       title: file.name,
       description: "",
       access: "private",
-      asset_url: "",
-      canonical_url: "",
-      created_at: new Date(),
-      edit_access: true,
-      data: {},
-      user: $me,
     } as Document;
   });
 </script>
@@ -32,57 +26,4 @@
   <title>Upload | DocumentCloud</title>
 </svelte:head>
 
-<div class="upload">
-  <h1>Upload</h1>
-
-  <form method="post">
-    <fieldset>
-      <label>
-        Files
-        <input
-          bind:files
-          type="file"
-          name="files"
-          multiple
-          accept={DOCUMENT_TYPES.join(",")}
-        />
-      </label>
-    </fieldset>
-
-    <fieldset class="documents">
-      {#each documents || [] as doc, i}
-        {@const file = files[i]}
-        <h3>{file.name}</h3>
-        <label>
-          <span>Title</span>
-          <input name="title" type="text" bind:value={documents[i].title} />
-        </label>
-
-        <label>
-          <span>Description</span>
-          <textarea name="description" bind:value={documents[i].description}
-          ></textarea>
-        </label>
-      {/each}
-    </fieldset>
-
-    <fieldset>
-      <input
-        disabled={!files || files.length === 0}
-        type="submit"
-        value="Upload"
-      />
-    </fieldset>
-  </form>
-</div>
-
-<style>
-  .upload {
-    padding: 1em;
-  }
-
-  label {
-    display: flex;
-    gap: 1.5em;
-  }
-</style>
+<DocumentUpload />