From 93545b7186b1fd41c0563b842d308898dad6f447 Mon Sep 17 00:00:00 2001 From: Dorine Lambinet <dorine.lambinet@gmail.com> Date: Mon, 15 May 2023 17:52:48 +0200 Subject: [PATCH] =?UTF-8?q?Retire=20les=20boutons=20"foyer"=20et=20"budget?= =?UTF-8?q?"=20de=20la=20page=20sans=20dispositifs=20s=C3=A9lectionn=C3=A9?= =?UTF-8?q?s.=20Ajout=20du=20dispositif=20du=20RSA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routes/+page.svelte | 108 +++++++++++------------------------- static/illustration-rsa.png | Bin 0 -> 12596 bytes 2 files changed, 32 insertions(+), 76 deletions(-) create mode 100644 static/illustration-rsa.png diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 2fcb12f81..54a8297d5 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -658,58 +658,32 @@ { title: "Impôt sur le revenu", icon: "picto-impot-sur-le-revenu.png", - foyer: { - budget: undefined, - parametersVariableName: "irpp_economique", - }, - budget: { - budget: true, - parametersVariableName: "irpp_economique", - }, + parametersVariableName: "irpp_economique", }, { title: "Contribution sociale généralisée - CSG", icon: "picto-csg.png", - foyer: { - budget: undefined, - parametersVariableName: "csg_imposable_salaire", - }, - budget: { - budget: true, - parametersVariableName: "csg_imposable_salaire", - }, + parametersVariableName: "csg_imposable_salaire", }, { title: "Prime de partage de la valeur", icon: "illustration-pepa.png", - foyer: { - mobileLaw: true, - budget: undefined, - parametersVariableName: "prime_partage_valeur_exoneree", - testCasesIndex: [3, 4], - waterfallName: "brut_to_super_brut", - }, + parametersVariableName: "prime_partage_valeur_exoneree", + }, + { + title: "Revenu de solidarité active", + icon: "illustration-rsa.png", + parametersVariableName: "rsa", }, { title: "Taxes sur les carburants", icon: "illustration-ticpe.png", - foyer: { - mobileLaw: true, - budget: undefined, - parametersVariableName: "essence_sp95_e10_ticpe", - testCasesIndex: [15], - }, + parametersVariableName: "essence_sp95_e10_ticpe", }, { title: "Exonération TO-DE", icon: "illustration-exoneration-tode.png", - foyer: { - mobileLaw: true, - budget: undefined, - parametersVariableName: "exoneration_cotisations_employeur_tode", - testCasesIndex: [13, 14], - waterfallName: "brut_to_super_brut", - }, + parametersVariableName: "exoneration_cotisations_employeur_tode", }, ] @@ -867,7 +841,7 @@ <!-- DESKTOP - Modifications en cours --> <div class="hidden md:block"> <button - class="mx-4 flex h-8 grow-0 items-center rounded-md bg-le-jaune px-2 py-1 text-sm sm:text-xs 2xl:text-sm uppercase text-black shadow-md hover:bg-le-jaune-dark hover:text-white focus:outline-none md:mx-0" + class="mx-4 flex h-8 grow-0 items-center rounded-md bg-le-jaune px-2 py-1 text-sm uppercase text-black shadow-md hover:bg-le-jaune-dark hover:text-white focus:outline-none sm:text-xs md:mx-0 2xl:text-sm" class:!bg-gray-200={Object.keys($parametricReform).length === 0} class:!text-gray-500={Object.keys($parametricReform).length === 0} @@ -988,49 +962,31 @@ <div class="w-full overflow-y-scroll bg-white p-4"> <!-- Vue par défaut - choix de dispositifs --> {#if displayMode.parametersVariableName === undefined && displayMode.parameterName === undefined} - <div class="grid grid-cols-1 gap-8 text-center sm:grid-cols-2"> + <div class="grid grid-cols-1 gap-4 text-center sm:grid-cols-2"> {#each dispositifsTypes as dispositifType} - <div - class="flex flex-col items-center justify-between gap-4 rounded-lg border bg-white p-5 shadow-md" + <a + class="flex gap-2 rounded-lg border bg-white p-3 shadow-md hover:bg-gray-200" + href={newSimulationUrl({ + ...displayMode, + parametersVariableName: + dispositifType.parametersVariableName, + })} > - <h3 - class="mb-2 text-xl font-bold sm:text-base lg:text-xl 2xl:text-xl" + <div + class="flex w-full flex-col items-center justify-center" > - {dispositifType.title} - </h3> - <img - class="max-h-24" - src={dispositifType.icon} - alt="Pictogramme représentant une feuille d'impôt" - /> - <div class="flex gap-2 md:flex-col"> - {#if dispositifType.foyer !== undefined} - <a - class="inline-flex justify-between gap-2 rounded-lg border-2 border-le-bleu p-2 px-5 text-center text-base uppercase tracking-wide text-le-bleu shadow-md hover:border-blue-900 hover:bg-blue-900 hover:text-white" - href={newSimulationUrl({ - ...displayMode, - ...dispositifType.foyer, - tab: "dispositif", - })} - > - <span>Foyer</span> - <PictoFemme /> - </a> - {/if} - {#if dispositifType.budget !== undefined} - <a - class="inline-flex justify-between gap-2 rounded-lg border-2 border-le-bleu p-2 px-5 text-center text-base uppercase tracking-wide text-le-bleu shadow-md hover:border-blue-900 hover:bg-blue-900 hover:text-white" - href={newSimulationUrl({ - ...displayMode, - ...dispositifType.budget, - })} - > - <span>Budget</span> - <PictoEtat /> - </a> - {/if} + <h3 + class="mb-2 text-center text-lg font-bold sm:text-base lg:text-xl 2xl:text-xl" + > + {dispositifType.title} + </h3> + <img + class="max-h-24" + src={dispositifType.icon} + alt="Pictogramme représentant une feuille d'impôt" + /> </div> - </div> + </a> {/each} </div> <!-- Vue modification de la loi --> diff --git a/static/illustration-rsa.png b/static/illustration-rsa.png new file mode 100644 index 0000000000000000000000000000000000000000..9d5d37981cb72c0a6590786e8f9bc83f7c062053 GIT binary patch literal 12596 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 literal 0 HcmV?d00001 -- GitLab