Skip to content

#413 nav-bar consistency fixed #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2018
Merged

#413 nav-bar consistency fixed #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e588fd
#413 nav-bar consistency fixed
Oct 15, 2018
095207f
cli build fail issue resolved
Oct 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/app/bundles/comments/components/NavigationBar/NavigationBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ const NavigationBar = (props) => {
</div>
<div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul className="nav navbar-nav">
<li className={classNames({ active: (pathname === paths.ROUTER_PATH) })}>
<li className={classNames(
{ active: (pathname === paths.ROUTER_PATH || pathname === paths.REACT_ROUTER_PATH) },
)}>
<a href={paths.ROUTER_PATH}>React Router Demo</a>
</li>
<li className={classNames({ active: (pathname === paths.NO_ROUTER_PATH) })}>
Expand Down
1 change: 1 addition & 0 deletions client/app/bundles/comments/constants/paths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const ROUTER_PATH = '/';
export const REACT_ROUTER_PATH = '/react-router';
export const NO_ROUTER_PATH = '/no-router';
export const SIMPLE_REACT_PATH = '/simple';
export const RAILS_PATH = '/comments';
2 changes: 1 addition & 1 deletion client/app/bundles/comments/layout/Layout.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default class Layout extends Component {
<header>
<ul>
<li>
<Link to="/" activeClassName="active">
<Link exact to="/" activeClassName="active">
Comments (Root URL)
</Link>
</li>
Expand Down