From 16cb1b236720d7ff7b9eca1e88b57e63ad4e1ad7 Mon Sep 17 00:00:00 2001 From: Yohann Marchat Date: Wed, 17 Jan 2024 18:50:10 +0100 Subject: [PATCH] feat: factorize legal notice in common, adapt conf --- package-lock.json | 18 +- package.json | 4 +- src/App.vue | 2 +- src/components/legal/AccessibilityLegal.vue | 52 +--- src/components/legal/CGULegal.vue | 253 ++---------------- src/components/legal/CookiesLegal.vue | 17 +- src/components/legal/HeaderLegalNotice.vue | 26 +- src/components/legal/LegalNotice.vue | 83 +----- src/components/legal/PrivacyLegal.vue | 249 +---------------- src/components/legal/SiteMap.vue | 35 +-- .../ui/WaveObservatoryComponent.vue | 8 +- src/services/api-adresse-data-gouv.ts | 21 -- src/services/api.ts | 34 --- src/stores/config.ts | 11 + 14 files changed, 98 insertions(+), 715 deletions(-) delete mode 100644 src/services/api-adresse-data-gouv.ts diff --git a/package-lock.json b/package-lock.json index a5e35c7..a5e1a79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "cooperation_jn_wave", - "version": "1.1.0-RC1", + "version": "1.1.0-SNAPSHOT", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "cooperation_jn_wave", - "version": "1.1.0-RC1", + "version": "1.1.0-SNAPSHOT", "dependencies": { "@kyvg/vue3-notification": "^2.9.0", "@pinia/testing": "^0.0.14", - "@sigrennesmetropole/cooperation_jn_common_ui": "0.0.35", + "@sigrennesmetropole/cooperation_jn_common_ui": "0.0.36", "@tailwindcss/forms": "^0.5.3", "@turf/boolean-intersects": "^6.5.0", "@turf/distance": "^6.5.0", @@ -2045,9 +2045,9 @@ "dev": true }, "node_modules/@sigrennesmetropole/cooperation_jn_common_ui": { - "version": "0.0.35", - "resolved": "https://npm.pkg.github.com/download/@sigrennesmetropole/cooperation_jn_common_ui/0.0.35/80977c8c289861314de8a813ef24887d4cccee92", - "integrity": "sha512-NSs2aZ0PuratY+EjSchGTfDILrJE369dcVXbDx4QvPKTLVIO8hapRrdNs+cxHh/OURGQ3Of7o2gADQjyFYY10g==", + "version": "0.0.36", + "resolved": "https://npm.pkg.github.com/download/@sigrennesmetropole/cooperation_jn_common_ui/0.0.36/152c1cdbcbdfa1b37a3950c0ef02b248d81d0fc6", + "integrity": "sha512-Pa6aj12KvKaujoL4KlPv/KIB8i608x2QjzOgo+yK9zXk0Nb8hNTku+NRknP4zFQxZK8FwB+V0CQ12lmlqGDc6w==", "dependencies": { "npm-watch": "^0.11.0", "vue": "^3.2.38" @@ -16160,9 +16160,9 @@ "dev": true }, "@sigrennesmetropole/cooperation_jn_common_ui": { - "version": "0.0.35", - "resolved": "https://npm.pkg.github.com/download/@sigrennesmetropole/cooperation_jn_common_ui/0.0.35/80977c8c289861314de8a813ef24887d4cccee92", - "integrity": "sha512-NSs2aZ0PuratY+EjSchGTfDILrJE369dcVXbDx4QvPKTLVIO8hapRrdNs+cxHh/OURGQ3Of7o2gADQjyFYY10g==", + "version": "0.0.36", + "resolved": "https://npm.pkg.github.com/download/@sigrennesmetropole/cooperation_jn_common_ui/0.0.36/152c1cdbcbdfa1b37a3950c0ef02b248d81d0fc6", + "integrity": "sha512-Pa6aj12KvKaujoL4KlPv/KIB8i608x2QjzOgo+yK9zXk0Nb8hNTku+NRknP4zFQxZK8FwB+V0CQ12lmlqGDc6w==", "requires": { "npm-watch": "^0.11.0", "vue": "^3.2.38" diff --git a/package.json b/package.json index b3ac1cf..e1399a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cooperation_jn_wave", - "version": "1.1.0-RC1", + "version": "1.1.0-SNAPSHOT", "engines": { "node": ">=14" }, @@ -29,7 +29,7 @@ "dependencies": { "@kyvg/vue3-notification": "^2.9.0", "@pinia/testing": "^0.0.14", - "@sigrennesmetropole/cooperation_jn_common_ui": "0.0.35", + "@sigrennesmetropole/cooperation_jn_common_ui": "0.0.36", "@tailwindcss/forms": "^0.5.3", "@turf/boolean-intersects": "^6.5.0", "@turf/distance": "^6.5.0", diff --git a/src/App.vue b/src/App.vue index 7658813..b779e02 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ const mapStore = useMapStore() onBeforeMount(async () => { const rennesApp = new RennesApp(mapConfig) provide('rennesApp', rennesApp) - displayRealTimePoints(rennesApp) + await displayRealTimePoints(rennesApp) }) function isLeftPanelRetractable() { diff --git a/src/components/legal/AccessibilityLegal.vue b/src/components/legal/AccessibilityLegal.vue index 9c766fd..f1ad0b0 100644 --- a/src/components/legal/AccessibilityLegal.vue +++ b/src/components/legal/AccessibilityLegal.vue @@ -1,50 +1,6 @@ + diff --git a/src/components/legal/CGULegal.vue b/src/components/legal/CGULegal.vue index 37729ba..3ac8e55 100644 --- a/src/components/legal/CGULegal.vue +++ b/src/components/legal/CGULegal.vue @@ -1,233 +1,30 @@ diff --git a/src/components/legal/CookiesLegal.vue b/src/components/legal/CookiesLegal.vue index 9f8cfb6..b3245e8 100644 --- a/src/components/legal/CookiesLegal.vue +++ b/src/components/legal/CookiesLegal.vue @@ -1,15 +1,6 @@ - + diff --git a/src/components/legal/HeaderLegalNotice.vue b/src/components/legal/HeaderLegalNotice.vue index 6e91b98..c2a0007 100644 --- a/src/components/legal/HeaderLegalNotice.vue +++ b/src/components/legal/HeaderLegalNotice.vue @@ -2,6 +2,7 @@ import { useRoute, useRouter } from 'vue-router' import { ref } from 'vue' import { UiHeaderFullScreen } from '@sigrennesmetropole/cooperation_jn_common_ui' +import { UiMidLegalNotice } from '@sigrennesmetropole/cooperation_jn_common_ui' import logoRennes from '@/assets/illustrations/logoRennes.png' import { legalList } from '@/constants/legalLinks' import { useViewsStore } from '@/stores/views' @@ -10,7 +11,7 @@ const router = useRouter() const { params } = useRoute() const viewStore = useViewsStore() const routeParams = ref(params) -const legalLink = routeParams.value.legallink +const legalLink = routeParams.value.legallink.toString() function goTo(link: string) { router.push(link) @@ -29,23 +30,12 @@ const close = () => {