fix: upload files

Barresi · Jul 10, 2024 · bfba70a · bfba70a
1 parent 90714fb
commit bfba70a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/src/features/input-create-post/ui/input-create-post.tsx b/src/features/input-create-post/ui/input-create-post.tsx
@@ -13,14 +13,7 @@ const InputCreatePost: FC<IInputCreatePostProps> = ({ className }) => {
   const user = useAppSelector(selectUser)
   const dispatch = useAppDispatch()
   const handleCreatePost = async (text: string, pictures?: FileList): Promise<void> => {
-    const formData = new FormData()
-    formData.append(`text`, text)
-    if (pictures)
-      Array.from(pictures).forEach((file, index) => {
-        formData.append(`file${index}`, file)
-      })
-
-    await createPost(formData)
+    await createPost({ text, pictures })
     dispatch(getAllPostsThunk())
   }
   return (

diff --git a/src/shared/api/news/news.ts b/src/shared/api/news/news.ts
@@ -14,8 +14,17 @@ export const getAllPosts = async (): Promise<IGetPostsResponse> => {
   return res.data
 }
 
-export const createPost = async (form: ICreatePostForm): Promise<ICreatePostResponse> => {
-  const res = await apiWithAuth.post<ICreatePostResponse>('/posts', form)
+export const createPost = async ({
+  text,
+  pictures
+}: ICreatePostForm): Promise<ICreatePostResponse> => {
+  const formData = new FormData()
+  formData.append(`text`, text)
+  if (pictures)
+    Array.from(pictures).forEach((file) => {
+      formData.append('pictures', file)
+    })
+  const res = await apiWithAuth.post<ICreatePostResponse>('/posts', formData)
 
   return res.data
 }

diff --git a/src/shared/api/user-info/user-info.ts b/src/shared/api/user-info/user-info.ts
@@ -20,9 +20,12 @@ export const getUserInfo = async (): Promise<IGetUserInfoResponse> => {
 export const editUserInfo = async (
   form: IEditUserInfoForm
 ): Promise<IEditUserInfoResponse> => {
-  const res = await apiWithAuth.patch<IEditUserInfoResponse>('/auth/account', form, {
-    headers: { 'Content-Type': 'multipart/form-data' }
-  })
+  const formData = new FormData()
+  for (const property in form) {
+    formData.append(property, form[property as keyof IEditUserInfoForm] as File | string)
+  }
+
+  const res = await apiWithAuth.patch<IEditUserInfoResponse>('/auth/account', formData)
 
   return res.data
 }

diff --git a/src/shared/ui/input-send-message.tsx b/src/shared/ui/input-send-message.tsx
@@ -12,7 +12,7 @@ import send from '@assets/ui/send.svg'
 interface IInputSendMessageProps extends IInputProps {
   avatar?: string | null
   withPicture: boolean
-  sendMessage: (message: string, pictures?: FileList) => void
+  sendMessage: (message: string, pictures?: FileList) => Promise<void>
 }
 
 // Todo Переписать в textarea