Merge pull request #94 from sgmap/maj-react

Mise à jour des dépendances, dont React 16
pull/98/head
Mael 2017-10-13 13:30:28 +02:00 committed by GitHub
commit 72ed579e79
4 changed files with 19 additions and 20 deletions

View File

@ -21,20 +21,20 @@
"nearley": "^2.9.2",
"npm": "^5.3.0",
"ramda": "0.24.1",
"react": "^15.5.4",
"react-dom": "^15.5.4",
"react-helmet": "^5.1.3",
"react": "^16.0.0",
"react-dom": "^16.0.0",
"react-helmet": "^5.2.0",
"react-piwik": "^1.0.7",
"react-redux": "^5.0.5",
"react-router": "^4.1.1",
"react-router-dom": "^4.1.1",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
"react-scroll": "^1.5.4",
"react-select": "^1.0.0-rc.10",
"react-select-fast-filter-options": "^0.2.3",
"react-virtualized": "^9.10.1",
"react-virtualized-select": "^3.1.0",
"reduce-reducers": "^0.1.2",
"redux": "^3.6.0",
"redux": "^3.7.2",
"redux-form": "6.8.0",
"redux-saga": "^0.15.3",
"reselect": "^3.0.1",
@ -46,7 +46,7 @@
"autoprefixer": "^7.1.1",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-eslint": "^7.2.3",
"babel-eslint": "^8.0.1",
"babel-loader": "^7.0.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-class-properties": "^6.24.1",
@ -69,12 +69,12 @@
"fantasy-combinators": "0.0.1",
"fantasy-land": "^3.3.0",
"fantasy-tuples": "^1.0.0",
"file-loader": "^0.11.1",
"file-loader": "^1.1.5",
"html-loader": "^0.5.1",
"img-loader": "^2.0.0",
"jsdom": "^11.0.0",
"json-loader": "^0.5.4",
"mocha": "^3.4.2",
"mocha": "^4.0.1",
"mocha-webpack": "^0.7.0",
"nearley-loader": "0.0.2",
"postcss-loader": "^2.0.5",
@ -83,9 +83,9 @@
"redux-devtools": "^3.4.0",
"redux-devtools-dock-monitor": "^1.1.2",
"redux-devtools-log-monitor": "^1.3.0",
"source-map-support": "^0.4.15",
"style-loader": "^0.18.2",
"url-loader": "^0.5.8",
"source-map-support": "^0.5.0",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"webpack": "^3.6.0",
"webpack-dev-server": "^2.9.1"
},

View File

@ -1,8 +1,5 @@
#satisfaction {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
text-align: center;
}

View File

@ -53,13 +53,13 @@ export default class Satisfaction extends Component {
if (!answer)
return (
<p id="satisfaction">
Vous êtes satisfait du simulateur ?
<div id="satisfaction">
<p>Vous êtes satisfait du simulateur ?</p>
<p>
<Smiley text=":)" hoverColor="#16a085" clicked={onSmileyClick}/>
<Smiley text=":|" hoverColor="#f39c12" clicked={onSmileyClick}/>
</p>
</p>
</div>
)
let messagePlaceholder = {

View File

@ -11,7 +11,9 @@ export default class App extends Component {
<Provider store={store}>
<div>
<Layout />
{/*
<DevTools />
*/}
</div>
</Provider>
)