diff --git a/public/index.html b/public/index.html index 08865a5d6..3cb063aed 100644 --- a/public/index.html +++ b/public/index.html @@ -12,6 +12,10 @@ window['ga-disable-UA-166263401-1'] = devHostname; window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); gtag('config', 'UA-166263401-1'); + + + + diff --git a/src/Routes.jsx b/src/Routes.jsx index 0f59829e0..c50408d1e 100644 --- a/src/Routes.jsx +++ b/src/Routes.jsx @@ -16,7 +16,8 @@ export default function Routes() { - + + ); } diff --git a/src/components/Comparison/Contact311Comparison.jsx b/src/components/Comparison/Contact311Comparison.jsx index 8112231e1..3cff0d0ce 100644 --- a/src/components/Comparison/Contact311Comparison.jsx +++ b/src/components/Comparison/Contact311Comparison.jsx @@ -8,6 +8,8 @@ import { transformCounts } from '@utils'; const Contact311Comparison = ({ counts: { set1, set2 }, + set1list, + set2list, }) => { const setName = district => ( DISTRICT_TYPES @@ -73,21 +75,25 @@ const Contact311Comparison = ({ exportData={exportData} filename="How People Contact 311" /> -
- -

{ set1name }

-
-
- -

{ set2name }

+
+
+ +

{`${set1name}${set1list.length > 1 ? 's' : ''} (Set 1):`}

+

{ set1list.join(', ')}

+
+
+ +

{`${set2name}${set2list.length > 1 ? 's' : ''} (Set 2):`}

+

{ set2list.join(', ') }

+
); @@ -95,6 +101,8 @@ const Contact311Comparison = ({ const mapStateToProps = state => ({ counts: state.comparisonData.counts, + set1list: state.comparisonFilters.comparison.set1.list, + set2list: state.comparisonFilters.comparison.set2.list, }); export default connect(mapStateToProps)(Contact311Comparison); @@ -110,6 +118,8 @@ Contact311Comparison.propTypes = { source: PropTypes.shape({}), }), }), + set1list: PropTypes.arrayOf(PropTypes.string).isRequired, + set2list: PropTypes.arrayOf(PropTypes.string).isRequired, }; Contact311Comparison.defaultProps = { diff --git a/src/components/about/About.jsx b/src/components/about/About.jsx index 6ffc31549..fc7006aa0 100644 --- a/src/components/about/About.jsx +++ b/src/components/about/About.jsx @@ -1,8 +1,4 @@ import React from 'react'; -import PropTypes from 'proptypes'; -import { connect } from 'react-redux'; -import { disableSplashPage } from '@reducers/ui'; - import { Link } from 'react-router-dom'; import Button from '@components/common/Button'; import Icon from '@components/common/Icon'; @@ -11,9 +7,7 @@ import HeroImage from './HeroImage'; import WhatIs311Data from './WhatIs311Data'; import HowItWorks from './HowItWorks'; -const About = ({ - disableSplash, -}) => { +const About = () => { const aboutRef = React.createRef(); const scrollTo = ref => { @@ -37,19 +31,11 @@ const About = ({ - -