diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 2fcb12f81fa1e7573bb6cf23554a90eea0fb71cf..54a8297d5c37cedcfeef04e47ecf12612c8abbf0 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 Binary files /dev/null and b/static/illustration-rsa.png differ