diff --git a/backend/src/main.py b/backend/src/main.py index 70cca91f..25124a0d 100644 --- a/backend/src/main.py +++ b/backend/src/main.py @@ -322,8 +322,10 @@ async def log_tutorial_feedback(request: Request, user_id: Union[str, None] = Co "bg_label": res["label"], "bg_confidence": res["confidence"], "bg_confidence_level": res["confidence_level"], - "bg_current_step": res["current_step"], "bg_route_name": res["route_name"], + "bg_current_step": res["current_step"], + "bg_tutorial_option": res["tutorial_option"], + "bg_tutorial_ammo": res["tutorial_ammo"], "bg_user_id": user_id, "bg_device": get_device(user_agent), "bg_device_family": user_agent.device.family, diff --git a/frontend/package-lock.json b/frontend/package-lock.json index f326cbf5..7d6b91bd 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,7 +8,7 @@ "name": "basegun", "version": "2.0.0", "dependencies": { - "@gouvminint/vue-dsfr": "~1.6.0", + "@gouvminint/vue-dsfr": "~2.0.0", "@vue/compat": "^3.2.40", "@vueuse/core": "^9.6.0", "axios": "^0.27.2", @@ -1834,35 +1834,50 @@ } }, "node_modules/@gouvfr/dsfr": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@gouvfr/dsfr/-/dsfr-1.7.2.tgz", - "integrity": "sha512-hPNtz+gHcc8m7ZPANxSOFMz4Ap+M9FHOudqoMR/+Kjl5FCOqwA6u/aoYnMJ8KqedS1k5XThFMp7jiktr53qXYw==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@gouvfr/dsfr/-/dsfr-1.8.5.tgz", + "integrity": "sha512-29L+THvWmYJXztPa0Os5TS9yD2WQbrH7VnCKxkyUXQZQ+6lsGebtz0GdCnLexOWDfCn1y53Mh7+/ihxI/z0Vjw==", "engines": { "node": ">=14.18.0" } }, "node_modules/@gouvminint/vue-dsfr": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@gouvminint/vue-dsfr/-/vue-dsfr-1.6.0.tgz", - "integrity": "sha512-mh6FXTh4D3lQRKysUVBUokqIKQBAJpp8YWYNaXKduz914ZYp24a/RgboOTnUMBRLBYyP+YG4CkD+2Uj1z7DkXg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@gouvminint/vue-dsfr/-/vue-dsfr-2.0.0.tgz", + "integrity": "sha512-021fYlEKQhmcCuGLO0zK7uf9rfCJ1i4xu9+UruZSxgEA4JrqVSx4iL5YZnsRZFXbHgwum31wQAU8B1VWmJUa9g==", "dependencies": { - "@gouvfr/dsfr": "~1.7.2", + "@gouvfr/dsfr": "~1.8.5", "focus-trap": "~6.7.0", "focus-trap-vue": "^3.3.1", "oh-vue-icons": "1.0.0-rc3", - "vue": "^3.2.39" + "vue": "^3.2.45" }, "engines": { "node": ">=18.x.x", "npm": "8.x.x" }, "optionalDependencies": { - "esbuild-linux-64": "^0.15.9" + "esbuild-linux-64": "^0.15.18" }, "peerDependencies": { "oh-vue-icons": "1.0.0-rc3", - "vue": "^3.2.39", - "vue-router": "^4.1.5" + "vue": "^3.2.45", + "vue-router": "^4.1.6" + } + }, + "node_modules/@gouvminint/vue-dsfr/node_modules/esbuild-linux-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", + "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" } }, "node_modules/@humanwhocodes/config-array": { @@ -8664,21 +8679,29 @@ } }, "@gouvfr/dsfr": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/@gouvfr/dsfr/-/dsfr-1.7.2.tgz", - "integrity": "sha512-hPNtz+gHcc8m7ZPANxSOFMz4Ap+M9FHOudqoMR/+Kjl5FCOqwA6u/aoYnMJ8KqedS1k5XThFMp7jiktr53qXYw==" + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@gouvfr/dsfr/-/dsfr-1.8.5.tgz", + "integrity": "sha512-29L+THvWmYJXztPa0Os5TS9yD2WQbrH7VnCKxkyUXQZQ+6lsGebtz0GdCnLexOWDfCn1y53Mh7+/ihxI/z0Vjw==" }, "@gouvminint/vue-dsfr": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@gouvminint/vue-dsfr/-/vue-dsfr-1.6.0.tgz", - "integrity": "sha512-mh6FXTh4D3lQRKysUVBUokqIKQBAJpp8YWYNaXKduz914ZYp24a/RgboOTnUMBRLBYyP+YG4CkD+2Uj1z7DkXg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@gouvminint/vue-dsfr/-/vue-dsfr-2.0.0.tgz", + "integrity": "sha512-021fYlEKQhmcCuGLO0zK7uf9rfCJ1i4xu9+UruZSxgEA4JrqVSx4iL5YZnsRZFXbHgwum31wQAU8B1VWmJUa9g==", "requires": { - "@gouvfr/dsfr": "~1.7.2", - "esbuild-linux-64": "^0.15.9", + "@gouvfr/dsfr": "~1.8.5", + "esbuild-linux-64": "^0.15.18", "focus-trap": "~6.7.0", "focus-trap-vue": "^3.3.1", "oh-vue-icons": "1.0.0-rc3", - "vue": "^3.2.39" + "vue": "^3.2.45" + }, + "dependencies": { + "esbuild-linux-64": { + "version": "0.15.18", + "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", + "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", + "optional": true + } } }, "@humanwhocodes/config-array": { diff --git a/frontend/package.json b/frontend/package.json index 2ecaa138..c8132666 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "pretest:unit": "npm run lint" }, "dependencies": { - "@gouvminint/vue-dsfr": "~1.6.0", + "@gouvminint/vue-dsfr": "~2.0.0", "@vue/compat": "^3.2.40", "@vueuse/core": "^9.6.0", "axios": "^0.27.2", diff --git a/frontend/public/guide-factice/images/autre_epaule/autre-epaule-pistolet-mitrailleur.png b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-pistolet-mitrailleur.png new file mode 100644 index 00000000..2a68624d Binary files /dev/null and b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-pistolet-mitrailleur.png differ diff --git a/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine-focus.jpg b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine-focus.jpg new file mode 100644 index 00000000..52e64a89 Binary files /dev/null and b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine-focus.jpg differ diff --git a/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine.jpg b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine.jpg new file mode 100644 index 00000000..194b8972 Binary files /dev/null and b/frontend/public/guide-factice/images/autre_epaule/autre-epaule-transparent-magazine.jpg differ diff --git a/frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-billes.jpg b/frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-balls.jpg similarity index 100% rename from frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-billes.jpg rename to frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-balls.jpg diff --git a/frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-cartouches.jpg b/frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-cartridge.jpg similarity index 100% rename from frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-cartouches.jpg rename to frontend/public/guide-factice/images/autre_pistolet/autre-pistolet-cartridge.jpg diff --git a/frontend/src/assets/logo.png b/frontend/src/assets/logo.png deleted file mode 100644 index f3d2503f..00000000 Binary files a/frontend/src/assets/logo.png and /dev/null differ diff --git a/frontend/src/assets/pistol_test_1.mp4 b/frontend/src/assets/pistol_test_1.mp4 deleted file mode 100644 index 2f464334..00000000 Binary files a/frontend/src/assets/pistol_test_1.mp4 and /dev/null differ diff --git a/frontend/src/assets/pistol_test_2.mp4 b/frontend/src/assets/pistol_test_2.mp4 deleted file mode 100644 index ac85cf12..00000000 Binary files a/frontend/src/assets/pistol_test_2.mp4 and /dev/null differ diff --git a/frontend/src/assets/thumbs-down.png b/frontend/src/assets/thumbs-down.png deleted file mode 100644 index e52eea4d..00000000 Binary files a/frontend/src/assets/thumbs-down.png and /dev/null differ diff --git a/frontend/src/assets/thumbs-up.png b/frontend/src/assets/thumbs-up.png deleted file mode 100644 index 07c4880f..00000000 Binary files a/frontend/src/assets/thumbs-up.png and /dev/null differ diff --git a/frontend/src/components/HeaderMain.vue b/frontend/src/components/HeaderMain.vue index a0a53b3d..28c8c400 100644 --- a/frontend/src/components/HeaderMain.vue +++ b/frontend/src/components/HeaderMain.vue @@ -119,25 +119,22 @@ export default { diff --git a/frontend/src/components/OnboardingSwiper.vue b/frontend/src/components/OnboardingSwiper.vue index 3b93084f..57d84e8d 100644 --- a/frontend/src/components/OnboardingSwiper.vue +++ b/frontend/src/components/OnboardingSwiper.vue @@ -85,7 +85,6 @@ export default { diff --git a/frontend/src/views/GuideFactice/EndTutorial.vue b/frontend/src/views/GuideFactice/EndTutorial.vue index 71ed0e89..6389f9f8 100644 --- a/frontend/src/views/GuideFactice/EndTutorial.vue +++ b/frontend/src/views/GuideFactice/EndTutorial.vue @@ -1,10 +1,9 @@ diff --git a/frontend/src/views/GuideFactice/FirearmDirection.vue b/frontend/src/views/GuideFactice/FirearmDirection.vue index bc29a59d..1fdc2a31 100644 --- a/frontend/src/views/GuideFactice/FirearmDirection.vue +++ b/frontend/src/views/GuideFactice/FirearmDirection.vue @@ -4,7 +4,7 @@ Tenir l’arme en la dirigeant toujours dans une DIRECTION SÛRE par la poignée en maintenant toujours le doigt hors du pontet.

-
+
alt -import { ref, computed } from 'vue' +import { ref, computed, onMounted } from 'vue' import { guideFacticeSelectAmmo } from '@/utils/firearms-utils' import AskingExpert from './AskingExpert.vue' @@ -26,10 +26,71 @@ const zoom = ref('') const zoomOn = (imgValue) => { zoom.value = imgValue } + +const showModal = ref(false) + +function closeModal () { + showModal.value = false +} + +function openModal () { + showModal.value = true + useStepsStore.isOpened = true +} + +onMounted(() => { + if (useStepsStore.isOpened === undefined) { + openModal() + } else { showModal.value = false } +}) +