From 33e8a9f384ecc424031dcd5ac5d5c0eddac13796 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Fri, 24 Nov 2017 10:42:01 +0100
Subject: [PATCH] BT4 + header migration (wip)

---
 client/main.js                                |  5 +--
 .../AuthenticatedNavigation.js                | 32 ++++++++-----------
 imports/ui/components/NavItem/NavItem.js      |  1 -
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/client/main.js b/client/main.js
index 7261bd7..5d831e3 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,3 +1,4 @@
 import '../imports/startup/client';
-/* import '../node_modules/daemonite-material/js/material.min.js';
- * import '../node_modules/daemonite-material/css/material.css';*/
+/*
+import '../node_modules/daemonite-material/js/material.min.js';
+import '../node_modules/daemonite-material/css/material.css';*/
diff --git a/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js b/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
index 82b78b9..1f024e5 100644
--- a/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
+++ b/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 import { LinkContainer } from 'react-router-bootstrap';
-import { Nav, NavDropdown, MenuItem } from 'react-bootstrap';
+import { Nav, NavDropdown } from 'react-bootstrap';
 /*
    FIXME:
    navitem needs a nav-link class but does not works
@@ -11,27 +11,21 @@ import { Nav, NavDropdown, MenuItem } from 'react-bootstrap';
    so we did a custom NavLink
  */
 import NavItem from '../NavItem/NavItem';
+
 import { Meteor } from 'meteor/meteor';
 
 const AuthenticatedNavigation = ({ name, history }) => (
-  <div>
-    {/*
-    https://github.com/react-bootstrap/react-bootstrap/blob/master/src/Nav.js */}
-    <Nav>
-      <LinkContainer className="nav-item" anchorClassName="nav-link" to="/documents">
-        <NavItem eventKey={1} href="/documents">Documents</NavItem>
-      </LinkContainer>
-    </Nav>
-    <Nav pullRight>
-      <NavDropdown eventKey={2} title={name} id="user-nav-dropdown">
-        <LinkContainer className="nav-item" anchorClassName="nav-link" to="/profile">
-          <NavItem eventKey={2.1} href="/profile">Profile</NavItem>
-        </LinkContainer>
-        <MenuItem divider />x
-        <MenuItem eventKey={2.2} onClick={() => history.push('/logout')}>Logout</MenuItem>
-      </NavDropdown>
-    </Nav>
-  </div>
+  <Nav pullRight>
+    <LinkContainer className="nav-item" anchorClassName="nav-link" to="/documents">
+      <NavItem eventKey={1} href="/documents">Documents</NavItem>
+    </LinkContainer>
+    <LinkContainer className="nav-item" anchorClassName="nav-link" to="/profile">
+      <NavItem eventKey={2.1} href="/profile">{name}</NavItem>
+    </LinkContainer>
+    <LinkContainer className="nav-item" anchorClassName="nav-link" to="/logout">
+      <NavItem eventKey={2.2} onClick={() => history.push('/logout')} href="/logout">Logout</NavItem>
+    </LinkContainer>
+  </Nav>
 );
 
 AuthenticatedNavigation.propTypes = {
diff --git a/imports/ui/components/NavItem/NavItem.js b/imports/ui/components/NavItem/NavItem.js
index 953cf85..8d51871 100644
--- a/imports/ui/components/NavItem/NavItem.js
+++ b/imports/ui/components/NavItem/NavItem.js
@@ -55,7 +55,6 @@ class NavItem extends React.Component {
     } else if (props.role === 'tab') {
       props['aria-selected'] = active;
     }
-
     return (
       <li
         role="presentation"