xonecas.io
3517
Mt

meal_tracker / commit af5cf71

Fix issues introduced by eslint --fix

Project now works again.

xonecas2020-07-27 af5cf7158df6ce38e1346c0c030db7ebf95b3218 parent e459dc9

8 files changed

bmi_ui/src/components/FilterForm.js+7−6
@@ -29,7 +29,6 @@ class UserForm extends React.Component {
2929 }
3030
3131 filter (e) {
32- console.log(this.props.user.token)
3332 e && e.preventDefault()
3433
3534 const params = {}
@@ -50,14 +49,16 @@ class UserForm extends React.Component {
5049 };
5150
5251 render () {
52+ const boundChange = this.onChange.bind(this)
53+
5354 return (
54- <Form onSubmit={this.filter}>
55+ <Form onSubmit={this.filter.bind(this)}>
5556 <FormGroup>
5657 <Label for="date_from">Start date:</Label>
5758 <Input
5859 type="date"
5960 name="date_from"
60- onChange={this.onChange}
61+ onChange={boundChange}
6162 value={this.state.date_from}
6263 />
6364 </FormGroup>
@@ -66,7 +67,7 @@ class UserForm extends React.Component {
6667 <Input
6768 type="date"
6869 name="date_to"
69- onChange={this.onChange}
70+ onChange={boundChange}
7071 value={this.state.date_to}
7172 />
7273 </FormGroup>
@@ -75,7 +76,7 @@ class UserForm extends React.Component {
7576 <Input
7677 type="time"
7778 name="time_from"
78- onChange={this.onChange}
79+ onChange={boundChange}
7980 value={this.state.time_from}
8081 />
8182 </FormGroup>
@@ -84,7 +85,7 @@ class UserForm extends React.Component {
8485 <Input
8586 type="time"
8687 name="time_to"
87- onChange={this.onChange}
88+ onChange={boundChange}
8889 value={this.state.time_to}
8990 />
9091 </FormGroup>
bmi_ui/src/components/FilterModal.js+6−4
@@ -29,21 +29,23 @@ class FilterModal extends Component {
2929 };
3030
3131 render () {
32+ const boundToggle = this.toggle.bind(this)
33+
3234 return (
3335 <Fragment>
3436 <Button
3537 className="mr-3"
36- onClick={this.toggle}
38+ onClick={boundToggle}
3739 size="sm"
3840 outline
3941 color="primary">
4042 Filter
4143 </Button>
42- <Modal isOpen={this.state.modal} toggle={this.toggle}>
43- <ModalHeader toggle={this.toggle}>Filter</ModalHeader>
44+ <Modal isOpen={this.state.modal} toggle={boundToggle}>
45+ <ModalHeader toggle={boundToggle}>Filter</ModalHeader>
4446 <ModalBody>
4547 <FilterForm
46- toggle={this.toggle}
48+ toggle={boundToggle}
4749 user={this.props.user}
4850 update={this.props.update}
4951 />
bmi_ui/src/components/LoginForm.js+5−3
@@ -36,14 +36,16 @@ class UserForm extends React.Component {
3636 }
3737
3838 render () {
39+ const boundChange = this.onChange.bind(this)
40+
3941 return (
40- <Form onSubmit={this.login}>
42+ <Form onSubmit={this.login.bind(this)}>
4143 <FormGroup>
4244 <Label for="username">Username:</Label>
4345 <Input
4446 type="text"
4547 name="username"
46- onChange={this.onChange}
48+ onChange={boundChange}
4749 value={this.state.name}
4850 />
4951 </FormGroup>
@@ -52,7 +54,7 @@ class UserForm extends React.Component {
5254 <Input
5355 type="password"
5456 name="password"
55- onChange={this.onChange}
57+ onChange={boundChange}
5658 value={this.state.name}
5759 />
5860 </FormGroup>
bmi_ui/src/components/LoginModal.js+5−4
@@ -27,15 +27,17 @@ class UserModal extends Component {
2727 }
2828
2929 render () {
30+ const boundToggle = this.toggle.bind(this)
31+
3032 return (
3133 <Fragment>
32- <Button onClick={this.toggle} color='primary' size='sm'>Login</Button>
34+ <Button onClick={boundToggle} color='primary' size='sm'>Login</Button>
3335 <Modal isOpen={this.state.modal} toggle={this.toggle}>
34- <ModalHeader toggle={this.toggle}>Login</ModalHeader>
36+ <ModalHeader toggle={boundToggle}>Login</ModalHeader>
3537
3638 <ModalBody>
3739 <LoginForm
38- toggle={this.toggle}
40+ toggle={boundToggle}
3941 update={this.props.update}
4042 />
4143 </ModalBody>
@@ -46,4 +48,3 @@ class UserModal extends Component {
4648 }
4749
4850 export default UserModal
49-
bmi_ui/src/components/MealForm.js+7−5
@@ -60,14 +60,16 @@ class MealForm extends React.Component {
6060 }
6161
6262 render () {
63+ const boundChange = this.onChange.bind(this)
64+
6365 return (
64- <Form onSubmit={this.props.meal ? this.edit : this.create}>
66+ <Form onSubmit={this.props.meal ? this.edit.bind(this) : this.create.bind(this)}>
6567 <FormGroup>
6668 <Label for='text'>Title:</Label>
6769 <Input
6870 type='text'
6971 name='text'
70- onChange={this.onChange}
72+ onChange={boundChange}
7173 value={this.state.text}
7274 />
7375 </FormGroup>
@@ -76,7 +78,7 @@ class MealForm extends React.Component {
7678 <Input
7779 type='text'
7880 name='calories'
79- onChange={this.onChange}
81+ onChange={boundChange}
8082 value={this.state.calories}
8183 />
8284 </FormGroup>
@@ -85,7 +87,7 @@ class MealForm extends React.Component {
8587 <Input
8688 type='date'
8789 name='date'
88- onChange={this.onChange}
90+ onChange={boundChange}
8991 value={this.state.date}
9092 />
9193 </FormGroup>
@@ -94,7 +96,7 @@ class MealForm extends React.Component {
9496 <Input
9597 type='time'
9698 name='time'
97- onChange={this.onChange}
99+ onChange={boundChange}
98100 value={this.state.time}
99101 />
100102 </FormGroup>
bmi_ui/src/components/MealModal.js+6−6
@@ -17,7 +17,6 @@ class MealModal extends Component {
1717 create: PropTypes.boolean,
1818 meal: PropTypes.any,
1919 user: PropTypes.any,
20- toggle: PropTypes.func,
2120 update: PropTypes.func
2221 }
2322 }
@@ -32,10 +31,11 @@ class MealModal extends Component {
3231
3332 render () {
3433 const create = this.props.create
34+ const toggle = this.toggle.bind(this)
3535
3636 let title = 'Editing meal'
3737 let button = (
38- <Button onClick={this.toggle} size='sm' outline className='mr-3 float-right'>Edit</Button>
38+ <Button onClick={toggle} size='sm' outline className='mr-3 float-right'>Edit</Button>
3939 )
4040
4141 if (create) {
@@ -46,7 +46,7 @@ class MealModal extends Component {
4646 color='primary'
4747 size='sm'
4848 outline
49- onClick={this.toggle}
49+ onClick={toggle}
5050 className='mr-3 float-right'
5151 >Add new meal</Button>
5252 )
@@ -55,12 +55,12 @@ class MealModal extends Component {
5555 return (
5656 <Fragment>
5757 {button}
58- <Modal isOpen={this.state.modal} toggle={this.toggle}>
59- <ModalHeader toggle={this.toggle}>{title}</ModalHeader>
58+ <Modal isOpen={this.state.modal} toggle={toggle}>
59+ <ModalHeader toggle={toggle}>{title}</ModalHeader>
6060
6161 <ModalBody>
6262 <MealForm
63- toggle={this.toggle}
63+ toggle={toggle}
6464 meal={this.props.meal}
6565 user={this.props.user}
6666 update={this.props.update}
bmi_ui/src/components/UserForm.js+10−7
@@ -57,15 +57,18 @@ class UserForm extends React.Component {
5757 }
5858
5959 render () {
60+ const boundChange = this.onChange.bind(this)
61+ const boundCaloriesChange = this.onCaloriesChange.bind(this)
62+
6063 return (
61- <Form onSubmit={this.props.user ? this.editUser : this.createUser}>
64+ <Form onSubmit={this.props.user ? this.editUser.bind(this) : this.createUser.bind(this)}>
6265 <FormGroup>
6366 <Label for='username'>Username:</Label>
6467 <Input
6568 type='text'
6669 name='username'
67- onChange={this.onChange}
68- value={this.defaultIfEmpty(this.state.username)}
70+ onChange={boundChange}
71+ value={this.state.username}
6972 />
7073 </FormGroup>
7174 <FormGroup>
@@ -73,8 +76,8 @@ class UserForm extends React.Component {
7376 <Input
7477 type='password'
7578 name='password'
76- onChange={this.onChange}
77- value={this.defaultIfEmpty(this.state.password)}
79+ onChange={boundChange}
80+ value={this.state.password}
7881 />
7982 </FormGroup>
8083 <FormGroup>
@@ -82,8 +85,8 @@ class UserForm extends React.Component {
8285 <Input
8386 type='text'
8487 name='caloriesPerDay'
85- onChange={this.onCaloriesChange}
86- value={this.defaultIfEmpty(this.state.preferences.max_calories)}
88+ onChange={boundCaloriesChange}
89+ value={this.state.preferences.max_calories}
8790 />
8891 </FormGroup>
8992
bmi_ui/src/components/UserModal.js+6−5
@@ -30,9 +30,10 @@ class UserModal extends Component {
3030
3131 render () {
3232 const create = this.props.create
33+ const toggle = this.toggle.bind(this)
3334
3435 let title = 'Editing user'
35- let button = <Button onClick={this.toggle} size='sm' outline>Edit user</Button>
36+ let button = <Button onClick={toggle} size='sm' outline>Edit user</Button>
3637
3738 if (create) {
3839 title = 'Creating user'
@@ -42,7 +43,7 @@ class UserModal extends Component {
4243 color='primary'
4344 size='sm'
4445 outline
45- onClick={this.toggle}
46+ onClick={toggle}
4647 >Signup</Button>
4748 )
4849 }
@@ -50,12 +51,12 @@ class UserModal extends Component {
5051 return (
5152 <Fragment>
5253 {button}
53- <Modal isOpen={this.state.modal} toggle={this.toggle}>
54- <ModalHeader toggle={this.toggle}>{title}</ModalHeader>
54+ <Modal isOpen={this.state.modal} toggle={toggle}>
55+ <ModalHeader toggle={toggle}>{title}</ModalHeader>
5556
5657 <ModalBody>
5758 <UserForm
58- toggle={this.toggle}
59+ toggle={toggle}
5960 user={this.props.user}
6061 update={this.props.update}
6162 />