Handle adding work for homie

client/src/homies/CashFlow.js

@@ -0,0 +1,77 @@
+import React, { useState, useEffect } from 'react';
+import { withRouter, useParams } from 'react-router-dom';
+import axios from "axios";
+import './Flow.css';
+import { formatMoney, timestampToDate } from "../common/formatting";
+import {errorToast} from "../common/errorHelpers";
+
+const CashFlow = (props) => {
+  const { homie_id } = useParams();
+
+  const [cashFlow, setCashFlow] = useState([]);
+
+  useEffect( () => {
+    (async () => {
+      try {
+        const response = await axios.get(`/api/money_moves?homie_id=${parseInt(homie_id)}`);
+        if (response.status === 200 && response.data){
+          setCashFlow(response.data);
+        }
+      } catch (e) {
+        errorToast();
+      }
+    })();
+  }, [homie_id]);
+
+  const dateBlock = (timestamp) => <span className="grey-text">{ timestampToDate(timestamp) }</span>
+
+  const flowData = cashFlow.map( (singleFlowData, index) => (
+    <li key={index}>
+      <div className="collapsible-header record">
+        <div className="flex-row opposite-sides-content">
+          <div className="flex-col">
+            <div>{ singleFlowData.description }</div>
+            <div>{ dateBlock(singleFlowData['created_at']) }</div>
+          </div>
+
+          <div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount) }</div>
+        </div>
+      </div>
+    </li>
+  ));
+
+  const totalStats = () => {
+    const totalCount = cashFlow.length;
+    const firstFlowRow = totalCount > 0 ? cashFlow[0] : undefined;
+    const lastFlowRow = totalCount > 0 ? cashFlow[cashFlow.length - 1] : undefined;
+    const totalFlow = cashFlow.reduce((sum, record) => sum + parseInt(record.amount), 0);
+
+    const fromDate = lastFlowRow ? timestampToDate(lastFlowRow['created_at']) : '';
+    const toDate = firstFlowRow ? timestampToDate(firstFlowRow['created_at']) : '';
+
+    return (
+      <div>
+        <br />
+        <div className="row">
+          <div className="col s6">
+            <strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
+          </div>
+          <div className="col s6 right-align">
+            <span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow)}</strong>
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div>
+      { totalStats() }
+      <ul className="collapsible">
+        { flowData }
+      </ul>
+    </div>
+  );
+}
+
+export default withRouter(CashFlow);

client/src/homies/Flow.css

@@ -31,4 +31,9 @@
     border-left: rgb(72, 172, 152) solid 4px;
     box-sizing: border-box;
     padding-left: 11px;
+}
+
+.switch-box {
+    margin-top: 10px;
+    margin-bottom: 20px;
 }

client/src/homies/Flow.js

@@ -1,76 +1,26 @@
-import React, { useState, useEffect } from 'react';
-import { withRouter, useParams } from 'react-router-dom';
-import axios from "axios";
-import M from "materialize-css";
+import React, { useState } from 'react';
+import { withRouter } from 'react-router-dom';
+import { Switch } from 'react-materialize';
 import './Flow.css';
-import { formatMoney, timestampToDate } from "../common/formatting";
+import CashFlow from "./CashFlow";
+import WorkFlow from "./WorkFlow";
 
 const Flow = (props) => {
-  const { homie_id } = useParams();
-
-  const [flow, setFlow] = useState([]);
-
-  useEffect( () => {
-    (async () => {
-      try {
-        const response = await axios.get(`/api/money_moves?homie_id=${parseInt(homie_id)}`);
-        if (response.status === 200 && response.data){
-          setFlow(response.data);
-        }
-      } catch (e) {
-        M.toast({ html: "Yo! It ain't workin'" });
-      }
-    })();
-  }, [homie_id]);
-
-  const dateBlock = (timestamp) => <span className="grey-text">{ timestampToDate(timestamp) }</span>
-
-
-  const flowData = flow.map( (singleFlowData, index) => (
-    <li key={index}>
-      <div className="collapsible-header record">
-        <div className="flex-row opposite-sides-content">
-          <div className="flex-col">
-            <div>{ singleFlowData.description }</div>
-            <div>{ dateBlock(singleFlowData['created_at']) }</div>
-          </div>
-
-          <div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount) }</div>
-        </div>
-      </div>
-    </li>
-  ));
-
-  const totalStats = () => {
-    const totalCount = flow.length;
-    const firstFlowRow = totalCount > 0 ? flow[0] : undefined;
-    const lastFlowRow = totalCount > 0 ? flow[flow.length - 1] : undefined;
-    const totalFlow = flow.reduce((sum, record) => sum + parseInt(record.amount), 0);
-
-    const fromDate = lastFlowRow ? timestampToDate(lastFlowRow['created_at']) : '';
-    const toDate = firstFlowRow ? timestampToDate(firstFlowRow['created_at']) : '';
-
-    return (
-      <div>
-        <br />
-        <div className="row">
-          <div className="col s6">
-            <strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
-          </div>
-          <div className="col s6 right-align">
-            <span className="grey-text">Total flow:</span> <strong>{formatMoney(totalFlow)}</strong>
-          </div>
-        </div>
-      </div>
-    )
-  }
+  const [flowType, setFlowType] = useState('cash');
 
   return (
     <div className="container">
-      { totalStats() }
-      <ul className="collapsible">
-        { flowData }
-      </ul>
+      <div className='switch-box'>
+        <Switch
+          offLabel="Cash"
+          onChange={(e) => setFlowType(e.target.checked === true ? 'work' : 'cash')}
+          onLabel="Work"
+        />
+      </div>
+
+      { flowType === 'cash' && <CashFlow /> }
+      { flowType === 'work' && <WorkFlow /> }
+
     </div>
   );
 }

client/src/homies/WorkFlow.js

@@ -0,0 +1,77 @@
+import React, { useState, useEffect } from 'react';
+import { withRouter, useParams } from 'react-router-dom';
+import axios from "axios";
+import './Flow.css';
+import { formatTime, timestampToDate } from "../common/formatting";
+import {errorToast} from "../common/errorHelpers";
+
+const WorkFlow = (props) => {
+  const { homie_id } = useParams();
+
+  const [work, setWork] = useState([]);
+
+  useEffect( () => {
+    (async () => {
+      try {
+        const response = await axios.get(`/api/work?homie_id=${parseInt(homie_id)}`);
+        if (response.status === 200 && response.data){
+          setWork(response.data);
+        }
+      } catch (e) {
+        errorToast();
+      }
+    })();
+  }, [homie_id]);
+
+  const dateBlock = (timestamp) => <span className="grey-text">{ timestampToDate(timestamp) }</span>
+
+  const flowData = work.map( (singleWorkData, index) => (
+    <li key={index}>
+      <div className="collapsible-header record">
+        <div className="flex-row opposite-sides-content">
+          <div className="flex-col">
+            <div>{ singleWorkData.description }</div>
+            <div>{ dateBlock(singleWorkData['created_at']) }</div>
+          </div>
+
+          <div className={`flex-center ${singleWorkData.amount > 0 ? 'amount-green' : ''}`}>{ formatTime(singleWorkData.amount) }</div>
+        </div>
+      </div>
+    </li>
+  ));
+
+  const totalStats = () => {
+    const totalCount = work.length;
+    const firstFlowRow = totalCount > 0 ? work[0] : undefined;
+    const lastFlowRow = totalCount > 0 ? work[work.length - 1] : undefined;
+    const totalFlow = work.reduce((sum, record) => sum + parseInt(record.amount), 0);
+
+    const fromDate = lastFlowRow ? timestampToDate(lastFlowRow['created_at']) : '';
+    const toDate = firstFlowRow ? timestampToDate(firstFlowRow['created_at']) : '';
+
+    return (
+      <div>
+        <br />
+        <div className="row">
+          <div className="col s6">
+            <strong>{`${totalCount} Records`}</strong><span className="grey-text">{` • ${fromDate} - ${toDate}`}</span>
+          </div>
+          <div className="col s6 right-align">
+            <span className="grey-text">Total work:</span> <strong>{formatTime(totalFlow)}</strong>
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div>
+      { totalStats() }
+      <ul className="collapsible">
+        { flowData }
+      </ul>
+    </div>
+  );
+}
+
+export default withRouter(WorkFlow);