Skip to content
This repository has been archived by the owner on Oct 8, 2019. It is now read-only.

Link story fix #49

Merged
merged 5 commits into from
Feb 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@
"author": "",
"license": "",
"devDependencies": {
"@kadira/storybook": "^2.21.0",
"autoprefixer": "^6.5.3",
"babel-eslint": "^7.1.1",
"babel-plugin-lodash": "^3.2.10",
Expand Down Expand Up @@ -133,6 +132,7 @@
"webpack-node-externals": "^1.5.4"
},
"dependencies": {
"@kadira/storybook": "^2.21.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

required by changes in storybook/rr.js and storybook/webpack.config.js

"asynch": "^0.5.2",
"babel": "^6.5.2",
"babel-cli": "^6.18.0",
Expand Down
32 changes: 13 additions & 19 deletions src/client/components/NotificationList/NotificationList.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { List, ListItem } from 'material-ui/List'
import Divider from 'material-ui/Divider'
import { Link } from 'react-router'
import Link from 'components/Link'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the changes in this file were done mostly to test using link in another component. I can drop the changes in this file if you wish.

import { darkBlack, grey400 } from 'material-ui/styles/colors'
import ActionInfo from 'material-ui/svg-icons/action/info'
import Update from 'material-ui/svg-icons/action/system-update-alt'
Expand Down Expand Up @@ -51,9 +51,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw=="
>
Fixes for builds count controller, added new charts, fixed minor issues
</Link>
label="Fixes for builds count controller, added new charts, fixed minor issues"
/>
<span
style={{
color: '#bcbbbb',
Expand Down Expand Up @@ -100,9 +99,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw=="
>
[5.4] Fix particle random number regression
</Link>
label="[5.4] Fix particle random number regression"
/>
<span
style={{
color: '#bcbbbb',
Expand Down Expand Up @@ -142,9 +140,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="/project/UmVwb3NpdG9yeTox"
>
Option to use low resolution for Game View aspect ratios V4
</Link>
label="Option to use low resolution for Game View aspect ratios V4"
/>
<span
style={{
color: '#bcbbbb',
Expand Down Expand Up @@ -177,9 +174,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw=="
>
Trunk merge of the scriptable renderloop branch
</Link>
label="Trunk merge of the scriptable renderloop branch"
/>
<span
style={{
color: '#bcbbbb',
Expand Down Expand Up @@ -223,9 +219,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw=="
>
Option to use low resolution for Game View aspect ratios
</Link>
link="Option to use low resolution for Game View aspect ratios"
/>
<span
style={{
color: '#bcbbbb',
Expand Down Expand Up @@ -258,9 +253,8 @@ function NotificationList() {
paddingLeft: '10px',
}}
to="project/undefined/pullrequest/UHVsbFJlcXVlc3Q6Mw=="
>
Move render target switching out from jobs
</Link>
label="Move render target switching out from jobs"
/>
<span
style={{
color: '#bcbbbb',
Expand Down
25 changes: 25 additions & 0 deletions storybook/react-router.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react'
import { action } from '@kadira/storybook'

// Set the custom link component
module.exports.Link = class Link extends React.Component {
handleClick(e) {
e.preventDefault()
const { to } = this.props
action('Link')(to)
}

render() {
const { children, style } = this.props

return (
<a
style={style}
href="#"
onClick={(e) => this.handleClick(e)}
>
{children}
</a>
)
}
}
8 changes: 8 additions & 0 deletions storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,12 @@ module.exports = {
},
],
},
resolve: {
alias: {
// this is used by the custom `react-router.js` module
'react-router-original': require.resolve('react-router'),
// this `react-router.js` will replace the Link with a our own mock component
'react-router': require.resolve('./react-router.js'),
},
},
}