rename original gangsta to gang

This commit is contained in:
Bilal
2020-10-07 18:26:59 +03:00
parent b5a70a6e42
commit e0c5f60c68
13 changed files with 67 additions and 63 deletions

View File

@@ -16,21 +16,21 @@ import {
PUT_IN_WORK
} from './RouteNames';
import PutInWork from "./cash/PutInWork";
import ChipSelection from "./originalGangstaOnboarding/ChipSelection";
import ChipSelection from "./gangOnboarding/ChipSelection";
import {errorToast} from "./common/errorHelpers";
const App = (props) => {
const [loading, setLoading] = useState(true);
const [originalGangsta, setOriginalGangsta] = useState({});
const [gang, setGang] = useState({});
useEffect(() => {
(async() => {
try {
setLoading(true);
const response = await axios.get(`/api/original_gangstas/0`);
const response = await axios.get(`/api/gangs/0`);
if (response.status === 200 && response.data){
setOriginalGangsta(response.data);
setGang(response.data);
}else{
errorToast();
}
@@ -42,15 +42,15 @@ const App = (props) => {
}, []);
const routes = ([
<Route key='1' exact path={CRIB} component={() => <Cash originalGangsta={originalGangsta} />} />,
<Route key='2' exact path={HOMIES} component={() => <Homies originalGangsta={originalGangsta} />} />,
<Route key='3' path={HOMIE_FLOW} component={() => <Flow originalGangsta={originalGangsta} />} />,
<Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove originalGangsta={originalGangsta} />} />,
<Route key='5' path={PUT_IN_WORK} component={() => <PutInWork originalGangsta={originalGangsta} />} />
<Route key='1' exact path={CRIB} component={() => <Cash gang={gang} />} />,
<Route key='2' exact path={HOMIES} component={() => <Homies />} />,
<Route key='3' path={HOMIE_FLOW} component={() => <Flow gang={gang} />} />,
<Route key='4' path={MAKE_MONEY_MOVE} component={() => <MakeMoneyMove />} />,
<Route key='5' path={PUT_IN_WORK} component={() => <PutInWork />} />
]
);
const onboarded = () => originalGangsta.chip_name && originalGangsta.chip_name.length > 0;
const onboarded = () => gang.chip_name && gang.chip_name.length > 0;
const preloaderCircle = (
<div className="container">

View File

@@ -11,7 +11,7 @@ import M from 'materialize-css';
const Cash = (props) => {
const [homiesCash, setHomiesCash] = useState([]);
const originalGangsta = props.originalGangsta;
const gang = props.gang;
useEffect( () => {
const getCashForHomies = async () => {
@@ -49,7 +49,7 @@ const Cash = (props) => {
{ formatTime(homieLine.work) }
</td>
<td className="cash-cell-right">
{ formatMoney(homieLine.amount, originalGangsta) }
{ formatMoney(homieLine.amount, gang) }
</td>
<td className="cash-cell-left">
[

View File

@@ -31,7 +31,7 @@ const ChipSelection = (props) => {
const handleSubmit = async () => {
const chipData = chips.find(chip => chip.id === parseInt(selectedChip));
if (chipData){
const originalGangsta = {
const gang = {
chip_name: chipData.name,
chip_code: chipData.code,
chip_symbol: chipData.symbol,
@@ -40,7 +40,7 @@ const ChipSelection = (props) => {
}
try{
const response = await axios.put('/api/original_gangstas/0', { 'original_gangsta': originalGangsta });
const response = await axios.put('/api/gangs/0', { 'gang': gang });
if (response.status === 200 && response.data && response.data.onboarded) {
window.location.reload();
}else{

View File

@@ -7,7 +7,7 @@ import {errorToast} from "../common/errorHelpers";
const CashFlow = (props) => {
const { homie_id } = useParams();
const originalGangsta = props.originalGangsta;
const gang = props.gang;
const [cashFlow, setCashFlow] = useState([]);
@@ -35,7 +35,7 @@ const CashFlow = (props) => {
<div>{ dateBlock(singleFlowData['created_at']) }</div>
</div>
<div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, originalGangsta) }</div>
<div className={`flex-center ${singleFlowData.amount > 0 ? 'amount-green' : ''}`}>{ formatMoney(singleFlowData.amount, gang) }</div>
</div>
</div>
</li>
@@ -58,7 +58,7 @@ const CashFlow = (props) => {
<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, originalGangsta)}</strong>
<span className="grey-text">Total cash flow:</span> <strong>{formatMoney(totalFlow, gang)}</strong>
</div>
</div>
</div>

View File

@@ -7,7 +7,7 @@ import WorkFlow from "./WorkFlow";
const Flow = (props) => {
const [flowType, setFlowType] = useState('cash');
const originalGangsta = props.originalGangsta;
const gang = props.gang;
return (
<div className="container">
@@ -19,7 +19,7 @@ const Flow = (props) => {
/>
</div>
{ flowType === 'cash' && <CashFlow originalGangsta={originalGangsta} /> }
{ flowType === 'cash' && <CashFlow gang={gang} /> }
{ flowType === 'work' && <WorkFlow /> }
</div>