From 75d0ff4b903b1506e7a033c3f7d844a96529a37a Mon Sep 17 00:00:00 2001 From: Mohamed Basrai Date: Wed, 13 Mar 2024 12:33:01 -0400 Subject: [PATCH 1/3] initial doc upload --- frontend/components/write/metadata/FileUpload.tsx | 7 ++++--- frontend/components/write/metadata/MetadataBox.tsx | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/components/write/metadata/FileUpload.tsx b/frontend/components/write/metadata/FileUpload.tsx index be9a8393..e4e7512f 100644 --- a/frontend/components/write/metadata/FileUpload.tsx +++ b/frontend/components/write/metadata/FileUpload.tsx @@ -12,9 +12,9 @@ import { BsUpload } from "react-icons/bs"; import { useUploadMetadata } from "../../../hooks/useUploadNote"; type FileUploadProps = { - accept?: string; multiple?: boolean; name: string; + isImage?: boolean; }; export type FileControlProps = FormControlProps & @@ -27,10 +27,11 @@ export const FileControl: React.FC = React.forwardRef( label, buttonProps, multiple = false, - accept = ".jpg,.jpeg,.png,.gif,.pdf,.docx,.csv", + isImage, ...rest } = props; - const [{ onChange, ...field }, , { setValue }] = useField(name); + const accept = isImage ? ".jpg,.jpeg,.png,.gif" : ".pdf,.docx,.csv"; + const [{ ...field }, , { setValue }] = useField(name); const inputRef = useRef(null); const toast = useToast(); const { upload } = useUploadMetadata(); diff --git a/frontend/components/write/metadata/MetadataBox.tsx b/frontend/components/write/metadata/MetadataBox.tsx index 8e091ac1..82c5a9d1 100644 --- a/frontend/components/write/metadata/MetadataBox.tsx +++ b/frontend/components/write/metadata/MetadataBox.tsx @@ -30,7 +30,14 @@ function MetadataBox() { flexGrow={1} maxW="100%" > - + + + + + + + + Date: Wed, 13 Mar 2024 12:35:03 -0400 Subject: [PATCH 2/3] update --- frontend/components/write/metadata/MetadataBox.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/components/write/metadata/MetadataBox.tsx b/frontend/components/write/metadata/MetadataBox.tsx index 82c5a9d1..1c852186 100644 --- a/frontend/components/write/metadata/MetadataBox.tsx +++ b/frontend/components/write/metadata/MetadataBox.tsx @@ -35,7 +35,7 @@ function MetadataBox() { - + @@ -51,7 +51,7 @@ function MetadataBox() { - + From 19c8e1191f3b6c0d5ca11175627529969de66d9f Mon Sep 17 00:00:00 2001 From: Mohamed Basrai Date: Mon, 25 Mar 2024 15:04:10 -0400 Subject: [PATCH 3/3] storage file --- services/metadata_upload/nft_storage.mjs | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/services/metadata_upload/nft_storage.mjs b/services/metadata_upload/nft_storage.mjs index 6f5922ef..e1ac698b 100644 --- a/services/metadata_upload/nft_storage.mjs +++ b/services/metadata_upload/nft_storage.mjs @@ -4,8 +4,6 @@ import multer from "multer"; import lighthouse from "@lighthouse-web3/sdk"; -import imageType from "image-type"; - const app = express(); app.use(function (req, res, next) { @@ -42,12 +40,7 @@ app.post("/lighthouse", cpUpload, async function (req, res) { obj.filename = req.files.file[0].originalname; obj.file = response.data.Hash; - - const type = await imageType(fileContent); - const isImage = !!type; - if (isImage) { - obj.image = "ipfs://" + response.data.Hash; - } + obj.fileUrl = "ipfs://" + response.data.Hash; } if (req.files.document) { @@ -66,7 +59,7 @@ app.post("/lighthouse", cpUpload, async function (req, res) { res.send({ key: response.data.Hash, - imageUrl: obj.image ?? "", + fileUrl: obj.fileUrl ?? "", url: "https://gateway.lighthouse.storage/ipfs/" + response.data.Hash, }); } catch (err) {