Skip to content
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
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"node-sass": "^4.0.0",
"normalize.css": "^5.0.0",
"postcss-loader": "^1.1.0",
"prop-types": "^15.5.10",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-redux": "^5.0.1",
Expand Down
3 changes: 2 additions & 1 deletion src/layouts/CoreLayout/CoreLayout.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import PropTypes from 'prop-types'
import Header from '../../components/Header'
import './CoreLayout.scss'
import '../../styles/core.scss'
Expand All @@ -13,7 +14,7 @@ export const CoreLayout = ({ children }) => (
)

CoreLayout.propTypes = {
children: React.PropTypes.element.isRequired
children: PropTypes.element.isRequired
}

export default CoreLayout
7 changes: 4 additions & 3 deletions src/routes/Counter/components/Counter.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import PropTypes from 'prop-types'

export const Counter = (props) => (
<div style={{ margin: '0 auto' }}>
Expand All @@ -14,9 +15,9 @@ export const Counter = (props) => (
)

Counter.propTypes = {
counter: React.PropTypes.number.isRequired,
doubleAsync: React.PropTypes.func.isRequired,
increment: React.PropTypes.func.isRequired
counter: PropTypes.number.isRequired,
doubleAsync: PropTypes.func.isRequired,
increment: PropTypes.func.isRequired
}

export default Counter
7 changes: 4 additions & 3 deletions src/routes/Elapse/components/Elapse.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, {Component} from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'

export default class Elapse extends Component {

Expand All @@ -21,6 +22,6 @@ export default class Elapse extends Component {
}

Elapse.propTypes = {
elapse: React.PropTypes.number.isRequired,
plus: React.PropTypes.func.isRequired
elapse: PropTypes.number.isRequired,
plus: PropTypes.func.isRequired
}
3 changes: 2 additions & 1 deletion src/routes/PageNotFound/components/PageNotFound.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import NotFoundImage from '../assets/404.jpg'
import classes from './PageNotFound.scss'
import { withRouter } from 'react-router'
Expand All @@ -19,7 +20,7 @@ class PageNotFound extends Component {
}

PageNotFound.propTypes = {
router: React.PropTypes.object.isRequired
router: PropTypes.object.isRequired
}

export default withRouter(PageNotFound)
5 changes: 3 additions & 2 deletions src/routes/Route/components/Route.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import { Link, withRouter } from 'react-router'

class Route extends Component {
Expand Down Expand Up @@ -29,8 +30,8 @@ class Route extends Component {
}

Route.propTypes = {
location: React.PropTypes.object.isRequired,
router: React.PropTypes.object.isRequired
location: PropTypes.object.isRequired,
router: PropTypes.object.isRequired
}

export default withRouter(Route)
7 changes: 4 additions & 3 deletions src/routes/Zen/components/Zen.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React, {Component} from 'react'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import './Zen.scss'
import Spinner from 'react-spinkit'

export default class Zen extends Component {

render () {
const { fetchZen, clearZen, zen: {fetching, text} } = this.props
const { fetchZen, clearZen, zen: { fetching, text } } = this.props

return (
<div>
Expand All @@ -32,5 +33,5 @@ export default class Zen extends Component {
}

Zen.propTypes = {
zen: React.PropTypes.object.isRequired
zen: PropTypes.object.isRequired
}