diff --git a/src/api/01-integrations.ts b/src/api/01-integrations.ts index ed982e89..1b3479e8 100644 --- a/src/api/01-integrations.ts +++ b/src/api/01-integrations.ts @@ -15,7 +15,7 @@ import type { IntegrateContextBody, IntegrateXmlContextBody, IntegrationResults, -} from '../model/api' +} from '../models/api' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/02-campaigns.ts b/src/api/02-campaigns.ts index 3e36127b..987d5cd3 100644 --- a/src/api/02-campaigns.ts +++ b/src/api/02-campaigns.ts @@ -23,7 +23,7 @@ import type { CampaignCreationV2, CampaignSummary, DeleteCampaignByIdParams, -} from '../model/api' +} from '../models/api' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/03-questionnaires.ts b/src/api/03-questionnaires.ts index 51c83c2d..0e6f7bc9 100644 --- a/src/api/03-questionnaires.ts +++ b/src/api/03-questionnaires.ts @@ -24,7 +24,7 @@ import type { QuestionnaireModelId, QuestionnaireModelValue, SurveyUnitsOkNok, -} from '../model/api' +} from '../models/api' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/04-nomenclatures.ts b/src/api/04-nomenclatures.ts index 29147b8d..4a585bdd 100644 --- a/src/api/04-nomenclatures.ts +++ b/src/api/04-nomenclatures.ts @@ -18,8 +18,8 @@ import type { UseQueryResult, } from '@tanstack/react-query' import { useMutation, useQuery } from '@tanstack/react-query' -import type { NomenclatureCreation } from '../model/api' -import type { SchemaNomenclature } from '../model/api/schema.nomenclature' +import type { NomenclatureCreation } from '../models/api' +import type { SchemaNomenclature } from '../models/api/schema.nomenclature' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/05-metadata.ts b/src/api/05-metadata.ts index cded414b..cffcef2c 100644 --- a/src/api/05-metadata.ts +++ b/src/api/05-metadata.ts @@ -15,7 +15,7 @@ import type { UseQueryResult, } from '@tanstack/react-query' import { useQuery } from '@tanstack/react-query' -import type { SchemaMetadata } from '../model/api/schema.metadata' +import type { SchemaMetadata } from '../models/api/schema.metadata' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/06-survey-units.ts b/src/api/06-survey-units.ts index b23e46f4..63add1a0 100644 --- a/src/api/06-survey-units.ts +++ b/src/api/06-survey-units.ts @@ -30,9 +30,9 @@ import type { SurveyUnitSummary, SurveyUnitUpdate, SurveyUnitsOkNok, -} from '../model/api' -import type { SchemaData } from '../model/api/schema.data' -import type { SchemaPersonalization } from '../model/api/schema.personalization' +} from '../models/api' +import type { SchemaData } from '../models/api/schema.data' +import type { SchemaPersonalization } from '../models/api/schema.personalization' import { depositProofInstance, stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/07-paradata-events.ts b/src/api/07-paradata-events.ts index 7dc6cf65..de7c0597 100644 --- a/src/api/07-paradata-events.ts +++ b/src/api/07-paradata-events.ts @@ -11,7 +11,7 @@ import type { UseMutationResult, } from '@tanstack/react-query' import { useMutation } from '@tanstack/react-query' -import type { AddParadataBody } from '../model/api' +import type { AddParadataBody } from '../models/api' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/api/08-survey-units-in-temp-zone.ts b/src/api/08-survey-units-in-temp-zone.ts index efa02ba4..8698dd64 100644 --- a/src/api/08-survey-units-in-temp-zone.ts +++ b/src/api/08-survey-units-in-temp-zone.ts @@ -18,8 +18,8 @@ import type { UseQueryResult, } from '@tanstack/react-query' import { useMutation, useQuery } from '@tanstack/react-query' -import type { SurveyUnitTempZone } from '../model/api' -import type { SchemaSurveyUnitTempZone } from '../model/api/schema.survey-unit-temp-zone' +import type { SurveyUnitTempZone } from '../models/api' +import type { SchemaSurveyUnitTempZone } from '../models/api/schema.survey-unit-temp-zone' import { stromaeInstance } from './axiosInstance' type SecondParameter any> = Parameters[1] diff --git a/src/shared/query/visualizeQueryOptions.ts b/src/api/visualizeQueryOptions.ts similarity index 81% rename from src/shared/query/visualizeQueryOptions.ts rename to src/api/visualizeQueryOptions.ts index 02d7adb8..e1be19dd 100644 --- a/src/shared/query/visualizeQueryOptions.ts +++ b/src/api/visualizeQueryOptions.ts @@ -1,8 +1,8 @@ -import type { Metadata } from '@/model/Metadata' -import type { SurveyUnitData } from '@/model/SurveyUnitData' -import type { Nomenclature } from '@/shared/components/Orchestrator/utils/lunaticType' -import { ZodErrorWithName } from '@/shared/error/ZodErrorWithName' -import { surveyUnitMetadataSchema } from '@/shared/parser/metadata' +import { ZodErrorWithName } from '@/components/error/ZodErrorWithName' +import type { Nomenclature } from '@/components/orchestrator/utils/lunaticType' +import type { Metadata } from '@/models/Metadata' +import type { SurveyUnitData } from '@/models/SurveyUnitData' +import { surveyUnitMetadataSchema } from '@/models/metadataSchema' import type { LunaticSource } from '@inseefr/lunatic' import { queryOptions } from '@tanstack/react-query' import axios, { type AxiosRequestConfig } from 'axios' diff --git a/src/shared/components/Container.tsx b/src/components/Container.tsx similarity index 100% rename from src/shared/components/Container.tsx rename to src/components/Container.tsx diff --git a/src/shared/components/ContentSkeleton.tsx b/src/components/ContentSkeleton.tsx similarity index 100% rename from src/shared/components/ContentSkeleton.tsx rename to src/components/ContentSkeleton.tsx diff --git a/src/shared/components/Grid.tsx b/src/components/Grid.tsx similarity index 100% rename from src/shared/components/Grid.tsx rename to src/components/Grid.tsx diff --git a/src/shared/toast/Toast.tsx b/src/components/Toast.tsx similarity index 100% rename from src/shared/toast/Toast.tsx rename to src/components/Toast.tsx diff --git a/src/shared/components/Error/ErrorComponent.tsx b/src/components/error/ErrorComponent.tsx similarity index 95% rename from src/shared/components/Error/ErrorComponent.tsx rename to src/components/error/ErrorComponent.tsx index c0123bdf..69cc3623 100644 --- a/src/shared/components/Error/ErrorComponent.tsx +++ b/src/components/error/ErrorComponent.tsx @@ -3,10 +3,10 @@ import Button from '@codegouvfr/react-dsfr/Button' import ArtWorkBackground from '@codegouvfr/react-dsfr/dsfr/artwork/background/ovoid.svg' import ArtWork from '@codegouvfr/react-dsfr/dsfr/artwork/system.svg' +import { Container } from '@/components/Container' +import { errorNormalizer } from '@/components/error/errorNormalizer' +import { useDocumentTitle } from '@/hooks/useDocumentTitle' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Container } from '@/shared/components/Container' -import { errorNormalizer } from '@/shared/error/errorNormalizer' -import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle' import TechnicalError from '@codegouvfr/react-dsfr/dsfr/artwork/pictograms/system/technical-error.svg' import { useNavigate, useSearch } from '@tanstack/react-router' diff --git a/src/shared/error/ZodErrorWithName.ts b/src/components/error/ZodErrorWithName.ts similarity index 100% rename from src/shared/error/ZodErrorWithName.ts rename to src/components/error/ZodErrorWithName.ts diff --git a/src/shared/error/errorNormalizer.tsx b/src/components/error/errorNormalizer.tsx similarity index 100% rename from src/shared/error/errorNormalizer.tsx rename to src/components/error/errorNormalizer.tsx diff --git a/src/shared/error/notFoundError.ts b/src/components/error/notFoundError.ts similarity index 100% rename from src/shared/error/notFoundError.ts rename to src/components/error/notFoundError.ts diff --git a/src/shared/components/Layout/AutoLogoutCountdown.tsx b/src/components/layout/AutoLogoutCountdown.tsx similarity index 100% rename from src/shared/components/Layout/AutoLogoutCountdown.tsx rename to src/components/layout/AutoLogoutCountdown.tsx diff --git a/src/shared/components/Layout/Footer.tsx b/src/components/layout/Footer.tsx similarity index 91% rename from src/shared/components/Layout/Footer.tsx rename to src/components/layout/Footer.tsx index 23352e86..04c283a2 100644 --- a/src/shared/components/Layout/Footer.tsx +++ b/src/components/layout/Footer.tsx @@ -1,14 +1,14 @@ import { MODE_TYPE } from '@/constants/mode' +import { useMode } from '@/hooks/useMode' import { declareComponentKeys, useResolveLocalizedString, useTranslation, } from '@/i18n' -import type { Logo } from '@/model/Metadata' -import { NavigationAssistancePage } from '@/pages/NavigationAssistance/NavigationAssistancePage' -import { SecurityPage } from '@/pages/Security/SecurityPage' -import { useMode } from '@/shared/hooks/useMode' -import { useMetadataStore } from '@/shared/metadataStore/useMetadataStore' +import type { Logo } from '@/models/Metadata' +import { NavigationAssistancePage } from '@/pages/navigationAssistance/NavigationAssistancePage' +import { SecurityPage } from '@/pages/security/SecurityPage' +import { useMetadataStore } from '@/stores/useMetadataStore' import { fr } from '@codegouvfr/react-dsfr' import { Footer as DSFRFooter } from '@codegouvfr/react-dsfr/Footer' import { Header } from './Header' diff --git a/src/shared/components/Layout/Header.test.tsx b/src/components/layout/Header.test.tsx similarity index 97% rename from src/shared/components/Layout/Header.test.tsx rename to src/components/layout/Header.test.tsx index 47f51713..c42d7059 100644 --- a/src/shared/components/Layout/Header.test.tsx +++ b/src/components/layout/Header.test.tsx @@ -1,15 +1,15 @@ import { MODE_TYPE } from '@/constants/mode' import { TELEMETRY_EVENT_TYPE } from '@/constants/telemetry' import { TelemetryContext } from '@/contexts/TelemetryContext' +import { useMode } from '@/hooks/useMode' import { OidcProvider } from '@/oidc' -import { useMode } from '@/shared/hooks/useMode' import { renderWithRouter } from '@/utils/tests' import { waitFor } from '@testing-library/react' import userEvent from '@testing-library/user-event' import { expect } from 'vitest' import { Header } from './Header' -vi.mock('@/shared/hooks/useMode') +vi.mock('@/hooks/useMode') describe('Header', () => { it('triggers telemetry contact support event', async () => { diff --git a/src/shared/components/Layout/Header.tsx b/src/components/layout/Header.tsx similarity index 93% rename from src/shared/components/Layout/Header.tsx rename to src/components/layout/Header.tsx index f6a8c034..554d0a2a 100644 --- a/src/shared/components/Layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -1,16 +1,16 @@ import { MODE_TYPE } from '@/constants/mode' import { TELEMETRY_EVENT_EXIT_SOURCE } from '@/constants/telemetry' import { useTelemetry } from '@/contexts/TelemetryContext' +import { executePreLogoutActions } from '@/hooks/prelogout' +import { useMode } from '@/hooks/useMode' import { declareComponentKeys, useResolveLocalizedString, useTranslation, } from '@/i18n' import { useOidc } from '@/oidc' -import { collectPath } from '@/pages/Collect/route' -import { executePreLogoutActions } from '@/shared/hooks/prelogout' -import { useMode } from '@/shared/hooks/useMode' -import { useMetadataStore } from '@/shared/metadataStore/useMetadataStore' +import { collectPath } from '@/pages/collect/route' +import { useMetadataStore } from '@/stores/useMetadataStore' import { computeContactSupportEvent, computeExitEvent } from '@/utils/telemetry' import { headerFooterDisplayItem } from '@codegouvfr/react-dsfr/Display' import { Header as DsfrHeader } from '@codegouvfr/react-dsfr/Header' diff --git a/src/shared/components/Orchestrator/Orchestrator.test.tsx b/src/components/orchestrator/Orchestrator.test.tsx similarity index 100% rename from src/shared/components/Orchestrator/Orchestrator.test.tsx rename to src/components/orchestrator/Orchestrator.test.tsx diff --git a/src/shared/components/Orchestrator/Orchestrator.tsx b/src/components/orchestrator/Orchestrator.tsx similarity index 92% rename from src/shared/components/Orchestrator/Orchestrator.tsx rename to src/components/orchestrator/Orchestrator.tsx index 9964c4a8..5ca58011 100644 --- a/src/shared/components/Orchestrator/Orchestrator.tsx +++ b/src/components/orchestrator/Orchestrator.tsx @@ -1,15 +1,11 @@ import { MODE_TYPE } from '@/constants/mode' import { PAGE_TYPE } from '@/constants/page' import { useTelemetry } from '@/contexts/TelemetryContext' -import type { Metadata } from '@/model/Metadata' -import type { StateData } from '@/model/StateData' -import type { SurveyUnitData } from '@/model/SurveyUnitData' -import { usePushEventAfterInactivity } from '@/shared/components/Orchestrator/usePushEventAfterInactivity' -import { useAddPreLogoutAction } from '@/shared/hooks/prelogout' -import { usePrevious } from '@/shared/hooks/usePrevious' -import { downloadAsJson } from '@/utils/downloadAsJson' -import { isObjectEmpty } from '@/utils/isObjectEmpty' -import { hasBeenSent, shouldDisplayWelcomeModal } from '@/utils/orchestrator' +import { useAddPreLogoutAction } from '@/hooks/prelogout' +import { usePrevious } from '@/hooks/usePrevious' +import type { Metadata } from '@/models/Metadata' +import type { StateData } from '@/models/StateData' +import type { SurveyUnitData } from '@/models/SurveyUnitData' import { computeControlEvent, computeControlSkipEvent, @@ -17,8 +13,6 @@ import { computeInputEvent, computeNewPageEvent, } from '@/utils/telemetry' -import { useRefSync } from '@/utils/useRefSync' -import { useUpdateEffect } from '@/utils/useUpdateEffect' import { fr } from '@codegouvfr/react-dsfr' import { LunaticComponents, @@ -30,22 +24,28 @@ import { } from '@inseefr/lunatic' import { useNavigate } from '@tanstack/react-router' import { useCallback, useEffect, useMemo, useRef, useState } from 'react' -import { EndPage } from './CustomPages/EndPage' -import { ValidationModal } from './CustomPages/ValidationModal' -import { ValidationPage } from './CustomPages/ValidationPage' -import { WelcomeModal } from './CustomPages/WelcomeModal' -import { WelcomePage } from './CustomPages/WelcomePage' -import { SurveyContainer } from './SurveyContainer' -import { VTLDevTools } from './VTLDevTools/VTLDevtools' -import { createLunaticLogger } from './VTLDevTools/VTLErrorStore' +import { EndPage } from './customPages/EndPage' +import { ValidationModal } from './customPages/ValidationModal' +import { ValidationPage } from './customPages/ValidationPage' +import { WelcomeModal } from './customPages/WelcomeModal' +import { WelcomePage } from './customPages/WelcomePage' +import { usePushEventAfterInactivity } from './hooks/usePushEventAfterInactivity' +import { useRefSync } from './hooks/useRefSync' +import { useStromaeNavigation } from './hooks/useStromaeNavigation' +import { useUpdateEffect } from './hooks/useUpdateEffect' import { slotComponents } from './slotComponents' -import { useStromaeNavigation } from './useStromaeNavigation' +import { SurveyContainer } from './SurveyContainer' import { computeLunaticComponents } from './utils/components' import { isBlockingError } from './utils/controls' import { trimCollectedData } from './utils/data' +import { downloadAsJson } from './utils/downloadAsJson' +import { isObjectEmpty } from './utils/isObjectEmpty' import type { LunaticGetReferentiel, LunaticPageTag } from './utils/lunaticType' +import { hasBeenSent, shouldDisplayWelcomeModal } from './utils/orchestrator' import { scrollAndFocusToFirstError } from './utils/scrollAndFocusToFirstError' import { isSequencePage } from './utils/sequence' +import { VTLDevTools } from './vtlDevTools/VTLDevtools' +import { createLunaticLogger } from './vtlDevTools/VTLErrorStore' /** * Module augmentation to specify that Lunatic Component can have an additional props position diff --git a/src/shared/components/Orchestrator/SequenceHeader.tsx b/src/components/orchestrator/SequenceHeader.tsx similarity index 96% rename from src/shared/components/Orchestrator/SequenceHeader.tsx rename to src/components/orchestrator/SequenceHeader.tsx index 58493ab1..5b27f799 100644 --- a/src/shared/components/Orchestrator/SequenceHeader.tsx +++ b/src/components/orchestrator/SequenceHeader.tsx @@ -1,5 +1,5 @@ +import { useSequenceTitle } from '@/hooks/useDocumentTitle' import { declareComponentKeys, useTranslation } from '@/i18n' -import { useSequenceTitle } from '@/shared/hooks/useDocumentTitle' import { fr } from '@codegouvfr/react-dsfr' import type { LunaticOverview } from './utils/lunaticType' diff --git a/src/shared/components/Orchestrator/SurveyContainer.tsx b/src/components/orchestrator/SurveyContainer.tsx similarity index 98% rename from src/shared/components/Orchestrator/SurveyContainer.tsx rename to src/components/orchestrator/SurveyContainer.tsx index 789d84f3..0baaf394 100644 --- a/src/shared/components/Orchestrator/SurveyContainer.tsx +++ b/src/components/orchestrator/SurveyContainer.tsx @@ -1,7 +1,7 @@ import { MODE_TYPE } from '@/constants/mode' import { PAGE_TYPE } from '@/constants/page' import { declareComponentKeys, useTranslation } from '@/i18n' -import type { InternalPageType } from '@/model/Page' +import type { InternalPageType } from '@/models/Page' import { fr } from '@codegouvfr/react-dsfr' import Button from '@codegouvfr/react-dsfr/Button' import { useState, type PropsWithChildren, type ReactNode } from 'react' diff --git a/src/shared/components/Orchestrator/CustomPages/EndPage.test.tsx b/src/components/orchestrator/customPages/EndPage.test.tsx similarity index 100% rename from src/shared/components/Orchestrator/CustomPages/EndPage.test.tsx rename to src/components/orchestrator/customPages/EndPage.test.tsx diff --git a/src/shared/components/Orchestrator/CustomPages/EndPage.tsx b/src/components/orchestrator/customPages/EndPage.tsx similarity index 90% rename from src/shared/components/Orchestrator/CustomPages/EndPage.tsx rename to src/components/orchestrator/customPages/EndPage.tsx index 52b77615..47ffa7f8 100644 --- a/src/shared/components/Orchestrator/CustomPages/EndPage.tsx +++ b/src/components/orchestrator/customPages/EndPage.tsx @@ -1,6 +1,6 @@ +import { useDocumentTitle } from '@/hooks/useDocumentTitle' import { declareComponentKeys, useTranslation } from '@/i18n' -import type { StateData } from '@/model/StateData' -import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle' +import type { StateData } from '@/models/StateData' import { fr } from '@codegouvfr/react-dsfr' /** diff --git a/src/shared/components/Orchestrator/CustomPages/ValidationModal.tsx b/src/components/orchestrator/customPages/ValidationModal.tsx similarity index 100% rename from src/shared/components/Orchestrator/CustomPages/ValidationModal.tsx rename to src/components/orchestrator/customPages/ValidationModal.tsx diff --git a/src/shared/components/Orchestrator/CustomPages/ValidationPage.tsx b/src/components/orchestrator/customPages/ValidationPage.tsx similarity index 89% rename from src/shared/components/Orchestrator/CustomPages/ValidationPage.tsx rename to src/components/orchestrator/customPages/ValidationPage.tsx index 099d1581..3c37d396 100644 --- a/src/shared/components/Orchestrator/CustomPages/ValidationPage.tsx +++ b/src/components/orchestrator/customPages/ValidationPage.tsx @@ -1,5 +1,5 @@ +import { useDocumentTitle } from '@/hooks/useDocumentTitle' import { declareComponentKeys, useTranslation } from '@/i18n' -import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle' import { fr } from '@codegouvfr/react-dsfr' export function ValidationPage() { diff --git a/src/shared/components/Orchestrator/CustomPages/WelcomeModal.tsx b/src/components/orchestrator/customPages/WelcomeModal.tsx similarity index 100% rename from src/shared/components/Orchestrator/CustomPages/WelcomeModal.tsx rename to src/components/orchestrator/customPages/WelcomeModal.tsx diff --git a/src/shared/components/Orchestrator/CustomPages/WelcomePage.test.tsx b/src/components/orchestrator/customPages/WelcomePage.test.tsx similarity index 100% rename from src/shared/components/Orchestrator/CustomPages/WelcomePage.test.tsx rename to src/components/orchestrator/customPages/WelcomePage.test.tsx diff --git a/src/shared/components/Orchestrator/CustomPages/WelcomePage.tsx b/src/components/orchestrator/customPages/WelcomePage.tsx similarity index 94% rename from src/shared/components/Orchestrator/CustomPages/WelcomePage.tsx rename to src/components/orchestrator/customPages/WelcomePage.tsx index e7429d3e..7035943a 100644 --- a/src/shared/components/Orchestrator/CustomPages/WelcomePage.tsx +++ b/src/components/orchestrator/customPages/WelcomePage.tsx @@ -1,10 +1,10 @@ +import { useDocumentTitle } from '@/hooks/useDocumentTitle' import { declareComponentKeys, useResolveLocalizedString, useTranslation, } from '@/i18n' -import type { Contents, Metadata } from '@/model/Metadata' -import { useDocumentTitle } from '@/shared/hooks/useDocumentTitle' +import type { Contents, Metadata } from '@/models/Metadata' import { fr } from '@codegouvfr/react-dsfr' import { Fragment } from 'react' diff --git a/src/shared/components/Orchestrator/usePushEventAfterInactivity.test.ts b/src/components/orchestrator/hooks/usePushEventAfterInactivity.test.ts similarity index 100% rename from src/shared/components/Orchestrator/usePushEventAfterInactivity.test.ts rename to src/components/orchestrator/hooks/usePushEventAfterInactivity.test.ts diff --git a/src/shared/components/Orchestrator/usePushEventAfterInactivity.ts b/src/components/orchestrator/hooks/usePushEventAfterInactivity.ts similarity index 96% rename from src/shared/components/Orchestrator/usePushEventAfterInactivity.ts rename to src/components/orchestrator/hooks/usePushEventAfterInactivity.ts index be6c6745..0ba9ec20 100644 --- a/src/shared/components/Orchestrator/usePushEventAfterInactivity.ts +++ b/src/components/orchestrator/hooks/usePushEventAfterInactivity.ts @@ -1,4 +1,4 @@ -import type { CommonParadata, InputParadata } from '@/types/telemetry' +import type { CommonParadata, InputParadata } from '@/models/telemetry' import { areInputParadataIdentical } from '@/utils/telemetry' import { useEffect, useRef, useState } from 'react' diff --git a/src/utils/useRefSync.ts b/src/components/orchestrator/hooks/useRefSync.ts similarity index 100% rename from src/utils/useRefSync.ts rename to src/components/orchestrator/hooks/useRefSync.ts diff --git a/src/shared/components/Orchestrator/useStromaeNavigation.tsx b/src/components/orchestrator/hooks/useStromaeNavigation.tsx similarity index 98% rename from src/shared/components/Orchestrator/useStromaeNavigation.tsx rename to src/components/orchestrator/hooks/useStromaeNavigation.tsx index d962e902..117be14c 100644 --- a/src/shared/components/Orchestrator/useStromaeNavigation.tsx +++ b/src/components/orchestrator/hooks/useStromaeNavigation.tsx @@ -1,12 +1,12 @@ import { PAGE_TYPE } from '@/constants/page' -import type { InternalPageType, PageType, StromaePage } from '@/model/Page' +import type { InternalPageType, PageType, StromaePage } from '@/models/Page' import { useState } from 'react' import { assert, type Equals } from 'tsafe/assert' import type { LunaticGoNextPage, LunaticGoPreviousPage, LunaticGoToPage, -} from './utils/lunaticType' +} from '../utils/lunaticType' type Params = { isFirstPage: boolean diff --git a/src/utils/useUpdateEffect.ts b/src/components/orchestrator/hooks/useUpdateEffect.ts similarity index 100% rename from src/utils/useUpdateEffect.ts rename to src/components/orchestrator/hooks/useUpdateEffect.ts diff --git a/src/shared/components/Orchestrator/slotComponents.tsx b/src/components/orchestrator/slotComponents.tsx similarity index 88% rename from src/shared/components/Orchestrator/slotComponents.tsx rename to src/components/orchestrator/slotComponents.tsx index 16f315bd..bb002437 100644 --- a/src/shared/components/Orchestrator/slotComponents.tsx +++ b/src/components/orchestrator/slotComponents.tsx @@ -1,5 +1,5 @@ /* eslint-disable react-refresh/only-export-components */ -import { useSequenceTitle } from '@/shared/hooks/useDocumentTitle' +import { useSequenceTitle } from '@/hooks/useDocumentTitle' import type { LunaticSlotComponents } from '@inseefr/lunatic' import { slotComponents as dsfrSlotsComponents } from '@inseefr/lunatic-dsfr' import { assert } from 'tsafe/assert' diff --git a/src/shared/components/Orchestrator/utils/components.ts b/src/components/orchestrator/utils/components.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/components.ts rename to src/components/orchestrator/utils/components.ts diff --git a/src/shared/components/Orchestrator/utils/controls.ts b/src/components/orchestrator/utils/controls.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/controls.ts rename to src/components/orchestrator/utils/controls.ts diff --git a/src/shared/components/Orchestrator/utils/data.test.ts b/src/components/orchestrator/utils/data.test.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/data.test.ts rename to src/components/orchestrator/utils/data.test.ts diff --git a/src/shared/components/Orchestrator/utils/data.ts b/src/components/orchestrator/utils/data.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/data.ts rename to src/components/orchestrator/utils/data.ts diff --git a/src/utils/downloadAsJson.ts b/src/components/orchestrator/utils/downloadAsJson.ts similarity index 100% rename from src/utils/downloadAsJson.ts rename to src/components/orchestrator/utils/downloadAsJson.ts diff --git a/src/utils/isObjectEmpty.ts b/src/components/orchestrator/utils/isObjectEmpty.ts similarity index 100% rename from src/utils/isObjectEmpty.ts rename to src/components/orchestrator/utils/isObjectEmpty.ts diff --git a/src/shared/components/Orchestrator/utils/lunaticType.ts b/src/components/orchestrator/utils/lunaticType.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/lunaticType.ts rename to src/components/orchestrator/utils/lunaticType.ts diff --git a/src/utils/orchestrator.test.ts b/src/components/orchestrator/utils/orchestrator.test.ts similarity index 100% rename from src/utils/orchestrator.test.ts rename to src/components/orchestrator/utils/orchestrator.test.ts diff --git a/src/utils/orchestrator.ts b/src/components/orchestrator/utils/orchestrator.ts similarity index 83% rename from src/utils/orchestrator.ts rename to src/components/orchestrator/utils/orchestrator.ts index 8eccf468..bd85e80b 100644 --- a/src/utils/orchestrator.ts +++ b/src/components/orchestrator/utils/orchestrator.ts @@ -1,6 +1,6 @@ import { PAGE_TYPE } from '@/constants/page' -import type { PageType } from '@/model/Page' -import type { StateData } from '@/model/StateData' +import type { PageType } from '@/models/Page' +import type { StateData } from '@/models/StateData' // Whether or not the form has been sent and cannot be updated anymore export function hasBeenSent(state?: StateData['state']): boolean { diff --git a/src/shared/components/Orchestrator/utils/scrollAndFocusToFirstError.ts b/src/components/orchestrator/utils/scrollAndFocusToFirstError.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/scrollAndFocusToFirstError.ts rename to src/components/orchestrator/utils/scrollAndFocusToFirstError.ts diff --git a/src/shared/components/Orchestrator/utils/sequence.ts b/src/components/orchestrator/utils/sequence.ts similarity index 100% rename from src/shared/components/Orchestrator/utils/sequence.ts rename to src/components/orchestrator/utils/sequence.ts diff --git a/src/shared/components/Orchestrator/VTLDevTools/VTLDevtools.tsx b/src/components/orchestrator/vtlDevTools/VTLDevtools.tsx similarity index 100% rename from src/shared/components/Orchestrator/VTLDevTools/VTLDevtools.tsx rename to src/components/orchestrator/vtlDevTools/VTLDevtools.tsx diff --git a/src/shared/components/Orchestrator/VTLDevTools/VTLErrorStore.tsx b/src/components/orchestrator/vtlDevTools/VTLErrorStore.tsx similarity index 96% rename from src/shared/components/Orchestrator/VTLDevTools/VTLErrorStore.tsx rename to src/components/orchestrator/vtlDevTools/VTLErrorStore.tsx index c935fa8d..011de1bc 100644 --- a/src/shared/components/Orchestrator/VTLDevTools/VTLErrorStore.tsx +++ b/src/components/orchestrator/vtlDevTools/VTLErrorStore.tsx @@ -2,7 +2,7 @@ import type { ErrorMessage, LoggerMessage, LunaticPageTag, -} from '@/shared/components/Orchestrator/utils/lunaticType' +} from '@/components/orchestrator/utils/lunaticType' import { VTLExpressionError } from '@inseefr/lunatic' import { useSyncExternalStore } from 'react' diff --git a/src/contexts/TelemetryContext.tsx b/src/contexts/TelemetryContext.tsx index 0c253be2..8f028203 100644 --- a/src/contexts/TelemetryContext.tsx +++ b/src/contexts/TelemetryContext.tsx @@ -1,11 +1,11 @@ /* eslint-disable react-refresh/only-export-components */ import { addParadata } from '@/api/07-paradata-events' -import { useBatch } from '@/shared/hooks/useBatch' +import { useBatch } from '@/hooks/useBatch' import type { DefaultParadataValues, TelemetryEvent, TelemetryParadata, -} from '@/types/telemetry' +} from '@/models/telemetry' import { createContext, useCallback, diff --git a/src/shared/hooks/prelogout.ts b/src/hooks/prelogout.ts similarity index 100% rename from src/shared/hooks/prelogout.ts rename to src/hooks/prelogout.ts diff --git a/src/shared/hooks/useBatch.test.ts b/src/hooks/useBatch.test.ts similarity index 100% rename from src/shared/hooks/useBatch.test.ts rename to src/hooks/useBatch.test.ts diff --git a/src/shared/hooks/useBatch.ts b/src/hooks/useBatch.ts similarity index 100% rename from src/shared/hooks/useBatch.ts rename to src/hooks/useBatch.ts diff --git a/src/shared/hooks/useDocumentTitle.ts b/src/hooks/useDocumentTitle.ts similarity index 100% rename from src/shared/hooks/useDocumentTitle.ts rename to src/hooks/useDocumentTitle.ts diff --git a/src/shared/hooks/useMode.ts b/src/hooks/useMode.ts similarity index 80% rename from src/shared/hooks/useMode.ts rename to src/hooks/useMode.ts index 33e7755d..a31beb5e 100644 --- a/src/shared/hooks/useMode.ts +++ b/src/hooks/useMode.ts @@ -1,7 +1,7 @@ import { MODE_TYPE } from '@/constants/mode' -import { collectPath } from '@/pages/Collect/route' -import { reviewPath } from '@/pages/Review/route' -import { visualizePath } from '@/pages/Visualize/route' +import { collectPath } from '@/pages/collect/route' +import { reviewPath } from '@/pages/review/route' +import { visualizePath } from '@/pages/visualize/route' import { useMatchRoute } from '@tanstack/react-router' /** Returns current mode based on url */ diff --git a/src/shared/hooks/usePrevious.ts b/src/hooks/usePrevious.ts similarity index 100% rename from src/shared/hooks/usePrevious.ts rename to src/hooks/usePrevious.ts diff --git a/src/i18n/types.ts b/src/i18n/types.ts index 4800f94f..9cad7a82 100644 --- a/src/i18n/types.ts +++ b/src/i18n/types.ts @@ -10,26 +10,26 @@ export const fallbackLanguage = 'fr' export type Language = (typeof languages)[number] export type ComponentKey = - | import('@/shared/components/Layout/Footer').I18n - | import('@/shared/components/Layout/Header').I18n - | import('@/shared/components/Layout/AutoLogoutCountdown').I18n - | import('@/shared/components/Error/ErrorComponent').I18n - | import('@/shared/components/Orchestrator/CustomPages/EndPage').I18n - | import('@/shared/components/Orchestrator/CustomPages/ValidationModal').I18n - | import('@/shared/components/Orchestrator/CustomPages/ValidationPage').I18n - | import('@/shared/components/Orchestrator/CustomPages/WelcomePage').I18n - | import('@/shared/components/Orchestrator/CustomPages/WelcomeModal').I18n - | import('@/shared/components/Orchestrator/SequenceHeader').I18n - | import('@/shared/components/Orchestrator/SurveyContainer').I18n - | import('@/shared/components/Orchestrator/VTLDevTools/VTLDevtools').I18n - | import('@/pages/Accessibility/AccessibilityPage').I18n - | import('@/pages/Legals/LegalsPage').I18n - | import('@/pages/NavigationAssistance/NavigationAssistancePage').I18n - | import('@/pages/Security/SecurityPage').I18n - | import('@/pages/SiteMap/SiteMapPage').I18n - | import('@/pages/Visualize/Form/VisualizeForm').I18n - | import('@/pages/Visualize/Form/SelectNomenclatures').I18n - | import('@/shared/error/errorNormalizer').I18n + | import('@/components/layout/Footer').I18n + | import('@/components/layout/Header').I18n + | import('@/components/layout/AutoLogoutCountdown').I18n + | import('@/components/error/ErrorComponent').I18n + | import('@/components/orchestrator/customPages/EndPage').I18n + | import('@/components/orchestrator/customPages/ValidationModal').I18n + | import('@/components/orchestrator/customPages/ValidationPage').I18n + | import('@/components/orchestrator/customPages/WelcomePage').I18n + | import('@/components/orchestrator/customPages/WelcomeModal').I18n + | import('@/components/orchestrator/SequenceHeader').I18n + | import('@/components/orchestrator/SurveyContainer').I18n + | import('@/components/orchestrator/vtlDevTools/VTLDevtools').I18n + | import('@/pages/accessibility/AccessibilityPage').I18n + | import('@/pages/legals/LegalsPage').I18n + | import('@/pages/navigationAssistance/NavigationAssistancePage').I18n + | import('@/pages/security/SecurityPage').I18n + | import('@/pages/siteMap/SiteMapPage').I18n + | import('@/pages/visualize/form/VisualizeForm').I18n + | import('@/pages/visualize/form/SelectNomenclatures').I18n + | import('@/components/error/errorNormalizer').I18n export type Translations = GenericTranslations< ComponentKey, diff --git a/src/shared/loader/protectedLoader.ts b/src/loader/protectedLoader.ts similarity index 100% rename from src/shared/loader/protectedLoader.ts rename to src/loader/protectedLoader.ts diff --git a/src/model/Metadata.ts b/src/models/Metadata.ts similarity index 100% rename from src/model/Metadata.ts rename to src/models/Metadata.ts diff --git a/src/model/Page.ts b/src/models/Page.ts similarity index 100% rename from src/model/Page.ts rename to src/models/Page.ts diff --git a/src/model/StateData.ts b/src/models/StateData.ts similarity index 100% rename from src/model/StateData.ts rename to src/models/StateData.ts diff --git a/src/model/SurveyUnitData.ts b/src/models/SurveyUnitData.ts similarity index 100% rename from src/model/SurveyUnitData.ts rename to src/models/SurveyUnitData.ts diff --git a/src/model/api/addParadataBody.ts b/src/models/api/addParadataBody.ts similarity index 100% rename from src/model/api/addParadataBody.ts rename to src/models/api/addParadataBody.ts diff --git a/src/model/api/arrayNode.ts b/src/models/api/arrayNode.ts similarity index 100% rename from src/model/api/arrayNode.ts rename to src/models/api/arrayNode.ts diff --git a/src/model/api/arrayNodeItem.ts b/src/models/api/arrayNodeItem.ts similarity index 100% rename from src/model/api/arrayNodeItem.ts rename to src/models/api/arrayNodeItem.ts diff --git a/src/model/api/campaignCreation.ts b/src/models/api/campaignCreation.ts similarity index 100% rename from src/model/api/campaignCreation.ts rename to src/models/api/campaignCreation.ts diff --git a/src/model/api/campaignCreationV2.ts b/src/models/api/campaignCreationV2.ts similarity index 100% rename from src/model/api/campaignCreationV2.ts rename to src/models/api/campaignCreationV2.ts diff --git a/src/model/api/campaignSummary.ts b/src/models/api/campaignSummary.ts similarity index 100% rename from src/model/api/campaignSummary.ts rename to src/models/api/campaignSummary.ts diff --git a/src/model/api/deleteCampaignByIdParams.ts b/src/models/api/deleteCampaignByIdParams.ts similarity index 100% rename from src/model/api/deleteCampaignByIdParams.ts rename to src/models/api/deleteCampaignByIdParams.ts diff --git a/src/model/api/getCommentBySurveyUnit200.ts b/src/models/api/getCommentBySurveyUnit200.ts similarity index 100% rename from src/model/api/getCommentBySurveyUnit200.ts rename to src/models/api/getCommentBySurveyUnit200.ts diff --git a/src/model/api/getQuestionnaireData200.ts b/src/models/api/getQuestionnaireData200.ts similarity index 100% rename from src/model/api/getQuestionnaireData200.ts rename to src/models/api/getQuestionnaireData200.ts diff --git a/src/model/api/index.ts b/src/models/api/index.ts similarity index 100% rename from src/model/api/index.ts rename to src/models/api/index.ts diff --git a/src/model/api/integrateContextBody.ts b/src/models/api/integrateContextBody.ts similarity index 100% rename from src/model/api/integrateContextBody.ts rename to src/models/api/integrateContextBody.ts diff --git a/src/model/api/integrateXmlContextBody.ts b/src/models/api/integrateXmlContextBody.ts similarity index 100% rename from src/model/api/integrateXmlContextBody.ts rename to src/models/api/integrateXmlContextBody.ts diff --git a/src/model/api/integrationResultUnit.ts b/src/models/api/integrationResultUnit.ts similarity index 100% rename from src/model/api/integrationResultUnit.ts rename to src/models/api/integrationResultUnit.ts diff --git a/src/model/api/integrationResultUnitStatus.ts b/src/models/api/integrationResultUnitStatus.ts similarity index 86% rename from src/model/api/integrationResultUnitStatus.ts rename to src/models/api/integrationResultUnitStatus.ts index 15b35000..7d7062a5 100644 --- a/src/model/api/integrationResultUnitStatus.ts +++ b/src/models/api/integrationResultUnitStatus.ts @@ -9,7 +9,6 @@ export type IntegrationResultUnitStatus = (typeof IntegrationResultUnitStatus)[keyof typeof IntegrationResultUnitStatus] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const IntegrationResultUnitStatus = { CREATED: 'CREATED', UPDATED: 'UPDATED', diff --git a/src/model/api/integrationResults.ts b/src/models/api/integrationResults.ts similarity index 100% rename from src/model/api/integrationResults.ts rename to src/models/api/integrationResults.ts diff --git a/src/model/api/logo.ts b/src/models/api/logo.ts similarity index 100% rename from src/model/api/logo.ts rename to src/models/api/logo.ts diff --git a/src/model/api/logos.ts b/src/models/api/logos.ts similarity index 100% rename from src/model/api/logos.ts rename to src/models/api/logos.ts diff --git a/src/model/api/metadataCreation.ts b/src/models/api/metadataCreation.ts similarity index 100% rename from src/model/api/metadataCreation.ts rename to src/models/api/metadataCreation.ts diff --git a/src/model/api/metadataVariable.ts b/src/models/api/metadataVariable.ts similarity index 100% rename from src/model/api/metadataVariable.ts rename to src/models/api/metadataVariable.ts diff --git a/src/model/api/nomenclatureCreation.ts b/src/models/api/nomenclatureCreation.ts similarity index 100% rename from src/model/api/nomenclatureCreation.ts rename to src/models/api/nomenclatureCreation.ts diff --git a/src/model/api/objectNode.ts b/src/models/api/objectNode.ts similarity index 100% rename from src/model/api/objectNode.ts rename to src/models/api/objectNode.ts diff --git a/src/model/api/questionnaireModelCreation.ts b/src/models/api/questionnaireModelCreation.ts similarity index 100% rename from src/model/api/questionnaireModelCreation.ts rename to src/models/api/questionnaireModelCreation.ts diff --git a/src/model/api/questionnaireModelCreationValue.ts b/src/models/api/questionnaireModelCreationValue.ts similarity index 100% rename from src/model/api/questionnaireModelCreationValue.ts rename to src/models/api/questionnaireModelCreationValue.ts diff --git a/src/model/api/questionnaireModelId.ts b/src/models/api/questionnaireModelId.ts similarity index 100% rename from src/model/api/questionnaireModelId.ts rename to src/models/api/questionnaireModelId.ts diff --git a/src/model/api/questionnaireModelValue.ts b/src/models/api/questionnaireModelValue.ts similarity index 100% rename from src/model/api/questionnaireModelValue.ts rename to src/models/api/questionnaireModelValue.ts diff --git a/src/model/api/questionnaireModelValueValue.ts b/src/models/api/questionnaireModelValueValue.ts similarity index 100% rename from src/model/api/questionnaireModelValueValue.ts rename to src/models/api/questionnaireModelValueValue.ts diff --git a/src/model/api/schema.collected-data/_.ts b/src/models/api/schema.collected-data/_.ts similarity index 100% rename from src/model/api/schema.collected-data/_.ts rename to src/models/api/schema.collected-data/_.ts diff --git a/src/model/api/schema.collected-data/collectedValues.ts b/src/models/api/schema.collected-data/collectedValues.ts similarity index 100% rename from src/model/api/schema.collected-data/collectedValues.ts rename to src/models/api/schema.collected-data/collectedValues.ts diff --git a/src/model/api/schema.collected-data/index.ts b/src/models/api/schema.collected-data/index.ts similarity index 100% rename from src/model/api/schema.collected-data/index.ts rename to src/models/api/schema.collected-data/index.ts diff --git a/src/model/api/schema.collected-data/schemaCollectedData.ts b/src/models/api/schema.collected-data/schemaCollectedData.ts similarity index 100% rename from src/model/api/schema.collected-data/schemaCollectedData.ts rename to src/models/api/schema.collected-data/schemaCollectedData.ts diff --git a/src/model/api/schema.data/index.ts b/src/models/api/schema.data/index.ts similarity index 100% rename from src/model/api/schema.data/index.ts rename to src/models/api/schema.data/index.ts diff --git a/src/model/api/schema.data/schemaData.ts b/src/models/api/schema.data/schemaData.ts similarity index 100% rename from src/model/api/schema.data/schemaData.ts rename to src/models/api/schema.data/schemaData.ts diff --git a/src/model/api/schema.metadata/index.ts b/src/models/api/schema.metadata/index.ts similarity index 100% rename from src/model/api/schema.metadata/index.ts rename to src/models/api/schema.metadata/index.ts diff --git a/src/model/api/schema.metadata/schemaMetadata.ts b/src/models/api/schema.metadata/schemaMetadata.ts similarity index 100% rename from src/model/api/schema.metadata/schemaMetadata.ts rename to src/models/api/schema.metadata/schemaMetadata.ts diff --git a/src/model/api/schema.metadata/schemaMetadataInseeContext.ts b/src/models/api/schema.metadata/schemaMetadataInseeContext.ts similarity index 85% rename from src/model/api/schema.metadata/schemaMetadataInseeContext.ts rename to src/models/api/schema.metadata/schemaMetadataInseeContext.ts index 8b066a88..f349037f 100644 --- a/src/model/api/schema.metadata/schemaMetadataInseeContext.ts +++ b/src/models/api/schema.metadata/schemaMetadataInseeContext.ts @@ -9,7 +9,6 @@ export type SchemaMetadataInseeContext = (typeof SchemaMetadataInseeContext)[keyof typeof SchemaMetadataInseeContext] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const SchemaMetadataInseeContext = { household: 'household', business: 'business', diff --git a/src/model/api/schema.metadata/variable.ts b/src/models/api/schema.metadata/variable.ts similarity index 100% rename from src/model/api/schema.metadata/variable.ts rename to src/models/api/schema.metadata/variable.ts diff --git a/src/model/api/schema.metadata/variableValue.ts b/src/models/api/schema.metadata/variableValue.ts similarity index 100% rename from src/model/api/schema.metadata/variableValue.ts rename to src/models/api/schema.metadata/variableValue.ts diff --git a/src/model/api/schema.nomenclature/index.ts b/src/models/api/schema.nomenclature/index.ts similarity index 100% rename from src/model/api/schema.nomenclature/index.ts rename to src/models/api/schema.nomenclature/index.ts diff --git a/src/model/api/schema.nomenclature/nomenclature.ts b/src/models/api/schema.nomenclature/nomenclature.ts similarity index 100% rename from src/model/api/schema.nomenclature/nomenclature.ts rename to src/models/api/schema.nomenclature/nomenclature.ts diff --git a/src/model/api/schema.nomenclature/schemaNomenclature.ts b/src/models/api/schema.nomenclature/schemaNomenclature.ts similarity index 100% rename from src/model/api/schema.nomenclature/schemaNomenclature.ts rename to src/models/api/schema.nomenclature/schemaNomenclature.ts diff --git a/src/model/api/schema.personalization/index.ts b/src/models/api/schema.personalization/index.ts similarity index 100% rename from src/model/api/schema.personalization/index.ts rename to src/models/api/schema.personalization/index.ts diff --git a/src/model/api/schema.personalization/personalization.ts b/src/models/api/schema.personalization/personalization.ts similarity index 100% rename from src/model/api/schema.personalization/personalization.ts rename to src/models/api/schema.personalization/personalization.ts diff --git a/src/model/api/schema.personalization/schemaPersonalization.ts b/src/models/api/schema.personalization/schemaPersonalization.ts similarity index 100% rename from src/model/api/schema.personalization/schemaPersonalization.ts rename to src/models/api/schema.personalization/schemaPersonalization.ts diff --git a/src/model/api/schema.survey-unit-temp-zone/index.ts b/src/models/api/schema.survey-unit-temp-zone/index.ts similarity index 100% rename from src/model/api/schema.survey-unit-temp-zone/index.ts rename to src/models/api/schema.survey-unit-temp-zone/index.ts diff --git a/src/model/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZone.ts b/src/models/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZone.ts similarity index 100% rename from src/model/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZone.ts rename to src/models/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZone.ts diff --git a/src/model/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZoneComment.ts b/src/models/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZoneComment.ts similarity index 100% rename from src/model/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZoneComment.ts rename to src/models/api/schema.survey-unit-temp-zone/schemaSurveyUnitTempZoneComment.ts diff --git a/src/model/api/schema.survey-unit-temp-zone/stateData.ts b/src/models/api/schema.survey-unit-temp-zone/stateData.ts similarity index 100% rename from src/model/api/schema.survey-unit-temp-zone/stateData.ts rename to src/models/api/schema.survey-unit-temp-zone/stateData.ts diff --git a/src/model/api/schema.survey-unit-temp-zone/stateDataState.ts b/src/models/api/schema.survey-unit-temp-zone/stateDataState.ts similarity index 86% rename from src/model/api/schema.survey-unit-temp-zone/stateDataState.ts rename to src/models/api/schema.survey-unit-temp-zone/stateDataState.ts index d549db6a..2c6fd319 100644 --- a/src/model/api/schema.survey-unit-temp-zone/stateDataState.ts +++ b/src/models/api/schema.survey-unit-temp-zone/stateDataState.ts @@ -9,7 +9,6 @@ export type StateDataState = (typeof StateDataState)[keyof typeof StateDataState] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const StateDataState = { INIT: 'INIT', COMPLETED: 'COMPLETED', diff --git a/src/model/api/schema.variable-type/index.ts b/src/models/api/schema.variable-type/index.ts similarity index 100% rename from src/model/api/schema.variable-type/index.ts rename to src/models/api/schema.variable-type/index.ts diff --git a/src/model/api/schema.variable-type/schemaVariableType.ts b/src/models/api/schema.variable-type/schemaVariableType.ts similarity index 100% rename from src/model/api/schema.variable-type/schemaVariableType.ts rename to src/models/api/schema.variable-type/schemaVariableType.ts diff --git a/src/model/api/schema.variable-type/schemaVariableTypeAnyOfItem.ts b/src/models/api/schema.variable-type/schemaVariableTypeAnyOfItem.ts similarity index 100% rename from src/model/api/schema.variable-type/schemaVariableTypeAnyOfItem.ts rename to src/models/api/schema.variable-type/schemaVariableTypeAnyOfItem.ts diff --git a/src/model/api/schema.variable-type/schemaVariableTypeAnyOfTwoItemItem.ts b/src/models/api/schema.variable-type/schemaVariableTypeAnyOfTwoItemItem.ts similarity index 100% rename from src/model/api/schema.variable-type/schemaVariableTypeAnyOfTwoItemItem.ts rename to src/models/api/schema.variable-type/schemaVariableTypeAnyOfTwoItemItem.ts diff --git a/src/model/api/setCommentBody.ts b/src/models/api/setCommentBody.ts similarity index 100% rename from src/model/api/setCommentBody.ts rename to src/models/api/setCommentBody.ts diff --git a/src/model/api/stateData.ts b/src/models/api/stateData.ts similarity index 100% rename from src/model/api/stateData.ts rename to src/models/api/stateData.ts diff --git a/src/model/api/stateDataForSurveyUnitUpdate.ts b/src/models/api/stateDataForSurveyUnitUpdate.ts similarity index 100% rename from src/model/api/stateDataForSurveyUnitUpdate.ts rename to src/models/api/stateDataForSurveyUnitUpdate.ts diff --git a/src/model/api/stateDataForSurveyUnitUpdateState.ts b/src/models/api/stateDataForSurveyUnitUpdateState.ts similarity index 88% rename from src/model/api/stateDataForSurveyUnitUpdateState.ts rename to src/models/api/stateDataForSurveyUnitUpdateState.ts index acb1d914..b31a2904 100644 --- a/src/model/api/stateDataForSurveyUnitUpdateState.ts +++ b/src/models/api/stateDataForSurveyUnitUpdateState.ts @@ -9,7 +9,6 @@ export type StateDataForSurveyUnitUpdateState = (typeof StateDataForSurveyUnitUpdateState)[keyof typeof StateDataForSurveyUnitUpdateState] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const StateDataForSurveyUnitUpdateState = { INIT: 'INIT', COMPLETED: 'COMPLETED', diff --git a/src/model/api/stateDataState.ts b/src/models/api/stateDataState.ts similarity index 86% rename from src/model/api/stateDataState.ts rename to src/models/api/stateDataState.ts index d549db6a..2c6fd319 100644 --- a/src/model/api/stateDataState.ts +++ b/src/models/api/stateDataState.ts @@ -9,7 +9,6 @@ export type StateDataState = (typeof StateDataState)[keyof typeof StateDataState] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const StateDataState = { INIT: 'INIT', COMPLETED: 'COMPLETED', diff --git a/src/model/api/stateDataUpdate.ts b/src/models/api/stateDataUpdate.ts similarity index 100% rename from src/model/api/stateDataUpdate.ts rename to src/models/api/stateDataUpdate.ts diff --git a/src/model/api/stateDataUpdateState.ts b/src/models/api/stateDataUpdateState.ts similarity index 87% rename from src/model/api/stateDataUpdateState.ts rename to src/models/api/stateDataUpdateState.ts index 69072371..5d63fb77 100644 --- a/src/model/api/stateDataUpdateState.ts +++ b/src/models/api/stateDataUpdateState.ts @@ -9,7 +9,6 @@ export type StateDataUpdateState = (typeof StateDataUpdateState)[keyof typeof StateDataUpdateState] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const StateDataUpdateState = { INIT: 'INIT', COMPLETED: 'COMPLETED', diff --git a/src/model/api/surveyUnit.ts b/src/models/api/surveyUnit.ts similarity index 100% rename from src/model/api/surveyUnit.ts rename to src/models/api/surveyUnit.ts diff --git a/src/model/api/surveyUnitComment.ts b/src/models/api/surveyUnitComment.ts similarity index 100% rename from src/model/api/surveyUnitComment.ts rename to src/models/api/surveyUnitComment.ts diff --git a/src/model/api/surveyUnitCreation.ts b/src/models/api/surveyUnitCreation.ts similarity index 100% rename from src/model/api/surveyUnitCreation.ts rename to src/models/api/surveyUnitCreation.ts diff --git a/src/model/api/surveyUnitCreationComment.ts b/src/models/api/surveyUnitCreationComment.ts similarity index 100% rename from src/model/api/surveyUnitCreationComment.ts rename to src/models/api/surveyUnitCreationComment.ts diff --git a/src/model/api/surveyUnitDataStateDataUpdate.ts b/src/models/api/surveyUnitDataStateDataUpdate.ts similarity index 100% rename from src/model/api/surveyUnitDataStateDataUpdate.ts rename to src/models/api/surveyUnitDataStateDataUpdate.ts diff --git a/src/model/api/surveyUnitMetadata.ts b/src/models/api/surveyUnitMetadata.ts similarity index 100% rename from src/model/api/surveyUnitMetadata.ts rename to src/models/api/surveyUnitMetadata.ts diff --git a/src/model/api/surveyUnitMetadataContext.ts b/src/models/api/surveyUnitMetadataContext.ts similarity index 85% rename from src/model/api/surveyUnitMetadataContext.ts rename to src/models/api/surveyUnitMetadataContext.ts index d5ab52a7..8c34690b 100644 --- a/src/model/api/surveyUnitMetadataContext.ts +++ b/src/models/api/surveyUnitMetadataContext.ts @@ -9,7 +9,6 @@ export type SurveyUnitMetadataContext = (typeof SurveyUnitMetadataContext)[keyof typeof SurveyUnitMetadataContext] -// eslint-disable-next-line @typescript-eslint/no-redeclare export const SurveyUnitMetadataContext = { household: 'household', business: 'business', diff --git a/src/model/api/surveyUnitSummary.ts b/src/models/api/surveyUnitSummary.ts similarity index 100% rename from src/model/api/surveyUnitSummary.ts rename to src/models/api/surveyUnitSummary.ts diff --git a/src/model/api/surveyUnitTempZone.ts b/src/models/api/surveyUnitTempZone.ts similarity index 100% rename from src/model/api/surveyUnitTempZone.ts rename to src/models/api/surveyUnitTempZone.ts diff --git a/src/model/api/surveyUnitUpdate.ts b/src/models/api/surveyUnitUpdate.ts similarity index 100% rename from src/model/api/surveyUnitUpdate.ts rename to src/models/api/surveyUnitUpdate.ts diff --git a/src/model/api/surveyUnitUpdateComment.ts b/src/models/api/surveyUnitUpdateComment.ts similarity index 100% rename from src/model/api/surveyUnitUpdateComment.ts rename to src/models/api/surveyUnitUpdateComment.ts diff --git a/src/model/api/surveyUnitsOkNok.ts b/src/models/api/surveyUnitsOkNok.ts similarity index 100% rename from src/model/api/surveyUnitsOkNok.ts rename to src/models/api/surveyUnitsOkNok.ts diff --git a/src/shared/parser/metadata.ts b/src/models/metadataSchema.ts similarity index 95% rename from src/shared/parser/metadata.ts rename to src/models/metadataSchema.ts index 78b489fa..4b2a26f1 100644 --- a/src/shared/parser/metadata.ts +++ b/src/models/metadataSchema.ts @@ -1,4 +1,4 @@ -import type { SurveyUnitMetadata } from '@/model/api' +import type { SurveyUnitMetadata } from '@/models/api' import { assert } from 'tsafe/assert' import type { Extends } from 'tsafe/Extends' import { z } from 'zod' diff --git a/src/shared/parser/page.ts b/src/models/pageSchema.ts similarity index 98% rename from src/shared/parser/page.ts rename to src/models/pageSchema.ts index bb1534bc..66ba9484 100644 --- a/src/shared/parser/page.ts +++ b/src/models/pageSchema.ts @@ -1,5 +1,5 @@ import { PAGE_TYPE } from '@/constants/page' -import type { InternalPageType, PageType, StromaePage } from '@/model/Page' +import type { InternalPageType, PageType, StromaePage } from '@/models/Page' import { assert, type Equals } from 'tsafe/assert' import z from 'zod' diff --git a/src/types/telemetry.ts b/src/models/telemetry.ts similarity index 100% rename from src/types/telemetry.ts rename to src/models/telemetry.ts diff --git a/src/pages/Accessibility/AccessibilityPage.tsx b/src/pages/accessibility/AccessibilityPage.tsx similarity index 98% rename from src/pages/Accessibility/AccessibilityPage.tsx rename to src/pages/accessibility/AccessibilityPage.tsx index 6bc9b3bb..395c07df 100644 --- a/src/pages/Accessibility/AccessibilityPage.tsx +++ b/src/pages/accessibility/AccessibilityPage.tsx @@ -1,5 +1,5 @@ +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Grid } from '@/shared/components/Grid' import { Breadcrumb } from '@codegouvfr/react-dsfr/Breadcrumb' import { memo } from 'react' diff --git a/src/pages/Accessibility/route.ts b/src/pages/accessibility/route.ts similarity index 100% rename from src/pages/Accessibility/route.ts rename to src/pages/accessibility/route.ts diff --git a/src/pages/Collect/CollectPage.tsx b/src/pages/collect/CollectPage.tsx similarity index 92% rename from src/pages/Collect/CollectPage.tsx rename to src/pages/collect/CollectPage.tsx index b11d5234..3d966c22 100644 --- a/src/pages/Collect/CollectPage.tsx +++ b/src/pages/collect/CollectPage.tsx @@ -4,14 +4,14 @@ import { getGetSurveyUnitByIdQueryKey, updateSurveyUnitDataStateDataById, } from '@/api/06-survey-units' -import { MODE_TYPE } from '@/constants/mode' -import type { StateData } from '@/model/StateData' -import { Orchestrator } from '@/shared/components/Orchestrator/Orchestrator' +import { Orchestrator } from '@/components/orchestrator/Orchestrator' import type { LunaticGetReferentiel, Nomenclature, -} from '@/shared/components/Orchestrator/utils/lunaticType' -import { showToast } from '@/shared/toast/Toast' +} from '@/components/orchestrator/utils/lunaticType' +import { showToast } from '@/components/Toast' +import { MODE_TYPE } from '@/constants/mode' +import type { StateData } from '@/models/StateData' import type { LunaticData } from '@inseefr/lunatic' import { useQueryClient } from '@tanstack/react-query' import { memo, useCallback } from 'react' diff --git a/src/pages/Collect/route.tsx b/src/pages/collect/route.tsx similarity index 88% rename from src/pages/Collect/route.tsx rename to src/pages/collect/route.tsx index 4ca01622..36607f01 100644 --- a/src/pages/Collect/route.tsx +++ b/src/pages/collect/route.tsx @@ -3,12 +3,12 @@ import { getGetSurveyUnitMetadataByIdQueryOptions, getSurveyUnitById, } from '@/api/06-survey-units' -import type { SurveyUnitData } from '@/model/SurveyUnitData' +import { ContentSkeleton } from '@/components/ContentSkeleton' +import { ErrorComponent } from '@/components/error/ErrorComponent' +import { protectedRouteLoader } from '@/loader/protectedLoader' +import type { SurveyUnitData } from '@/models/SurveyUnitData' import { rootRoute } from '@/router/router' -import { ContentSkeleton } from '@/shared/components/ContentSkeleton' -import { ErrorComponent } from '@/shared/components/Error/ErrorComponent' -import { protectedRouteLoader } from '@/shared/loader/protectedLoader' -import { metadataStore } from '@/shared/metadataStore/metadataStore' +import { metadataStore } from '@/stores/metadataStore' import { convertOldPersonalization } from '@/utils/convertOldPersonalization' import type { LunaticSource } from '@inseefr/lunatic' import { createRoute } from '@tanstack/react-router' diff --git a/src/pages/Legals/LegalsPage.tsx b/src/pages/legals/LegalsPage.tsx similarity index 97% rename from src/pages/Legals/LegalsPage.tsx rename to src/pages/legals/LegalsPage.tsx index 1d060270..03b8fc28 100644 --- a/src/pages/Legals/LegalsPage.tsx +++ b/src/pages/legals/LegalsPage.tsx @@ -1,5 +1,5 @@ +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Grid } from '@/shared/components/Grid' import { Breadcrumb } from '@codegouvfr/react-dsfr/Breadcrumb' import { memo, type ReactNode } from 'react' diff --git a/src/pages/Legals/route.ts b/src/pages/legals/route.ts similarity index 100% rename from src/pages/Legals/route.ts rename to src/pages/legals/route.ts diff --git a/src/pages/NavigationAssistance/NavigationAssistancePage.tsx b/src/pages/navigationAssistance/NavigationAssistancePage.tsx similarity index 94% rename from src/pages/NavigationAssistance/NavigationAssistancePage.tsx rename to src/pages/navigationAssistance/NavigationAssistancePage.tsx index 7e630753..3c1f2a68 100644 --- a/src/pages/NavigationAssistance/NavigationAssistancePage.tsx +++ b/src/pages/navigationAssistance/NavigationAssistancePage.tsx @@ -1,5 +1,5 @@ +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Grid } from '@/shared/components/Grid' import Breadcrumb from '@codegouvfr/react-dsfr/Breadcrumb' import { memo, type ReactNode } from 'react' diff --git a/src/pages/NavigationAssistance/route.ts b/src/pages/navigationAssistance/route.ts similarity index 100% rename from src/pages/NavigationAssistance/route.ts rename to src/pages/navigationAssistance/route.ts diff --git a/src/pages/Review/ReviewPage.tsx b/src/pages/review/ReviewPage.tsx similarity index 87% rename from src/pages/Review/ReviewPage.tsx rename to src/pages/review/ReviewPage.tsx index 4b1f1f76..9bb95594 100644 --- a/src/pages/Review/ReviewPage.tsx +++ b/src/pages/review/ReviewPage.tsx @@ -1,10 +1,10 @@ import { getGetNomenclatureByIdQueryOptions } from '@/api/04-nomenclatures' -import { MODE_TYPE } from '@/constants/mode' -import { Orchestrator } from '@/shared/components/Orchestrator/Orchestrator' +import { Orchestrator } from '@/components/orchestrator/Orchestrator' import type { LunaticGetReferentiel, Nomenclature, -} from '@/shared/components/Orchestrator/utils/lunaticType' +} from '@/components/orchestrator/utils/lunaticType' +import { MODE_TYPE } from '@/constants/mode' import { useQueryClient } from '@tanstack/react-query' import { memo } from 'react' import { reviewRoute } from './route' diff --git a/src/pages/Review/route.tsx b/src/pages/review/route.tsx similarity index 87% rename from src/pages/Review/route.tsx rename to src/pages/review/route.tsx index 0c56dad9..cebe421f 100644 --- a/src/pages/Review/route.tsx +++ b/src/pages/review/route.tsx @@ -3,12 +3,12 @@ import { getGetSurveyUnitByIdQueryOptions, getGetSurveyUnitMetadataByIdQueryOptions, } from '@/api/06-survey-units' -import type { SurveyUnitData } from '@/model/SurveyUnitData' +import { ContentSkeleton } from '@/components/ContentSkeleton' +import { ErrorComponent } from '@/components/error/ErrorComponent' +import { protectedRouteLoader } from '@/loader/protectedLoader' +import type { SurveyUnitData } from '@/models/SurveyUnitData' import { rootRoute } from '@/router/router' -import { ContentSkeleton } from '@/shared/components/ContentSkeleton' -import { ErrorComponent } from '@/shared/components/Error/ErrorComponent' -import { protectedRouteLoader } from '@/shared/loader/protectedLoader' -import { metadataStore } from '@/shared/metadataStore/metadataStore' +import { metadataStore } from '@/stores/metadataStore' import { convertOldPersonalization } from '@/utils/convertOldPersonalization' import type { LunaticSource } from '@inseefr/lunatic' import { createRoute } from '@tanstack/react-router' diff --git a/src/pages/Security/SecurityPage.tsx b/src/pages/security/SecurityPage.tsx similarity index 94% rename from src/pages/Security/SecurityPage.tsx rename to src/pages/security/SecurityPage.tsx index e293ff47..956757b7 100644 --- a/src/pages/Security/SecurityPage.tsx +++ b/src/pages/security/SecurityPage.tsx @@ -1,5 +1,5 @@ +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Grid } from '@/shared/components/Grid' import Breadcrumb from '@codegouvfr/react-dsfr/Breadcrumb' import { memo } from 'react' diff --git a/src/pages/Security/route.ts b/src/pages/security/route.ts similarity index 100% rename from src/pages/Security/route.ts rename to src/pages/security/route.ts diff --git a/src/pages/SiteMap/SiteMapPage.tsx b/src/pages/siteMap/SiteMapPage.tsx similarity index 84% rename from src/pages/SiteMap/SiteMapPage.tsx rename to src/pages/siteMap/SiteMapPage.tsx index 7d7d6224..d360dc25 100644 --- a/src/pages/SiteMap/SiteMapPage.tsx +++ b/src/pages/siteMap/SiteMapPage.tsx @@ -1,9 +1,9 @@ +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { AccessibilityPage } from '@/pages/Accessibility/AccessibilityPage' -import { LegalsPage } from '@/pages/Legals/LegalsPage' -import { NavigationAssistancePage } from '@/pages/NavigationAssistance/NavigationAssistancePage' -import { SecurityPage } from '@/pages/Security/SecurityPage' -import { Grid } from '@/shared/components/Grid' +import { AccessibilityPage } from '@/pages/accessibility/AccessibilityPage' +import { LegalsPage } from '@/pages/legals/LegalsPage' +import { NavigationAssistancePage } from '@/pages/navigationAssistance/NavigationAssistancePage' +import { SecurityPage } from '@/pages/security/SecurityPage' import { Breadcrumb } from '@codegouvfr/react-dsfr/Breadcrumb' import { Link } from '@tanstack/react-router' import { memo } from 'react' diff --git a/src/pages/SiteMap/route.ts b/src/pages/siteMap/route.ts similarity index 100% rename from src/pages/SiteMap/route.ts rename to src/pages/siteMap/route.ts diff --git a/src/pages/Visualize/Visualize.tsx b/src/pages/visualize/Visualize.tsx similarity index 77% rename from src/pages/Visualize/Visualize.tsx rename to src/pages/visualize/Visualize.tsx index baf3ad24..77022823 100644 --- a/src/pages/Visualize/Visualize.tsx +++ b/src/pages/visualize/Visualize.tsx @@ -1,10 +1,10 @@ +import { nomenclatureQueryOptions } from '@/api/visualizeQueryOptions' +import { Orchestrator } from '@/components/orchestrator/Orchestrator' +import type { LunaticGetReferentiel } from '@/components/orchestrator/utils/lunaticType' import { MODE_TYPE } from '@/constants/mode' -import { Orchestrator } from '@/shared/components/Orchestrator/Orchestrator' -import type { LunaticGetReferentiel } from '@/shared/components/Orchestrator/utils/lunaticType' -import { nomenclatureQueryOptions } from '@/shared/query/visualizeQueryOptions' import { useQueryClient } from '@tanstack/react-query' import { memo } from 'react' -import { VisualizeForm } from './Form/VisualizeForm' +import { VisualizeForm } from './form/VisualizeForm' import { visualizeRoute } from './route' export const VisualizePage = memo(function VisualizePage() { diff --git a/src/pages/Visualize/Form/SelectNomenclatures.tsx b/src/pages/visualize/form/SelectNomenclatures.tsx similarity index 100% rename from src/pages/Visualize/Form/SelectNomenclatures.tsx rename to src/pages/visualize/form/SelectNomenclatures.tsx diff --git a/src/pages/Visualize/Form/VisualizeForm.tsx b/src/pages/visualize/form/VisualizeForm.tsx similarity index 96% rename from src/pages/Visualize/Form/VisualizeForm.tsx rename to src/pages/visualize/form/VisualizeForm.tsx index 27036f2f..88a65ee4 100644 --- a/src/pages/Visualize/Form/VisualizeForm.tsx +++ b/src/pages/visualize/form/VisualizeForm.tsx @@ -1,6 +1,6 @@ +import { Container } from '@/components/Container' +import { Grid } from '@/components/Grid' import { declareComponentKeys, useTranslation } from '@/i18n' -import { Container } from '@/shared/components/Container' -import { Grid } from '@/shared/components/Grid' import { Button } from '@codegouvfr/react-dsfr/Button' import { Input } from '@codegouvfr/react-dsfr/Input' import { useNavigate } from '@tanstack/react-router' diff --git a/src/pages/Visualize/route.tsx b/src/pages/visualize/route.tsx similarity index 91% rename from src/pages/Visualize/route.tsx rename to src/pages/visualize/route.tsx index 685ee6fc..c05bfc7f 100644 --- a/src/pages/Visualize/route.tsx +++ b/src/pages/visualize/route.tsx @@ -1,12 +1,12 @@ -import { rootRoute } from '@/router/router' -import { ContentSkeleton } from '@/shared/components/ContentSkeleton' -import { ErrorComponent } from '@/shared/components/Error/ErrorComponent' -import { metadataStore } from '@/shared/metadataStore/metadataStore' import { metadataQueryOptions, sourceQueryOptions, surveyUnitDataQueryOptions, -} from '@/shared/query/visualizeQueryOptions' +} from '@/api/visualizeQueryOptions' +import { ContentSkeleton } from '@/components/ContentSkeleton' +import { ErrorComponent } from '@/components/error/ErrorComponent' +import { rootRoute } from '@/router/router' +import { metadataStore } from '@/stores/metadataStore' import { createRoute } from '@tanstack/react-router' import { convertOldPersonalization } from '@/utils/convertOldPersonalization' diff --git a/src/router/router.tsx b/src/router/router.tsx index 8e31e7ea..d48648f8 100644 --- a/src/router/router.tsx +++ b/src/router/router.tsx @@ -1,18 +1,18 @@ +import { ErrorComponent } from '@/components/error/ErrorComponent' +import { NotFoundError } from '@/components/error/notFoundError' +import { AutoLogoutCountdown } from '@/components/layout/AutoLogoutCountdown' +import { Footer } from '@/components/layout/Footer' +import { Header } from '@/components/layout/Header' import { useTelemetry } from '@/contexts/TelemetryContext' import { useOidc } from '@/oidc' -import { accessibilityRoute } from '@/pages/Accessibility/route' -import { collectRoute } from '@/pages/Collect/route' -import { legalsRoute } from '@/pages/Legals/route' -import { navigationAssistanceRoute } from '@/pages/NavigationAssistance/route' -import { reviewRoute } from '@/pages/Review/route' -import { securityRoute } from '@/pages/Security/route' -import { siteMapRoute } from '@/pages/SiteMap/route' -import { visualizeRoute } from '@/pages/Visualize/route' -import { ErrorComponent } from '@/shared/components/Error/ErrorComponent' -import { AutoLogoutCountdown } from '@/shared/components/Layout/AutoLogoutCountdown' -import { Footer } from '@/shared/components/Layout/Footer' -import { Header } from '@/shared/components/Layout/Header' -import { NotFoundError } from '@/shared/error/notFoundError' +import { accessibilityRoute } from '@/pages/accessibility/route' +import { collectRoute } from '@/pages/collect/route' +import { legalsRoute } from '@/pages/legals/route' +import { navigationAssistanceRoute } from '@/pages/navigationAssistance/route' +import { reviewRoute } from '@/pages/review/route' +import { securityRoute } from '@/pages/security/route' +import { siteMapRoute } from '@/pages/siteMap/route' +import { visualizeRoute } from '@/pages/visualize/route' import type { QueryClient } from '@tanstack/react-query' import { createRootRouteWithContext, diff --git a/src/shared/metadataStore/metadataStore.ts b/src/stores/metadataStore.ts similarity index 96% rename from src/shared/metadataStore/metadataStore.ts rename to src/stores/metadataStore.ts index 0a1fd836..6dcd8ea9 100644 --- a/src/shared/metadataStore/metadataStore.ts +++ b/src/stores/metadataStore.ts @@ -1,5 +1,5 @@ import logoInsee from '@/assets/logo-insee.png' -import type { Metadata } from '@/model/Metadata' +import type { Metadata } from '@/models/Metadata' const defaultState: Metadata = { label: { diff --git a/src/shared/metadataStore/useMetadataStore.tsx b/src/stores/useMetadataStore.tsx similarity index 100% rename from src/shared/metadataStore/useMetadataStore.tsx rename to src/stores/useMetadataStore.tsx diff --git a/src/utils/convertOldPersonalization.ts b/src/utils/convertOldPersonalization.ts index add3ba2b..328746b2 100644 --- a/src/utils/convertOldPersonalization.ts +++ b/src/utils/convertOldPersonalization.ts @@ -1,5 +1,5 @@ -import type { SurveyUnitMetadata } from '@/model/api' -import type { Content, Metadata } from '@/model/Metadata' +import type { SurveyUnitMetadata } from '@/models/api' +import type { Content, Metadata } from '@/models/Metadata' const keysToExtract = ['whoAnswers1', 'whoAnswers2', 'whoAnswers3'] diff --git a/src/utils/telemetry.ts b/src/utils/telemetry.ts index d7e535e8..c92b76af 100644 --- a/src/utils/telemetry.ts +++ b/src/utils/telemetry.ts @@ -4,7 +4,7 @@ import type { ExitParadata, InputParadata, TelemetryParadata, -} from '@/types/telemetry' +} from '@/models/telemetry' function getCommonData(): CommonParadata { return { diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts index 4093eae2..c990aad2 100644 --- a/src/vite-env.d.ts +++ b/src/vite-env.d.ts @@ -16,8 +16,8 @@ type ImportMetaEnv = { MODE: string DEV: boolean PROD: boolean - APP_VERSION: any - LUNATIC_VERSION: any + APP_VERSION: string + LUNATIC_VERSION: string // @user-defined-start /* * Here you can define your own special variables