diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx index 1400db3..c207d9f 100644 --- a/src/components/Dashboard.jsx +++ b/src/components/Dashboard.jsx @@ -9,15 +9,13 @@ import LoadingOverlay from './presentational/LoadingOverlay' import Map from './Map.jsx' import Toolbar from './Toolbar.jsx' import CardStack from './CardStack.jsx' -import NarrativeCard from './presentational/NarrativeCard.js' +import NarrativeControls from './presentational/NarrativeControls.js' import InfoPopUp from './InfoPopup.jsx' import Timeline from './Timeline.jsx' import Notification from './Notification.jsx' import { parseDate } from '../js/utilities' -import { injectNarrative } from '../js/utilities' - class Dashboard extends React.Component { constructor(props) { super(props) @@ -119,13 +117,6 @@ class Dashboard extends React.Component { getCategoryColor: category => this.getCategoryColor(category) }} /> - this.moveInNarrative(1), - onPrev: () => this.moveInNarrative(-1), - onSelectNarrative: this.setNarrative - }} - /> this.getNarrativeLinks(event)} getCategoryColor={category => this.getCategoryColor(category)} /> + this.moveInNarrative(1), + onPrev: () => this.moveInNarrative(-1), + onSelectNarrative: this.setNarrative + }} + /> - { this.onDragStart() }} onDrag={() => { this.onDrag() }} @@ -264,7 +264,7 @@ class Timeline extends React.Component { onSelect={this.props.methods.onSelect} /> - ); + ) } render() { diff --git a/src/components/presentational/NarrativeCard.js b/src/components/presentational/NarrativeCard.js index a181a9d..1112f16 100644 --- a/src/components/presentational/NarrativeCard.js +++ b/src/components/presentational/NarrativeCard.js @@ -2,35 +2,34 @@ import React from 'react' import { connect } from 'react-redux' import { selectActiveNarrative } from '../../selectors' -function NarrativeCard ({ narrative, methods }) { - const { onSelectNarrative, onNext, onPrev } = methods - function renderClose() { - return ( - - ) - } +function NarrativeCard ({ narrative }) { + // function renderClose() { + // return ( + // + // ) + // } - function _renderActions(current, steps) { - const prevExists = current !== 0 - const nextExists = current < steps.length - 1 - return ( -
-
← -
-
→ -
-
- ) - } + // function _renderActions(current, steps) { + // const prevExists = current !== 0 + // const nextExists = current < steps.length - 1 + // return ( + //
+ //
← + //
+ //
→ + //
+ //
+ // ) + // } // no display if no narrative if (!narrative) return null diff --git a/src/components/presentational/NarrativeControls.js b/src/components/presentational/NarrativeControls.js new file mode 100644 index 0000000..76f96e5 --- /dev/null +++ b/src/components/presentational/NarrativeControls.js @@ -0,0 +1,40 @@ +import React from 'react' +import NarrativeCard from './NarrativeCard' + +export default ({ narrative, methods }) => { + // function renderClose() { + // return ( + // + // ) + // } + + // function _renderActions(current, steps) { + // const prevExists = current !== 0 + // const nextExists = current < steps.length - 1 + // return ( + //
+ //
← + //
+ //
→ + //
+ //
+ // ) + // } + + + + return ( + + + + ) +} diff --git a/src/scss/card.scss b/src/scss/card.scss index a801f0e..a1b03de 100644 --- a/src/scss/card.scss +++ b/src/scss/card.scss @@ -42,10 +42,6 @@ margin: 5px 0 10px 0; padding-bottom: 10px; - &.details { - border-bottom: 1px solid $lightwhite; - } - .card-cell { flex: 1; }