From e608cfd7730741189a4f370e55e9fb482a43c0bc Mon Sep 17 00:00:00 2001 From: Bilal Date: Tue, 6 Oct 2020 00:16:33 +0300 Subject: [PATCH] show work amount for homie on Dashboard --- client/src/cash/Cash.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/cash/Cash.js b/client/src/cash/Cash.js index c3e2aac..86fbf8f 100644 --- a/client/src/cash/Cash.js +++ b/client/src/cash/Cash.js @@ -4,8 +4,8 @@ import './Cash.css'; import axios from 'axios'; import { MAKE_MONEY_MOVE } from '../RouteNames'; import { withRouter } from 'react-router-dom'; -import { formatMoney } from '../common/formatting'; -import InputModal from "../common/InputModal"; +import { formatMoney, formatTime } from '../common/formatting'; +import YesNoModal from "../common/YesNoModal"; import { errorToast } from "../common/errorHelpers"; import M from 'materialize-css'; @@ -16,7 +16,7 @@ const Cash = (props) => { useEffect( () => { const getCashForHomies = async () => { try { - const cash = await axios.get(`/api/homies/cash`); + const cash = await axios.get(`/api/homies/info`); setHomiesCash(cash.data); } catch (e) { console.log("Error fetching", e); @@ -45,6 +45,9 @@ const Cash = (props) => { { homieLine.homie.name } + + { formatTime(homieLine.work) } + { formatMoney(homieLine.amount) } @@ -71,6 +74,9 @@ const Cash = (props) => { Homie + + Work + Cash