Browse Source

Clean up.

feature/bike-tracking
Drew Larson 8 years ago
parent
commit
1f6202be56
  1. 18
      bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx
  2. 1
      bikeshop_project/assets/js/bikes/components/BikeModal/index.jsx
  3. 1
      bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx
  4. 2
      bikeshop_project/assets/js/bikes/components/Size/index.jsx
  5. 2
      bikeshop_project/assets/js/bikes/components/Source/index.jsx

18
bikeshop_project/assets/js/bikes/components/BikeForm/index.jsx

@ -1,8 +1,8 @@
import React, { PropTypes } from 'react';
import Checkbox from 'material-ui/Checkbox'; import Checkbox from 'material-ui/Checkbox';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import FlatButton from 'material-ui/FlatButton'; import FlatButton from 'material-ui/FlatButton';
import RaisedButton from 'material-ui/RaisedButton'; import RaisedButton from 'material-ui/RaisedButton';
import React from 'react';
import TextField from 'material-ui/TextField'; import TextField from 'material-ui/TextField';
import fetch from 'isomorphic-fetch'; import fetch from 'isomorphic-fetch';
import moment from 'moment-timezone'; import moment from 'moment-timezone';
@ -22,6 +22,10 @@ const styles = {
}; };
class BikeForm extends React.Component { class BikeForm extends React.Component {
static propTypes = {
bike: PropTypes.object,
editing: PropTypes.bool,
}
constructor({ bike, editing = false }) { constructor({ bike, editing = false }) {
super(); super();
if (editing) { if (editing) {
@ -117,7 +121,7 @@ class BikeForm extends React.Component {
name="make" name="make"
floatingLabelText="Make" floatingLabelText="Make"
hintText="Norco" hintText="Norco"
value={this.state.bike.make} value={this.state.bike.make || undefined}
onChange={this.handleChange} onChange={this.handleChange}
fullWidth fullWidth
required required
@ -128,7 +132,7 @@ class BikeForm extends React.Component {
name="price" name="price"
floatingLabelText="Price" floatingLabelText="Price"
hintText="35.60" hintText="35.60"
value={this.state.bike.price} value={this.state.bike.price || undefined}
onChange={this.handleChange} onChange={this.handleChange}
fullWidth fullWidth
/> />
@ -138,7 +142,7 @@ class BikeForm extends React.Component {
name="colour" name="colour"
floatingLabelText="Colour" floatingLabelText="Colour"
hintText="orange" hintText="orange"
value={this.state.bike.colour} value={this.state.bike.colour || undefined}
onChange={this.handleChange} onChange={this.handleChange}
fullWidth fullWidth
required required
@ -157,7 +161,7 @@ class BikeForm extends React.Component {
name="serial_number" name="serial_number"
floatingLabelText="Serial number" floatingLabelText="Serial number"
hintText="ab90cd23" hintText="ab90cd23"
value={this.state.bike.serial_number} value={this.state.bike.serial_number || undefined}
onChange={this.handleChange} onChange={this.handleChange}
fullWidth fullWidth
required required
@ -188,10 +192,10 @@ class BikeForm extends React.Component {
<div className="mdl-cell mdl-cell--6-col"> <div className="mdl-cell mdl-cell--6-col">
<TextField <TextField
floatingLabelText="Claimed by" floatingLabelText="Claimed by"
value={claimed_by} value={claimed_by || undefined}
fullWidth fullWidth
disabled disabled
readonly readOnly
/> />
</div> </div>
</div> </div>

1
bikeshop_project/assets/js/bikes/components/BikeModal/index.jsx

@ -9,6 +9,7 @@ import BikeForm from '../BikeForm';
export default class BikeModal extends React.Component { export default class BikeModal extends React.Component {
static propTypes = { static propTypes = {
open: PropTypes.bool, open: PropTypes.bool,
bike: PropTypes.object,
editing: PropTypes.bool, editing: PropTypes.bool,
} }

1
bikeshop_project/assets/js/bikes/components/BikeTable/index.jsx

@ -49,7 +49,6 @@ export default class BikeTable extends React.Component {
.then(parseJSON) .then(parseJSON)
.then((data) => { .then((data) => {
this.setState({ bikes: data }); this.setState({ bikes: data });
console.log('request succeeded with JSON response', data);
}) })
.catch((error) => { .catch((error) => {
console.log('request failed', error); console.log('request failed', error);

2
bikeshop_project/assets/js/bikes/components/Size/index.jsx

@ -48,7 +48,7 @@ const Size = ({ size, onChange }) => {
Size.propTypes = { Size.propTypes = {
size: PropTypes.string, size: PropTypes.string,
onChange: PropTypes.function, onChange: PropTypes.func,
}; };
export default Size; export default Size;

2
bikeshop_project/assets/js/bikes/components/Source/index.jsx

@ -38,7 +38,7 @@ const Source = ({ source, onChange }) => {
Source.propTypes = { Source.propTypes = {
source: PropTypes.string, source: PropTypes.string,
onChange: PropTypes.function onChange: PropTypes.func,
}; };
export default Source; export default Source;

Loading…
Cancel
Save