Skip to content

Commit 3ee4e4a

Browse files
iamfaizanahmadjustin808
authored andcommitted
shakacode#413 nav-bar consistency fixed (shakacode#448)
* shakacode#413 nav-bar consistency fixed * cli build fail issue resolved
1 parent 1f7dec6 commit 3ee4e4a

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ const NavigationBar = (props) => {
3232
</div>
3333
<div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
3434
<ul className="nav navbar-nav">
35-
<li className={classNames({ active: (pathname === paths.ROUTER_PATH) })}>
35+
<li className={classNames(
36+
{ active: (pathname === paths.ROUTER_PATH || pathname === paths.REACT_ROUTER_PATH) },
37+
)}>
3638
<a href={paths.ROUTER_PATH}>React Router Demo</a>
3739
</li>
3840
<li className={classNames({ active: (pathname === paths.NO_ROUTER_PATH) })}>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export const ROUTER_PATH = '/';
2+
export const REACT_ROUTER_PATH = '/react-router';
23
export const NO_ROUTER_PATH = '/no-router';
34
export const SIMPLE_REACT_PATH = '/simple';
45
export const RAILS_PATH = '/comments';

client/app/bundles/comments/layout/Layout.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default class Layout extends Component {
1717
<header>
1818
<ul>
1919
<li>
20-
<Link to="/" activeClassName="active">
20+
<Link exact to="/" activeClassName="active">
2121
Comments (Root URL)
2222
</Link>
2323
</li>

0 commit comments

Comments
 (0)