This commit is contained in:
@@ -2,6 +2,7 @@ import { CloseCircle, DocumentUpload, Gallery } from 'iconsax-react'
|
|||||||
import { type FC, useCallback, useEffect, useState } from 'react'
|
import { type FC, useCallback, useEffect, useState } from 'react'
|
||||||
import { useDropzone } from 'react-dropzone';
|
import { useDropzone } from 'react-dropzone';
|
||||||
import { clx } from '../helpers/utils';
|
import { clx } from '../helpers/utils';
|
||||||
|
import UploadProgressBar from './UploadProgressBar';
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
label: string;
|
label: string;
|
||||||
@@ -15,6 +16,8 @@ type Props = {
|
|||||||
/** نمایش وضعیت بارگذاری داخل باکس آپلود */
|
/** نمایش وضعیت بارگذاری داخل باکس آپلود */
|
||||||
isLoading?: boolean,
|
isLoading?: boolean,
|
||||||
loadingLabel?: string,
|
loadingLabel?: string,
|
||||||
|
/** درصد پیشرفت آپلود (۰ تا ۱۰۰) */
|
||||||
|
uploadProgress?: number,
|
||||||
/** بدون پیشنمایش زیر باکس (مثلاً گالری جداگانه دارد) */
|
/** بدون پیشنمایش زیر باکس (مثلاً گالری جداگانه دارد) */
|
||||||
hidePreview?: boolean,
|
hidePreview?: boolean,
|
||||||
}
|
}
|
||||||
@@ -77,8 +80,16 @@ const UploadBoxDraggble: FC<Props> = (props: Props) => {
|
|||||||
}, [props.coverUrl])
|
}, [props.coverUrl])
|
||||||
|
|
||||||
|
|
||||||
|
const showProgressOnly = props.isLoading && props.uploadProgress !== undefined;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
{showProgressOnly ? (
|
||||||
|
<UploadProgressBar
|
||||||
|
progress={props.uploadProgress!}
|
||||||
|
label={props.loadingLabel ?? `در حال آپلود... ${props.uploadProgress}٪`}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
<div
|
<div
|
||||||
{...getRootProps()}
|
{...getRootProps()}
|
||||||
className={clx(
|
className={clx(
|
||||||
@@ -114,6 +125,7 @@ const UploadBoxDraggble: FC<Props> = (props: Props) => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
{
|
{
|
||||||
!props.hidePreview && (files.length > 0 || perviews.length > 0) ? (
|
!props.hidePreview && (files.length > 0 || perviews.length > 0) ? (
|
||||||
|
|||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { type FC } from "react";
|
||||||
|
|
||||||
|
type UploadProgressBarProps = {
|
||||||
|
progress: number;
|
||||||
|
label?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const UploadProgressBar: FC<UploadProgressBarProps> = ({ progress, label }) => {
|
||||||
|
const clampedProgress = Math.min(100, Math.max(0, progress));
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex w-full flex-col items-center gap-2 py-2">
|
||||||
|
<div className="h-1.5 w-full overflow-hidden rounded-full bg-gray-200">
|
||||||
|
<div
|
||||||
|
className="h-full rounded-full bg-black transition-all duration-200"
|
||||||
|
style={{ width: `${clampedProgress}%` }}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="text-description text-xs">
|
||||||
|
{label ?? `${clampedProgress}٪`}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default UploadProgressBar;
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
import { type FC } from "react";
|
import { type FC } from "react";
|
||||||
import { DocumentUpload, VideoSquare } from "iconsax-react";
|
import { DocumentUpload, VideoSquare } from "iconsax-react";
|
||||||
import { clx } from "@/helpers/utils";
|
import { clx } from "@/helpers/utils";
|
||||||
|
import UploadProgressBar from "@/components/UploadProgressBar";
|
||||||
|
|
||||||
type VideoUploadZoneProps = {
|
type VideoUploadZoneProps = {
|
||||||
getRootProps: () => React.HTMLAttributes<HTMLDivElement>;
|
getRootProps: () => React.HTMLAttributes<HTMLDivElement>;
|
||||||
getInputProps: () => React.InputHTMLAttributes<HTMLInputElement>;
|
getInputProps: () => React.InputHTMLAttributes<HTMLInputElement>;
|
||||||
isLoading?: boolean;
|
isLoading?: boolean;
|
||||||
loadingLabel?: string;
|
loadingLabel?: string;
|
||||||
|
uploadProgress?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
const VideoUploadZone: FC<VideoUploadZoneProps> = ({
|
const VideoUploadZone: FC<VideoUploadZoneProps> = ({
|
||||||
@@ -14,7 +16,17 @@ const VideoUploadZone: FC<VideoUploadZoneProps> = ({
|
|||||||
getInputProps,
|
getInputProps,
|
||||||
isLoading = false,
|
isLoading = false,
|
||||||
loadingLabel = "در حال آپلود...",
|
loadingLabel = "در حال آپلود...",
|
||||||
|
uploadProgress,
|
||||||
}) => {
|
}) => {
|
||||||
|
if (isLoading && uploadProgress !== undefined) {
|
||||||
|
return (
|
||||||
|
<UploadProgressBar
|
||||||
|
progress={uploadProgress}
|
||||||
|
label={`${loadingLabel} ${uploadProgress}٪`}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
{...getRootProps()}
|
{...getRootProps()}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ const SettingsPanel = () => {
|
|||||||
if (!file) return
|
if (!file) return
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const result = await uploadFile(file)
|
const result = await uploadFile({ file })
|
||||||
const imageUrl = result?.data?.url
|
const imageUrl = result?.data?.url
|
||||||
if (!imageUrl) return
|
if (!imageUrl) return
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const AudioInput: FC = () => {
|
|||||||
try {
|
try {
|
||||||
for (const file of acceptedFiles) {
|
for (const file of acceptedFiles) {
|
||||||
try {
|
try {
|
||||||
const result = await uploadFile(file);
|
const result = await uploadFile({ file });
|
||||||
const audioUrl = result?.data?.url;
|
const audioUrl = result?.data?.url;
|
||||||
if (!audioUrl) continue;
|
if (!audioUrl) continue;
|
||||||
const audioId = `audio-${Date.now()}-${Math.random()}`;
|
const audioId = `audio-${Date.now()}-${Math.random()}`;
|
||||||
|
|||||||
@@ -10,14 +10,23 @@ const ImageGallery: FC = () => {
|
|||||||
const { gallery, addGalleryItem, removeGalleryItem } = useEditorStore();
|
const { gallery, addGalleryItem, removeGalleryItem } = useEditorStore();
|
||||||
const { mutateAsync: uploadFile } = useSingleUpload();
|
const { mutateAsync: uploadFile } = useSingleUpload();
|
||||||
const [isUploading, setIsUploading] = useState(false);
|
const [isUploading, setIsUploading] = useState(false);
|
||||||
|
const [uploadProgress, setUploadProgress] = useState(0);
|
||||||
|
|
||||||
const handleFileChange = async (files: File[]) => {
|
const handleFileChange = async (files: File[]) => {
|
||||||
if (files.length === 0) return;
|
if (files.length === 0) return;
|
||||||
|
|
||||||
setIsUploading(true);
|
setIsUploading(true);
|
||||||
|
setUploadProgress(0);
|
||||||
try {
|
try {
|
||||||
for (const file of files) {
|
for (let i = 0; i < files.length; i++) {
|
||||||
const result = await uploadFile(file);
|
const file = files[i];
|
||||||
|
const result = await uploadFile({
|
||||||
|
file,
|
||||||
|
onProgress: (fileProgress) => {
|
||||||
|
const overall = Math.round(((i + fileProgress / 100) / files.length) * 100);
|
||||||
|
setUploadProgress(overall);
|
||||||
|
},
|
||||||
|
});
|
||||||
const imageUrl = result?.data?.url;
|
const imageUrl = result?.data?.url;
|
||||||
if (!imageUrl) continue;
|
if (!imageUrl) continue;
|
||||||
|
|
||||||
@@ -33,6 +42,7 @@ const ImageGallery: FC = () => {
|
|||||||
// TODO: show error toast
|
// TODO: show error toast
|
||||||
} finally {
|
} finally {
|
||||||
setIsUploading(false);
|
setIsUploading(false);
|
||||||
|
setUploadProgress(0);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -54,6 +64,7 @@ const ImageGallery: FC = () => {
|
|||||||
isMultiple={true}
|
isMultiple={true}
|
||||||
hidePreview
|
hidePreview
|
||||||
isLoading={isUploading}
|
isLoading={isUploading}
|
||||||
|
uploadProgress={isUploading ? uploadProgress : undefined}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{gallery.length === 0 && !isUploading && (
|
{gallery.length === 0 && !isUploading && (
|
||||||
|
|||||||
@@ -10,16 +10,27 @@ const VideoInput: FC = () => {
|
|||||||
useEditorStore();
|
useEditorStore();
|
||||||
const { mutateAsync: uploadFile } = useSingleUpload();
|
const { mutateAsync: uploadFile } = useSingleUpload();
|
||||||
const [isUploading, setIsUploading] = useState(false);
|
const [isUploading, setIsUploading] = useState(false);
|
||||||
|
const [uploadProgress, setUploadProgress] = useState(0);
|
||||||
|
|
||||||
const onDrop = useCallback(
|
const onDrop = useCallback(
|
||||||
async (acceptedFiles: File[]) => {
|
async (acceptedFiles: File[]) => {
|
||||||
if (acceptedFiles.length === 0) return;
|
if (acceptedFiles.length === 0) return;
|
||||||
|
|
||||||
setIsUploading(true);
|
setIsUploading(true);
|
||||||
|
setUploadProgress(0);
|
||||||
try {
|
try {
|
||||||
for (const file of acceptedFiles) {
|
for (let i = 0; i < acceptedFiles.length; i++) {
|
||||||
|
const file = acceptedFiles[i];
|
||||||
try {
|
try {
|
||||||
const result = await uploadFile(file);
|
const result = await uploadFile({
|
||||||
|
file,
|
||||||
|
onProgress: (fileProgress) => {
|
||||||
|
const overall = Math.round(
|
||||||
|
((i + fileProgress / 100) / acceptedFiles.length) * 100
|
||||||
|
);
|
||||||
|
setUploadProgress(overall);
|
||||||
|
},
|
||||||
|
});
|
||||||
const videoUrl = result?.data?.url;
|
const videoUrl = result?.data?.url;
|
||||||
if (!videoUrl) continue;
|
if (!videoUrl) continue;
|
||||||
const videoId = `video-${Date.now()}-${Math.random()}`;
|
const videoId = `video-${Date.now()}-${Math.random()}`;
|
||||||
@@ -41,6 +52,7 @@ const VideoInput: FC = () => {
|
|||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
setIsUploading(false);
|
setIsUploading(false);
|
||||||
|
setUploadProgress(0);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
[addObject, setSelectedObjectId, setTool, uploadFile]
|
[addObject, setSelectedObjectId, setTool, uploadFile]
|
||||||
@@ -71,6 +83,7 @@ const VideoInput: FC = () => {
|
|||||||
getRootProps={getRootProps}
|
getRootProps={getRootProps}
|
||||||
getInputProps={getInputProps}
|
getInputProps={getInputProps}
|
||||||
isLoading={isUploading}
|
isLoading={isUploading}
|
||||||
|
uploadProgress={isUploading ? uploadProgress : undefined}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{videoObjects.length > 0 && (
|
{videoObjects.length > 0 && (
|
||||||
|
|||||||
@@ -1,9 +1,15 @@
|
|||||||
import { useMutation } from "@tanstack/react-query";
|
import { useMutation } from "@tanstack/react-query";
|
||||||
import * as api from "../service/UploaderService";
|
import * as api from "../service/UploaderService";
|
||||||
|
|
||||||
|
export type SingleUploadParams = {
|
||||||
|
file: File;
|
||||||
|
onProgress?: (progress: number) => void;
|
||||||
|
};
|
||||||
|
|
||||||
export const useSingleUpload = () => {
|
export const useSingleUpload = () => {
|
||||||
return useMutation({
|
return useMutation({
|
||||||
mutationFn: api.singleUpload,
|
mutationFn: ({ file, onProgress }: SingleUploadParams) =>
|
||||||
|
api.singleUpload(file, onProgress),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,21 @@ import type {
|
|||||||
} from "../types/Types";
|
} from "../types/Types";
|
||||||
|
|
||||||
export const singleUpload = async (
|
export const singleUpload = async (
|
||||||
file: File
|
file: File,
|
||||||
|
onProgress?: (progress: number) => void
|
||||||
): Promise<SingleUploadResponse> => {
|
): Promise<SingleUploadResponse> => {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("file", file);
|
formData.append("file", file);
|
||||||
const { data } = await axios.post<SingleUploadResponse>(
|
const { data } = await axios.post<SingleUploadResponse>(
|
||||||
`/admin/single-file`,
|
`/admin/single-file`,
|
||||||
formData
|
formData,
|
||||||
|
{
|
||||||
|
onUploadProgress: (event) => {
|
||||||
|
if (event.total) {
|
||||||
|
onProgress?.(Math.round((event.loaded / event.total) * 100));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
);
|
);
|
||||||
return data;
|
return data;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user