Small stylistic changes to Header and NavRoutes

js/components/header.js

@@ -93,16 +93,16 @@ let Header = React.createClass({
                     <img className="img-brand" src={whitelabel.logo} alt="Whitelabel brand"/>
                 </Link>
             );
+        } else {
+            return (
+                <span>
+                    <Link className="icon-ascribe-logo" to="/collection"/>
+                </span>
+            );
         }
-
-        return (
-            <span>
-                <Link className="icon-ascribe-logo" to="/collection"/>
-            </span>
-        );
     },
 
-    getPoweredBy(){
+    getPoweredBy() {
         return (
             <AclProxy
                 aclObject={this.state.whitelabel}
@@ -159,7 +159,8 @@ let Header = React.createClass({
         let account;
         let signup;
         let navRoutesLinks;
-        if (this.state.currentUser.username){
+
+        if (this.state.currentUser.username) {
             account = (
                 <DropdownButton
                     ref='dropdownbutton'
@@ -195,9 +196,15 @@ let Header = React.createClass({
                     </LinkContainer>
                 </DropdownButton>
             );
-            navRoutesLinks = <NavRoutesLinks routes={this.props.routes} userAcl={this.state.currentUser.acl} navbar right/>;
+
-        }
+            navRoutesLinks = (
-        else {
+                <NavRoutesLinks
+                    navbar
+                    right
+                    routes={this.props.routes}
+                    userAcl={this.state.currentUser.acl} />
+            );
+        } else {
             account = (
                 <LinkContainer
                     to="/login">

js/components/nav_routes_links.js

@@ -29,28 +29,28 @@ let NavRoutesLinks = React.createClass({
      * @return {Array}         Array of ReactElements that can be displayed to the user
      */
     extractLinksFromRoutes(node, userAcl, i) {
-        if(!node) {
+        if (!node) {
             return;
         }
 
-        let links = node.childRoutes.map((child, j) => {
+        const links = node.childRoutes.map((child, j) => {
+            const { aclName, headerTitle, path, childRoutes } = child;
             let childrenFn = null;
-            let { aclName, headerTitle, path, childRoutes } = child;
 
             // If the node has children that could be rendered, then we want
             // to execute this function again with the child as the root
             //
             // Otherwise we'll just pass childrenFn as false
-            if(child.childRoutes && child.childRoutes.length > 0) {
+            if (child.childRoutes && child.childRoutes.length) {
                 childrenFn = this.extractLinksFromRoutes(child, userAcl, i++);
             }
 
             // We validate if the user has set the title correctly,
             // otherwise we're not going to render his route
-            if(headerTitle && typeof headerTitle === 'string') {
+            if (headerTitle && typeof headerTitle === 'string') {
                 // if there is an aclName present on the route definition,
                 // we evaluate it against the user's acl
-                if(aclName && typeof aclName !== 'undefined') {
+                if (aclName && typeof aclName !== 'undefined') {
                     return (
                         <AclProxy
                             key={j}
@@ -60,7 +60,7 @@ let NavRoutesLinks = React.createClass({
                                 headerTitle={headerTitle}
                                 routePath={'/' + path}
                                 depth={i}
-                                children={childrenFn}/>
+                                children={childrenFn} />
                         </AclProxy>
                     );
                 } else {
@@ -70,7 +70,7 @@ let NavRoutesLinks = React.createClass({
                             headerTitle={headerTitle}
                             routePath={'/' + path}
                             depth={i}
-                            children={childrenFn}/>
+                            children={childrenFn} />
                     );
                 }
             } else {
@@ -84,7 +84,7 @@ let NavRoutesLinks = React.createClass({
     },
 
     render() {
-        let {routes, userAcl} = this.props;
+        const {routes, userAcl} = this.props;
 
         return (
             <Nav {...this.props}>
@@ -94,4 +94,4 @@ let NavRoutesLinks = React.createClass({
     }
 });
 
-export default NavRoutesLinks;
+export default NavRoutesLinks;

js/components/nav_routes_links_link.js

@@ -23,18 +23,18 @@ let NavRoutesLinksLink = React.createClass({
     },
 
     render() {
-        let { children, headerTitle, depth, routePath } = this.props;
+        const { children, headerTitle, depth, routePath } = this.props;
 
         // if the route has children, we're returning a DropdownButton that will get filled
         // with MenuItems
-        if(children) {
+        if (children) {
             return (
                 <DropdownButton title={headerTitle}>
                     {children}
                 </DropdownButton>
             );
         } else {
-            if(depth === 1) {
+            if (depth === 1) {
                 // if the node's child is actually a node of level one (a child of a node), we're
                 // returning a DropdownButton matching MenuItem
                 return (
@@ -42,7 +42,7 @@ let NavRoutesLinksLink = React.createClass({
                         <MenuItem>{headerTitle}</MenuItem>
                     </LinkContainer>
                 );
-            } else if(depth === 0) {
+            } else if (depth === 0) {
                 return (
                     <LinkContainer to={routePath}>
                         <NavItem>{headerTitle}</NavItem>
@@ -55,4 +55,4 @@ let NavRoutesLinksLink = React.createClass({
     }
 });
 
-export default NavRoutesLinksLink;
+export default NavRoutesLinksLink;