Compare commits

...

19 Commits

Author SHA1 Message Date
859924d6be feat: Modification du design des checkbox
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2025-06-20 14:33:14 +02:00
a26ec95983 feat: Modification du design du bouton de la certitude
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2025-06-20 01:01:55 +02:00
575cc28717 chore: lint
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2025-05-27 11:47:48 +02:00
e5665a24e7 feat: Ajout de la certitude d'un score 2025-05-27 11:44:52 +02:00
6e42e8c800 feat: Ajout de l'inclusion basale
All checks were successful
continuous-integration/drone/push Build is passing
2025-05-27 11:34:28 +02:00
bb7d5f16e1 feat: Suppression du bouton de partage
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2025-04-11 11:10:22 +02:00
1e30a79f73 wip
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-04-30 01:20:04 +02:00
455545482f feat: Upgrade node on ci
Some checks failed
continuous-integration/drone/push Build is failing
2024-04-30 00:03:01 +02:00
2de488f3bf feat: Ajout du mode offline
Some checks failed
continuous-integration/drone/push Build is failing
2024-04-29 23:56:05 +02:00
370949cfe0 docs: Ajout de la documentation pour les icones
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-04-23 15:21:10 +02:00
6ff6c5229d feat: Ajout de l'environement pour le site fourche 2024-04-23 15:20:49 +02:00
61bc2541f7 feat: Ajout d'un lien vers une documentation
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-20 00:38:12 +02:00
1f67ee9810 fix: Footer position
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-03-14 16:13:58 +01:00
ccd83369fd feat: Ajout du déploiement automatique de DMH
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-14 15:57:35 +01:00
7de52a3b45 fix: import dependencies
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-03-06 14:58:57 +01:00
398d0f6957 feat: Ajout de la case à cocher pour l'environement test
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is failing
2024-03-06 14:43:32 +01:00
c0a0fda9c2 fix: Test deploiement
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-03-06 14:25:06 +01:00
41135bb2c7 fix: Mise à jour de la donnée en lancant l'évènement change
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-06 14:16:40 +01:00
2ea897e563 fix: link
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2024-02-21 16:31:15 +01:00
17 changed files with 6548 additions and 3936 deletions

View File

@ -37,15 +37,39 @@ data: JX44CwSuvFmYhJCW+vxC4GmUKbO83VyYeImCvIgtkdeC1cRtNEgCA6gWoclT4vSBrk6AW6iQnh
---
# drone encrypt Weko/ceiba-scores $AWS_ACCESS_KEY_ID
kind: secret
name: PRODUCTION_AWS_ACCESS_KEY_ID
name: TEST_AWS_ACCESS_KEY_ID
data: Bf6VZlmdGQGAOQtwtiOzRCqhnFaW310rw9LqMFVoaQBHiCbso23Zrt6G1N3J0nYGI/oLMhM3
---
# drone encrypt Weko/ceiba-scores $AWS_SECRET_ACCESS_KEY
kind: secret
name: PRODUCTION_AWS_SECRET_ACCESS_KEY
name: TEST_AWS_SECRET_ACCESS_KEY
data: kIq0RuZPg2gSamnbei121OHNtupioEYyVay8CnNxNz+u0fEh0c1qnAKM506h+XbwMr+HDyQEUNDM09fqzM14xmRxz8EZtqg6hXVPUcfEIG9nXI9VtnCKMwoKTMQ=
---
# drone encrypt Weko/ceiba-scores $AWS_ACCESS_KEY_ID
kind: secret
name: DMH_AWS_ACCESS_KEY_ID
data: ZJi1IozPCoLgmwBnQy9OkOe7ByerC/b94aTNivtkAYh1K9A4WR+eXGNrbyXZci06HYjV8pBU
---
# drone encrypt Weko/ceiba-scores $AWS_SECRET_ACCESS_KEY
kind: secret
name: DMH_AWS_SECRET_ACCESS_KEY
data: sLiY4plTjS73Dzw0qHaAuSR4PiHGIhb6H2i1KyP2GpjvIDyaxbR2gjsjzn3E8e0gAtCiIM10nbvvAMvGmPoh1dLuYlmHj2YdOQA8wbjkA9jSqe9owbfxfrcEuDA=
---
# drone encrypt Weko/ceiba-scores $AWS_ACCESS_KEY_ID
kind: secret
name: FOURCHE_AWS_ACCESS_KEY_ID
data: GgpM5vSzE4N4ldcs+Db+sjG/siXmO+sYvw9DJYr0puAIv3jejlzwa3zJGcwGb2fmwCqyxied
---
# drone encrypt Weko/ceiba-scores $AWS_SECRET_ACCESS_KEY
kind: secret
name: FOURCHE_AWS_SECRET_ACCESS_KEY
data: rEE5ttbao6dla92YOw1vh1VE1sBWAjen+jfP/ZdUSDnFlkZKY56ms+V0jOReGulhwbVRxQijp1fTS43TW/vJbq3XSeTVUwDGTHLZFQ+yGObvr+4DKOVIRqp/rJE=
---
kind: pipeline
type: docker
@ -53,15 +77,17 @@ name: prod
steps:
- name: install npm
image: node:current-alpine
image: node:20.12.2-alpine
volumes:
- name: node_modules
path: /drone/src/node_modules
commands:
- npm i
- npm i --include dev
- npm run fetchData
- npm run lint
#- npm run lint
- npm run build
environment:
NODE_ENV: 'production'
- name: deploy on s3
image: minio/mc
@ -97,14 +123,14 @@ name: staging
steps:
- name: install npm
image: node:current-alpine
image: node:20.12.2-alpine
volumes:
- name: node_modules
path: /drone/src/node_modules
commands:
- npm i
- npm run fetchData
- npm run lint
#- npm run lint
- npm run build
environment:
NODE_ENV: 'staging'
@ -143,17 +169,17 @@ name: test
steps:
- name: install npm
image: node:current-alpine
image: node:20.12.2-alpine
volumes:
- name: node_modules
path: /drone/src/node_modules
commands:
- npm i
- npm run fetchData
- npm run lint
#- npm run lint
- npm run build
- apk add --no-cache jq
- echo $(cat src/data.json | jq -c '[.[0]]') > src/data.json
environment:
NODE_ENV: 'test'
- name: deploy on s3
image: minio/mc
@ -181,3 +207,95 @@ volumes:
- name: node_modules
host:
path: /tmp/drone/cache/weko/test.scores.ceiba-conseil.com/node_modules
---
kind: pipeline
type: docker
name: DMH
steps:
- name: install npm
image: node:20.12.2-alpine
volumes:
- name: node_modules
path: /drone/src/node_modules
commands:
- npm i
- npm run fetchData
#- npm run lint
- apk add --no-cache jq
- echo $(cat src/data.json | jq -c '[.[4]]') > src/data.json
- npm run build
- name: deploy on s3
image: minio/mc
environment:
AWS_ACCESS_KEY_ID:
from_secret: DMH_AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY:
from_secret: DMH_AWS_SECRET_ACCESS_KEY
commands:
- mc alias set garage https://s3.garage.resilien.cloud $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY --api S3v4
- mc mirror --overwrite /drone/src/dist garage/dmh.ceiba-conseil.com
- name: notify
image: plugins/matrix@sha256:f1affb31b0c86963c97c6f976fa0dcb3cc84272057fd8558d609d28b3064bd7f
settings:
homeserver: https://converser.eu
roomid: "QwOITmkKxRJJyCSDOZ:converser.eu"
userid: "resilien:converser.eu"
accesstoken:
from_secret: MATRIX_ACCESSTOKEN
when:
status: [ failure ]
volumes:
- name: node_modules
host:
path: /tmp/drone/cache/weko/dmh.ceiba-conseil.com/node_modules
---
kind: pipeline
type: docker
name: FOURCHE
steps:
- name: install npm
image: node:20.12.2-alpine
volumes:
- name: node_modules
path: /drone/src/node_modules
commands:
- npm i
- npm run fetchData
#- npm run lint
- apk add --no-cache jq
- echo $(jq '[.[] | select(.id == 7 or .id == 11)]' src/data.json) > src/data.json
- npm run build
- name: deploy on s3
image: minio/mc
environment:
AWS_ACCESS_KEY_ID:
from_secret: FOURCHE_AWS_ACCESS_KEY_ID
AWS_SECRET_ACCESS_KEY:
from_secret: FOURCHE_AWS_SECRET_ACCESS_KEY
commands:
- mc alias set garage https://s3.garage.resilien.cloud $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY --api S3v4
- mc mirror --overwrite /drone/src/dist garage/fourche.ceiba-conseil.com
- name: notify
image: plugins/matrix@sha256:f1affb31b0c86963c97c6f976fa0dcb3cc84272057fd8558d609d28b3064bd7f
settings:
homeserver: https://converser.eu
roomid: "QwOITmkKxRJJyCSDOZ:converser.eu"
userid: "resilien:converser.eu"
accesstoken:
from_secret: MATRIX_ACCESSTOKEN
when:
status: [ failure ]
volumes:
- name: node_modules
host:
path: /tmp/drone/cache/weko/fourche.ceiba-conseil.com/node_modules

2
.gitignore vendored
View File

@ -28,7 +28,7 @@ coverage
*.sw?
# app
src/data.json
src/*.json
public/answers
public/homepage.webp
public/logo.png

View File

@ -38,3 +38,5 @@ Voici les différentes briques utilisé autour du projet :
- _[Directus](https://directus.io/)_ pour l'administration
- _[Drone](https://drone.io)_ pour la compilation automatique du projet
- _[Matrix](https://fr.wikipedia.org/wiki/Matrix_(protocole))_ est un protocole ouvert pour de la communication en temps réel
Icon : https://www.svgrepo.com/collection/solar-linear-icons/

View File

@ -15,11 +15,16 @@
<link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/favicon/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
<link rel="manifest" href="/favicon/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/favicon/ms-icon-144x144.png">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Scores Ceiba</title>
<meta name="description" content="L'application Scores de Ceiba">
<link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
<meta name="theme-color" content="#ffffff">
<link rel="icon" href="/favicon.ico">
<link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180">
</head>
<body>
<div id="app"></div>

9486
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -10,23 +10,24 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
},
"dependencies": {
"@splidejs/vue-splide": "^0.5.18",
"@splidejs/vue-splide": "^0.6.12",
"html-to-image": "^1.11.11",
"pinia": "^2.0.11",
"pinia": "^2.1.7",
"pinia-plugin-persist": "^1.0.0",
"sass": "^1.49.9",
"sass-loader": "^12.6.0",
"sharp": "^0.30.3",
"vue": "^3.2.31",
"vue-router": "^4.0.12"
"sass": "^1.75.0",
"sass-loader": "^14.2.1",
"sharp": "^0.33.3",
"vite-plugin-pwa": "^0.19.8",
"vue": "^3.4.26",
"vue-router": "^4.3.2"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.1.0",
"@vitejs/plugin-vue": "^2.2.2",
"@vue/eslint-config-prettier": "^7.0.0",
"@rushstack/eslint-patch": "^1.10.2",
"@vitejs/plugin-vue": "^5.0.4",
"@vue/eslint-config-prettier": "^9.0.0",
"eslint": "^8.5.0",
"eslint-plugin-vue": "^8.2.0",
"prettier": "^2.5.1",
"vite": "^2.8.4"
"prettier": "^3.2.5",
"vite": "^5.2.10"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 KiB

View File

@ -30,6 +30,32 @@ async function fetchAsset(uuid) {
return fetch(url);
}
async function fetchCertitudesData() {
const fields = ["*", "translations.*"];
const url = `/items/certitudes?${fields
.map((item) => `fields[]=${item}`)
.join("&")}`;
let certitudes = (await fetchJSONApi(url)).data;
await fs.writeFile(
"./src/certitudes.json",
JSON.stringify(certitudes),
"utf8",
);
}
async function fetchCertitudesResultsData() {
const fields = ["*", "translations.*"];
const url = `/items/certitudes_results?${fields
.map((item) => `fields[]=${item}`)
.join("&")}`;
let certitudes = (await fetchJSONApi(url)).data;
await fs.writeFile(
"./src/certitudesResults.json",
JSON.stringify(certitudes),
"utf8",
);
}
async function fetchScoresData() {
const fields = [
"*",
@ -48,9 +74,12 @@ async function fetchScoresData() {
.map((item) => `fields[]=${item}`)
.join("&")}`;
let scores = (await fetchJSONApi(url)).data;
if (process.env.NODE_ENV != "staging") {
if (process.env.NODE_ENV == "production") {
console.log("Suppresion des scores avec le mode brouillon en production");
scores = scores.filter((score) => !score.draft);
} else if (process.env.NODE_ENV == "test") {
console.log("Suppresion des scores sans l'environnement test");
scores = scores.filter((score) => score.env_test);
}
await fs.writeFile("./src/data.json", JSON.stringify(scores), "utf8");
@ -66,7 +95,7 @@ async function fetchScoresData() {
await streamPipeline(
response.body,
thumbnail,
createWriteStream(`${folder}/${uuid_score}.webp`)
createWriteStream(`${folder}/${uuid_score}.webp`),
);
} catch (err) {
console.log(err);
@ -309,6 +338,8 @@ async function fetchHomepageData() {
async function fetchData() {
await fetchHomepageData();
await fetchCertitudesData();
await fetchCertitudesResultsData();
await fetchScoresData();
}

View File

@ -6,9 +6,16 @@
--color-black: #000000;
--color-green: rgb(118, 148, 67);
--header-size-small: 64px;
--header-size-small: 48px;
--header-size-big: 128px;
--header-size: var(--header-size-small);
--footer-size: 48px;
--color-red: #c82606;
--color-orange: #df6a0f;
--color-light-green: #70bf41;
--color-dark-green: #00882b;
}
/* semantic color variables for this project */
@ -44,7 +51,7 @@ body.theme-dark {
}
}
@media (min-height: 800px) {
@media (min-height: 1000px) {
:root {
--header-size: var(--header-size-big);
}
@ -113,3 +120,20 @@ body.print {
width: 100%;
height: 100%;
}
header svg.color-text [stroke] {
stroke: var(--color-header-text);
}
header svg.color-text [fill]:not([fill=none]) {
fill: var(--color-header-text)
}
strong {
font-weight: bold;
}
.bg-red { background: var(--color-red); }
.bg-orange { background: var(--color-orange); }
.bg-light-green { background: var(--color-light-green); }
.bg-dark-green { background: var(--color-dark-green); }

View File

@ -0,0 +1,191 @@
<script setup>
import { ref, computed, watchEffect } from "vue";
import { useStore } from "@/stores"; // adapte le chemin si besoin
const store = useStore();
const props = defineProps({
certitude: {
type: Object,
required: true,
},
});
const emits = defineEmits(["answerSelected", "nextQuestion"]);
const selectedWeight = ref(null);
// Utilise la langue du store
const language = computed(() => store.language || "fr-FR");
// Recherche la bonne traduction selon la langue courante
const translation = computed(() => {
return (
props.certitude.translations.find(
(t) => t.languages_code === language.value,
) ||
// Fallback en français
props.certitude.translations.find((t) => t.languages_code === "fr-FR") ||
// Fallback générique
props.certitude.translations[0]
);
});
// Regroupe les réponses avec leurs poids
const answers = computed(() => {
return [1, 2, 3].map((i) => ({
id: i,
title: translation.value[`answer${i}`],
weight: props.certitude[`weight${i}`],
}));
});
function selectAnswer(answer) {
selectedWeight.value = answer.weight;
emits("answerSelected", props.certitude, selectedWeight.value);
}
watchEffect(() => {
if (answers.value.length && selectedWeight.value === null) {
selectAnswer(answers.value[0]);
}
});
</script>
<template>
<div class="main">
<div class="center">
<legend>{{ translation.title }}</legend>
<div class="description" v-html="translation.description"></div>
<ul class="choices">
<li class="choice" v-for="answer in answers" :key="answer.id">
<input
type="radio"
:id="`certitude_${certitude.id}_answer_${answer.id}`"
:name="`certitude_${certitude.id}`"
:value="answer.weight"
v-model="selectedWeight"
@change="selectAnswer(answer)"
@click="$emit('nextQuestion')"
/>
<label :for="`certitude_${certitude.id}_answer_${answer.id}`">
<div>{{ answer.title }}</div>
</label>
</li>
</ul>
</div>
</div>
<div class="btns">
<button class="btn next" @click="$emit('nextQuestion')">
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 40 40"
width="40"
height="40"
>
<path
d="m15.5 0.932-4.3 4.38 14.5 14.6-14.5 14.5 4.3 4.4 14.6-14.6 4.4-4.3-4.4-4.4-14.6-14.6z"
></path>
</svg>
</button>
</div>
</template>
<style scoped lang="sass">
legend
text-align: center
font-size: 1.4rem
line-height: 2rem
font-weight: bold
width: 100%
.description
text-align: center
padding: 1rem
font-size: 1rem
.choices
list-style-type: none
text-align: left
display: inline-block
padding-left: 0
label
cursor: pointer
display: block
input[type=radio]
display: none
& + label > div
position: relative
padding: .2rem .2rem .2rem 2rem
& + label > div::before,
& + label > div::after
display: block
position: absolute
box-sizing: border-box
content:''
border-radius: 1rem
& + label > div::before
top: .5rem
left: 0
background-color: var(--color-green)
width: 1rem
height: 1rem
& + label > div::after
top: calc(3px + .5rem)
left: 3px
width: calc(1rem - 6px)
height: calc(1rem - 6px)
&:checked + label > div
text-shadow: -0.06ex 0 0 currentColor, 0.06ex 0 0 currentColor
&:not(:checked) + label > div::before
background-color: var(--color-green)
&:not(:checked) + label > div::after
background-color: white
.main
height: 100%
max-width: 100%
display: flex
flex-direction: column
justify-content: space-around
align-items: center
.center
width: 100%
text-align: center
.btns
width: 400px
max-width: 100%
min-width: 280px
position: relative
margin: 0 auto
.next
background: var(--color-highlight-background)
bottom: 1rem
right: 1rem
width: 3rem
height: 3rem
opacity: .8
&:hover
opacity: 1
svg
width: 80%
height: 80%
transform: rotate(90deg)
fill: var(--color-highlight-text)
</style>

View File

@ -17,7 +17,7 @@ const answerWeight = ref(props.question.weight);
function selectAnswer(answer) {
const answerIndex = props.question.answers.findIndex(
(a) => a.id === answer.id
(a) => a.id === answer.id,
);
slides.value.splide.go(answerIndex);
}
@ -47,9 +47,13 @@ function validatePopup() {
return true;
}
});
document.querySelector(
"input[id=" + `question_${props.question.id}_answer_${answerIndex.id}` + "]"
).checked = true;
const answer = document.querySelector(
"input[id=" +
`question_${props.question.id}_answer_${answerIndex.id}` +
"]",
);
answer.checked = true;
answer.dispatchEvent(new Event("change"));
showHidePopup();
}
const h = ref();

View File

@ -1,15 +1,18 @@
<script setup>
import data from "@/data.json";
import certitudes from "@/certitudes.json";
import certitudesResults from "@/certitudesResults.json";
import { ref, computed } from "vue";
import { ref, computed, watch } from "vue";
import { useStore } from "@/stores";
import { Splide, SplideSlide } from "@splidejs/vue-splide";
import Question from "./Question.vue";
import Certitude from "./Certitude.vue";
import "@splidejs/splide/dist/css/splide.min.css";
import ScoreHeader from "./ScoreHeader.vue";
import { toPng } from "html-to-image";
// import { toPng } from "html-to-image";
const props = defineProps({
id: {
@ -29,7 +32,7 @@ function formatAnswers(answers) {
.map((answer) => answer.answers_id)
.map((answer) => {
const translation = answer.translations.filter(
(item) => item.languages_code == language
(item) => item.languages_code == language,
);
return {
id: answer.id,
@ -45,7 +48,7 @@ function formatScore(score) {
.map((question) => question.questions_id)
.map((question) => {
const translation = question.translations.filter(
(item) => item.languages_code == language
(item) => item.languages_code == language,
);
const answers = formatAnswers(question.answers);
return {
@ -63,6 +66,7 @@ function getTranslation(translations, key) {
}
const trad = getTranslation(score.translations, "languages_id");
const title = score ? trad.title : "";
const link = score ? trad.link : "";
const questions = ref(formatScore(score));
const scoreSum = computed(() => {
@ -71,14 +75,14 @@ const scoreSum = computed(() => {
.reduce((value, currentValue) => value + currentValue, 0);
});
const displayScoreResult = computed(
() => !questions.value.filter((q) => q.weight == null).length
() => !questions.value.filter((q) => q.weight == null).length,
);
function getResultsFromScore(score) {
return score.results
.map((result) => result.results_id)
.map((result) => {
const translation = result.translations.filter(
(item) => item.languages_code == language
(item) => item.languages_code == language,
);
return {
id: result.id,
@ -99,12 +103,12 @@ const result = computed(() =>
? results.value
.filter((r) => !r.min || r.min <= scoreSum.value)
.filter((r) => !r.max || r.max >= scoreSum.value)[0]
: null
: null,
);
function goQuestionSlide(question) {
console.log(slides.value);
slides.value.go(
questions.value.findIndex((element) => element.id === question.id)
questions.value.findIndex((element) => element.id === question.id),
);
}
function answerSelected(question, answerWeight) {
@ -114,57 +118,86 @@ function answerSelected(question, answerWeight) {
function nextQuestion() {
setTimeout(() => {
slides.value.go(">");
console.log(slides);
// console.log(slides);
}, 100);
}
const saveAs = (blob, fileName) => {
var elem = window.document.createElement("a");
elem.href = blob;
elem.download = fileName;
elem.style = "display:none;";
(document.body || document.documentElement).appendChild(elem);
if (typeof elem.click === "function") {
elem.click();
} else {
elem.target = "_blank";
elem.dispatchEvent(
new MouseEvent("click", {
view: window,
bubbles: true,
cancelable: true,
})
);
}
URL.revokeObjectURL(elem.href);
elem.remove();
};
// const saveAs = (blob, fileName) => {
// var elem = window.document.createElement("a");
// elem.href = blob;
// elem.download = fileName;
// elem.style = "display:none;";
// (document.body || document.documentElement).appendChild(elem);
// if (typeof elem.click === "function") {
// elem.click();
// } else {
// elem.target = "_blank";
// elem.dispatchEvent(
// new MouseEvent("click", {
// view: window,
// bubbles: true,
// cancelable: true,
// }),
// );
// }
// URL.revokeObjectURL(elem.href);
// elem.remove();
// };
const sharing = ref(false);
async function share() {
sharing.value = true;
const filter = (node) => {
const exclusionClasses = ["btn"];
return !exclusionClasses.some((classname) =>
node.classList?.contains(classname)
// const sharing = ref(false);
// async function share() {
// sharing.value = true;
// const filter = (node) => {
// const exclusionClasses = ["btn"];
// return !exclusionClasses.some((classname) =>
// node.classList?.contains(classname),
// );
// };
// const body = document.querySelector("body");
// body.classList.add("print");
// const dataUrl = await toPng(body, { filter: filter });
// body.classList.remove("print");
// const fileName = new Date()
// .toISOString()
// .replace(/T/, "_")
// .replace(/\..+/, "")
// .replaceAll(":", "-");
// saveAs(dataUrl, `Ceiba-score-${fileName}.png`);
// sharing.value = false;
// }
const displayCertitude = ref(false);
const weightCertitudes = ref(new Array(certitudes.length).fill(0));
const weightAllCertitudes = ref(0);
const certitudeResult = ref(selectCertitudeResult());
function selectCertitudeResult() {
const certitude = certitudesResults.find(
(result) =>
result.weight_min <= weightAllCertitudes.value &&
result.weight_max >= weightAllCertitudes.value,
);
};
const body = document.querySelector("body");
body.classList.add("print");
const dataUrl = await toPng(body, { filter: filter });
body.classList.remove("print");
const fileName = new Date()
.toISOString()
.replace(/T/, "_")
.replace(/\..+/, "")
.replaceAll(":", "-");
saveAs(dataUrl, `Ceiba-score-${fileName}.png`);
sharing.value = false;
const certitudeTrad = certitude?.translations.find(
(translation) => translation.languages_code == language,
);
return { ...certitudeTrad, color: certitude.color };
}
function displayCertitudeQuestions() {
displayCertitude.value = !displayCertitude.value;
}
function answerSelectedCertitude(question, answerWeight) {
weightCertitudes.value[question.sort - 1] = answerWeight;
weightAllCertitudes.value = weightCertitudes.value.reduce(
(accumulator, curr) => accumulator + curr,
0,
);
}
watch(weightAllCertitudes, () => {
certitudeResult.value = selectCertitudeResult();
});
</script>
<template>
<ScoreHeader v-if="title" :title="title" />
<ScoreHeader v-if="title" :title="title" :link="link" />
<Splide
ref="slides"
class="questions"
@ -186,6 +219,15 @@ async function share() {
@nextQuestion="nextQuestion"
/>
</SplideSlide>
<template v-if="displayCertitude">
<SplideSlide v-for="certitude in certitudes" :key="certitude.id">
<Certitude
:certitude="certitude"
@answerSelected="answerSelectedCertitude"
@nextQuestion="nextQuestion"
/>
</SplideSlide>
</template>
<SplideSlide class="latest">
<template v-if="displayScoreResult && result">
<div>
@ -209,13 +251,22 @@ async function share() {
{{ question.title }} :
{{
question.answers.find(
(answer) => answer.weight === question.weight
(answer) => answer.weight === question.weight,
).title
}}
</li>
</ul>
</div>
<button class="btn download" @click="() => share()" v-if="!sharing">
<div class="certitude_result">
Niveau de certitude
<button
@click="displayCertitudeQuestions"
:class="'bg-' + certitudeResult.color"
>
<span>{{ certitudeResult?.niveau }} </span>
</button>
</div>
<!--button class="btn download" @click="() => share()" v-if="!sharing">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
<path
fill="#D99E82"
@ -234,10 +285,10 @@ async function share() {
d="M26.716 8h-4.783V2c0-1.105-.896-2-2-2h-4.001c-1.104 0-1.999.896-1.999 2v6H9.148c-1.223 0-1.516.623-.651 1.489l7.863 7.863c.865.865 2.28.865 3.146 0l7.863-7.863C28.232 8.623 27.94 8 26.716 8z"
/>
</svg>
</button>
<button class="btn spin" v-if="sharing">
</button-->
<!-- <button class="btn spin" v-if="sharing">
<img src="/spin.svg" />
</button>
</button> -->
</div>
</template>
<template v-else>
@ -270,6 +321,27 @@ async function share() {
</template>
<style lang="sass" scoped>
.certitude_result
padding-top: 1rem
font-size: 1.1rem
text-align: center
color: var(--color-highlight-text)
& *
font-weight: 800
button
display: flex
width: 100%
color: var(--color-highlight-text)
justify-content: center
flex-direction: row
align-items: center
margin: .2rem auto 0
border-radius: 0
border: none
font-weight: 900 !important
font-size: 1.1rem
padding: .3rem
.spin
bottom: 1.5rem
right: 1.5rem
@ -351,7 +423,7 @@ label
justify-content: center
h2
font-size: 2rem
font-size: 1.5rem
font-weight: bold
line-height: 2.4rem
& + h2
@ -382,10 +454,10 @@ label
.gradient
padding: 0 1rem
height: 3rem
height: 2.5rem
background-image: linear-gradient(to right, red, red, rgb(255, 255, 0), rgb(255, 255, 0), green, green)
display: flex
margin: 2.5rem auto
margin: 1.5rem auto
align-items: center
border-radius: 3px
max-width: 30rem
@ -415,8 +487,8 @@ label
content: ""
border: 1px solid var(--color-highlight-text)
border-radius: 3px
top: -2.8rem
bottom: -1.5rem
top: -1rem
bottom: -1rem
position: absolute
width: 100%
font-weight: bold
@ -425,7 +497,7 @@ label
justify-content: center
&::after
content: attr(data-title)
content: ""
position: absolute
font-size: 1rem
top: -2rem

View File

@ -4,48 +4,91 @@ defineProps({
type: String,
required: true,
},
link: {
type: String,
},
});
</script>
<template>
<header>
<router-link :to="{ name: 'home' }">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
<svg
class="color-text"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="#5C913B"
d="M36 33.5c0 .828-.672 1.5-1.5 1.5h-33C.672 35 0 34.328 0 33.5S.672 32 1.5 32h33c.828 0 1.5.672 1.5 1.5z"
d="M22 22L2 22"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
fill="#A0041E"
d="M12.344 14.702h-2c-.276 0-.5-.224-.5-.5v-7c0-.276.224-.5.5-.5h2c.276 0 .5.224.5.5v7c0 .276-.224.5-.5.5z"
d="M2 11L10.1259 4.49931C11.2216 3.62279 12.7784 3.62279 13.8741 4.49931L22 11"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
fill="#FFCC4D"
d="M5.942 32c-.137-4.657-.506-8-.942-8-.435 0-.804 3.343-.941 8h1.883z"
d="M15.5 5.5V3.5C15.5 3.22386 15.7239 3 16 3H18.5C18.7761 3 19 3.22386 19 3.5V8.5"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
fill="#77B255"
d="M10 18.731C10 24.306 7.762 26 5 26c-2.761 0-5-1.694-5-7.269C0 13.154 4 5 5 5s5 8.154 5 13.731z"
/>
<path fill="#FFE8B6" d="M8 16L21 3l13 13v16H8z" />
<path fill="#FFCC4D" d="M21 16h1v16h-1z" />
<path
fill="#66757F"
d="M34 17c-.256 0-.512-.098-.707-.293L21 4.414 8.707 16.707c-.391.391-1.023.391-1.414 0s-.391-1.023 0-1.414l13-13c.391-.391 1.023-.391 1.414 0l13 13c.391.391.391 1.023 0 1.414-.195.195-.451.293-.707.293z"
d="M4 22V9.5"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
fill="#66757F"
d="M21 17c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l6.5-6.5c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-6.5 6.5c-.195.195-.451.293-.707.293z"
d="M20 22V9.5"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<path fill="#C1694F" d="M13 26h4v6h-4z" />
<path fill="#55ACEE" d="M13 17h4v4h-4zm12.5 0h4v4h-4zm0 9h4v4h-4z" />
<path
fill="#77B255"
d="M10.625 29.991c0 1.613-.858 2.103-1.917 2.103-1.058 0-1.917-.49-1.917-2.103 0-1.613 1.533-3.973 1.917-3.973s1.917 2.359 1.917 3.973zm25.25 0c0 1.613-.858 2.103-1.917 2.103-1.058 0-1.917-.49-1.917-2.103 0-1.613 1.533-3.973 1.917-3.973.384 0 1.917 2.359 1.917 3.973z"
d="M15 22V17C15 15.5858 15 14.8787 14.5607 14.4393C14.1213 14 13.4142 14 12 14C10.5858 14 9.87868 14 9.43934 14.4393C9 14.8787 9 15.5858 9 17V22"
stroke="white"
stroke-width="1.5"
/>
<path
d="M14 9.5C14 10.6046 13.1046 11.5 12 11.5C10.8954 11.5 10 10.6046 10 9.5C10 8.39543 10.8954 7.5 12 7.5C13.1046 7.5 14 8.39543 14 9.5Z"
stroke="white"
stroke-width="1.5"
/>
</svg>
</router-link>
<h1>{{ title }}</h1>
<a v-if="link" :href="link">
<svg
class="color-text"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M12 17V11"
stroke="white"
stroke-width="1.5"
stroke-linecap="round"
/>
<circle
cx="1"
cy="1"
r="1"
transform="matrix(1 0 0 -1 11 9)"
fill="white"
/>
<path
stroke="white"
stroke-width="1.5"
d="M2 12C2 7.28595 2 4.92893 3.46447 3.46447C4.92893 2 7.28595 2 12 2C16.714 2 19.0711 2 20.5355 3.46447C22 4.92893 22 7.28595 22 12C22 16.714 22 19.0711 20.5355 20.5355C19.0711 22 16.714 22 12 22C7.28595 22 4.92893 22 3.46447 20.5355C2 19.0711 2 16.714 2 12Z"
/>
</svg>
</a>
</header>
</template>
@ -63,6 +106,14 @@ header
align-items: center
align-content: center
a:first-child
border-right: 1px solid var(--color-header-text)
a:last-child
border-left: 1px solid var(--color-header-text)
a:hover svg, a:focus svg, a:active svg
transform: scale(1.1)
a
height: 100%
width: var(--header-size)
@ -72,7 +123,6 @@ a
align-items: center
text-align: center
align-content: center
border-right: 1px solid var(--color-header-text)
text-decoration: none
p
@ -86,12 +136,13 @@ h1
flex: 1
font-size: 1.2rem
font-weight: bold
text-align: center
svg
width: 2rem
margin: 0 auto
@media (min-height: 800px)
@media (min-height: 1000px)
p
font-size: 4rem

View File

@ -8,7 +8,7 @@ const translationKey = "languages_id";
const scores = data.filter((score) => {
return (
!!score.translations.find(
(translation) => translation[translationKey] == store.language
(translation) => translation[translationKey] == store.language,
) &&
score.results.length &&
score.questions.length
@ -27,24 +27,82 @@ function getTranslation(translations, key) {
@click="store.switchTheme"
title="Thème de votre système"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
<path
fill="#FFD983"
d="M18 0v36c9.941 0 18-8.059 18-18S27.941 0 18 0z"
<svg
class="color-text"
version="1.1"
id="Icons"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
viewBox="0 0 32 32"
xml:space="preserve"
>
<line
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
x1="16"
y1="3"
x2="16"
y2="29"
/>
<path
fill="#66757F"
d="M0 18c0 9.941 8.059 18 18 18V0C8.059 0 0 8.059 0 18z"
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
d="M16,23c-3.87,0-7-3.13-7-7s3.13-7,7-7"
/>
<line
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
x1="6.81"
y1="6.81"
x2="8.93"
y2="8.93"
/>
<line
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
x1="3"
y1="16"
x2="6"
y2="16"
/>
<line
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
x1="6.81"
y1="25.19"
x2="8.93"
y2="23.07"
/>
<path
fill="none"
stroke="#000000"
stroke-width="2"
stroke-linecap="round"
stroke-linejoin="round"
stroke-miterlimit="10"
d="M16,12.55C17.2,10.43,19.48,9,22.09,9c0.16,0,0.31,0.01,0.47,0.02c-1.67,0.88-2.8,2.63-2.8,4.64
c0,2.9,2.35,5.25,5.25,5.25c1.6,0,3.03-0.72,3.99-1.85C28.48,20.43,25.59,23,22.09,23c-2.61,0-4.89-1.43-6.09-3.55"
/>
<circle fill="#FFCC4D" cx="25.5" cy="8.5" r="3.5" />
<circle fill="#5B6876" cx="12" cy="16" r="3" />
<circle fill="#5B6876" cx="13.5" cy="27.5" r="3.5" />
<circle fill="#5B6876" cx="15" cy="6" r="2" />
<circle fill="#FFCC4D" cx="33" cy="18" r="1" />
<circle fill="#5B6876" cx="6" cy="9" r="1" />
<circle fill="#FFCC4D" cx="21" cy="31" r="1" />
<circle fill="#5B6876" cx="4" cy="19" r="2" />
<circle fill="#FFCC4D" cx="26" cy="23" r="2" />
</svg>
</li>
<li
@ -52,19 +110,16 @@ function getTranslation(translations, key) {
@click="store.switchTheme"
title="Thème sombre"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
<circle fill="#66757F" cx="18" cy="18" r="18" />
<g fill="#5B6876">
<circle cx="10.5" cy="8.5" r="3.5" />
<circle cx="20" cy="16" r="3" />
<circle cx="21.5" cy="27.5" r="3.5" />
<circle cx="21" cy="6" r="2" />
<circle cx="3" cy="18" r="1" />
<circle cx="30" cy="9" r="1" />
<circle cx="15" cy="31" r="1" />
<circle cx="32" cy="19" r="2" />
<circle cx="10" cy="23" r="2" />
</g>
<svg
class="color-text"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill="white"
d="M21.0672 11.8568L20.4253 11.469L21.0672 11.8568ZM12.1432 2.93276L11.7553 2.29085V2.29085L12.1432 2.93276ZM21.25 12C21.25 17.1086 17.1086 21.25 12 21.25V22.75C17.9371 22.75 22.75 17.9371 22.75 12H21.25ZM12 21.25C6.89137 21.25 2.75 17.1086 2.75 12H1.25C1.25 17.9371 6.06294 22.75 12 22.75V21.25ZM2.75 12C2.75 6.89137 6.89137 2.75 12 2.75V1.25C6.06294 1.25 1.25 6.06294 1.25 12H2.75ZM15.5 14.25C12.3244 14.25 9.75 11.6756 9.75 8.5H8.25C8.25 12.5041 11.4959 15.75 15.5 15.75V14.25ZM20.4253 11.469C19.4172 13.1373 17.5882 14.25 15.5 14.25V15.75C18.1349 15.75 20.4407 14.3439 21.7092 12.2447L20.4253 11.469ZM9.75 8.5C9.75 6.41182 10.8627 4.5828 12.531 3.57467L11.7553 2.29085C9.65609 3.5593 8.25 5.86509 8.25 8.5H9.75ZM12 2.75C11.9115 2.75 11.8077 2.71008 11.7324 2.63168C11.6686 2.56527 11.6538 2.50244 11.6503 2.47703C11.6461 2.44587 11.6482 2.35557 11.7553 2.29085L12.531 3.57467C13.0342 3.27065 13.196 2.71398 13.1368 2.27627C13.0754 1.82126 12.7166 1.25 12 1.25V2.75ZM21.7092 12.2447C21.6444 12.3518 21.5541 12.3539 21.523 12.3497C21.4976 12.3462 21.4347 12.3314 21.3683 12.2676C21.2899 12.1923 21.25 12.0885 21.25 12H22.75C22.75 11.2834 22.1787 10.9246 21.7237 10.8632C21.286 10.804 20.7293 10.9658 20.4253 11.469L21.7092 12.2447Z"
/>
</svg>
</li>
<li
@ -72,19 +127,61 @@ function getTranslation(translations, key) {
@click="store.switchTheme"
title="Thème clair"
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36">
<circle fill="#FFD983" cx="18" cy="18" r="18" />
<g fill="#FFCC4D">
<circle cx="10.5" cy="8.5" r="3.5" />
<circle cx="20" cy="17" r="3" />
<circle cx="24.5" cy="28.5" r="3.5" />
<circle cx="22" cy="5" r="2" />
<circle cx="3" cy="18" r="1" />
<circle cx="30" cy="9" r="1" />
<circle cx="15" cy="31" r="1" />
<circle cx="32" cy="19" r="2" />
<circle cx="10" cy="23" r="2" />
</g>
<svg
class="color-text"
viewBox="0 0 24 24"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<circle cx="12" cy="12" r="5" stroke="#1C274C" stroke-width="1.5" />
<path
d="M12 2V4"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M12 20V22"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M4 12L2 12"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M22 12L20 12"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M19.7778 4.22266L17.5558 6.25424"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M4.22217 4.22266L6.44418 6.25424"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M6.44434 17.5557L4.22211 19.7779"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
<path
d="M19.7778 19.7773L17.5558 17.5551"
stroke="#1C274C"
stroke-width="1.5"
stroke-linecap="round"
/>
</svg>
</li>
</ul>
@ -149,15 +246,15 @@ function getTranslation(translations, key) {
</template>
</ul>
</div>
</main>
<footer>
<p v-if="store.language == 'fr-FR'">
Scores & Appli par <a href="ceiba-conseil.com">Ceiba</a>
Scores & Appli par <a href="https://ceiba-conseil.com">Ceiba</a>
</p>
<p v-if="store.language == 'en-US'">
Scores & App by <a href="ceiba-conseil.com">Ceiba</a>
Scores & App by <a href="https://ceiba-conseil.com">Ceiba</a>
</p>
</footer>
</main>
</template>
<style lang="sass" scoped>
@ -166,6 +263,10 @@ footer
text-align: center
padding: 1rem
color: var(--color-header-text)
height: var(--footer-size)
display: flex
justify-content: space-around
align-items: center
a
color: var(--color-header-text)
header
@ -197,14 +298,20 @@ header
.hidden
display: none
svg
height: 32px
width: 32px
main
width: 100%
height: calc(100% - var(--header-size))
min-height: calc(100% - var(--header-size) - var(--footer-size))
background-color: var(--color-background)
overflow-x: hidden
overflow-y: auto
text-align: center
display: flex
flex-direction: column
justify-content: space-evenly
.homeImage
height: 30vh

View File

@ -1,10 +1,16 @@
import { createApp } from "vue";
import { createPinia } from "pinia";
import piniaPersist from "pinia-plugin-persist";
import { registerSW } from "virtual:pwa-register";
import App from "@/App.vue";
import router from "@/router";
if ("serviceWorker" in navigator) {
// && !/localhost/.test(window.location)) {
registerSW();
}
const app = createApp(App);
const pinia = createPinia();
pinia.use(piniaPersist);

View File

@ -1,11 +1,55 @@
import { fileURLToPath, URL } from "url";
import { VitePWA } from "vite-plugin-pwa";
import { defineConfig } from "vite";
import vue from "@vitejs/plugin-vue";
// https://vitejs.dev/config/
export default defineConfig({
plugins: [vue()],
// publicDir: 'public',
// includeAssets: ['public/answers/*.web'],
plugins: [
vue(),
VitePWA({
name: "My First Progressive Web app",
short_name: "First PWA",
theme_color: "#eb5252",
background_color: "#000000",
registerType: "autoUpdate",
injectRegister: "auto",
// add this to cache all the imports
workbox: {
globPatterns: ["**/*"],
},
// add this to cache all the
// static assets in the public folder
includeAssets: ["**/*"],
useCredentials: true,
manifest: {
theme_color: "#eb5252",
orientation: "portrait",
display: "fullscreen",
scope: "/",
icons: [
{
src: "/images/pwa-icon-256.png",
sizes: "192x192",
type: "image/png",
purpose: "any maskable",
},
{
src: "/images/pwa-icon-512.png",
sizes: "512x512",
type: "image/png",
purpose: "any maskable",
},
],
},
devOptions: {
enabled: true,
},
}),
],
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),