1efb09a · bridge · git.iko.soy

git.iko.soy/bridge

Merge pull request #79 from pkova/master

Add loading placeholder text for points

commit1efb09a1e2fce85fa5d11f13890e16b4cc7bad44 authorFang <Fang-@users.noreply.github.com> dateTue 19 Mar 2019, 18:11 (8 years ago) parent7ae8f22 c9c3868

2 files changed+9−7

compare with master

unifiedsplit

src/components/PointList.js+3−4 src/views/Points.js+6−3

src/components/PointList.js+3−4

@@ -4,12 +4,12 @@ import { Row } from './Base'

44import RenderedPoint from './RenderedPoint'

66const PointList = props => {

7− const { setPointCursor, routeHandler, points } = props

7+ const { setPointCursor, routeHandler, points, loading } = props

88 const chunks = lodash.chunk(points, 3)

1010 return (

1111 points.length === 0

12− ? <p>{'No points to display'}</p>

12+ ? <p>{loading ? 'Loading...' : 'No points to display' }</p>

1313 : lodash.map(chunks, (chunk, idx) =>

1414 <Row key={ `render-row-${idx}` }>

1515 {

@@ -23,8 +23,7 @@ const PointList = props => {

2323 }

2424 </Row>

2525 )

26−

27−)

26+ )

2827}

2928

3029export default PointList

src/views/Points.js+6−3

@@ -27,7 +27,8 @@ class Points extends React.Component {

2727 managing: [],

2828 voting: [],

2929 spawning: [],

30− eclipticOwner: false

30+ eclipticOwner: false,

31+ loading: true

3132 }

3233 }

3334

@@ -66,7 +67,8 @@ class Points extends React.Component {

6667 managing,

6768 voting,

6869 spawning,

69− eclipticOwner

70+ eclipticOwner,

71+ loading: false

7072 })

7173

7274 this.cachePoints(ctrcs, addToPointCache, points)

@@ -84,7 +86,7 @@ class Points extends React.Component {

8486 const { setPointCursor, pushRoute } = this.props

8587 const { pointCache } = this.props

8688

87− const { points, incoming, managing, voting, spawning } = this.state

89+ const { points, incoming, managing, voting, spawning, loading } = this.state

8890 const { eclipticOwner } = this.state

8991

9092 const lookupPointButton =

@@ -227,6 +229,7 @@ class Points extends React.Component {

227229 setPointCursor={ setPointCursor }

228230 routeHandler={ pushRoute }

229231 points={ points }

232+ loading={ loading }

230233 />

231234

232235 { managingPoints }