Merge branch 'master' into redux

.storybook/webpack.config.js

@@ -3,5 +3,6 @@ var baseConfig = require('../webpack.config')
 module.exports = function (storybookBaseConfig, configType) {
   storybookBaseConfig.resolve = baseConfig.resolve
   storybookBaseConfig.entry.preview.unshift('babel-polyfill')
+  storybookBaseConfig.module.loaders.push(...baseConfig.module.loaders)
   return storybookBaseConfig
 }

README.md

@@ -1,8 +1,9 @@
 <p align="center">
   <img width="206" alt="arclogo2" src="https://cloud.githubusercontent.com/assets/3068563/19498653/f9b73170-9570-11e6-9183-61dce798abab.png"><br><br>
-  <a href="http://standardjs.com"><img src="https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square" alt="Standard Style" /></a>
+
   <a href="https://travis-ci.org/diegohaz/arc"><img src="https://img.shields.io/travis/diegohaz/arc/redux.svg?style=flat-square" alt="Build Status" /></a>
   <a href="https://codecov.io/gh/diegohaz/arc/branch/redux"><img src="https://img.shields.io/codecov/c/github/diegohaz/arc/redux.svg?style=flat-square" alt="Coverage Status" /></a>
+  <a href="https://gitter.im/atomic-react/Lobby"><img src="https://img.shields.io/badge/gitter-join%20chat-1dce73.svg?style=flat-square" alt="Gitter chat" /></a>
 </p>
 
 ## Redux

src-clean/components/App.js

@@ -1,23 +1,24 @@
-import React, { PropTypes, Component } from 'react'
-import { injectGlobal } from 'styled-components'
+import React, { PropTypes } from 'react'
+import { injectGlobal, ThemeProvider } from 'styled-components'
+
+import theme from './themes/default'
 
 injectGlobal`
   body {
     margin: 0;
   }
 `
 
-class App extends Component {
-  static propTypes = {
-    children: PropTypes.any
-  }
+const App = ({ children }) => {
+  return (
+    <ThemeProvider theme={theme}>
+      {children}
+    </ThemeProvider>
+  )
+}
 
-  render () {
-    const { children } = this.props
-    return (
-      <div>{children}</div>
-    )
-  }
+App.propTypes = {
+  children: PropTypes.any
 }
 
 export default App

src-clean/components/pages/HomePage/index.stories.js

@@ -0,0 +1,8 @@
+import React from 'react'
+import { storiesOf } from '@kadira/storybook'
+import { HomePage } from 'components'
+
+storiesOf('HomePage', module)
+  .add('default', () => (
+    <HomePage />
+  ))

src/components/App.js

@@ -1,4 +1,4 @@
-import React, { PropTypes, Component } from 'react'
+import React, { PropTypes } from 'react'
 import { injectGlobal, ThemeProvider } from 'styled-components'
 
 import theme from './themes/default'
@@ -9,17 +9,16 @@ injectGlobal`
   }
 `
 
-class App extends Component {
-  static propTypes = {
-    children: PropTypes.any
-  }
+const App = ({ children }) => {
+  return (
+    <ThemeProvider theme={theme}>
+      {children}
+    </ThemeProvider>
+  )
+}
 
-  render () {
-    const { children } = this.props
-    return (
-      <ThemeProvider theme={theme}>{children}</ThemeProvider>
-    )
-  }
+App.propTypes = {
+  children: PropTypes.any
 }
 
 export default App