Merge pull request #100 from myanzik/master

resolved merge conflicts from stage
esatya · Sep 29, 2021 · 2b8a456 · 2b8a456
2 parents 5476463 + e210e49
commit 2b8a456
Show file tree

Hide file tree

Showing 43 changed files with 1,758 additions and 513 deletions.
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
   },
   "dependencies": {
     "add": "^2.0.6",
+    "apexcharts": "^3.28.3",
     "axios": "^0.21.1",
     "bootstrap-switch-button-react": "^1.2.0",
     "chart.js": "^2.9.3",
@@ -52,6 +53,7 @@
     "qrcode.react": "^1.0.0",
     "query-string": "^6.13.1",
     "react": "^16.13.1",
+    "react-apexcharts": "1.3.7",
     "react-chartjs-2": "^2.10.0",
     "react-digit-input": "^2.1.0",
     "react-dom": "^16.13.1",
@@ -64,6 +66,7 @@
     "react-select": "^2.2.0",
     "react-stepzilla": "^6.0.2",
     "react-table-v6": "^6.8.6",
+    "react-to-print": "^2.13.0",
     "react-toast-notifications": "^2.4.0",
     "reactstrap": "^8.4.1",
     "redux-devtools-extension": "^2.13.8",

diff --git a/src/constants/index.js b/src/constants/index.js
@@ -21,6 +21,10 @@ module.exports = {
 		SUCCESS: {
 			appearance: 'success',
 			autoDismiss: true
+		},
+		WARNING: {
+			appearance: 'warning',
+			autoDismiss: true
 		}
 	},
 	PROJECT_STATUS: {

diff --git a/src/contexts/BeneficiaryContext.js b/src/contexts/BeneficiaryContext.js
@@ -4,7 +4,6 @@ import * as Service from '../services/beneficiary';
 import * as AidService from '../services/aid';
 import ACTION from '../actions/beneficiary';
 import { AppContext } from './AppSettingsContext';
-import { APP_CONSTANTS } from '../constants';
 
 const initialState = {
 	list: [],
@@ -38,15 +37,11 @@ export const BeneficiaryContextProvider = ({ children }) => {
 		return Service.getBeneficiaryBalance(phone, contract_address);
 	}, []);
 
-	const listAid = useCallback(() => {
-		return AidService.listAid({ limit: APP_CONSTANTS.FETCH_LIMIT });
-	}, []);
-
-	// async function listAid() {
-	// 	const d = await AidService.listAid({ start: 0, limit: 50 });
-	// 	dispatch({ type: ACTION.LIST_AID, data: { projectList: d.data } });
-	// 	return d;
-	// }
+	async function listProject() {
+		const d = await AidService.listAid({ start: 0, limit: 50 });
+		dispatch({ type: ACTION.LIST_AID, data: { projectList: d.data } });
+		return d;
+	}
 
 	function setAid(aid) {
 		dispatch({ type: ACTION.SET_AID, data: aid });
@@ -79,23 +74,6 @@ export const BeneficiaryContextProvider = ({ children }) => {
 		return Service.updateBeneficiary(id, payload);
 	};
 
-	// const addBeneficiary = async event => {
-	// 	event.preventDefault();
-	// 	const formData = new FormData(event.target);
-
-	// 	let payload = {
-	// 		name: formData.get('name'),
-	// 		phone: formData.get('phone'),
-	// 		govt_id: formData.get('govt_id'),
-	// 		email: formData.get('email'),
-	// 		address: formData.get('address'),
-	// 		wallet_address: formData.get('wallet_address'),
-	// 		project_id: formData.get('aid')
-	// 	};
-	// 	let d = await Service.addBeneficiary(payload);
-	// 	return d;
-	// };
-
 	async function listBeneficiary(params) {
 		let res = await Service.listBeneficiary(params);
 		if (res) {
@@ -112,8 +90,9 @@ export const BeneficiaryContextProvider = ({ children }) => {
 		for (let b of beneficiaries) await Service.addBeneficiary(b);
 	};
 
-	const getBeneficiaryDetails = useCallback(id => {
-		return Service.get(id);
+	const getBeneficiaryDetails = useCallback(async id => {
+		const data = await Service.get(id);
+		return data;
 	}, []);
 
 	return (
@@ -124,10 +103,10 @@ export const BeneficiaryContextProvider = ({ children }) => {
 				list: state.list,
 				pagination: state.pagination,
 				tokenBalance: state.tokenBalance,
-				beneficiary_detail: state.beneficiary,
+				beneficiary: state.beneficiary,
 				clear,
 				setAid,
-				listAid,
+				listProject,
 				issueTokens,
 				addBeneficiary,
 				updateBeneficiary,