diff --git a/.dockerignore b/.dockerignore index 3357e5b8d..fad29fc26 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ public/system public/assets node_modules +storybook diff --git a/package.json b/package.json index e980a72b2..990124985 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,11 @@ { "name": "mastodon", "scripts": { - "test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx" + "test": "mocha --require ./spec/javascript/setup.js --compilers js:babel-register ./spec/javascript/components/*.test.jsx", + "storybook": "start-storybook -p 9001 -c storybook" }, "devDependencies": { + "@kadira/storybook": "^2.24.0", "axios": "^0.14.0", "babel-plugin-react-transform": "^2.0.2", "babel-plugin-transform-object-rest-spread": "^6.8.0", diff --git a/storybook/config.js b/storybook/config.js new file mode 100644 index 000000000..98dde07de --- /dev/null +++ b/storybook/config.js @@ -0,0 +1,16 @@ +import { configure } from '@kadira/storybook'; +import React from 'react'; +import { storiesOf, action } from '@kadira/storybook'; + +import './storybook.css' + +window.storiesOf = storiesOf; +window.action = action; +window.React = React; + +function loadStories () { + require('./stories/loading_indicator.story.jsx'); + require('./stories/button.story.jsx'); +} + +configure(loadStories, module); diff --git a/storybook/stories/button.story.jsx b/storybook/stories/button.story.jsx new file mode 100644 index 000000000..fe6d57ad0 --- /dev/null +++ b/storybook/stories/button.story.jsx @@ -0,0 +1,15 @@ +import Button from '../../app/assets/javascripts/components/components/button.jsx' + +storiesOf('Button', module) + .add('default state', () => ( +