From b462bc9d81d43a8647724da819ca5369dd2efdcd Mon Sep 17 00:00:00 2001 From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr> Date: Wed, 26 Feb 2025 11:15:51 +0100 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9e=20dossier=20ui=5Ftransverse=5Fcompone?= =?UTF-8?q?nts=20et=20commence=20=C3=A0=20d=C3=A9placer=20les=20composants?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{transverse_pages => }/Footer.svelte | 0 .../{transverse_pages => }/OpenGraph.svelte | 0 .../components/budget/BudgetDetailView.svelte | 4 ++-- .../test_cases/TestCaseFilters.svelte | 2 +- .../test_cases/TestCaseGraph.svelte | 22 +++++++++---------- .../test_cases/TestCaseGraphXlsxExport.svelte | 2 +- .../AnchorTitle.svelte | 0 .../SelectChip.svelte | 0 .../accordion/Accordion.svelte | 0 .../accordion/AccordionItem.svelte | 0 .../layercake/AxisY.svelte | 0 .../layercake/Column.svelte | 0 .../piece_of_cake/Area.svelte | 2 +- .../piece_of_cake/AxisX.svelte | 0 .../piece_of_cake/AxisY.svelte | 0 .../piece_of_cake/BinaryTree.svelte | 0 .../piece_of_cake/DragSelect.svelte | 4 ++-- .../piece_of_cake/Html.svelte | 0 .../piece_of_cake/MultiLine.svelte | 0 .../piece_of_cake/PieceOfCake.svelte | 0 .../piece_of_cake/SharedTooltip.svelte | 0 .../piece_of_cake/Svg.svelte | 0 .../piece_of_cake/model.ts | 0 .../piece_of_cake/types.ts | 0 .../variables/VariableDetail.svelte | 4 ++-- src/routes/accueil/+page.svelte | 4 ++-- src/routes/fonctionnement/+page.svelte | 6 ++--- .../simulations/[simulation]/+page.svelte | 2 +- 28 files changed, 26 insertions(+), 26 deletions(-) rename src/lib/components/{transverse_pages => }/Footer.svelte (100%) rename src/lib/components/{transverse_pages => }/OpenGraph.svelte (100%) rename src/lib/components/{transverse_pages => ui_transverse_components}/AnchorTitle.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/SelectChip.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/accordion/Accordion.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/accordion/AccordionItem.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/layercake/AxisY.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/layercake/Column.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/Area.svelte (99%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/AxisX.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/AxisY.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/BinaryTree.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/DragSelect.svelte (94%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/Html.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/MultiLine.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/PieceOfCake.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/SharedTooltip.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/Svg.svelte (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/model.ts (100%) rename src/lib/components/{ => ui_transverse_components}/piece_of_cake/types.ts (100%) diff --git a/src/lib/components/transverse_pages/Footer.svelte b/src/lib/components/Footer.svelte similarity index 100% rename from src/lib/components/transverse_pages/Footer.svelte rename to src/lib/components/Footer.svelte diff --git a/src/lib/components/transverse_pages/OpenGraph.svelte b/src/lib/components/OpenGraph.svelte similarity index 100% rename from src/lib/components/transverse_pages/OpenGraph.svelte rename to src/lib/components/OpenGraph.svelte diff --git a/src/lib/components/budget/BudgetDetailView.svelte b/src/lib/components/budget/BudgetDetailView.svelte index ee332f988..0bcc33efb 100644 --- a/src/lib/components/budget/BudgetDetailView.svelte +++ b/src/lib/components/budget/BudgetDetailView.svelte @@ -7,8 +7,8 @@ BudgetQuantileByCalculationName, BudgetSimulation, } from "$lib/budgets" - import AxisY from "$lib/components/layercake/AxisY.svelte" - import Column from "$lib/components/layercake/Column.svelte" + import AxisY from "$lib/components/ui_transverse_components/layercake/AxisY.svelte" + import Column from "$lib/components/ui_transverse_components/layercake/Column.svelte" import PictoBudgetDecileIr from "$lib/components/pictos/PictoBudgetDecileIr.svelte" import PictoBudgetDecileIrFoyer from "$lib/components/pictos/PictoBudgetDecileIrFoyer.svelte" import PictoBudgetEtatIr from "$lib/components/pictos/PictoBudgetEtatIr.svelte" diff --git a/src/lib/components/test_cases/TestCaseFilters.svelte b/src/lib/components/test_cases/TestCaseFilters.svelte index 2f9a5194c..6699e53b6 100644 --- a/src/lib/components/test_cases/TestCaseFilters.svelte +++ b/src/lib/components/test_cases/TestCaseFilters.svelte @@ -6,7 +6,7 @@ import { createEventDispatcher } from "svelte" import { page } from "$app/stores" - import SelectChip from "$lib/components/SelectChip.svelte" + import SelectChip from "$lib/components/ui_transverse_components/SelectChip.svelte" import TestCaseSummary from "$lib/components/test_cases/TestCaseSummary.svelte" import Tooltip from "$lib/components/Tooltip.svelte" import VariableValueChange from "$lib/components/variables/VariableValueChange.svelte" diff --git a/src/lib/components/test_cases/TestCaseGraph.svelte b/src/lib/components/test_cases/TestCaseGraph.svelte index 9eff7ebc2..769f218d6 100644 --- a/src/lib/components/test_cases/TestCaseGraph.svelte +++ b/src/lib/components/test_cases/TestCaseGraph.svelte @@ -20,17 +20,17 @@ import PictoBigPersonneACharge from "$lib/components/pictos/PictoBigPersonneACharge.svelte" import PictoGardeAlternee from "$lib/components/pictos/PictoGardeAlternee.svelte" import PictoHandicap from "$lib/components/pictos/PictoHandicap.svelte" - import Area from "$lib/components/piece_of_cake/Area.svelte" - import AxisX from "$lib/components/piece_of_cake/AxisX.svelte" - import AxisY from "$lib/components/piece_of_cake/AxisY.svelte" - import DragSelect from "$lib/components/piece_of_cake/DragSelect.svelte" - import Html from "$lib/components/piece_of_cake/Html.svelte" - import { CurveModel } from "$lib/components/piece_of_cake/model" - import MultiLine from "$lib/components/piece_of_cake/MultiLine.svelte" - import PieceOfCake from "$lib/components/piece_of_cake/PieceOfCake.svelte" - import SharedTooltip from "$lib/components/piece_of_cake/SharedTooltip.svelte" - import Svg from "$lib/components/piece_of_cake/Svg.svelte" - import type { GraphDomain } from "$lib/components/piece_of_cake/types" + import Area from "$lib/components/ui_transverse_components/piece_of_cake/Area.svelte" + import AxisX from "$lib/components/ui_transverse_components/piece_of_cake/AxisX.svelte" + import AxisY from "$lib/components/ui_transverse_components/piece_of_cake/AxisY.svelte" + import DragSelect from "$lib/components/ui_transverse_components/piece_of_cake/DragSelect.svelte" + import Html from "$lib/components/ui_transverse_components/piece_of_cake/Html.svelte" + import { CurveModel } from "$lib/components/ui_transverse_components/piece_of_cake/model" + import MultiLine from "$lib/components/ui_transverse_components/piece_of_cake/MultiLine.svelte" + import PieceOfCake from "$lib/components/ui_transverse_components/piece_of_cake/PieceOfCake.svelte" + import SharedTooltip from "$lib/components/ui_transverse_components/piece_of_cake/SharedTooltip.svelte" + import Svg from "$lib/components/ui_transverse_components/piece_of_cake/Svg.svelte" + import type { GraphDomain } from "$lib/components/ui_transverse_components/piece_of_cake/types" import TestCaseGraphXlsxExport from "$lib/components/test_cases/TestCaseGraphXlsxExport.svelte" import Tooltip from "$lib/components/Tooltip.svelte" import ValueChange from "$lib/components/ValueChange.svelte" diff --git a/src/lib/components/test_cases/TestCaseGraphXlsxExport.svelte b/src/lib/components/test_cases/TestCaseGraphXlsxExport.svelte index f541e5a07..597f79c2f 100644 --- a/src/lib/components/test_cases/TestCaseGraphXlsxExport.svelte +++ b/src/lib/components/test_cases/TestCaseGraphXlsxExport.svelte @@ -12,7 +12,7 @@ import XLSX from "xlsx-js-style" import { page } from "$app/stores" - import type { GraphDomain } from "$lib/components/piece_of_cake/types" + import type { GraphDomain } from "$lib/components/ui_transverse_components/piece_of_cake/types" import { decompositionCoreByName } from "$lib/decompositions" import type { DisplayMode } from "$lib/displays" import { entityByKey } from "$lib/entities" diff --git a/src/lib/components/transverse_pages/AnchorTitle.svelte b/src/lib/components/ui_transverse_components/AnchorTitle.svelte similarity index 100% rename from src/lib/components/transverse_pages/AnchorTitle.svelte rename to src/lib/components/ui_transverse_components/AnchorTitle.svelte diff --git a/src/lib/components/SelectChip.svelte b/src/lib/components/ui_transverse_components/SelectChip.svelte similarity index 100% rename from src/lib/components/SelectChip.svelte rename to src/lib/components/ui_transverse_components/SelectChip.svelte diff --git a/src/lib/components/accordion/Accordion.svelte b/src/lib/components/ui_transverse_components/accordion/Accordion.svelte similarity index 100% rename from src/lib/components/accordion/Accordion.svelte rename to src/lib/components/ui_transverse_components/accordion/Accordion.svelte diff --git a/src/lib/components/accordion/AccordionItem.svelte b/src/lib/components/ui_transverse_components/accordion/AccordionItem.svelte similarity index 100% rename from src/lib/components/accordion/AccordionItem.svelte rename to src/lib/components/ui_transverse_components/accordion/AccordionItem.svelte diff --git a/src/lib/components/layercake/AxisY.svelte b/src/lib/components/ui_transverse_components/layercake/AxisY.svelte similarity index 100% rename from src/lib/components/layercake/AxisY.svelte rename to src/lib/components/ui_transverse_components/layercake/AxisY.svelte diff --git a/src/lib/components/layercake/Column.svelte b/src/lib/components/ui_transverse_components/layercake/Column.svelte similarity index 100% rename from src/lib/components/layercake/Column.svelte rename to src/lib/components/ui_transverse_components/layercake/Column.svelte diff --git a/src/lib/components/piece_of_cake/Area.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/Area.svelte similarity index 99% rename from src/lib/components/piece_of_cake/Area.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/Area.svelte index 39f907357..4e870e627 100644 --- a/src/lib/components/piece_of_cake/Area.svelte +++ b/src/lib/components/ui_transverse_components/piece_of_cake/Area.svelte @@ -7,7 +7,7 @@ import { v4 as uuidV4 } from "uuid" import type { CalculationName } from "$lib/calculations.svelte" - import type { CurveModel } from "$lib/components/piece_of_cake/model" + import type { CurveModel } from "$lib/components/ui_transverse_components/piece_of_cake/model" interface Props { modelGroups: CurveModel[][] diff --git a/src/lib/components/piece_of_cake/AxisX.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/AxisX.svelte similarity index 100% rename from src/lib/components/piece_of_cake/AxisX.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/AxisX.svelte diff --git a/src/lib/components/piece_of_cake/AxisY.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/AxisY.svelte similarity index 100% rename from src/lib/components/piece_of_cake/AxisY.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/AxisY.svelte diff --git a/src/lib/components/piece_of_cake/BinaryTree.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/BinaryTree.svelte similarity index 100% rename from src/lib/components/piece_of_cake/BinaryTree.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/BinaryTree.svelte diff --git a/src/lib/components/piece_of_cake/DragSelect.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/DragSelect.svelte similarity index 94% rename from src/lib/components/piece_of_cake/DragSelect.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/DragSelect.svelte index 577c63336..cc87fc0c2 100644 --- a/src/lib/components/piece_of_cake/DragSelect.svelte +++ b/src/lib/components/ui_transverse_components/piece_of_cake/DragSelect.svelte @@ -1,6 +1,6 @@ <script lang="ts"> - import type { CurveModel } from "$lib/components/piece_of_cake/model" - import type { GraphDomain } from "$lib/components/piece_of_cake/types" + import type { CurveModel } from "$lib/components/ui_transverse_components/piece_of_cake/model" + import type { GraphDomain } from "$lib/components/ui_transverse_components/piece_of_cake/types" interface Props { children?: import("svelte").Snippet<[any]> diff --git a/src/lib/components/piece_of_cake/Html.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/Html.svelte similarity index 100% rename from src/lib/components/piece_of_cake/Html.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/Html.svelte diff --git a/src/lib/components/piece_of_cake/MultiLine.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/MultiLine.svelte similarity index 100% rename from src/lib/components/piece_of_cake/MultiLine.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/MultiLine.svelte diff --git a/src/lib/components/piece_of_cake/PieceOfCake.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/PieceOfCake.svelte similarity index 100% rename from src/lib/components/piece_of_cake/PieceOfCake.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/PieceOfCake.svelte diff --git a/src/lib/components/piece_of_cake/SharedTooltip.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/SharedTooltip.svelte similarity index 100% rename from src/lib/components/piece_of_cake/SharedTooltip.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/SharedTooltip.svelte diff --git a/src/lib/components/piece_of_cake/Svg.svelte b/src/lib/components/ui_transverse_components/piece_of_cake/Svg.svelte similarity index 100% rename from src/lib/components/piece_of_cake/Svg.svelte rename to src/lib/components/ui_transverse_components/piece_of_cake/Svg.svelte diff --git a/src/lib/components/piece_of_cake/model.ts b/src/lib/components/ui_transverse_components/piece_of_cake/model.ts similarity index 100% rename from src/lib/components/piece_of_cake/model.ts rename to src/lib/components/ui_transverse_components/piece_of_cake/model.ts diff --git a/src/lib/components/piece_of_cake/types.ts b/src/lib/components/ui_transverse_components/piece_of_cake/types.ts similarity index 100% rename from src/lib/components/piece_of_cake/types.ts rename to src/lib/components/ui_transverse_components/piece_of_cake/types.ts diff --git a/src/lib/components/variables/VariableDetail.svelte b/src/lib/components/variables/VariableDetail.svelte index 0fd9a5193..5b2021171 100644 --- a/src/lib/components/variables/VariableDetail.svelte +++ b/src/lib/components/variables/VariableDetail.svelte @@ -8,8 +8,8 @@ import { goto } from "$app/navigation" import { requestAllBudgetCalculations } from "$lib/calculations.svelte" import { clickOutside } from "$lib/click_outside" - import Accordion from "$lib/components/accordion/Accordion.svelte" - import AccordionItem from "$lib/components/accordion/AccordionItem.svelte" + import Accordion from "$lib/components/ui_transverse_components/accordion/Accordion.svelte" + import AccordionItem from "$lib/components/ui_transverse_components/accordion/AccordionItem.svelte" import PictoBudgetEtat from "$lib/components/pictos/PictoBudgetEtat.svelte" import TestCaseFilters from "$lib/components/test_cases/TestCaseFilters.svelte" import TestCasePictos from "$lib/components/test_cases/TestCasePictos.svelte" diff --git a/src/routes/accueil/+page.svelte b/src/routes/accueil/+page.svelte index b7bebe242..48050cf73 100644 --- a/src/routes/accueil/+page.svelte +++ b/src/routes/accueil/+page.svelte @@ -14,8 +14,8 @@ import PlfVariablesListIntro from "$lib/components/welcome_views/PlfVariablesListIntro.svelte" import WelcomeSearch from "$lib/components/search/WelcomeSearch.svelte" import TestCaseSelectModal from "$lib/components/test_cases/TestCaseSelectModal.svelte" - import AnchorTitle from "$lib/components/transverse_pages/AnchorTitle.svelte" - import Footer from "$lib/components/transverse_pages/Footer.svelte" + import AnchorTitle from "$lib/components/ui_transverse_components/AnchorTitle.svelte" + import Footer from "$lib/components/Footer.svelte" import VariableDetail from "$lib/components/variables/VariableDetail.svelte" import LegislationPerimeterTree from "$lib/components/welcome_views/LegislationPerimeterTree.svelte" import { waterfalls, withLinkedVariableNames } from "$lib/decompositions" diff --git a/src/routes/fonctionnement/+page.svelte b/src/routes/fonctionnement/+page.svelte index 56b8c2f2d..7dead3365 100644 --- a/src/routes/fonctionnement/+page.svelte +++ b/src/routes/fonctionnement/+page.svelte @@ -3,9 +3,9 @@ import PictoEtat from "$lib/components/pictos/PictoEtat.svelte" import PictoFemme from "$lib/components/pictos/PictoFemme.svelte" import TestCaseSelectModal from "$lib/components/test_cases/TestCaseSelectModal.svelte" - import AnchorTitle from "$lib/components/transverse_pages/AnchorTitle.svelte" - import Footer from "$lib/components/transverse_pages/Footer.svelte" - import OpenGraph from "$lib/components/transverse_pages/OpenGraph.svelte" + import AnchorTitle from "$lib/components/ui_transverse_components/AnchorTitle.svelte" + import Footer from "$lib/components/Footer.svelte" + import OpenGraph from "$lib/components/OpenGraph.svelte" import { withLinkedVariableNames } from "$lib/decompositions" import publicConfig from "$lib/public_config" import { year } from "$lib/shared.svelte" diff --git a/src/routes/test_cases/simulations/[simulation]/+page.svelte b/src/routes/test_cases/simulations/[simulation]/+page.svelte index 2022b6eb5..443b37585 100644 --- a/src/routes/test_cases/simulations/[simulation]/+page.svelte +++ b/src/routes/test_cases/simulations/[simulation]/+page.svelte @@ -6,7 +6,7 @@ import { goto } from "$app/navigation" import { page } from "$app/stores" import { requestAllTestCasesCalculations } from "$lib/calculations.svelte" - import OpenGraph from "$lib/components/transverse_pages/OpenGraph.svelte" + import OpenGraph from "$lib/components/OpenGraph.svelte" import publicConfig from "$lib/public_config" import { shared } from "$lib/shared.svelte" import { newSimulationUrl } from "$lib/urls" -- GitLab