LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

React router #343

Merged
bones7242 merged 96 commits from react-router into master 2018-02-15 08:02:17 +01:00
Conversation 3 Commits 96 Files changed 111 +4 -4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8fc44a4534 - Show all commits

8
react/containers/NavBar/view.jsx
View file

@ -1,5 +1,5 @@
import React from 'react';
import { Link, withRouter } from 'react-router-dom';
import { NavLink, withRouter } from 'react-router-dom';
import Logo from 'components/Logo';
import NavBarChannelDropdown from 'components/NavBarChannelOptionsDropdown';
import request from 'utils/request';
@ -64,8 +64,8 @@ class NavBar extends React.Component {
<span className="nav-bar-tagline">Open-source, decentralized image and video sharing.</span>
</div>
<div className="nav-bar--right">
<Link className="nav-bar-link link--nav-active" to="/">Publish</Link>
<Link className="nav-bar-link link--nav" to="/about">About</Link>
<NavLink className="nav-bar-link link--nav" activeClassName="link--nav-active" to="/" exact={true}>Publish</NavLink>
<NavLink className="nav-bar-link link--nav" activeClassName="link--nav-active" to="/about">About</NavLink>
{ this.props.channelName ? (
<NavBarChannelDropdown
channelName={this.props.channelName}
@ -74,7 +74,7 @@ class NavBar extends React.Component {
LOGOUT={LOGOUT}
/>
) : (
<Link id="nav-bar-login-link" className="nav-bar-link link--nav" to="/login">Channel</Link>
<NavLink id="nav-bar-login-link" className="nav-bar-link link--nav" activeClassName="link--nav-active" to="/login">Channel</NavLink>
)}
</div>
</div>