Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/required props and tax percentage #40

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions client/src/components/BillItem/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,19 @@ const BillItem = (props) => {
);
};

// some of the below should not be required if our app stays constructed
// as basically a one page application
BillItem.propTypes = {
// eslint-disable-next-line react/no-unused-prop-types
changeBillItem: React.PropTypes.func.isRequired,
claimBillItem: React.PropTypes.func.isRequired,
deleteBillItem: React.PropTypes.func.isRequired,
debtorId: React.PropTypes.string.isRequired,
// debtorId: React.PropTypes.string.isRequired,
description: React.PropTypes.string.isRequired,
id: React.PropTypes.string.isRequired,
// id: React.PropTypes.string.isRequired,
index: React.PropTypes.number.isRequired,
interactionType: React.PropTypes.symbol.isRequired,
paid: React.PropTypes.bool.isRequired,
// paid: React.PropTypes.bool.isRequired,
price: React.PropTypes.number.isRequired,
};

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Jumbotron/Jumbotron.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class JumbotronInstance extends Component {
<h1>Piddle</h1>
<p className="lead">Split the bill like a pro.</p>
<Row>
<Col xs="12" sm={6}>
<Col xs={12} sm={6}>
<p><Button bsStyle="primary" bsSize="large" onClick={this.handleCallToAction}>
Split a Bill
</Button></p>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/TaxField/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const TaxField = (props) => {
<FormControl
type="number"
name="tax"
placeholder="Tax Percentage"
placeholder="Tax"
value={props.taxValue}
onChange={event => (
props.changeTaxValue(Number.parseFloat(event.target.value))
Expand Down