--- a/client/src/components/NavbarLogin.js Wed Aug 29 11:02:36 2018 +0200
+++ b/client/src/components/NavbarLogin.js Fri Aug 31 15:14:18 2018 +0200
@@ -16,6 +16,7 @@
}
handleClickOutside = (e) => {
+ e.preventDefault();
const currentNode = ReactDOM.findDOMNode(this);
if(!currentNode.contains(e.target)) {
this.hideDropDown();
@@ -47,21 +48,21 @@
if (isAuthenticated) {
return (
- <li className={`nav-item dropdown navs ${this.state.showDropdown?'show':''}`}>
- <a className="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded={this.state.showDropdown} onClick={this.toggleShowDropdown} onBlur={this.hideDropDown}>
+ <li className={`nav-item dropdown ${this.state.showDropdown?'show':''}`}>
+ <a name className="nav-link dropdown-toggle username" id="navbarDropdown" role="button" aria-haspopup="true" aria-expanded={this.state.showDropdown} onClick={this.toggleShowDropdown} onBlur={this.hideDropDown}>
{ currentUser.get('username') }
<span className="caret"></span>
</a>
- <ul className={`dropdown-menu ${this.state.showDropdown?'show':''}`} aria-labelledby="navbarDropdown">
- <li><a className="user-dropdown" href="#settings" onClick={this.onClickSettings}>Paramètres</a></li>
- <li><a className="user-dropdown" href="#logout" onClick={onLogout}>Se déconnecter</a></li>
- </ul>
+ <div className={`dropdown-menu dropdown-menu-right bg-primary border-0 ${this.state.showDropdown?'show':''}`} aria-labelledby="navbarDropdown">
+ <a className="dropdown-item bg-primary text-secondary" onClick={this.onClickSettings}>Paramètres</a>
+ <a className="dropdown-item bg-primary text-secondary" onClick={onLogout}>Se déconnecter</a>
+ </div>
</li>
);
} else {
return (
- <li>
- <a className="navs" onClick={this.onClickLogin} href="/login">Se connecter</a>
+ <li className="nav-item">
+ <a className="nav-link" onClick={this.onClickLogin} href="/login">Se connecter</a>
</li>
);
}