|
-
+ > */}
|
{file.name} |
- {bytesToSize(file.sizeOriginal)} |
+ {byteStringToHumanSizeString(file.size)} |
{file.uploadingState ? (
file.uploadingState != "finished" ? (
@@ -60,9 +59,9 @@ const FileList = ({
) : (
- router.push(aw.storage.getFileDownload(shareId, file.$id))
- }
+ onClick={async () => {
+ await shareService.downloadFile(shareId, file.id);
+ }}
>
diff --git a/src/components/share/showEnterPasswordModal.tsx b/frontend/src/components/share/showEnterPasswordModal.tsx
similarity index 96%
rename from src/components/share/showEnterPasswordModal.tsx
rename to frontend/src/components/share/showEnterPasswordModal.tsx
index f2d1424..5e6ac5e 100644
--- a/src/components/share/showEnterPasswordModal.tsx
+++ b/frontend/src/components/share/showEnterPasswordModal.tsx
@@ -42,7 +42,7 @@ const Body = ({ submitCallback }: { submitCallback: any }) => {
.then((res: any) => res)
.catch((e: any) => {
const error = e.response.data.message;
- if (error == "wrong_password") {
+ if (error == "Wrong password") {
setPasswordWrong(true);
}
})
diff --git a/src/components/share/showErrorModal.tsx b/frontend/src/components/share/showErrorModal.tsx
similarity index 100%
rename from src/components/share/showErrorModal.tsx
rename to frontend/src/components/share/showErrorModal.tsx
diff --git a/src/components/upload/Dropzone.tsx b/frontend/src/components/upload/Dropzone.tsx
similarity index 95%
rename from src/components/upload/Dropzone.tsx
rename to frontend/src/components/upload/Dropzone.tsx
index c830af6..794f26f 100644
--- a/src/components/upload/Dropzone.tsx
+++ b/frontend/src/components/upload/Dropzone.tsx
@@ -8,11 +8,13 @@ import {
useMantineTheme,
} from "@mantine/core";
import { Dropzone as MantineDropzone, DropzoneStatus } from "@mantine/dropzone";
+import getConfig from "next/config";
import React, { Dispatch, ForwardedRef, SetStateAction, useRef } from "react";
import { CloudUpload, Upload } from "tabler-icons-react";
-import { useConfig } from "../../utils/config.util";
import toast from "../../utils/toast.util";
+const { publicRuntimeConfig } = getConfig()
+
const useStyles = createStyles((theme) => ({
wrapper: {
position: "relative",
@@ -53,13 +55,12 @@ const Dropzone = ({
setFiles: Dispatch>;
}) => {
const theme = useMantineTheme();
- const config = useConfig();
const { classes } = useStyles();
const openRef = useRef<() => void>();
return (
{
toast.error(e[0].errors[0].message);
}}
diff --git a/src/components/upload/FileList.tsx b/frontend/src/components/upload/FileList.tsx
similarity index 88%
rename from src/components/upload/FileList.tsx
rename to frontend/src/components/upload/FileList.tsx
index 7cd94a4..872f3f4 100644
--- a/src/components/upload/FileList.tsx
+++ b/frontend/src/components/upload/FileList.tsx
@@ -2,7 +2,7 @@ import { ActionIcon, Loader, Table } from "@mantine/core";
import { Dispatch, SetStateAction } from "react";
import { CircleCheck, Trash } from "tabler-icons-react";
import { FileUpload } from "../../types/File.type";
-import { bytesToSize } from "../../utils/math/byteToSize.util";
+import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util";
const FileList = ({
files,
@@ -20,7 +20,7 @@ const FileList = ({
| {file.name} |
{file.type} |
- {bytesToSize(file.size)} |
+ {byteStringToHumanSizeString(file.size.toString())} |
{file.uploadingState ? (
file.uploadingState != "finished" ? (
diff --git a/src/components/upload/showCompletedUploadModal.tsx b/frontend/src/components/upload/showCompletedUploadModal.tsx
similarity index 80%
rename from src/components/upload/showCompletedUploadModal.tsx
rename to frontend/src/components/upload/showCompletedUploadModal.tsx
index c869514..4578008 100644
--- a/src/components/upload/showCompletedUploadModal.tsx
+++ b/frontend/src/components/upload/showCompletedUploadModal.tsx
@@ -9,15 +9,15 @@ import {
import { useClipboard } from "@mantine/hooks";
import { useModals } from "@mantine/modals";
import { ModalsContextProps } from "@mantine/modals/lib/context";
+import moment from "moment";
import { useRouter } from "next/router";
import { Copy } from "tabler-icons-react";
+import { Share } from "../../types/share.type";
import toast from "../../utils/toast.util";
const showCompletedUploadModal = (
modals: ModalsContextProps,
- link: string,
- expiresAt: string,
- mode: "email" | "standard"
+ share: Share,
) => {
return modals.openModal({
closeOnClickOutside: false,
@@ -26,19 +26,17 @@ const showCompletedUploadModal = (
title: (
Share ready
- {mode == "email" && (
- Emails were sent to the to invited users.
- )}
),
- children: | ,
+ children: ,
});
};
-const Body = ({ link, expiresAt }: { link: string; expiresAt: string }) => {
+const Body = ({ share }: { share: Share }) => {
const clipboard = useClipboard({ timeout: 500 });
const modals = useModals();
const router = useRouter();
+ const link = `${window.location.origin}/share/${share.id}`;
return (
{
color: theme.colors.gray[6],
})}
>
- Your share expires at {expiresAt}{" "}
+ Your share expires at {moment(share.expiration).format("LLL")}
|
Pingvin Share