diff --git a/package-lock.json b/package-lock.json index 7df5e2f..b52f8e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17629,6 +17629,11 @@ } } }, + "react-ga": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/react-ga/-/react-ga-2.6.0.tgz", + "integrity": "sha512-GWHBWZDFjDGMkIk1LzroIn0mNTygKw3adXuqvGvheFZvlbpqMPbHsQsTdQBIxRRdXGQM/Zq+dQLRPKbwIHMTaw==" + }, "react-image-gallery": { "version": "0.8.16", "resolved": "https://registry.npmjs.org/react-image-gallery/-/react-image-gallery-0.8.16.tgz", diff --git a/src/App.js b/src/App.js index 88a9ace..cc4ef40 100755 --- a/src/App.js +++ b/src/App.js @@ -35,12 +35,17 @@ class App extends Component { }; render() { - const {isMobile} = this.props; + const {isMobile, history} = this.props; + // If we are on the mobile create reports page, show nothing. Otherwise, show either the mobile header or the + // desktop header. + const header = isMobile && history.location.pathname === '/reports/create' ? null : isMobile ?
: ; + // If we are on mobile, and not on the create reports page, show a footer. + const footer = isMobile && history.location.pathname !== '/reports/create' ?