diff --git a/frontend/src/Store/Context.jsx b/frontend/src/Store/Context.jsx index 91a7ba43..adcf73a8 100644 --- a/frontend/src/Store/Context.jsx +++ b/frontend/src/Store/Context.jsx @@ -20,6 +20,10 @@ export const UserProvider = ({ children }) => { const ReconciledRecordsSaved = JSON.parse( localStorage.getItem('localData3') || '[]' ); + const ClearFileName = JSON.parse( + localStorage.removeItem('fileName') || '[]' + ); + // Persisting data for uploaded files @@ -40,18 +44,18 @@ export const UserProvider = ({ children }) => { const [localFile, setLocalFile] = useState([]); const [localFile2, setLocalFile2] = useState([]); - const [localData, setLocalData] = useState(AccountStatementsaved); - const [localData2, setLocalData2] = useState(SalesRecordsaved); + const [localData, setLocalData] = useState(AccountStatementsaved, ClearFileName); + const [localData2, setLocalData2] = useState(SalesRecordsaved, ClearFileName); // reconcile data - const [localData3, setLocalData3] = useState(ReconciledRecordsSaved); + const [localData3, setLocalData3] = useState(ReconciledRecordsSaved, ClearFileName); const [loading, setLoading] = useState(true); const [uploadLoading, setUploadLoading] = useState(true); const [uploadLoading2, setUploadLoading2] = useState(true); const [rError, setRError] = useState(''); - const [fileDropped, setFileDropped] = useState([]); - const [fileDropped2, setFileDropped2] = useState([]); + const [fileDropped, setFileDropped] = useState(ClearFileName); + const [fileDropped2, setFileDropped2] = useState(ClearFileName); const uploadUrl = 'https://api.reconcileai.hng.tech/upload'; const reconcileUrl = `https://api.reconcileai.hng.tech/reconcile`; @@ -181,9 +185,9 @@ export const UserProvider = ({ children }) => { localStorage.clear() setLocalData([]); setLocalData2([]); - setFileDropped([]); - setFileDropped2([]); - setLocalData3([]); + setFileDropped(fileDropped); + setFileDropped2(fileDropped2); + setLocalData3(localData3); }; const value = useMemo( diff --git a/frontend/src/pages/Dashboard/DashboardMain/UploadFile/Upload.jsx b/frontend/src/pages/Dashboard/DashboardMain/UploadFile/Upload.jsx index 4d90613d..3dd9152e 100644 --- a/frontend/src/pages/Dashboard/DashboardMain/UploadFile/Upload.jsx +++ b/frontend/src/pages/Dashboard/DashboardMain/UploadFile/Upload.jsx @@ -17,7 +17,11 @@ function Upload() { inputRef.current.click(); }} role="presentation" +<<<<<<< HEAD + className="flex flex-col items-center py-[4em] space-y-[2em] w-full md:w-[60%] lg:w-[40%] rounded-xl border-[2px] border-dashed border-[#1D2939] cursor-pointer" +======= className="flex flex-col items-center py-[2em] space-y-[2em] mb-[1em] w-full md:w-[60%] lg:w-[40%] rounded-xl border-[2px] border-dashed border-[#1D2939]" +>>>>>>> 2331ab9ea7c1e4816afccd9cb801ca6ff1b7ca00 >

- Drop your account statement in here + Drag & Drop first record in here

Supported formats: .csv, .xls, .xlxs, .pdf diff --git a/frontend/src/pages/Dashboard/DashboardMain/UploadReady/UploadReady.jsx b/frontend/src/pages/Dashboard/DashboardMain/UploadReady/UploadReady.jsx index 1e6b901d..03909640 100644 --- a/frontend/src/pages/Dashboard/DashboardMain/UploadReady/UploadReady.jsx +++ b/frontend/src/pages/Dashboard/DashboardMain/UploadReady/UploadReady.jsx @@ -21,7 +21,11 @@ function UploadReady() { return (

Ready for Upload

+<<<<<<< HEAD +
+=======
+>>>>>>> 2331ab9ea7c1e4816afccd9cb801ca6ff1b7ca00 {fileErr ? ( + )} @@ -241,7 +242,7 @@ function ImportData() { {localData2.length < 1 && (
-

Next, upload Sales Record

+

Upload Second Document

{showUpload ? (
@@ -300,7 +301,11 @@ function ImportData() { setShowUpload(true); setFileDropped2(e.dataTransfer?.files[0]); }} +<<<<<<< HEAD + className="ml-[450px] flex flex-col items-center py-[4em] space-y-[2em] w-full md:w-[60%] lg:w-[40%] rounded-xl border-[2px] border-dashed border-[#1D2939] cursor-pointer" +======= className="flex flex-col items-center py-[2em] space-y-[1em] mb-[1em] w-full md:w-[60%] lg:w-[40%] mx-auto rounded-xl border-[2px] border-dashed border-[#1D2939]" +>>>>>>> 2331ab9ea7c1e4816afccd9cb801ca6ff1b7ca00 > */}

- Drag and drop sales record here. + Drag & Drop second document here.

Supported formats: PDF, Word DOCS, Excel