Merge pull request #145 from partio-scout/feature/show-user-name-in-n…

…avbar

Show user name in navbar

src/client/components/App/MainNavigation.jsx

@@ -43,6 +43,13 @@ export function getMainNavigation() {
         );
       }
 
+      navItems.push(
+        {
+          icon: 'user',
+          label: `${this.props.currentUser.firstName} ${this.props.currentUser.lastName}`,
+        }
+      );
+
       navItems.push(
         {
           onClick: this.props.onLogout,

src/client/components/App/NavigationItem.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { NavItem } from 'react-bootstrap';
+import { NavItem, Glyphicon } from 'react-bootstrap';
 import { NavLinkItem } from '../../components';
 
 export function getNavigationItem() {
@@ -9,14 +9,14 @@ export function getNavigationItem() {
         values,
       } = this.props;
 
+      const label = (values.icon ? <span><Glyphicon glyph={ values.icon }/> { values.label }</span> : values.label);
+
       if (values.isExternalLink) {
-        return (<NavItem href={ values.to } onClick={ values.onClick }>{ values.label }</NavItem>);
+        return (<NavItem href={ values.to } onClick={ values.onClick }>{ label }</NavItem>);
+      } else if (values.onClick || values.to) {
+        return (<NavLinkItem to={ values.to } isIndexLink={ values.isIndexLink }>{ label }</NavLinkItem>);
       } else {
-        return (
-          <NavLinkItem to={ values.to } isIndexLink={ values.isIndexLink }>
-            { values.label }
-          </NavLinkItem>
-        );
+        return (<NavItem disabled={ true }>{ label }</NavItem>);
       }
     }
   }

src/client/styles.scss

@@ -183,6 +183,12 @@ table {
   font-weight: bold;
 }
 
+.navbar {
+  .no-link {
+    cursor: default !important
+  }
+}
+
 /**
  * Sidebar & Main Container
  */