Merge branch 'develop' into fix/fixing-previous-version

Author: PolGuixe

package.json

@@ -1,6 +1,6 @@
 {
   "name": "material-ui-layout",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Layout components for material-ui",
   "main": "./lib/index.js",
   "scripts": {

src/components/AppBar/AppBar.jsx

@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import { withStyles } from 'material-ui/styles';
 import MaterialUIAppBar from 'material-ui/AppBar';
 
+
 import styles from './styles';
 
 class AppBar extends React.PureComponent {

src/index.js

@@ -3,6 +3,7 @@ import Layout from './components/Layout';
 export { default as AppBar } from './components/AppBar';
 export { default as Footer } from './components/Footer';
 
+
 export { default as BasicAppBar } from './templates/AppBar/BasicAppBar';
 export { default as TwoRowsAppBar } from './templates/AppBar/TwoRowsAppBar';
 export { default as BasicFooter } from './templates/Footer/BasicFooter';

src/templates/AppBar/BasicNavBar/BasicNavBar.jsx

@@ -0,0 +1,69 @@
+import _ from 'lodash';
+import React from 'react';
+import PropTypes from 'prop-types';
+import IconButton from 'material-ui/IconButton';
+import Button from 'material-ui/Button';
+import Toolbar from 'material-ui/Toolbar';
+import Typography from 'material-ui/Typography';
+import MenuIcon from 'material-ui-icons/Menu';
+import Hidden from 'material-ui/Hidden';
+import { withStyles } from 'material-ui/styles';
+import withWidth from 'material-ui/utils/withWidth';
+import compose from 'recompose/compose';
+
+import styles from './styles';
+
+class BasicNavBar extends React.PureComponent {
+  static propTypes = {
+    links: PropTypes.arrayOf(PropTypes.shape({})),
+    classes: PropTypes.shape({}),
+    title: PropTypes.string,
+    logo: PropTypes.string,
+    onIconClick: PropTypes.func,
+  };
+
+  handleIconClick = () => {
+    this.props.onIconClick();
+  }
+
+  renderLogo = () => {
+    const { classes, title, logo } = this.props;
+    if (logo) {
+      return (
+        <div className={classes.logo}>
+          <img src={logo} alt={title} className={classes.image} />
+        </div>
+      );
+    }
+    return (
+      <Typography type="title" color="inherit" className={classes.flex}>
+        {title}
+      </Typography>
+    );
+  };
+
+  render() {
+    const { links } = this.props;
+    return (
+      <Toolbar>
+        <Hidden smUp>
+          <IconButton color="inherit" aria-label="Menu" onClick={this.handleIconClick}>
+            <MenuIcon />
+          </IconButton>
+        </Hidden>
+        {this.renderLogo()}
+        <Hidden xsDown>
+          <div>
+            {_.map(links, link => (
+              <Button href={link.href} color="inherit" key={link.label}>
+                {link.label}
+              </Button>
+            ))}
+          </div>
+        </Hidden>
+      </Toolbar>
+    );
+  }
+}
+
+export default compose(withStyles(styles), withWidth())(BasicNavBar);

src/templates/AppBar/BasicNavBar/index.js

@@ -0,0 +1,3 @@
+import BasicNavBar from './BasicNavBar';
+
+export default BasicNavBar;

src/templates/AppBar/BasicNavBar/styles.js

@@ -0,0 +1,18 @@
+const styles = {
+  flex: {
+    flex: 1,
+  },
+  logo: {
+    flex: 1,
+    cursor: 'pointer',
+    height: '45px',
+    minWidth: '160px',
+  },
+  image: {
+    height: '100%',
+    margin: '0',
+    padding: '0',
+  },
+};
+
+export default styles;

src/templates/AppBar/TwoRowsAppBar/TwoRowsAppBar.jsx

@@ -29,6 +29,7 @@ class TwoRowsAppBar extends PureComponent {
     bottomRightContent: null,
   };
 
+
   render() {
     const {
       classes,