Merge branch 'mark-mandatory-fields' into 'master'

improve money move form

See merge request saburly/gangsta/roraccounting!8
This commit was merged in pull request #8.
This commit is contained in:
Senad Uka
2020-09-07 03:30:05 +00:00
2 changed files with 16 additions and 12 deletions

View File

@@ -45,3 +45,7 @@
margin-right: 100px; margin-right: 100px;
} }
.required:before {
color: red;
content: "* ";
}

View File

@@ -39,7 +39,6 @@ const MakeMoneyMove = (props) => {
const homieOptions = homiesCash.map(homieToOptionMapper); const homieOptions = homiesCash.map(homieToOptionMapper);
const handleFromHomieChange = (e) => { const handleFromHomieChange = (e) => {
console.log("from homie", e.target.value);
setSelectedFrom(e.target.value); setSelectedFrom(e.target.value);
}; };
const filteredHomieCashes = homiesCash.filter((homieCash) => homieCash.homie.id !== parseInt(selectedFrom)); const filteredHomieCashes = homiesCash.filter((homieCash) => homieCash.homie.id !== parseInt(selectedFrom));
@@ -92,23 +91,24 @@ const MakeMoneyMove = (props) => {
const disableSubmit = () => (!formComplete() || submitInProgress); const disableSubmit = () => (!formComplete() || submitInProgress);
return ( return (
<div className="center-align"> <div className="center-align container">
<form onSubmit={handleSubmit}> <form onSubmit={handleSubmit}>
<h3>Make Money Move</h3> <h3>Make Money Move</h3>
<TextInput label="How Much?"
type="number" <div className="input-field col s12">
required pattern="^\\?(([1-9](\\d*|\\d{0,2}(,\\d{3})*))|0)(\\.\\d{1,2})?$" <input id="how-much" type="number" className="validate" step="0.01" required="required" value={amountToMove} onChange={handleAmountChange} pattern="^\\?(([1-9](\\d*|\\d{0,2}(,\\d{3})*))|0)(\\.\\d{1,2})?$" />
value={`${amountToMove}`} <label className="required" htmlFor="how-much">How much?</label>
step="0.01" <span className="helper-text" data-error="Yo! Put some money" />
onChange={handleAmountChange}/> </div>
<label>From: </label>
<label>From (only if you can say): </label>
<Select value={selectedFrom} name="from_homie" onChange={handleFromHomieChange}> <Select value={selectedFrom} name="from_homie" onChange={handleFromHomieChange}>
<option disabled value="">Select Homie</option> <option value="">NOT SAYIN'</option>
{homieOptions} {homieOptions}
</Select> </Select>
<label>To: </label> <label className="required">To: </label>
<Select value={selectedTo} name="to_homie" onChange={handleToHomieChange}> <Select value={selectedTo} name="to_homie" onChange={handleToHomieChange} required="required">
<option disabled value="">Select Homie</option> <option disabled value="">Select Homie</option>
{filteredHomieOptions} {filteredHomieOptions}
</Select> </Select>