Merge branch 'main' into sreyom

Author: sreyom31

src/components/Card.js

@@ -17,6 +17,5 @@ const Card = (props) => {
     </Modal>
   );
 };
-
 export default Card;
 

src/components/Download.js

@@ -1,81 +1,79 @@
-import { Fragment, useState } from "react";
+import {Fragment,useState,useEffect,useCallback, useEffec } from "react";
+import {Link,useParams} from 'react-router-dom'
 import "./FileUpload.css";
-import { Link } from "react-router-dom";
 import { create } from "ipfs-http-client";
-import Card from "../components/Card";
+import Web3 from 'web3'
+import { lock_addr,lock_abi } from "../wallet/config";
 import LoadingSpinner from "./LoadingSpinner";
 import download from "../images/download.png";
 const Cryptr = require("cryptr");
 const client = create("https://ipfs.infura.io:5001/api/v0");
 
-const FileUpload = (props) => {
-  const [name, setName] = useState("");
-  const [filename, setFilename] = useState("Choose a File");
-  const [file, setFile] = useState("");
-  const [password, setPassword] = useState("");
-  const [cpassword, setCPassword] = useState("");
-  const [link, setLink] = useState("");
-  const [message, setMessage] = useState("");
-  const [uploading, setUploading] = useState(false);
-  const [modal, setModal] = useState(false);
-
-  const onChange = (e) => {
-    setFile(e.target.files[0]);
-    setFilename(e.target.files[0].name);
-  };
 
-  const formSubmission = async (e) => {
-    e.preventDefault();
-    if (!password === cpassword && name && file) {
-      console.log("not met");
-      return;
-    }
-    setUploading(true);
-    const cryptr = new Cryptr(cpassword);
-    try {
-      const options = {
-        wrapWithDirectory: true,
-      };
-      const files = [{ path: filename, content: file }];
-      const added = await client.add(files, options);
-      const url = `https://ipfs.infura.io/ipfs/${added.cid.toString()}/${filename}`;
-      console.log(url);
-      const encryptedString = cryptr.encrypt(url);
-      setLink(encryptedString);
-      setMessage("File Uploaded");
-    } catch (error) {
-      console.log("Error uploading file: ", error);
-      setMessage(error);
-    }
-    setTimeout(() => setMessage(""), 10000);
-    setName("");
-    setCPassword("");
-    setPassword("");
-    setFilename("Choose a file");
-    setFile("");
-    setUploading(false);
-    setModal(true);
-  };
 
-  const nameChangeHandler = (event) => {
-    setName(event.target.value);
-  };
+var requestOptions = {
+  method: 'GET',
+  redirect: 'follow'
+};
+const FileUpload = (props) => {
+    const [name,setName]=useState(props.id)
+    const [password,setPassword]=useState('')
+    const [uploading, setUploading] = useState(false);
+    const [error, setError] = useState(null);
+    const [account, setAccount] = useState('');
+    const [lockk,setLockk] = useState({})
+    const openLink = (url) => window.open(url,'download')?.focus();
+    const loadBlockhainData=async()=>{
+      const web3 = new Web3(Web3.givenProvider || "https://localhost:7545");
+      const accounts=await web3.eth.getAccounts()
+      setAccount(accounts[0])
+      console.log(account)
+      const lock=new web3.eth.Contract(lock_abi,lock_addr)
+      setLockk(lock)
+      
+    };
+    useEffect(() => {
+      loadBlockhainData();
+    },[account])
+    
+        const formSubmission=async(e)=>{
+          e.preventDefault();
+          setUploading(true);
 
-  const passwordChangeHandler = (event) => {
-    setPassword(event.target.value);
-  };
+          if(!name||!password){return}
+            try{
+              const cryptr = new Cryptr(password);
+              console.log('started')
+              const link=await lockk.methods.getlink(name-1).call()
+              console.log(link)
+              const decryptedString = cryptr.decrypt(link);
+              console.log(decryptedString)
+              const response = await fetch(`${decryptedString}`,requestOptions);
+              if (!response.ok) {
+                throw new Error('Something went wrong!');
+              }
+              const data = await response.url;
+              console.log(data)
+              openLink(data)
+            }catch(error){
+              setError(error);
+            }
+            setUploading(false)
+  
+          
+        };
 
-  const cpasswordChangeHandler = (event) => {
-    setCPassword(event.target.value);
-  };
-  const modalChangeHandler = () => {
-    setModal(false);
-  };
+      const nameChangeHandler = (event) => {
+        setName(event.target.value);
+      };
+    
+      const passwordChangeHandler = (event) => {
+        setPassword(event.target.value);
+      };
 
   return (
     <Fragment>
       {uploading && <LoadingSpinner />}
-      {modal && <Card onClose={modalChangeHandler} link={link} />}
       <div className="updown">
         <form onSubmit={formSubmission} className="form-down">
           <div class="row">
@@ -85,7 +83,7 @@ const FileUpload = (props) => {
                 type="text"
                 id="fname"
                 name="fname"
-                placeholder="File Name"
+                placeholder="File ID"
                 required="true"
                 onChange={nameChangeHandler}
                 value={name}
@@ -112,7 +110,7 @@ const FileUpload = (props) => {
               type="submit"
               value="Download"
               class="btn"
-              disabled={!password === cpassword && name}
+              disabled={!password && !name}
             ></input>
             <Link to="/" class="btn">
               Cancel
@@ -121,14 +119,8 @@ const FileUpload = (props) => {
         </form>
         <div className="img-con-down">
           <img src={download} alt="upload" className="down-img" />
-          <div class="row">
-            <div class="input_field">
-              {/* <h1>Upload Files</h1> */}
-            </div>
-          </div>
         </div>
       </div>
-      <p>{message}</p>
     </Fragment>
   );
 };

src/components/FileUpload.js

@@ -44,7 +44,7 @@ const FileUpload = (props) => {
   const formSubmission = async (e) => {
     e.preventDefault();
     if (!password === cpassword && name && file) {
-      console.log("not met");
+      console.log("Please Fill the correct Details");
       return;
     }
 

src/layout/NavLinks.js

@@ -11,7 +11,7 @@ function NavLinks(props) {
           <li>WRITE</li>
         </NavLink>
 
-        <NavLink to='/view' activeClassName={classes.active} style={{ textDecoration: 'none' }} onClick={() => props.isMobile && props.closeMobileMenu()}>
+        <NavLink to='/view/0' activeClassName={classes.active} style={{ textDecoration: 'none' }} onClick={() => props.isMobile && props.closeMobileMenu()}>
           <li>VIEW</li>
         </NavLink>
 

src/pages/View.js

@@ -2,8 +2,6 @@ import {Fragment} from 'react';
 import {useParams} from 'react-router-dom'
 // import LoadingSpinner from '../components/LoadingSpinner'
 import classes from './View.module.css'
-// import { useWeb3React } from "@web3-react/core"
-// import { injected } from "../wallet/connectors"
 
 const View =props => {
 
@@ -12,13 +10,13 @@ const View =props => {
 
     return (
       <Fragment>
-       {/* {isLoading&&<LoadingSpinner/>} */}
         <section className={classes.info}>
         <div className={classes.heading}>
-            <h1>{params.id}</h1>
+            <h1>Download</h1>
         </div>
       <div className={classes.cards_wrapper}>
         <div className={classes.card_grid_space}>
+          <Download id={params.id}/>
         </div>
         </div>
     </section>