From 8ba11e99634415b01b60ffde1a1ac4d58dc2e7e8 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Thu, 7 Feb 2019 17:32:20 +0000 Subject: [PATCH] add icons for home and info --- src/components/Toolbar.jsx | 10 +++++- src/components/ToolbarBottomActions.jsx | 37 ++++++++++---------- src/components/presentational/Icons/Cover.js | 21 +++++++++++ src/components/presentational/Icons/Info.js | 21 +++++++++++ src/components/presentational/Icons/Sites.js | 6 ++-- 5 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 src/components/presentational/Icons/Cover.js create mode 100644 src/components/presentational/Icons/Info.js diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx index 519c6f0..76b9cca 100644 --- a/src/components/Toolbar.jsx +++ b/src/components/Toolbar.jsx @@ -165,10 +165,17 @@ class Toolbar extends React.Component { {(isTags) ? this.renderToolbarTab(2, tagsLabel, 'filter_list') : null} ) @@ -197,7 +204,8 @@ function mapStateToProps (state) { viewFilters: state.app.filters.views, features: state.app.features, narrative: state.app.narrative, - sitesShowing: state.app.flags.isShowingSites + sitesShowing: state.app.flags.isShowingSites, + infoShowing: state.app.flags.isInfopopup } } diff --git a/src/components/ToolbarBottomActions.jsx b/src/components/ToolbarBottomActions.jsx index b20f87d..8040948 100644 --- a/src/components/ToolbarBottomActions.jsx +++ b/src/components/ToolbarBottomActions.jsx @@ -1,36 +1,35 @@ import React from 'react' -import SitesIcon from './presentational/Icons/Sites.js' -// import RefreshIcon from './presentational/Icons/RefreshIcon.js' -// import CoeventIcon from './presentational/Icons/CoeventIcon.js' -// import RouteIcon from './presentational/Icons/RouteIcon.js' +import SitesIcon from './presentational/Icons/Sites' +import CoverIcon from './presentational/Icons/Cover' +import InfoIcon from './presentational/Icons/Info' function ToolbarBottomActions (props) { - function renderMapActions () { - return ( + function renderToggles () { + return [
{process.env.features.USE_SITES ? : null} +
, +
+ +
, +
+ {process.env.features.USE_COVER ? : null}
- ) + ] } return (
- {renderMapActions()} -
- {/* */} - {/* */} - {/* */} -
+ {renderToggles()}
) } diff --git a/src/components/presentational/Icons/Cover.js b/src/components/presentational/Icons/Cover.js new file mode 100644 index 0000000..e1f1029 --- /dev/null +++ b/src/components/presentational/Icons/Cover.js @@ -0,0 +1,21 @@ +import React from 'react' + +const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => { + let classes = (isActive) ? 'action-button enabled' : 'action-button' + if (isDisabled) { + classes = 'action-button disabled' + } + + return ( + + ) +} + +export default CoverIcon diff --git a/src/components/presentational/Icons/Info.js b/src/components/presentational/Icons/Info.js new file mode 100644 index 0000000..f328021 --- /dev/null +++ b/src/components/presentational/Icons/Info.js @@ -0,0 +1,21 @@ +import React from 'react' + +const CoverIcon = ({ isActive, isDisabled, onClickHandler }) => { + let classes = (isActive) ? 'action-button enabled' : 'action-button' + if (isDisabled) { + classes = 'action-button disabled' + } + + return ( + + ) +} + +export default CoverIcon diff --git a/src/components/presentational/Icons/Sites.js b/src/components/presentational/Icons/Sites.js index 0b394cb..86dcf06 100644 --- a/src/components/presentational/Icons/Sites.js +++ b/src/components/presentational/Icons/Sites.js @@ -11,9 +11,9 @@ const SitesIcon = ({ isActive, isDisabled, onClickHandler }) => { className={classes} onClick={onClickHandler} > - - - + + location_on + ) }