diff --git a/npm/react/README.md b/npm/react/README.md index 22b86ad62..f6320ca68 100644 --- a/npm/react/README.md +++ b/npm/react/README.md @@ -175,6 +175,14 @@ Liste des équivalents à comparer parmis la liste suivante : - bonbons : kg de bonbons gélifiés - baguette : kg de baguette tradition - pommedeterre : kg de pomme de terre nouvelle + - boulettesvegetales : kg de boulette végétale + - galettefromage : kg de galette au fromage + - galettevegetale : kg de galette végétale + - hachevegetal : kg de haché végétal + - nuggetsvegetaux : kg de nuggets végétaux + - saucissevegetale : kg de saucisse végétale + - chocolataulait : kg de chocolat au lait + - chocolatnoir : kg de chocolat noir - Fruits et légumes - fraise : kg de fraise - pomme : kg de pomme diff --git a/public/equivalents.csv b/public/equivalents.csv index 692968f57..eeb8abfb0 100644 --- a/public/equivalents.csv +++ b/public/equivalents.csv @@ -13,6 +13,8 @@ Cabillaud (cru),12.0864877,Alimentation,cabillaud,https://impactco2.fr/outils/al Canard,8.0609,Alimentation,canard,https://impactco2.fr/outils/alimentation/canard Chausson aux pommes,2.0441000000000003,Alimentation,chaussonauxpommes,https://impactco2.fr/outils/alimentation/chaussonauxpommes Cheeseburger,18.833399999999997,Alimentation,cheeseburger,https://impactco2.fr/outils/alimentation/cheeseburger +Chocolat au lait,12.5989,Alimentation,chocolataulait,https://impactco2.fr/outils/alimentation/chocolataulait +Chocolat noir,19.027900000000002,Alimentation,chocolatnoir,https://impactco2.fr/outils/alimentation/chocolatnoir Cookie au pépites de chocolat,6.272900000000001,Alimentation,cookie,https://impactco2.fr/outils/alimentation/cookie Crevettes,20.345228,Alimentation,crevettes,https://impactco2.fr/outils/alimentation/crevettes Croissant au beurre,2.9431000000000003,Alimentation,croissant,https://impactco2.fr/outils/alimentation/croissant @@ -36,7 +38,7 @@ Madeleine,2.2434,Alimentation,madeleine,https://impactco2.fr/outils/alimentation Matière grasse végétale,2.58463,Alimentation,matieregrasse,https://impactco2.fr/outils/alimentation/matieregrasse Moules,5.328231000000001,Alimentation,moules,https://impactco2.fr/outils/alimentation/moules Mozarella,4.714629999999999,Alimentation,mozarella,https://impactco2.fr/outils/alimentation/mozarella -Nuggets végétaux,1.7695,Alimentation,nuggetsvegetaux,https://impactco2.fr/outils/alimentation/nuggetsvegetaux +Nuggets végétaux,1.7705,Alimentation,nuggetsvegetaux,https://impactco2.fr/outils/alimentation/nuggetsvegetaux Oeufs,1.8780103000000001,Alimentation,oeuf,https://impactco2.fr/outils/alimentation/oeuf Pain au chocolat ou chocolatine,5.7291,Alimentation,painauchocolat,https://impactco2.fr/outils/alimentation/painauchocolat Pain aux raisins,2.5641,Alimentation,painauxraisins,https://impactco2.fr/outils/alimentation/painauxraisins @@ -61,7 +63,7 @@ Repas végétarien,0.85,Alimentation,repasvegetarien,https://impactco2.fr/outils Riz,2.01458575,Alimentation,riz,https://impactco2.fr/outils/alimentation/riz Rocher au chocolat,10.521899999999999,Alimentation,boucheechocolat,https://impactco2.fr/outils/alimentation/boucheechocolat Sardines,2.2764877,Alimentation,sardines,https://impactco2.fr/outils/alimentation/sardines -Saucisse végétale,2.1973999999999996,Alimentation,saucissevegetale,https://impactco2.fr/outils/alimentation/saucissevegetale +Saucisse végétale,2.2134,Alimentation,saucissevegetale,https://impactco2.fr/outils/alimentation/saucissevegetale Saumon ou truite d'élevage (cru),5.55693,Alimentation,saumon,https://impactco2.fr/outils/alimentation/saumon Sushis ou makis,2.6689999999999996,Alimentation,sushis,https://impactco2.fr/outils/alimentation/sushis Thon (cru),4.98343,Alimentation,thon,https://impactco2.fr/outils/alimentation/thon diff --git a/public/icons/chocolataulait.svg b/public/icons/chocolataulait.svg new file mode 100644 index 000000000..12f9d9f3a --- /dev/null +++ b/public/icons/chocolataulait.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/icons/chocolatnoir.svg b/public/icons/chocolatnoir.svg new file mode 100644 index 000000000..b2ec69910 --- /dev/null +++ b/public/icons/chocolatnoir.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/kit/illustrations.zip b/public/kit/illustrations.zip index de4c95530..00bf4cbbd 100644 Binary files a/public/kit/illustrations.zip and b/public/kit/illustrations.zip differ diff --git a/public/meta/chocolataulait-en.png b/public/meta/chocolataulait-en.png new file mode 100644 index 000000000..47e51f8fa Binary files /dev/null and b/public/meta/chocolataulait-en.png differ diff --git a/public/meta/chocolataulait-es.png b/public/meta/chocolataulait-es.png new file mode 100644 index 000000000..1e3d6246f Binary files /dev/null and b/public/meta/chocolataulait-es.png differ diff --git a/public/meta/chocolataulait-fr.png b/public/meta/chocolataulait-fr.png new file mode 100644 index 000000000..351abf44f Binary files /dev/null and b/public/meta/chocolataulait-fr.png differ diff --git a/public/meta/chocolatnoir-en.png b/public/meta/chocolatnoir-en.png new file mode 100644 index 000000000..bd1648853 Binary files /dev/null and b/public/meta/chocolatnoir-en.png differ diff --git a/public/meta/chocolatnoir-es.png b/public/meta/chocolatnoir-es.png new file mode 100644 index 000000000..213a95e87 Binary files /dev/null and b/public/meta/chocolatnoir-es.png differ diff --git a/public/meta/chocolatnoir-fr.png b/public/meta/chocolatnoir-fr.png new file mode 100644 index 000000000..afa2eac2d Binary files /dev/null and b/public/meta/chocolatnoir-fr.png differ diff --git a/src/data/categories/alimentation.json b/src/data/categories/alimentation.json index 06702b5be..0a1fcdf4c 100644 --- a/src/data/categories/alimentation.json +++ b/src/data/categories/alimentation.json @@ -2009,5 +2009,59 @@ "value": 0.0888 } ] + }, + { + "slug": "chocolataulait", + "category": 2, + "Code_CIQUAL": 31004, + "ecv": [ + { + "id": 30, + "value": 11.5 + }, + { + "id": 31, + "value": 0.137 + }, + { + "id": 32, + "value": 0.705 + }, + { + "id": 33, + "value": 0.236 + }, + { + "id": 34, + "value": 0.0209 + } + ] + }, + { + "slug": "chocolatnoir", + "category": 2, + "Code_CIQUAL": 31074, + "ecv": [ + { + "id": 30, + "value": 17.8 + }, + { + "id": 31, + "value": 0.194 + }, + { + "id": 32, + "value": 0.705 + }, + { + "id": 33, + "value": 0.308 + }, + { + "id": 34, + "value": 0.0209 + } + ] } ] \ No newline at end of file diff --git a/src/data/categories/alimentation.ts b/src/data/categories/alimentation.ts index 8ff0c4880..21b3c35e3 100644 --- a/src/data/categories/alimentation.ts +++ b/src/data/categories/alimentation.ts @@ -1713,4 +1713,56 @@ export const alimentation = [ }, ], }, + { + slug: 'chocolataulait', + category: 2, + ecv: [ + { + id: 30, + value: 11.5, + }, + { + id: 31, + value: 0.137, + }, + { + id: 32, + value: 0.705, + }, + { + id: 33, + value: 0.236, + }, + { + id: 34, + value: 0.0209, + }, + ], + }, + { + slug: 'chocolatnoir', + category: 2, + ecv: [ + { + id: 30, + value: 17.8, + }, + { + id: 31, + value: 0.194, + }, + { + id: 32, + value: 0.705, + }, + { + id: 33, + value: 0.308, + }, + { + id: 34, + value: 0.0209, + }, + ], + }, ] diff --git a/src/utils/Equivalent/values.json b/src/utils/Equivalent/values.json index fb24e426a..5610dee56 100644 --- a/src/utils/Equivalent/values.json +++ b/src/utils/Equivalent/values.json @@ -1814,6 +1814,20 @@ "en": "kg of ;hazelnut spread", "es": "kg de ;crema de avellanas" }, + "chocolataulait": { + "category": 2, + "value": 12598.9, + "fr": "kg de ;chocolat au lait", + "en": "kg of ;milk chocolate", + "es": "kg de ;chocolate con leche" + }, + "chocolatnoir": { + "category": 2, + "value": 19027.9, + "fr": "kg de ;chocolat noir", + "en": "kg of ;dark chocolate", + "es": "kg de ;chocolate negro" + }, "brownie": { "category": 2, "value": 8356.9, diff --git a/src/utils/alimentation.ts b/src/utils/alimentation.ts index 96f79008b..686e8c2c0 100644 --- a/src/utils/alimentation.ts +++ b/src/utils/alimentation.ts @@ -76,6 +76,8 @@ const slugByCategory: Record