Skip to content

Commit

Permalink
Merge pull request #1 from NateWr/convention_feedback
Browse files Browse the repository at this point in the history
Fixes in response to Daniel's comments
  • Loading branch information
NateWr authored May 22, 2018
2 parents 89486f3 + 1c4811d commit cceb0e8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import Balance from './components/Balance';
import MakePayment from './components/MakePayment';
import Payments from './containers/Payments';
import Payments from './components/Payments';
import currencies from './data/currencies';
import './App.css';

Expand Down
2 changes: 1 addition & 1 deletion src/components/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import './Button.css';

function Button(props) {
return (
<button className="Button">{props.label}</button>
<button {...props} className="Button" />
)
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/MakePayment.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Payment extends Component {
}

selectCurrency = (event) => {
let currency = event.target.value;
const currency = event.target.value;
this.setState({
selectedCurrency: currency
});
Expand All @@ -28,7 +28,7 @@ class Payment extends Component {
</select>
<input className="MakePayment-amount" type="text" defaultValue="0.00" />
<input className="MakePayment-description" type="text" placeholder="What is this payment for?" />
<Button label="Pay" />
<Button>Pay</Button>
</div>
</div>
)
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/containers/Payments.js → src/components/Payments.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function Payments(props) {
<td>Dinner with friends at a local restaurant</td>
<td>Pending</td>
<td>
<Button label="Cancel"></Button>
<Button>Cancel</Button>
</td>
</tr>
<tr>
Expand Down

0 comments on commit cceb0e8

Please sign in to comment.