From 833ea9f83a1f8b8ae341d9b4dc2eb8bb7695408a Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Thu, 10 Oct 2024 12:25:26 +0200 Subject: [PATCH 01/75] cta wip --- apps/web/src/components.d.ts | 1 + apps/web/src/components/header/TeeDsfrHeader.vue | 1 + apps/web/src/components/identification/RegisterCTA.vue | 4 ++++ 3 files changed, 6 insertions(+) create mode 100644 apps/web/src/components/identification/RegisterCTA.vue diff --git a/apps/web/src/components.d.ts b/apps/web/src/components.d.ts index a0c8a081c..464fb5279 100644 --- a/apps/web/src/components.d.ts +++ b/apps/web/src/components.d.ts @@ -55,6 +55,7 @@ declare module 'vue' { ProjectPrograms: typeof import('./components/project/details/ProjectPrograms.vue')['default'] ProjectProgramsList: typeof import('./components/project/details/ProjectProgramsList.vue')['default'] ProjectSideNav: typeof import('./components/project/details/ProjectSideNav.vue')['default'] + RegisterCTA: typeof import('./components/identification/RegisterCTA.vue')['default'] ResultHeader: typeof import('./components/questionnaire/result/list/ResultHeader.vue')['default'] ResultList: typeof import('./components/questionnaire/result/list/ResultList.vue')['default'] ResultListInTabs: typeof import('./components/questionnaire/result/list/ResultListInTabs.vue')['default'] diff --git a/apps/web/src/components/header/TeeDsfrHeader.vue b/apps/web/src/components/header/TeeDsfrHeader.vue index e6b6e96b4..0db9c5bfd 100644 --- a/apps/web/src/components/header/TeeDsfrHeader.vue +++ b/apps/web/src/components/header/TeeDsfrHeader.vue @@ -108,6 +108,7 @@ /> + - +
+ +
diff --git a/apps/web/src/components/identification/details/TeeProfileDetails.vue b/apps/web/src/components/identification/details/TeeProfileDetails.vue index 44e8342ff..292de0890 100644 --- a/apps/web/src/components/identification/details/TeeProfileDetails.vue +++ b/apps/web/src/components/identification/details/TeeProfileDetails.vue @@ -8,9 +8,7 @@ class="fr-btn--tertiary-no-outline fr-p-0 fr-text--white fr-btn-bg fr-text--sm fr-text--underline" @click="openSiretStep" > - + je complète les informations avec mon SIRET Date: Wed, 30 Oct 2024 11:44:17 +0100 Subject: [PATCH 38/75] add close button + remove bold --- apps/web/src/assets/scss/setting/_typography.scss | 6 +----- apps/web/src/assets/scss/typography.scss | 8 +------- .../src/components/identification/TeeRegisterModal.vue | 4 +--- .../src/components/identification/TeeRegisterSiret.vue | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/apps/web/src/assets/scss/setting/_typography.scss b/apps/web/src/assets/scss/setting/_typography.scss index 87d7e7b5a..4e20d9981 100644 --- a/apps/web/src/assets/scss/setting/_typography.scss +++ b/apps/web/src/assets/scss/setting/_typography.scss @@ -12,8 +12,4 @@ $font-styles: ( $text-decorations: ( underline -); - -$font-weight: ( - bold -) +); \ No newline at end of file diff --git a/apps/web/src/assets/scss/typography.scss b/apps/web/src/assets/scss/typography.scss index dca0ada3a..db6b5efcb 100644 --- a/apps/web/src/assets/scss/typography.scss +++ b/apps/web/src/assets/scss/typography.scss @@ -24,13 +24,7 @@ &--#{$decoration} { text-decoration: $decoration; } - } - - @each $weight in setting.$font-weight { - &-weight--#{$weight} { - font-weight: $weight; - } - } + } } .tee-font { diff --git a/apps/web/src/components/identification/TeeRegisterModal.vue b/apps/web/src/components/identification/TeeRegisterModal.vue index faa7e29e9..47e774d62 100644 --- a/apps/web/src/components/identification/TeeRegisterModal.vue +++ b/apps/web/src/components/identification/TeeRegisterModal.vue @@ -32,9 +32,7 @@ class="fr-bg--blue-france--lightness fr-mt-8v fr-p-0 fr-text--blue-france fr-radius-a--2v" @click="closeRegisterModal" > - + diff --git a/apps/web/src/components/identification/TeeRegisterSiret.vue b/apps/web/src/components/identification/TeeRegisterSiret.vue index a5d2702c4..a174e2ea4 100644 --- a/apps/web/src/components/identification/TeeRegisterSiret.vue +++ b/apps/web/src/components/identification/TeeRegisterSiret.vue @@ -28,7 +28,7 @@
-
{{ response.denomination || 'Entreprise individuelle' }}
+
{{ response.denomination || 'Entreprise individuelle' }}
SIRET {{ response.siret }}
From ff53e5d91bc39a1308a769662a1420abcb68d31e Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Wed, 30 Oct 2024 11:56:27 +0100 Subject: [PATCH 39/75] fix decalage avec header --- apps/web/src/components/identification/TeeRegisterModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/src/components/identification/TeeRegisterModal.vue b/apps/web/src/components/identification/TeeRegisterModal.vue index 47e774d62..b2aa4924c 100644 --- a/apps/web/src/components/identification/TeeRegisterModal.vue +++ b/apps/web/src/components/identification/TeeRegisterModal.vue @@ -92,7 +92,7 @@ const closeRegisterModal = () => { } .register-modal-overlay-lg { - top: 120px !important; + top: 118px !important; } #register-modal { @@ -115,6 +115,6 @@ const closeRegisterModal = () => { .register-modal-lg { background-image: url('/images/TEE-modal-bottom.svg'); - min-height: calc(100vh - 120px); + min-height: calc(100vh - 118px); } From 0570c76ae122167c22f74440355afb6f4e817998 Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Wed, 30 Oct 2024 13:34:08 +0100 Subject: [PATCH 40/75] =?UTF-8?q?provide/inject=20openModal=20(=C3=A0=20ut?= =?UTF-8?q?iliser=20pour=20les=20autres=20acc=C3=A8s=20=C3=A0=20la=20modal?= =?UTF-8?q?e)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/WebApp.vue | 9 ++++++--- apps/web/src/components/TeeHeader.vue | 4 ---- apps/web/src/components/header/TeeDsfrHeader.vue | 16 ++-------------- .../components/identification/TeeRegisterCTA.vue | 11 +++-------- 4 files changed, 11 insertions(+), 29 deletions(-) diff --git a/apps/web/src/WebApp.vue b/apps/web/src/WebApp.vue index 37e03536e..dad7f3cf2 100644 --- a/apps/web/src/WebApp.vue +++ b/apps/web/src/WebApp.vue @@ -2,7 +2,7 @@
- + (() => { }) const openRegisterModal = () => { - registerModal.value = true - document.body.style.overflow = 'hidden' + if (!registerModal.value) { + registerModal.value = true + document.body.style.overflow = 'hidden' + } } +provide('openModal', openRegisterModal) const closeRegisterModal = () => { registerModal.value = false document.body.style.overflow = '' diff --git a/apps/web/src/components/TeeHeader.vue b/apps/web/src/components/TeeHeader.vue index eec13df8f..d088c117c 100644 --- a/apps/web/src/components/TeeHeader.vue +++ b/apps/web/src/components/TeeHeader.vue @@ -10,7 +10,6 @@ :operator-img-src="`/images/logos/mission-transition-logo-alone.png`" operator-img-alt="Transition Ecologique des Entreprises - ADEME" operator-img-style="width:3.5rem;" - @open-register="emit('openRegister')" /> @@ -21,9 +20,6 @@ import { RouteName } from '@/types/routeType' import { TeeDsfrHeaderMenuLinkProps } from '@/components/header/TeeDsfrHeaderMenuLinks.vue' -const emit = defineEmits<{ - openRegister: [] -}>() const quickLinks: TeeDsfrHeaderMenuLinkProps[] = [ { label: 'Accueil', diff --git a/apps/web/src/components/header/TeeDsfrHeader.vue b/apps/web/src/components/header/TeeDsfrHeader.vue index 52052c90a..f4ee9ab30 100644 --- a/apps/web/src/components/header/TeeDsfrHeader.vue +++ b/apps/web/src/components/header/TeeDsfrHeader.vue @@ -43,10 +43,7 @@ @click.prevent.stop="showSearchModal()" />
- +
- +
(), { closeMenuModalLabel: 'Fermer', homeLabel: 'Accueil' }) -const registrationStatus = ref(false) const emit = defineEmits<{ (e: 'update:modelValue', payload: string): void @@ -254,11 +247,6 @@ const menuOpened = ref(false) const searchModalOpened = ref(false) const modalOpened = ref(false) -const openRegisterModal = () => { - registrationStatus.value = !registrationStatus.value - emit('openRegister') -} - const hideModal = () => { modalOpened.value = false menuOpened.value = false diff --git a/apps/web/src/components/identification/TeeRegisterCTA.vue b/apps/web/src/components/identification/TeeRegisterCTA.vue index ec9bc770d..903c31647 100644 --- a/apps/web/src/components/identification/TeeRegisterCTA.vue +++ b/apps/web/src/components/identification/TeeRegisterCTA.vue @@ -6,7 +6,7 @@ (false) const registeredData = CompanyDataStorage.getData() +const openModal = inject<() => void>('openModal') watch( registeredData, (newRegisteredData) => { @@ -68,17 +68,12 @@ watch( { deep: true } ) -const emit = defineEmits(['click']) const companyName = computed(() => { return registeredData.value[CompanyDataStorageKey.Company]?.denomination || '' }) const hasData = computed(() => { return !!registeredData.value[CompanyDataStorageKey.Company] }) -const showModal = () => { - modalStatus.value = true - emit('click') -} const badgeIcon = computed(() => { if (Breakpoint.isSmallScreen() && !hasData.value) { From dbbb1dbc932c7782057e7c6553726e4b0631c79e Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Wed, 30 Oct 2024 15:36:52 +0100 Subject: [PATCH 41/75] register close on header --- apps/web/src/WebApp.vue | 19 +++++------------- .../identification/TeeRegisterCTA.vue | 6 +++--- .../identification/TeeRegisterModal.vue | 20 ++++++++++--------- .../details/TeeProfileDetails.vue | 5 ++++- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/apps/web/src/WebApp.vue b/apps/web/src/WebApp.vue index dad7f3cf2..d26f7aee7 100644 --- a/apps/web/src/WebApp.vue +++ b/apps/web/src/WebApp.vue @@ -3,10 +3,7 @@
- + diff --git a/apps/web/src/components/identification/TeeRegisterSiret.vue b/apps/web/src/components/identification/TeeRegisterSiret.vue index 450a97b4e..65568ba9c 100644 --- a/apps/web/src/components/identification/TeeRegisterSiret.vue +++ b/apps/web/src/components/identification/TeeRegisterSiret.vue @@ -45,7 +45,7 @@ v-if="requestResponses.resultCount > 9" class="fr-card fr-card-result fr-card--no-arrow fr-card--shadow custom-border" > -
+
Votre entreprise n'est pas affichée ? - Cliquez ici + trouver mon SIRET
@@ -84,7 +84,7 @@ const defaultSearchValue = { } const queryValue = ref() -const debouncedQueryValue = useDebounce(queryValue, 1000) +const debouncedQueryValue = useDebounce(queryValue, 500) watch(debouncedQueryValue, (newValue) => { if (newValue) { processInput() @@ -141,8 +141,10 @@ const processInput = async () => { From 4dca11fbfb5fd57b3d85406a857d45c3d9455f4f Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Thu, 7 Nov 2024 11:19:42 +0100 Subject: [PATCH 74/75] fix lint --- .../components/identification/details/TeeProfileLocalisation.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/web/src/components/identification/details/TeeProfileLocalisation.vue b/apps/web/src/components/identification/details/TeeProfileLocalisation.vue index fea6454d3..befb057f6 100644 --- a/apps/web/src/components/identification/details/TeeProfileLocalisation.vue +++ b/apps/web/src/components/identification/details/TeeProfileLocalisation.vue @@ -116,6 +116,7 @@ onClickOutside(localisationSearchBar, () => modifyLocalisation()) position: absolute; overflow: hidden auto; } + #register-localisation { position: relative; margin-bottom: 0; From 239d0cd1fc666aa54aa3bba9f84ee4042e160d1a Mon Sep 17 00:00:00 2001 From: oumeimaelisbihani Date: Thu, 7 Nov 2024 13:46:59 +0100 Subject: [PATCH 75/75] fix spacing --- .../details/TeeProfileLocalisation.vue | 51 +++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/apps/web/src/components/identification/details/TeeProfileLocalisation.vue b/apps/web/src/components/identification/details/TeeProfileLocalisation.vue index befb057f6..0baffbf00 100644 --- a/apps/web/src/components/identification/details/TeeProfileLocalisation.vue +++ b/apps/web/src/components/identification/details/TeeProfileLocalisation.vue @@ -14,32 +14,34 @@ v-else id="register-localisation" > - + + +
-

- {{ errorMsg }} -