Skip to content

Commit e52df12

Browse files
lowskylowsky
committed
use prettier with eslint for automatic formatting
1 parent 76cac41 commit e52df12

21 files changed

Lines changed: 291 additions & 261 deletions

‎src/components/Board.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ const middlewares = process.env.NODE_ENV === 'development' ? [logger] : []
99
const store = createStore(boardReducer, applyMiddleware(...middlewares))
1010

1111
export default class Board extends Component {
12-
render () {
13-
return <Provider store={store}>
14-
<BoardContainer {...this.props} />
15-
</Provider>
12+
render() {
13+
return (
14+
<Provider store={store}>
15+
<BoardContainer {...this.props} />
16+
</Provider>
17+
)
1618
}
1719
}

‎src/components/BoardContainer.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,13 @@ class BoardContainer extends Component {
5858
console.log('onDragEnd')
5959
console.log(result)
6060
const {source, destination, draggableId} = result
61-
destination && this.props.actions.moveCardAcrossLanes({fromLaneId: source.droppableId, toLaneId: destination.droppableId, cardId: draggableId, index: destination.index})
61+
destination &&
62+
this.props.actions.moveCardAcrossLanes({
63+
fromLaneId: source.droppableId,
64+
toLaneId: destination.droppableId,
65+
cardId: draggableId,
66+
index: destination.index
67+
})
6268
}
6369

6470
render() {

‎src/components/Card.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ class Card extends Component {
4646
const dragStyle = this.getItemStyle(dragSnapshot.isDragging, dragProvided.draggableProps.style)
4747
return (
4848
<div>
49-
<MovableCardWrapper
50-
key={id}
51-
data-id={id}
52-
{...otherProps}
53-
innerRef={dragProvided.innerRef}
54-
{...dragProvided.draggableProps}
55-
{...dragProvided.dragHandleProps}
56-
style={{
57-
...style,
58-
...dragStyle
59-
}}>
60-
{this.renderBody()}
61-
{editable && <DeleteButton onClick={this.removeCard} />}
62-
</MovableCardWrapper>
49+
<MovableCardWrapper
50+
key={id}
51+
data-id={id}
52+
{...otherProps}
53+
innerRef={dragProvided.innerRef}
54+
{...dragProvided.draggableProps}
55+
{...dragProvided.dragHandleProps}
56+
style={{
57+
...style,
58+
...dragStyle
59+
}}>
60+
{this.renderBody()}
61+
{editable && <DeleteButton onClick={this.removeCard} />}
62+
</MovableCardWrapper>
6363
{dragProvided.placeholder}
6464
</div>
6565
)

‎src/components/Lane.js‎

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ import Loader from './Loader'
33
import PropTypes from 'prop-types'
44
import Card from './Card'
55
import {
6-
Section,
7-
Header,
8-
Title,
9-
RightContent,
10-
DraggableList,
11-
Placeholder,
12-
AddCardLink,
13-
LaneWrapper, ScrollableLane,
14-
} from '../styles/Base';
6+
Section,
7+
Header,
8+
Title,
9+
RightContent,
10+
DraggableList,
11+
Placeholder,
12+
AddCardLink,
13+
LaneWrapper,
14+
ScrollableLane
15+
} from '../styles/Base'
1516
import {bindActionCreators} from 'redux'
1617
import {connect} from 'react-redux'
1718
import update from 'immutability-helper'
@@ -44,7 +45,11 @@ class Lane extends Component {
4445
// if no cards present, stop retrying until user action
4546
node.scrollTop = node.scrollTop - 50
4647
} else {
47-
this.props.actions.paginateLane({laneId: this.props.id, newCards: moreCards, nextPage: nextPage})
48+
this.props.actions.paginateLane({
49+
laneId: this.props.id,
50+
newCards: moreCards,
51+
nextPage: nextPage
52+
})
4853
}
4954
this.setState({loading: false})
5055
})
@@ -62,7 +67,7 @@ class Lane extends Component {
6267
laneDidMount = (node, dragReference) => {
6368
if (node) {
6469
node.addEventListener('scroll', this.handleScroll)
65-
dragReference(node)
70+
dragReference(node)
6671
}
6772
}
6873

@@ -81,12 +86,20 @@ class Lane extends Component {
8186

8287
componentWillReceiveProps(nextProps) {
8388
if (!isEqual(this.props.cards, nextProps.cards)) {
84-
this.setState({cards: nextProps.cards, currentPage: nextProps.currentPage})
89+
this.setState({
90+
cards: nextProps.cards,
91+
currentPage: nextProps.currentPage
92+
})
8593
}
8694
}
8795

8896
moveCardAcrossLanes = (fromLaneId, toLaneId, cardId) => {
89-
toLaneId && this.props.actions.moveCardAcrossLanes({fromLaneId: fromLaneId, toLaneId: toLaneId, cardId: cardId})
97+
toLaneId &&
98+
this.props.actions.moveCardAcrossLanes({
99+
fromLaneId: fromLaneId,
100+
toLaneId: toLaneId,
101+
cardId: cardId
102+
})
90103
}
91104

92105
removeCard = (laneId, cardId) => {
@@ -190,10 +203,11 @@ class Lane extends Component {
190203
return (
191204
<Header>
192205
<Title style={titleStyle}>{title}</Title>
193-
{label &&
206+
{label && (
194207
<RightContent>
195208
<span style={labelStyle}>{label}</span>
196-
</RightContent>}
209+
</RightContent>
210+
)}
197211
</Header>
198212
)
199213
}
@@ -207,18 +221,20 @@ class Lane extends Component {
207221
<Droppable droppableId={id} type="card" index={index} isDropDisabled={isDropDisabled}>
208222
{(dropProvided, dropSnapshot) => {
209223
const isDraggingOver = dropSnapshot.isDraggingOver
210-
return <Section
211-
{...otherProps}
212-
key={id}
213-
onClick={() => onLaneClick && onLaneClick(id)}
214-
innerRef={ref => this.laneDidMount(ref, dropProvided.innerRef)}
215-
isDraggingOver={isDraggingOver}
216-
{...dropProvided.draggableProps}>
217-
{this.renderHeader()}
218-
{this.renderDragContainer()}
219-
{loading && <Loader/>}
220-
</Section>
221-
}}
224+
return (
225+
<Section
226+
{...otherProps}
227+
key={id}
228+
onClick={() => onLaneClick && onLaneClick(id)}
229+
innerRef={ref => this.laneDidMount(ref, dropProvided.innerRef)}
230+
isDraggingOver={isDraggingOver}
231+
{...dropProvided.draggableProps}>
232+
{this.renderHeader()}
233+
{this.renderDragContainer()}
234+
{loading && <Loader />}
235+
</Section>
236+
)
237+
}}
222238
</Droppable>
223239
)
224240
}
@@ -255,6 +271,8 @@ Lane.defaultProps = {
255271
onCardAdd: () => {}
256272
}
257273

258-
const mapDispatchToProps = dispatch => ({actions: bindActionCreators(laneActions, dispatch)})
274+
const mapDispatchToProps = dispatch => ({
275+
actions: bindActionCreators(laneActions, dispatch)
276+
})
259277

260278
export default connect(null, mapDispatchToProps)(Lane)

‎src/components/NewCard.js‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, {Component} from 'react'
22
import PropTypes from 'prop-types'
33
import {CardHeader, CardRightContent, CardTitle, CardWrapper, Detail} from '../styles/Base'
44
import EditableLabel from './widgets/EditableLabel'
5-
import {AddButton, CancelButton} from '../styles/Elements';
5+
import {AddButton, CancelButton} from '../styles/Elements'
66

77
class NewCard extends Component {
88
updateField = (field, value) => {
@@ -13,30 +13,28 @@ class NewCard extends Component {
1313
this.props.onAdd(this.state)
1414
}
1515

16-
render () {
16+
render() {
1717
const {onCancel} = this.props
18-
return <div style={{background: '#E3E3E3'}}>
19-
<CardWrapper>
20-
<CardHeader>
21-
<CardTitle>
22-
<EditableLabel placeholder='title'
23-
onChange={val => this.updateField('title', val)}
24-
autoFocus/>
25-
</CardTitle>
26-
<CardRightContent>
27-
<EditableLabel placeholder='label'
28-
onChange={val => this.updateField('label', val)}/>
29-
</CardRightContent>
30-
</CardHeader>
31-
<Detail>
32-
<EditableLabel placeholder='description'
33-
onChange={val => this.updateField('description', val)}/>
34-
</Detail>
35-
</CardWrapper>
36-
<AddButton onClick={this.handleAdd}>Add</AddButton>
37-
<CancelButton onClick={onCancel}>Cancel</CancelButton>
38-
</div>
39-
}
18+
return (
19+
<div style={{background: '#E3E3E3'}}>
20+
<CardWrapper>
21+
<CardHeader>
22+
<CardTitle>
23+
<EditableLabel placeholder="title" onChange={val => this.updateField('title', val)} autoFocus />
24+
</CardTitle>
25+
<CardRightContent>
26+
<EditableLabel placeholder="label" onChange={val => this.updateField('label', val)} />
27+
</CardRightContent>
28+
</CardHeader>
29+
<Detail>
30+
<EditableLabel placeholder="description" onChange={val => this.updateField('description', val)} />
31+
</Detail>
32+
</CardWrapper>
33+
<AddButton onClick={this.handleAdd}>Add</AddButton>
34+
<CancelButton onClick={onCancel}>Cancel</CancelButton>
35+
</div>
36+
)
37+
}
4038
}
4139

4240
NewCard.propTypes = {

‎src/components/Tag.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ import PropTypes from 'prop-types'
33
import {TagSpan} from '../styles/Base'
44

55
export default class Tag extends Component {
6-
render () {
6+
render() {
77
const {title, color, bgcolor, tagStyle, ...otherProps} = this.props
88
const style = {color: color || 'white', backgroundColor: bgcolor || 'orange', ...tagStyle}
9-
return <TagSpan style={style} {...otherProps}>{title}</TagSpan>
9+
return (
10+
<TagSpan style={style} {...otherProps}>
11+
{title}
12+
</TagSpan>
13+
)
1014
}
1115
}
1216

‎src/components/widgets/DeleteButton.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import {DeleteWrapper, DeleteIcon} from '../../styles/Elements'
33

4-
const DeleteButton = (props) => {
4+
const DeleteButton = props => {
55
return (
66
<DeleteWrapper {...props}>
77
<DeleteIcon />

‎src/components/widgets/EditableLabel.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default class EditableLabel extends React.Component {
55
onChange: () => {},
66
placeholder: '',
77
className: '',
8-
autoFocus: false
8+
autoFocus: false
99
}
1010

1111
state = {text: ''}
@@ -19,15 +19,15 @@ export default class EditableLabel extends React.Component {
1919
this.setState({text: text})
2020
}
2121

22-
componentDidMount(){
23-
if (this.props.autoFocus) {
24-
this.refDiv.focus()
25-
}
26-
}
22+
componentDidMount() {
23+
if (this.props.autoFocus) {
24+
this.refDiv.focus()
25+
}
26+
}
2727

2828
onBlur = () => {
29-
this.props.onChange(this.state.text)
30-
}
29+
this.props.onChange(this.state.text)
30+
}
3131

3232
onPaste = ev => {
3333
ev.preventDefault()
@@ -40,14 +40,14 @@ export default class EditableLabel extends React.Component {
4040
return `comPlainTextContentEditable ${placeholder} ${this.props.className}`
4141
}
4242

43-
render () {
43+
render() {
4444
return (
4545
<div
46-
ref={(ref) => this.refDiv = ref}
47-
contentEditable='true'
46+
ref={ref => (this.refDiv = ref)}
47+
contentEditable="true"
4848
className={this.getClassName()}
4949
onPaste={this.onPaste}
50-
onBlur={this.onBlur}
50+
onBlur={this.onBlur}
5151
onInput={this.onTextChange}
5252
placeholder={this.props.placeholder}
5353
/>

0 commit comments

Comments
 (0)