Skip to content

Commit

Permalink
Merge in react-storybook, add yarn lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Gargron committed Oct 12, 2016
2 parents 8d8ef18 + 4eeb794 commit ffaba61
Show file tree
Hide file tree
Showing 7 changed files with 4,801 additions and 1 deletion.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
public/system
public/assets
node_modules
storybook
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
16 changes: 16 additions & 0 deletions storybook/config.js
Original file line number Diff line number Diff line change
@@ -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);
15 changes: 15 additions & 0 deletions storybook/stories/button.story.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import Button from '../../app/assets/javascripts/components/components/button.jsx'

storiesOf('Button', module)
.add('default state', () => (
<Button text="submit" onClick={action('clicked')} />
))
.add('secondary', () => (
<Button secondary text="submit" onClick={action('clicked')} />
))
.add('disabled', () => (
<Button disabled text="submit" onClick={action('clicked')} />
))
.add('block', () => (
<Button block text="submit" onClick={action('clicked')} />
));
6 changes: 6 additions & 0 deletions storybook/stories/loading_indicator.story.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import LoadingIndicator from '../../app/assets/javascripts/components/components/loading_indicator.jsx'

storiesOf('LoadingIndicator', module)
.add('default state', () => (
<LoadingIndicator />
));
3 changes: 3 additions & 0 deletions storybook/storybook.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#root {
padding: 4rem;
}
Loading

0 comments on commit ffaba61

Please sign in to comment.