formatting

src/constants/api.js

@@ -1,6 +1,6 @@
 const SERVER_URL = process.env.REACT_APP_AGENCY_SERVER_API;
-const API_PATH = SERVER_URL + '/api/v1';
+const API_PATH = `${SERVER_URL}/api/v1`;
 
 module.exports = {
- AID_CONNECT: API_PATH + '/aid-connect',
+ AID_CONNECT: `${API_PATH}/aid-connect`,
 };

src/contexts/registerBeneficiaryContext.js

@@ -34,15 +34,15 @@ export const RegisterBeneficiaryContextProvider = ({ children }) => {
  };
 
  const setBeneficiaryPhone = phone => {
- dispatch({ type: BENEFICIARY_ACTIONS.SET_PHONE, phone: phone });
+ dispatch({ type: BENEFICIARY_ACTIONS.SET_PHONE, phone });
  };
 
  const setBeneficiaryPhoto = photo => {
- dispatch({ type: BENEFICIARY_ACTIONS.SET_PHOTO, photo: photo });
+ dispatch({ type: BENEFICIARY_ACTIONS.SET_PHOTO, photo });
  };
 
  const setBeneficiaryIdImage = idImage => {
- dispatch({ type: BENEFICIARY_ACTIONS.SET_ID_IMAGE, idImage: idImage });
+ dispatch({ type: BENEFICIARY_ACTIONS.SET_ID_IMAGE, idImage });
  };
 
  const resetBeneficiary = () => {

src/modules/App.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { BrowserRouter, Switch, Route } from 'react-router-dom';
-import Home from '../modules/home';
-import Errorpage from '../modules/global/Invalid';
+import Home from './home';
+import Errorpage from './global/Invalid';
 import { AppContextProvider } from '../contexts/AppContext';
 import { RegisterBeneficiaryContextProvider } from '../contexts/registerBeneficiaryContext';
 

src/modules/beneficiary/beneficiaryDetails.js

@@ -1,10 +1,10 @@
 import React, { useState, useEffect, useCallback, useContext } from 'react';
 import { useHistory } from 'react-router-dom';
 import Swal from 'sweetalert2';
+import { RiDeleteBin6Line } from 'react-icons/ri';
 import Avatar from '../../assets/images/Man.png';
 import DataService from '../../services/db';
 import AppHeader from '../layouts/AppHeader';
-import { RiDeleteBin6Line } from 'react-icons/ri';
 import { AppContext } from '../../contexts/AppContext';
 
 const BeneficiaryDetail = props => {
@@ -22,7 +22,6 @@ const BeneficiaryDetail = props => {
  }, [benId]);
 
  const handleDelete = async () => {
- console.log('deleting');
  await DataService.deleteBeneficiary(benId);
  Swal.fire({
  title: 'Are you sure?',

src/modules/beneficiary/beneficiaryLists.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback, useContext } from 'react';
 import { Link } from 'react-router-dom';
-import AppHeader from '../layouts/AppHeader';
 import { IoHomeOutline } from 'react-icons/io5';
+import AppHeader from '../layouts/AppHeader';
 import DataService from '../../services/db';
 import Avatar from '../../assets/images/Man.png';
 import { AppContext } from '../../contexts/AppContext';
@@ -10,7 +10,7 @@ const BeneficiaryList = () => {
  const [ben, setBen] = useState([]);
  const { aidConnectId } = useContext(AppContext);
  const getBeneficiaries = useCallback(async () => {
- let bens = await DataService.listBeneficiaries();
+ const bens = await DataService.listBeneficiaries();
  if (!bens) return;
  setBen(bens);
  }, []);

src/modules/beneficiary/idCard.js

@@ -1,12 +1,15 @@
 import React, { useState, useEffect, useContext } from 'react';
-import { useHistory } from 'react-router-dom';
-import { IoChevronForwardOutline, IoRadioButtonOff } from 'react-icons/io5';
+import { useHistory, Link } from 'react-router-dom';
+import {
+ IoChevronForwardOutline,
+ IoRadioButtonOff,
+ IoChevronBackOutline,
+ IoHomeOutline,
+} from 'react-icons/io5';
 
 import { BiReset } from 'react-icons/bi';
 import Webcam from 'react-webcam';
 import AppHeader from '../layouts/AppHeader';
-import { Link } from 'react-router-dom';
-import { IoChevronBackOutline, IoHomeOutline } from 'react-icons/io5';
 import { RegisterBeneficiaryContext } from '../../contexts/registerBeneficiaryContext';
 import { AppContext } from '../../contexts/AppContext';
 
@@ -138,7 +141,7 @@ export default function Main() {
  </div>
  ) : (
  <div className="d-flex justify-content-between align-items-center mt-5 mb-3">
- <div style={{ width: '40px', height: '40px' }}></div>
+ <div style={{ width: '40px', height: '40px' }} />
 
  <div className="btn-shutter" onClick={capture}>
  <IoRadioButtonOff className="btn-shutter-icon" />

src/modules/beneficiary/photo.js

@@ -1,11 +1,15 @@
 import React, { useState, useEffect, useContext } from 'react';
-import { useHistory } from 'react-router-dom';
-import { IoChevronForwardOutline, IoSyncOutline, IoRadioButtonOff } from 'react-icons/io5';
+import { useHistory, Link } from 'react-router-dom';
+import {
+ IoChevronForwardOutline,
+ IoSyncOutline,
+ IoRadioButtonOff,
+ IoChevronBackOutline,
+ IoHomeOutline,
+} from 'react-icons/io5';
 import { BiReset } from 'react-icons/bi';
 import Webcam from 'react-webcam';
 import AppHeader from '../layouts/AppHeader';
-import { Link } from 'react-router-dom';
-import { IoChevronBackOutline, IoHomeOutline } from 'react-icons/io5';
 import { AppContext } from '../../contexts/AppContext';
 import { RegisterBeneficiaryContext } from '../../contexts/registerBeneficiaryContext';
 

src/modules/beneficiary/preview.js

@@ -1,13 +1,12 @@
 import React, { useContext } from 'react';
-import { Link } from 'react-router-dom';
-import AppHeader from '../layouts/AppHeader';
-import { useHistory } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { IoChevronBackOutline, IoHomeOutline } from 'react-icons/io5';
-import { RegisterBeneficiaryContext } from '../../contexts/registerBeneficiaryContext';
-import DataService from '../../services/db';
 import { ImageGroup, Image } from 'react-fullscreen-image';
 // import image from '../../../public/assets/img/brand/icon-192.png';
 import { Row, Col } from 'react-bootstrap';
+import DataService from '../../services/db';
+import AppHeader from '../layouts/AppHeader';
+import { RegisterBeneficiaryContext } from '../../contexts/registerBeneficiaryContext';
 import { AppContext } from '../../contexts/AppContext';
 
 export default function Preview() {
@@ -82,7 +81,7 @@ export default function Preview() {
  <Row className="mt-2 mb-4 previewImage">
  <Col xs={6} className="previewImg mb-2">
  <Image
- src={photo ? photo : '/assets/img/brand/icon-192.png'}
+ src={photo || '/assets/img/brand/icon-192.png'}
  alt="profile_photo"
  style={{
  height: '200px',
@@ -92,7 +91,7 @@ export default function Preview() {
  </Col>
  <Col xs={6} className="previewImg">
  <Image
- src={govt_id_image ? govt_id_image : '/assets/img/brand/icon-192.png'}
+ src={govt_id_image || '/assets/img/brand/icon-192.png'}
  alt="id_card"
  style={{
  height: '200px',

src/modules/beneficiary/register.js

@@ -1,10 +1,9 @@
 import React, { useContext } from 'react';
 import { Form, Button, Accordion, Card } from 'react-bootstrap';
 import { IoCloseCircle, IoHomeOutline, IoChevronDownOutline } from 'react-icons/io5';
+import { useHistory, Link } from 'react-router-dom';
 import { RegisterBeneficiaryContext } from '../../contexts/registerBeneficiaryContext';
-import { useHistory } from 'react-router-dom';
 import AppHeader from '../layouts/AppHeader';
-import { Link } from 'react-router-dom';
 import { AppContext } from '../../contexts/AppContext';
 
 const AddBeneficiary = () => {
@@ -27,8 +26,8 @@ const AddBeneficiary = () => {
  } = useContext(RegisterBeneficiaryContext);
 
  const updateBeneficiaryData = e => {
- let formData = new FormData(e.target.form);
- let data = {};
+ const formData = new FormData(e.target.form);
+ const data = {};
  formData.forEach((value, key) => {
  data[key] = value;
  if (data[key] === '') data[key] = null;
@@ -72,7 +71,7 @@ const AddBeneficiary = () => {
  name="name"
  className="form-control"
  placeholder="Enter your full name"
- value={name ? name : ''}
+ value={name || ''}
  onChange={updateBeneficiaryData}
  required
  />
@@ -89,7 +88,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="phone"
  placeholder="Enter mobile number"
- value={phone ? phone : ''}
+ value={phone || ''}
  onChange={updateBeneficiaryData}
  onKeyDown={e => {
  if (['-', '+', 'e'].includes(e.key)) {
@@ -111,7 +110,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="address"
  placeholder="Enter permanent address"
- value={address ? address : ''}
+ value={address || ''}
  onChange={updateBeneficiaryData}
  required
  />
@@ -141,7 +140,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="address_temporary"
  placeholder="Enter temporary address"
- value={address_temporary ? address_temporary : ''}
+ value={address_temporary || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -157,7 +156,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="age"
  placeholder="Enter age"
- value={age ? age : ''}
+ value={age || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -190,7 +189,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="email"
  placeholder="Enter email"
- value={email ? email : ''}
+ value={email || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -206,7 +205,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="govt_id"
  placeholder="Enter address"
- value={govt_id ? govt_id : ''}
+ value={govt_id || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -222,7 +221,7 @@ const AddBeneficiary = () => {
  name="education"
  className="form-control"
  placeholder="Enter education"
- value={education ? education : ''}
+ value={education || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -238,7 +237,7 @@ const AddBeneficiary = () => {
  name="profession"
  className="form-control"
  placeholder="Enter profession"
- value={profession ? profession : ''}
+ value={profession || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -254,7 +253,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="family_members"
  placeholder="Enter number of family members"
- value={family_members ? family_members : ''}
+ value={family_members || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -270,7 +269,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="adult"
  placeholder="Enter number of adults"
- value={adult ? adult : ''}
+ value={adult || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">
@@ -286,7 +285,7 @@ const AddBeneficiary = () => {
  className="form-control"
  name="child"
  placeholder="Enter number of children"
- value={child ? child : ''}
+ value={child || ''}
  onChange={updateBeneficiaryData}
  />
  <i className="clear-input">

src/modules/beneficiary/share.js

@@ -1,10 +1,9 @@
 import React, { useState, useEffect, useCallback, useContext } from 'react';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import Swal from 'sweetalert2';
-import AppHeader from '../layouts/AppHeader';
 import { IoHomeOutline, IoEye } from 'react-icons/io5';
 import { Button } from 'react-bootstrap';
-import { useHistory } from 'react-router-dom';
+import AppHeader from '../layouts/AppHeader';
 import DataService from '../../services/db';
 import { AppContext } from '../../contexts/AppContext';
 import Info from '../global/Info';
@@ -55,7 +54,15 @@ const BeneficiaryList = () => {
  selectedBeneficiary.map(async el => {
  const { name, phone, address, email, gender, govt_id, shared } =
  await DataService.getBeneficiary(el);
- return { name, phone, address, email, gender, govt_id, shared };
+ return {
+ name,
+ phone,
+ address,
+ email,
+ gender,
+ govt_id,
+ shared,
+ };
  }),
  );
  const filteredBen = filterSharedBeneficiary(beneficiaries);
@@ -99,8 +106,8 @@ const BeneficiaryList = () => {
  <div className="card mt-3">
  <div className="ml-3 mt-1 mb-1">
  {selectedBeneficiary
- ? 'Beneficiary selected:' + selectedBeneficiary.length
- : 'Beneficiary selected:' + 0}
+ ? `Beneficiary selected:${selectedBeneficiary.length}`
+ : `Beneficiary selected:${0}`}
  </div>
  <div className="wide-block p-0">
  <div className="table-responsive p-1">

src/modules/global/Loading.js

@@ -7,7 +7,7 @@ export default function Loading({ showModal, message }) {
  <Modal backdrop="static" style={{ marginTop: 100 }} show={showModal || false}>
  <Modal.Body>
  <div className="text-center">
- <div className="spinner-border text-success mt-5 in-progress" role="status"></div>
+ <div className="spinner-border text-success mt-5 in-progress" role="status" />
  <div>{message || 'Please wait...'}</div>
  </div>
  </Modal.Body>

src/modules/home/PrivateRoute.js

@@ -14,9 +14,8 @@ function PrivateRoute({ component: Component, ...rest }) {
  {...rest}
  render={props => {
  if (aidConnectId) return <Component {...props} {...rest} />;
- else {
- return <Invalid message="Invalid Aid-Connect Link" />;
- }
+
+ return <Invalid message="Invalid Aid-Connect Link" />;
  }}
  />
  );

src/modules/layouts/Footer.js

@@ -1,7 +1,7 @@
 import React, { useContext } from 'react';
+import { useHistory } from 'react-router-dom';
 import UnlockedFooter from './UnlockedFooter';
 import { AppContext } from '../../contexts/AppContext';
-import { useHistory } from 'react-router-dom';
 
 export default function Footer() {
  const history = useHistory();