diff --git a/src/lib/components/variables/VariableReferredNodeParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte similarity index 89% rename from src/lib/components/variables/VariableReferredNodeParameter.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte index 1b9f2f293694283f401b2a73fbce668440769bf0..b9ae5c8009f8fe90e90c48d03552d3e74925c3a8 100644 --- a/src/lib/components/variables/VariableReferredNodeParameter.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte @@ -1,5 +1,5 @@ <script lang="ts"> - import VariableReferredNodeParameter from "./VariableReferredNodeParameter.svelte" + import VariableReferredNodeParameter from "$lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte" import { ParameterClass, type NodeParameter, @@ -8,9 +8,9 @@ type ValueParameter, } from "@openfisca/json-model" - import VariableReferredParameterHeader from "./VariableReferredParameterHeader.svelte" - import VariableReferredScaleParameter from "./VariableReferredScaleParameter.svelte" - import VariableReferredValueParameter from "./VariableReferredValueParameter.svelte" + import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte" + import VariableReferredScaleParameter from "$lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte" + import VariableReferredValueParameter from "$lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte" import type { DisplayMode } from "$lib/displays" diff --git a/src/lib/components/variables/VariableReferredParameterHeader.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte similarity index 100% rename from src/lib/components/variables/VariableReferredParameterHeader.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte diff --git a/src/lib/components/variables/VariableReferredParameters.svelte b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte similarity index 96% rename from src/lib/components/variables/VariableReferredParameters.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte index d454c249bffe74baba0792624f75bd67234be068..a265d0cc1cafc7f48e093474ee189bdd03b241db 100644 --- a/src/lib/components/variables/VariableReferredParameters.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredParameters.svelte @@ -11,10 +11,10 @@ type ValueParameter, } from "@openfisca/json-model" - import VariableHeader from "./VariableHeader.svelte" - import VariableReferredNodeParameter from "./VariableReferredNodeParameter.svelte" - import VariableReferredScaleParameter from "./VariableReferredScaleParameter.svelte" - import VariableReferredValueParameter from "./VariableReferredValueParameter.svelte" + import VariableHeader from "../../variables/VariableHeader.svelte" + import VariableReferredNodeParameter from "$lib/components/legislation_view/parameters/VariableReferredNodeParameter.svelte" + import VariableReferredScaleParameter from "$lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte" + import VariableReferredValueParameter from "$lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte" import { decompositionCoreByName, diff --git a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte b/src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte similarity index 98% rename from src/lib/components/variables/VariableReferredScaleAtInstant.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte index bd0e9f69ead2fdbe5d92248aabefdadf8eb371a7..ef7b667dd02c0252ae3f700f60cdb32687c98ae9 100644 --- a/src/lib/components/variables/VariableReferredScaleAtInstant.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte @@ -24,8 +24,8 @@ } from "@openfisca/json-model" import { createEventDispatcher } from "svelte" - import VariableReferredValueEdit from "$lib/components/variables/VariableReferredValueEdit.svelte" - import VariableReferredValueView from "$lib/components/variables/VariableReferredValueView.svelte" + import VariableReferredValueEdit from "$lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte" + import VariableReferredValueView from "$lib/components/legislation_view/parameters/VariableReferredValueView.svelte" import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors" import { asAmountBracketAtInstant, diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte similarity index 98% rename from src/lib/components/variables/VariableReferredScaleParameter.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte index 23f692d2ccf043cda4f1350481a7880bf1aed28d..48a760cbd88df441d1a820fa49ba49c81f3eadb5 100644 --- a/src/lib/components/variables/VariableReferredScaleParameter.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredScaleParameter.svelte @@ -18,8 +18,8 @@ import LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte" import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte" import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte" - import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte" - import VariableReferredScaleAtInstant from "$lib/components/variables/VariableReferredScaleAtInstant.svelte" + import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte" + import VariableReferredScaleAtInstant from "$lib/components/legislation_view/parameters/VariableReferredScaleAtInstant.svelte" import type { DisplayMode } from "$lib/displays" import { trackLawEditParameterArticles, diff --git a/src/lib/components/variables/VariableReferredValueEdit.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte similarity index 100% rename from src/lib/components/variables/VariableReferredValueEdit.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte similarity index 97% rename from src/lib/components/variables/VariableReferredValueParameter.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte index df94cac050f2ca136292c7ea393f18d8886ca940..a236340e252f86cfbe4630214380ba1fb11bf74a 100644 --- a/src/lib/components/variables/VariableReferredValueParameter.svelte +++ b/src/lib/components/legislation_view/parameters/VariableReferredValueParameter.svelte @@ -26,9 +26,9 @@ import LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte" import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte" import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte" - import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte" - import VariableReferredValueEdit from "$lib/components/variables/VariableReferredValueEdit.svelte" - import VariableReferredValueView from "$lib/components/variables/VariableReferredValueView.svelte" + import VariableReferredParameterHeader from "$lib/components/legislation_view/parameters/VariableReferredParameterHeader.svelte" + import VariableReferredValueEdit from "$lib/components/legislation_view/parameters/VariableReferredValueEdit.svelte" + import VariableReferredValueView from "$lib/components/legislation_view/parameters/VariableReferredValueView.svelte" import type { DisplayMode } from "$lib/displays" import { trackLawEditParameterArticles, diff --git a/src/lib/components/variables/VariableReferredValueView.svelte b/src/lib/components/legislation_view/parameters/VariableReferredValueView.svelte similarity index 100% rename from src/lib/components/variables/VariableReferredValueView.svelte rename to src/lib/components/legislation_view/parameters/VariableReferredValueView.svelte diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index fc9adc45d59fedb1b0622406c48665645ea06a64..3e609ea719b6c824dfa289cbe1a8e3aaf3a635b8 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -46,7 +46,7 @@ import TestCaseView from "$lib/components/test_cases/TestCaseView.svelte" import TestCaseSimulationSharingModal from "$lib/components/TestCaseSimulationSharingModal.svelte" import VariableDetail from "$lib/components/variables/VariableDetail.svelte" - import VariableReferredParameters from "$lib/components/variables/VariableReferredParameters.svelte" + import VariableReferredParameters from "$lib/components/legislation_view/parameters/VariableReferredParameters.svelte" import VariableValueChange from "$lib/components/variables/VariableValueChange.svelte" import LegislationPerimeterTree from "$lib/components/welcome_views/LegislationPerimeterTree.svelte" import WithoutBudgetCard from "$lib/components/budget/WithoutBudgetCard.svelte" diff --git a/src/routes/variables/[variable]/parameters/[date]/+page.svelte b/src/routes/variables/[variable]/parameters/[date]/+page.svelte index 59f36b02494347362d8e88565d1a43aedde4e316..44482ac1e22fc79d41dab8c0ede44ea7b06176eb 100644 --- a/src/routes/variables/[variable]/parameters/[date]/+page.svelte +++ b/src/routes/variables/[variable]/parameters/[date]/+page.svelte @@ -2,7 +2,7 @@ import { setContext } from "svelte" import { page } from "$app/stores" - import VariableReferredParameters from "$lib/components/variables/VariableReferredParameters.svelte" + import VariableReferredParameters from "$lib/components/legislation_view/parameters/VariableReferredParameters.svelte" import { waterfalls } from "$lib/decompositions" import type { DisplayMode } from "$lib/displays" import publicConfig from "$lib/public_config"