Merge remote-tracking branch 'origin/develop' into add-linting

This commit is contained in:
Lachlan Kermode
2019-01-22 15:34:07 +00:00
53 changed files with 746 additions and 617 deletions

View File

@@ -0,0 +1,16 @@
import React from 'react'
export default ({ isDisabled, direction, onClickHandler }) => {
return (
<div
className={`narrative-adjust ${direction}`}
onClick={!isDisabled ? onClickHandler : null}
>
<i
className={`material-icons ${isDisabled ? 'disabled' : ''}`}
>
{`chevron_${direction}`}
</i>
</div>
)
}

View File

@@ -0,0 +1,40 @@
import React from 'react'
import { connect } from 'react-redux'
import { selectActiveNarrative } from '../../../selectors'
function NarrativeCard ({ narrative }) {
// no display if no narrative
const { steps, current } = narrative
if (steps[current]) {
return (
<div className='narrative-info'>
<div className='narrative-info-header'>
<div className='count-container'>
<div className='count'>
{current + 1}/{steps.length}
</div>
</div>
<div>
<h3>{narrative.label}</h3>
</div>
</div>
{/* <i className='material-icons left'>location_on</i> */}
{/* {_renderActions(current, steps)} */}
<div className='narrative-info-desc'>
<p>{narrative.description}</p>
</div>
</div>
)
} else {
return null
}
}
function mapStateToProps (state) {
return {
narrative: selectActiveNarrative(state)
}
}
export default connect(mapStateToProps)(NarrativeCard)

View File

@@ -0,0 +1,17 @@
import React from 'react'
export default ({ onClickHandler, closeMsg }) => {
return (
<div
className='narrative-close'
onClick={onClickHandler}
>
<button
className='side-menu-burg is-active'
>
<span />
</button>
<div className='close-text'>{closeMsg}</div>
</div>
)
}

View File

@@ -0,0 +1,32 @@
import React from 'react'
import Card from './Card'
import Adjust from './Adjust'
import Close from './Close'
export default ({ narrative, methods }) => {
if (!narrative) return null
const { current, steps } = narrative
const prevExists = current !== 0
const nextExists = current < steps.length - 1
return (
<React.Fragment>
<Card narrative={narrative} />
<Adjust
isDisabled={!prevExists}
direction='left'
onClickHandler={methods.onPrev}
/>
<Adjust
isDisabled={!nextExists}
direction='right'
onClickHandler={methods.onNext}
/>
<Close
onClickHandler={() => methods.onSelectNarrative(null)}
closeMsg='-- exit from narrative --'
/>
</React.Fragment>
)
}