Skip to content

Commit 43237aa

Browse files
author
David Silva
committed
fixed header visibility error
1 parent b0a86d6 commit 43237aa

File tree

6 files changed

+55
-14
lines changed

6 files changed

+55
-14
lines changed

package-lock.json

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"react-redux": "^5.0.6",
4949
"react-router": "^4.2.0",
5050
"react-router-dom": "^4.2.2",
51+
"react-router-prop-types": "0.0.2",
5152
"react-router-redux": "next",
5253
"redux": "^3.7.2",
5354
"redux-thunk": "^2.2.0",

src/components/footer/index.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import logoTextHover from '../../images/logo-text-hover.png';
33
import logoText from '../../images/logo-text.png';
44
import Hoverimage from '../hoverImage';
55
import '../../styles/_footer.scss';
6+
import { Link } from 'react-router-dom';
67

78
class Footer extends React.Component {
89
render() {
@@ -12,15 +13,15 @@ class Footer extends React.Component {
1213
<div className="row">
1314
<div className="col-md-4 col-sm-6 inner">
1415
<h4>About Us</h4>
15-
<a href="/about">
16+
<Link to="/about">
1617
<Hoverimage width="168" className="logo" alt="codecorgi logo" image1={logoText} image2={logoTextHover} />
17-
</a>
18+
</Link>
1819
<p>
1920
Work through tickets/challenges like a real programmer does on the job.
2021
codecorgi provides simulation project management tickets for you
2122
to build real products and grow your developer portfolio.
2223
</p>
23-
<a href="/about" className="txt-btn">About us</a>
24+
<Link to="/about" className="txt-btn">About us</Link>
2425
</div>
2526
<div className="col-md-4 hidden-md hidden-sm col-sm-6 inner">
2627
{/* <h4>Latest works</h4>
@@ -61,9 +62,9 @@ class Footer extends React.Component {
6162
<div className="container inner">
6263
<p className="pull-left">© 2017 codecorgi. All rights reserved.</p>
6364
<ul className="footer-menu pull-right">
64-
<li><a href="/">Home</a></li>
65-
<li><a href="/learning">Learning</a></li>
66-
<li><a href="/about">About</a></li>
65+
<li><Link to="/">Home</Link></li>
66+
<li><Link to="/learning">Learning</Link></li>
67+
<li><Link to="/about">About</Link></li>
6768
<li><a href="http://services.codecorgi.co/">Services</a></li>
6869
</ul>
6970
</div>

src/components/header/index.js

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,24 @@ import logoTextHover from '../../images/logo-text-hover.png';
44
import logoText from '../../images/logo-text.png';
55
import '../../styles/_header.scss';
66
import Hoverimage from '../hoverImage';
7+
import { connect } from 'react-redux';
8+
import { withRouter } from 'react-router';
9+
import ReactRouterPropTypes from 'react-router-prop-types';
710

811
class Header extends React.Component {
12+
static propTypes = {
13+
history: ReactRouterPropTypes.history.isRequired,
14+
}
15+
916
constructor(props) {
1017
super(props);
1118
this.toggleVisibility = this.toggleVisibility.bind(this);
1219
this.state = {
1320
visible: false,
1421
};
22+
this.props.history.listen(() => {
23+
this.setState({ visible: false });
24+
});
1525
}
1626

1727
toggleVisibility() {
@@ -31,22 +41,21 @@ class Header extends React.Component {
3141
<li><a href="#"><i class="icon-s-behance"></i></a></li>
3242
<li><a href="#"><i class="icon-s-dribbble"></i></a></li>*/}
3343
</ul>
34-
<Link className="navbar-brand" onClick={this.toggleVisibility} to="/">
44+
<Link className="navbar-brand" to="/">
3545
<Hoverimage width="168" className="logo" alt="codecorgi logo" image1={logoText} image2={logoTextHover} />
3646
</Link>
3747
<a className="navbar-toggle btn responsive-menu pull-right red-button" onClick={this.toggleVisibility}><i className="icon-menu-1"/></a>
3848
</div>
3949
</div>
4050
<div className="yamm">
41-
<div className={'navbar-collapse visible-md visible-lg' + (this.state.visible ? 'visible-sm visible-xs' : '')}>
51+
<div className={'navbar-collapse visible-md visible-lg ' + (this.state.visible ? 'visible-sm visible-xs' : '')}>
4252
<div className="container">
43-
<Link className="navbar-brand" onClick={this.toggleVisibility} to="/">
44-
{this.state.hover && <img src={logoTextHover} className="logo" alt="codecorgi logo" onMouseEnter={this.mouseOver} onMouseLeave={this.mouseOut} />}
45-
{!this.state.hover && <img src={logoText} className="logo" alt="codecorgi logo" onMouseEnter={this.mouseOver} onMouseLeave={this.mouseOut} />}
53+
<Link className="navbar-brand" to="/">
54+
<Hoverimage width="168" className="logo" alt="codecorgi logo" image1={logoText} image2={logoTextHover} />
4655
</Link>
4756
<ul className="nav navbar-nav">
4857
<li>
49-
<Link to="/challenges" onClick={this.toggleVisibility}>Challenges</Link>
58+
<Link to="/challenges">Challenges</Link>
5059
</li>
5160
<li>
5261
<Link className="red-button" to="/app#!/signup" onClick={this.toggleVisibility}>Account</Link>
@@ -60,4 +69,12 @@ class Header extends React.Component {
6069
}
6170
}
6271

63-
export default Header;
72+
function mapStateToProps() {
73+
return {};
74+
}
75+
76+
function mapDispatchToProps() {
77+
return {};
78+
}
79+
80+
export default withRouter(connect(mapStateToProps, mapDispatchToProps)(Header));

src/containers/about/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class About extends React.Component {
88
render() {
99
return(
1010
<main>
11-
<section id="hero" className="tint-bg img-bg-softer" style={{backgroundImage: `url(${patternBg})`}}>
11+
<section id="hero" className="tint-bg img-bg-softer" style={{backgroundRepeat: 'repeat', backgroundImage: `url(${patternBg})`}}>
1212
<div className="container inner">
1313
<div className="row">
1414
<div className="col-sm-10 aos-init aos-animate" data-aos="fade-up">

src/styles/_content.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
main {
2+
margin-top: -20px;
3+
}
14

25
.red-button {
36
background-color: #fa6c65;

0 commit comments

Comments
 (0)