From 53c6a5a0079381f33369b706d6c9e77a7f744b91 Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Mon, 18 Mar 2019 18:21:10 +0100 Subject: [PATCH] =?UTF-8?q?Ajoute=20un=20lien=20vers=20le=20pdf=20urssaf?= =?UTF-8?q?=20pour=20la=20cr=C3=A9ation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/components/ui/Button/button.css | 2 - source/components/ui/Checklist/index.js | 4 +- source/components/ui/Typography.css | 2 +- source/locales/en.yaml | 1 + .../pages/Company/AfterRegistration.js | 8 +- .../pages/Company/CreationChecklist.js | 74 +++++++++++++------ 6 files changed, 61 insertions(+), 30 deletions(-) diff --git a/source/components/ui/Button/button.css b/source/components/ui/Button/button.css index 45694af57..3f1796f66 100644 --- a/source/components/ui/Button/button.css +++ b/source/components/ui/Button/button.css @@ -157,11 +157,9 @@ } .ui__.skip.button { - opacity: 0.6; border: none; padding: 0; will-change: transform; - color: inherit; } .ui__.skip.button:not(:disabled):hover { diff --git a/source/components/ui/Checklist/index.js b/source/components/ui/Checklist/index.js index 8c6bc4780..810011eda 100644 --- a/source/components/ui/Checklist/index.js +++ b/source/components/ui/Checklist/index.js @@ -115,7 +115,9 @@ export class Checklist extends Component { // $FlowFixMe onChange: checked => props.onItemCheck(child.props.name, checked), // $FlowFixMe - defaultChecked: props.defaultChecked[child.props.name] + defaultChecked: + child.props.defaultChecked || + props.defaultChecked[child.props.name] }) ) props.onInitialization && diff --git a/source/components/ui/Typography.css b/source/components/ui/Typography.css index aec4f299f..a39b00164 100644 --- a/source/components/ui/Typography.css +++ b/source/components/ui/Typography.css @@ -36,7 +36,7 @@ h1 { h2 { margin-top: 1.5rem; margin-bottom: 1rem; - font-size: 1.7rem; + font-size: 1.5rem; } h3 { font-size: 1.5rem; diff --git a/source/locales/en.yaml b/source/locales/en.yaml index ac3f9bac7..c6ba8f2bf 100644 --- a/source/locales/en.yaml +++ b/source/locales/en.yaml @@ -274,6 +274,7 @@ entreprise: avancement: Use these lists to track down your advancement in the business creation process. It is automatically saved in your browser. retour: Choose another status ensuite: After registration + titre: The to-do list for creating your business formeJuridique: page: diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js b/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js index e08e6e8f7..405ca8b64 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/AfterRegistration.js @@ -93,15 +93,15 @@ const AfterRegistration = ({ t, companyStatusChoice, sitePaths }: Props) => (

)} -

+

← Démarche de création - + Estimez vos cotisations →

diff --git a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js index 3cdafe031..0e82906bd 100644 --- a/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js +++ b/source/sites/mycompanyinfrance.fr/pages/Company/CreationChecklist.js @@ -5,17 +5,18 @@ import { } from 'Actions/companyCreationChecklistActions' import { goToCompanyStatusChoice } from 'Actions/companyStatusActions' import { React, T } from 'Components' +import Route404 from 'Components/Route404' import Scroll from 'Components/utils/Scroll' import withSitePaths from 'Components/utils/withSitePaths' import { compose } from 'ramda' -import {Helmet} from 'react-helmet' +import emoji from 'react-easy-emoji' +import { Helmet } from 'react-helmet' import { withTranslation } from 'react-i18next' import { connect } from 'react-redux' import { Link } from 'react-router-dom' import * as Animate from 'Ui/animate' import { CheckItem, Checklist } from 'Ui/Checklist' import { LANDING_LEGAL_STATUS_LIST } from '../../sitePaths' -import Route404 from 'Components/Route404' import StatusDescription from './StatusDescription' import type { Match } from 'react-router' @@ -100,7 +101,13 @@ const CreateCompany = ({

{titre}

- {!statusChooserCompleted && ( + {statusChooserCompleted ? ( + + ) : ( <>

- +

+ Après la création →

+

{emoji('📜')} Vous êtes plutôt papier ?

+

+ Accédez gratuitement au guide complet de la création entreprise en 2019, + édité par l'URSSAF. Au programme : des conseils sur comment préparer son + projet, comment se lancer dans la création ou encore la présentation + détaillée de votre protection sociale. +

+ +
+ + {emoji('👉')} Téléchargez le guide PDF + +
) }