Skip to content

Feat/FRE-83/Privacy-page #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hokageCodes wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Feat/FRE-83/Privacy-page #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d405884
Merge branch 'dev' of https://github.com/workshopapps/salesaccount.we…
hokageCodes Dec 3, 2022
6c598d5
hot fix
hokageCodes Dec 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions frontend/src/Store/Context.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const UserProvider = ({ children }) => {
const [fileDropped2, setFileDropped2] = useState([]);

const bankStatementUrl =
'https://reconcileai.hng.tech/api/v1/upload_statement';
'https://reconcileai.hng.tech/api/v1/upload_statement';
const salesRecordUrl = `https://reconcileai.hng.tech/api/v1/upload_record`;
const reconcileUrl = `https://reconcileai.hng.tech/api/v1/reconcile_documents`;
const downloadUrl = ""
Expand All @@ -37,8 +37,8 @@ export const UserProvider = ({ children }) => {
'Content-Type': 'multipart/form-data',
},
})
.then((res) => setLocalData(JSON.parse(res?.data)))
.then((res) => console.log(res))
// .then((res) => console.log(JSON.parse(res?.data)))
.then((res) => setLocalData(res?.data))
.catch((e) => setError(e));
};

Expand All @@ -53,7 +53,7 @@ export const UserProvider = ({ children }) => {
'Content-Type': 'multipart/form-data',
},
})
.then((res) => setLocalData2(JSON.parse(res?.data)))
.then((res) => setLocalData2(res?.data))
.catch((e) => setError(e));
};

Expand All @@ -62,9 +62,9 @@ export const UserProvider = ({ children }) => {
axios
.get(reconcileUrl)
.then((res) => {
setLocalData3(JSON.parse(res?.data));
setLocalData3(res?.data);
})
.then((res) => console.log(res))
.then((res) => console.log(res?.data))
.catch((e) => setError(e));
};

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/Dashboard/ImportData/Hero/Reconcile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function Reconcile() {

const handleSubmit = async () => {
reconcileData();
// navigate('/dashboard/accountreport');
navigate('/dashboard/accountreport');
};

return (
Expand Down
Empty file added frontend/src/pages/ErrorProcessing/error.css
View file
Open in desktop
Empty file.
59 changes: 59 additions & 0 deletions frontend/src/pages/ErrorProcessing/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import React from 'react';
import { FaGreaterThan } from 'react-icons/fa';
import DashBoardHeader from '../../components/DashBoardHeader';
import NavigationBar from '../../components/NavigationBar';

const styles = {
bgColor: '#1570EF',
titleTextColor: '#101828',
inputwidth: '500px',
sideWidth: '248px',
dasboardwidth: '150px',
};
const processData = {
status: 'Processing...',
statusHeader: 'Maching data...',
statusMessage: 'imbalancing (s) found so far',
numberOfimbalance: 0,
};

const ErrorProcessing = () => (
<>
<NavigationBar />
<main className="m-[65px]">
<div className="processing-text">
<h1 className="font-['Lexend'] font-semibold text-[28px] leading-[136.02%] text-[#344054]">
Processing...
</h1>
<p className="font-['Lexend'] font-medium text-[20px] leading-[136.52%] text-[#667085]">
Our system is currently reconciling your records and will alert you of
any errors. Please be patient.
</p>
</div>
<div className="bg-[#F9FAFB] rounded-[12px] absolute top-[40%] left-[25%] translate-[-50%, -50%] w-[737px] h-[364px] text-center">
<h3 className="mt-[100px] font-['Lexend'] font-medium text-[36px] leading-[136.02%] text-[#101828]">
Matching data...
</h3>
<div className="my-[10px] flex items-center justify-center gap-[10px]">
<span className="text-[28px] text-[#F04438]">0</span>
<p className="font-['Lexend'] font-semibold text-[28px] leading-[136.02%] text-[#667085]">
imbalance(s) found so far
</p>
</div>
<div className="flex justify-center items-center gap-[5px]">
<input
className="bg-[#f2f4f7] w-[544px] rounded-[24px]"
type="range"
min="0"
max="100"
value="5"
step="5"
/>
<span>1%</span>
</div>
</div>
</main>
</>
);

export default ErrorProcessing;