From ff53a9c8eaa841d202faffd2e99836086d446f9d Mon Sep 17 00:00:00 2001 From: Jake McDermott Date: Mon, 15 Oct 2018 12:16:58 -0400 Subject: [PATCH] move logo component to folder --- src/components/{ => TowerLogo}/TowerLogo.jsx | 6 +++++- src/components/TowerLogo/index.js | 3 +++ src/components/{ => TowerLogo}/tower-logo-header-hover.svg | 0 src/components/{ => TowerLogo}/tower-logo-header.svg | 0 4 files changed, 8 insertions(+), 1 deletion(-) rename src/components/{ => TowerLogo}/TowerLogo.jsx (90%) create mode 100644 src/components/TowerLogo/index.js rename src/components/{ => TowerLogo}/tower-logo-header-hover.svg (100%) rename src/components/{ => TowerLogo}/tower-logo-header.svg (100%) diff --git a/src/components/TowerLogo.jsx b/src/components/TowerLogo/TowerLogo.jsx similarity index 90% rename from src/components/TowerLogo.jsx rename to src/components/TowerLogo/TowerLogo.jsx index c283c91e43..242e77864c 100644 --- a/src/components/TowerLogo.jsx +++ b/src/components/TowerLogo/TowerLogo.jsx @@ -13,9 +13,13 @@ class TowerLogo extends Component { } onClick = () => { + if (!this.props.onClick) return; + const { history } = this.props; history.push('/'); + + this.props.onClick(); }; onHover = () => { @@ -29,7 +33,7 @@ class TowerLogo extends Component { let src = TowerLogoHeader; - if (hover) { + if (hover && this.props.onClick) { src = TowerLogoHeaderHover; } diff --git a/src/components/TowerLogo/index.js b/src/components/TowerLogo/index.js new file mode 100644 index 0000000000..b1ed1985d8 --- /dev/null +++ b/src/components/TowerLogo/index.js @@ -0,0 +1,3 @@ +import TowerLogo from './TowerLogo'; + +export default TowerLogo; diff --git a/src/components/tower-logo-header-hover.svg b/src/components/TowerLogo/tower-logo-header-hover.svg similarity index 100% rename from src/components/tower-logo-header-hover.svg rename to src/components/TowerLogo/tower-logo-header-hover.svg diff --git a/src/components/tower-logo-header.svg b/src/components/TowerLogo/tower-logo-header.svg similarity index 100% rename from src/components/tower-logo-header.svg rename to src/components/TowerLogo/tower-logo-header.svg