betagouv
/
mon-entreprise
mirror of https://github.com/betagouv/mon-entreprise
1
0
Fork 0
Code Releases Activity

Amélioration de la page de comparaison des régimes

pull/530/head
Johan Girod 2019-06-11 15:28:46 +02:00
parent 601797f523
commit 5ae671464c
No known key found for this signature in database
GPG Key ID: 9E27B57DA2E8AE12
2 changed files with 48 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/components/SchemeComparaison.js
View File

@ -217,7 +217,7 @@ const SchemeComparaison = ({
<h3 className="legend">Paiement des cotisations</h3>
<div className="AS">Mensuel</div>
<div className="indep">
Provision mensuelle
Provision mensuelle ou trimestrielle
<small>
(avec régularisation après coup en fonction du revenu réel)
</small>

105
source/components/conversation/Conversation.js
View File

@ -1,7 +1,6 @@
import { goToQuestion, resetSimulation, skipQuestion } from 'Actions/actions'
import { T } from 'Components'
import QuickLinks from 'Components/QuickLinks'
import Scroll from 'Components/utils/Scroll'
import { getInputComponent } from 'Engine/generateQuestions'
import { compose } from 'ramda'
import React from 'react'
@ -48,64 +47,54 @@ export default compose(
goToNext()
}
}
return (
<Scroll.toElement onlyIfNotVisible>
{nextSteps.length ? (
<>
<Aide />
<div
tabIndex="0"
style={{ outline: 'none' }}
onKeyDown={handleKeyDown}>
{currentQuestion && (
<React.Fragment key={currentQuestion}>
<Animate.fadeIn>
{getInputComponent(flatRules)(currentQuestion)}
</Animate.fadeIn>
<div className="ui__ answer-group">
{previousAnswers.length > 0 && (
<>
<button
onClick={goToPrevious}
className="ui__ simple small skip button left">
← Précédent
</button>
</>
)}
return nextSteps.length ? (
<>
<Aide />
<div tabIndex="0" style={{ outline: 'none' }} onKeyDown={handleKeyDown}>
{currentQuestion && (
<React.Fragment key={currentQuestion}>
<Animate.fadeIn>
{getInputComponent(flatRules)(currentQuestion)}
</Animate.fadeIn>
<div className="ui__ answer-group">
{previousAnswers.length > 0 && (
<>
<button
onClick={goToNext}
className="ui__ simple small skip button right">
Passer →
onClick={goToPrevious}
className="ui__ simple small skip button left">
← Précédent
</button>
</div>
</React.Fragment>
)}
<QuickLinks />
</div>
</>
) : (
<div style={{ textAlign: 'center' }}>
<h3>
{emoji('🌟')}{' '}
<T k="simulation-end.title">Vous avez complété cette simulation</T>{' '}
</h3>
<p>
{customEndMessages ? (
customEndMessages
) : (
<T k="simulation-end.text">
Vous avez maintenant accès à l'estimation la plus précise
possible.
</T>
)}
</p>
<button
className="ui__ small simple button "
onClick={resetSimulation}>
<T>Recommencer</T>
</button>
</div>
)}
</Scroll.toElement>
</>
)}
<button
onClick={goToNext}
className="ui__ simple small skip button right">
Passer →
</button>
</div>
</React.Fragment>
)}
<QuickLinks />
</div>
</>
) : (
<div style={{ textAlign: 'center' }}>
<h3>
{emoji('🌟')}{' '}
<T k="simulation-end.title">Vous avez complété cette simulation</T>{' '}
</h3>
<p>
{customEndMessages ? (
customEndMessages
) : (
<T k="simulation-end.text">
Vous avez maintenant accès à l'estimation la plus précise possible.
</T>
)}
</p>
<button className="ui__ small simple button " onClick={resetSimulation}>
<T>Recommencer</T>
</button>
</div>
)
})