-
-
{name1}
-
{sender}
+
+
+
+
+
+
+
+
+
+
+
+ {name1}
+
+ {sender}
+
+ }
+ sx={{ ml: 1, }}
+ />
+
+
+
+
+
+
+
+
+
+
+ {name2}
+
+ {receiver}
+
+ }
+ sx={{ ml: 1, }}
+ />
+
+
-
-
-
-
{name2}
-
{receiver}
+
+
+
-
-
-
-
-
-
-
Received files
-
-
- {" "}
-
+
-
);
}
-export default Interface;
+export default Interface;
\ No newline at end of file
diff --git a/client/src/components/ReceivedFiles.js b/client/src/components/ReceivedFiles.js
index 93bf752..444f631 100644
--- a/client/src/components/ReceivedFiles.js
+++ b/client/src/components/ReceivedFiles.js
@@ -9,120 +9,96 @@ import ListItemText from "@mui/material/ListItemText";
import ListItemAvatar from "@mui/material/ListItemAvatar";
import Typography from "@mui/material/Typography";
import FileCopyOutlinedIcon from "@mui/icons-material/FileCopyOutlined";
+import { Button } from "@mui/material";
+import "../css/scrollbar.css"
-export default function ReceivedFiles() {
+// file imports
+import ipfs from "../utils/ipfs";
+import { convertWordArrayToUint8Array, Utf8ArrayToStr } from '../utils/stringConversion';
+var CryptoJS = require("crypto-js");
+const quickEncrypt = require("quick-encrypt");
+var FileSaver = require('file-saver');
+
+export default function ReceivedFiles({ receivedFiles1, receivedFiles2, privateKey }) {
+ const [fileAll, setFileAll] = React.useState([]);
+ React.useEffect(() => {
+ if (Object.keys(receivedFiles1).length > 0 && Object.keys(receivedFiles2).length > 0) {
+ const allfiles = [];
+ for (var i = 0; i < receivedFiles1[0].length; i++) {
+ let file = {
+ fileName: receivedFiles1[0][i],
+ ipfsHash: receivedFiles1[1][i],
+ senderEncryptedAESKey: receivedFiles1[2][i],
+ receiverEncryptedAESKey: receivedFiles2[0][i],
+ sender: receivedFiles2[1][i],
+ receiver: receivedFiles2[2][i],
+ }
+ allfiles.push(file)
+ }
+ setFileAll(allfiles);
+ }
+ }, [receivedFiles1, receivedFiles2])
+
+ const download = async (index) => {
+ var AESkey = quickEncrypt.decrypt(fileAll[index].receiverEncryptedAESKey, privateKey);
+ let resolvedString = '';
+ for await (const chunk of ipfs.cat(fileAll[index].ipfsHash)) {
+ resolvedString += Utf8ArrayToStr(chunk);
+ }
+ var decrypted = CryptoJS.AES.decrypt(resolvedString, AESkey);
+ var uint8array = convertWordArrayToUint8Array(decrypted);
+ var blob = new Blob([uint8array], { type: "application/octet-stream;" });
+ FileSaver.saveAs(blob, fileAll[index].fileName);
+ }
+
+
return (
+
+
+ Received files
+
-
-
-
-
-
-
- File size
-
- {" 35 MB"}
-
- }
- />
-
-
-
-
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 25 MB"}
-
- }
- />
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 75 MB"}
-
- }
- />
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 100 MB"}
-
- }
- />
-
+ {fileAll.length > 0 ?
+ fileAll.map((file, index) => {
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ )
+ })
+ : No files received
}
);
diff --git a/client/src/components/SentFiles.js b/client/src/components/SentFiles.js
index 220ea5f..ac71efe 100644
--- a/client/src/components/SentFiles.js
+++ b/client/src/components/SentFiles.js
@@ -2,6 +2,7 @@
import React from "react";
// mui imports
+
import List from "@mui/material/List";
import ListItem from "@mui/material/ListItem";
import Divider from "@mui/material/Divider";
@@ -9,120 +10,97 @@ import ListItemText from "@mui/material/ListItemText";
import ListItemAvatar from "@mui/material/ListItemAvatar";
import Typography from "@mui/material/Typography";
import FileCopyOutlinedIcon from "@mui/icons-material/FileCopyOutlined";
+import { Button, Card } from "@mui/material";
+import "../css/scrollbar.css"
+
+// file imports
+import ipfs from "../utils/ipfs";
+import {convertWordArrayToUint8Array, Utf8ArrayToStr} from '../utils/stringConversion';
+var CryptoJS = require("crypto-js");
+const quickEncrypt = require("quick-encrypt");
+var FileSaver = require('file-saver');
+
+export default function SentFiles({sentFiles1, sentFiles2, privateKey}) {
+ const [fileAll, setFileAll] = React.useState([]);
+ React.useEffect(() => {
+ if(Object.keys(sentFiles1).length > 0 && Object.keys(sentFiles2).length > 0){
+ const allfiles = [];
+ for(var i = 0; i < sentFiles1[0].length; i++) {
+ let file = {
+ fileName: sentFiles1[0][i],
+ ipfsHash: sentFiles1[1][i],
+ senderEncryptedAESKey: sentFiles1[2][i],
+ receiverEncryptedAESKey: sentFiles2[0][i],
+ sender: sentFiles2[1][i],
+ receiver: sentFiles2[2][i],
+ }
+ allfiles.push(file)
+ }
+ setFileAll(allfiles);
+ }
+ }, [sentFiles1, sentFiles2])
+
+
+ const download = async(index) => {
+ var AESkey = quickEncrypt.decrypt(fileAll[index].senderEncryptedAESKey, privateKey);
+ let resolvedString = '';
+ for await (const chunk of ipfs.cat(fileAll[index].ipfsHash)) {
+ resolvedString += Utf8ArrayToStr(chunk);
+ }
+ var decrypted = CryptoJS.AES.decrypt(resolvedString, AESkey);
+ var uint8array = convertWordArrayToUint8Array(decrypted);
+ var blob=new Blob([uint8array],{type:"application/octet-stream;"});
+ FileSaver.saveAs(blob, fileAll[index].fileName);
+ }
+
-export default function SentFiles() {
return (
+
+
+ Sent files
+
-
-
-
-
-
-
- File size
-
- {" 35 MB"}
-
- }
- />
-
-
-
-
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 25 MB"}
-
- }
- />
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 75 MB"}
-
- }
- />
-
-
-
-
- {/* */}
-
-
-
-
- File size
-
- {" 100 MB"}
-
- }
- />
-
+ {fileAll.length > 0 ?
+ fileAll.map((file, index) => {
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ )
+ })
+ : No files sent
}
);
diff --git a/client/src/components/ShareGlobally.js b/client/src/components/ShareGlobally.js
index dbb2646..0a8cb55 100644
--- a/client/src/components/ShareGlobally.js
+++ b/client/src/components/ShareGlobally.js
@@ -20,11 +20,10 @@ import UserAccount from "../contracts/UserAccount.json";
import GlobalShare from "../contracts/GlobalShare.json";
import ipfs from "../utils/ipfs";
-const ShareGlobally = () => {
+const ShareGlobally = ({refresh, setRefresh}) => {
const [open, setOpen] = React.useState(false);
const handleClickOpen = () => {
- console.log("hello")
setOpen(true);
};
@@ -124,7 +123,8 @@ const ShareGlobally = () => {
_ipfsHash: ipfsHash
})
.then((res) => {
- console.log(res)
+ setRefresh(!refresh);
+ handleClose();
})
.catch((e) => {
console.log(e)
@@ -146,7 +146,7 @@ const ShareGlobally = () => {
-