Adapt components

src/components/app.jsx

@@ -1,11 +1,11 @@
 import DocumentTitle from 'react-document-title'
 import React from 'react'
 import PropTypes from 'prop-types'
-import {locationShape, Link} from 'react-router'
+import {Link} from 'react-router-dom'
 import {FormattedMessage, injectIntl, intlShape} from 'react-intl'
 
-import { entityShape, parameterShape, variableShape } from '../openfisca-proptypes'
-import {findCountryModelItems} from '../search'
+import { entityShape, locationShape, parameterShape, variableShape } from '../utils/proptypes'
+import search from '../utils/search'
 
 class App extends React.Component {
   static childContextTypes = {
@@ -31,7 +31,7 @@ class App extends React.Component {
 
     this.state = {
       searchQuery,
-      searchResults: findCountryModelItems(entities, parameters, variables, searchQuery),
+      searchResults: search.findCountryModelItems(entities, parameters, variables, searchQuery),
     }
   }
 
@@ -43,7 +43,7 @@ class App extends React.Component {
       setSearchQuery: searchQuery => {
         this.setState({
           searchQuery,
-          searchResults: findCountryModelItems(entities, parameters, variables, searchQuery),
+          searchResults: search.findCountryModelItems(entities, parameters, variables, searchQuery),
         })
       },
     }

src/components/entity.jsx

@@ -4,7 +4,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import config from '../config'
-import { entityShape } from '../openfisca-proptypes'
+import { entityShape } from '../utils/proptypes'
 
 
 class Entity extends React.Component {

src/components/formula.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { parameterShape, variableShape } from '../openfisca-proptypes'
-import { Link } from 'react-router'
+import { parameterShape, variableShape } from '../utils/proptypes'
+import { Link } from 'react-router-dom'
 import { FormattedMessage, FormattedDate } from 'react-intl'
 import { flatten, pipe, map, is } from 'ramda'
 import Highlight from 'react-highlight/lib/optimized'

src/components/pages/country-model-item.jsx

@@ -1,9 +1,9 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { Link, locationShape, routerShape } from 'react-router'
+import { Link } from 'react-router-dom'
 import { FormattedMessage } from 'react-intl'
 
-import { entityShape, parameterShape, variableShape } from '../../openfisca-proptypes'
+import { entityShape, locationShape, parameterShape, routerShape, variableShape } from '../../utils/proptypes'
 import Entity from '../entity'
 import Parameter from '../parameter'
 import Variable from '../variable'

src/components/pages/home.jsx

@@ -1,11 +1,11 @@
 import {isEmpty} from 'ramda'
 import React from 'react'
 import PropTypes from 'prop-types'
-import {Link, locationShape, routerShape} from 'react-router'
+import {Link} from 'react-router-dom'
 import {FormattedMessage, injectIntl, intlShape} from 'react-intl'
 import DocumentTitle from 'react-document-title'
 
-import { entityShape, parameterShape, variableShape } from '../../openfisca-proptypes'
+import { entityShape, locationShape, parameterShape, routerShape, variableShape } from '../../utils/proptypes'
 import List from '../list'
 import config from '../../config'
 import SearchBar from './searchbar'

src/components/pages/searchbar.jsx

@@ -1,7 +1,7 @@
-import { routerShape } from 'react-router'
 import React from 'react'
 import {FormattedMessage, injectIntl, intlShape} from 'react-intl'
 
+import { routerShape } from '../../utils/proptypes'
 import { searchInputId } from './home'
 
 class SearchBar extends React.Component {

src/components/parameter.jsx

@@ -4,9 +4,9 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import config from '../config'
-import { parameterShape } from '../openfisca-proptypes'
+import { parameterShape } from '../utils/proptypes'
 import Scale from './scale'
-import getDayBefore from '../periods'
+import getDayBefore from '../utils/periods'
 
 class Parameter extends React.Component {
   static propTypes = {

src/components/scale.jsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { FormattedMessage, FormattedDate, FormattedNumber } from 'react-intl'
 
-import { parameterShape } from '../openfisca-proptypes'
+import { parameterShape } from '../utils/proptypes'
 
 
 class Scale extends React.Component {

src/components/variable.jsx

@@ -5,9 +5,9 @@ import PropTypes from 'prop-types'
 import { keys } from 'ramda'
 
 import config from '../config'
-import { parameterShape, variableShape } from '../openfisca-proptypes'
+import { parameterShape, variableShape } from '../utils/proptypes'
 import Formula from './formula'
-import getDayBefore from '../periods'
+import getDayBefore from '../utils/periods'
 
 class Variable extends React.Component {
   //Variable properties include other objects for Formula code highlight.