From 170d35e383b5a1a90dec49e848ae4499c4554413 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Thu, 20 Jun 2024 16:35:22 +0200 Subject: [PATCH 1/6] fix: test for ie --- src/core/asset/artwork/background/ovoid.svg | 31 ++++++++++--------- .../pictograms/system/technical-error.svg | 16 ++++++---- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/core/asset/artwork/background/ovoid.svg b/src/core/asset/artwork/background/ovoid.svg index 98d816a1f..91dbedca6 100644 --- a/src/core/asset/artwork/background/ovoid.svg +++ b/src/core/asset/artwork/background/ovoid.svg @@ -1,16 +1,19 @@ - - - - - - - + + + + + + + + + + diff --git a/src/core/asset/artwork/pictograms/system/technical-error.svg b/src/core/asset/artwork/pictograms/system/technical-error.svg index 3c90712e8..55d4586f3 100644 --- a/src/core/asset/artwork/pictograms/system/technical-error.svg +++ b/src/core/asset/artwork/pictograms/system/technical-error.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + + From 865536105ea1c5302f7ec402dea391dd62aa0eba Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Fri, 21 Jun 2024 17:30:55 +0200 Subject: [PATCH 2/6] fix(legacy): artwork injection --- src/core/script/artwork/artwork.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/script/artwork/artwork.js b/src/core/script/artwork/artwork.js index 8221aa350..198cc8b24 100644 --- a/src/core/script/artwork/artwork.js +++ b/src/core/script/artwork/artwork.js @@ -29,9 +29,15 @@ class Artwork extends Instance { const parser = new DOMParser(); const xmlDoc = parser.parseFromString(xhr.responseText, 'text/html'); this.realSvgContent = xmlDoc.getElementById(this.svgName); - if (this.realSvgContent) { - this.realSvgContent.classList.add(this.node.classList); + if (this.realSvgContent.tagName === 'symbol') { + this.use = xmlDoc.querySelector('use[href="#' + this.svgName + '"]'); + if (this.use) this.node.parentNode.insertBefore(this.use, this.node); + } else { + // deprecated svg structure + this.realSvgContent.classList.add(this.node.classList); + } + this.replace(); } }; From 7b79055c2f137a74ab7ea12b181adb6597b69b14 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Mon, 24 Jun 2024 17:50:08 +0200 Subject: [PATCH 3/6] feat(artwork): script de transformation des artworks --- package.json | 1 + src/core/asset/artwork/dark.svg | 15 ++++--- src/core/asset/artwork/light.svg | 15 ++++--- .../pictograms/buildings/city-hall.svg | 15 ++++--- .../artwork/pictograms/buildings/factory.svg | 15 ++++--- .../artwork/pictograms/buildings/house.svg | 15 ++++--- .../pictograms/buildings/nuclear-plant.svg | 15 ++++--- .../artwork/pictograms/buildings/school.svg | 15 ++++--- .../pictograms/digital/application.svg | 15 ++++--- .../artwork/pictograms/digital/avatar.svg | 15 ++++--- .../artwork/pictograms/digital/calendar.svg | 15 ++++--- .../artwork/pictograms/digital/coding.svg | 15 ++++--- .../pictograms/digital/data-visualization.svg | 15 ++++--- .../pictograms/digital/in-progress.svg | 15 ++++--- .../artwork/pictograms/digital/internet.svg | 15 ++++--- .../artwork/pictograms/digital/mail-send.svg | 15 ++++--- .../artwork/pictograms/digital/search.svg | 15 ++++--- .../artwork/pictograms/document/contract.svg | 15 ++++--- .../pictograms/document/document-add.svg | 15 ++++--- .../pictograms/document/document-download.svg | 15 ++++--- .../document/document-signature.svg | 15 ++++--- .../artwork/pictograms/document/document.svg | 15 ++++--- .../pictograms/document/driving-licence.svg | 15 ++++--- .../document/national-identity-card.svg | 15 ++++--- .../artwork/pictograms/document/passport.svg | 15 ++++--- .../artwork/pictograms/document/tax-stamp.svg | 15 ++++--- .../document/vehicle-registration.svg | 15 ++++--- .../pictograms/environment/environment.svg | 15 ++++--- .../artwork/pictograms/environment/food.svg | 15 ++++--- .../pictograms/environment/grocery.svg | 15 ++++--- .../environment/human-cooperation.svg | 15 ++++--- .../artwork/pictograms/environment/leaf.svg | 15 ++++--- .../artwork/pictograms/environment/moon.svg | 15 ++++--- .../pictograms/environment/mountain.svg | 15 ++++--- .../artwork/pictograms/environment/sun.svg | 15 ++++--- .../artwork/pictograms/environment/tree.svg | 15 ++++--- .../artwork/pictograms/health/health.svg | 15 ++++--- .../artwork/pictograms/health/hospital.svg | 15 ++++--- .../artwork/pictograms/health/vaccine.svg | 15 ++++--- .../asset/artwork/pictograms/health/virus.svg | 15 ++++--- .../pictograms/institutions/firefighter.svg | 15 ++++--- .../pictograms/institutions/gendarmerie.svg | 15 ++++--- .../pictograms/institutions/justice.svg | 15 ++++--- .../artwork/pictograms/institutions/money.svg | 15 ++++--- .../pictograms/institutions/police.svg | 15 ++++--- .../asset/artwork/pictograms/leisure/book.svg | 15 ++++--- .../artwork/pictograms/leisure/community.svg | 15 ++++--- .../artwork/pictograms/leisure/culture.svg | 15 ++++--- .../pictograms/leisure/digital-art.svg | 15 ++++--- .../artwork/pictograms/leisure/paint.svg | 15 ++++--- .../asset/artwork/pictograms/map/airport.svg | 15 ++++--- .../pictograms/map/location-france.svg | 15 ++++--- .../asset/artwork/pictograms/map/luggage.svg | 15 ++++--- src/core/asset/artwork/pictograms/map/map.svg | 15 ++++--- .../pictograms/system/connection-lost.svg | 15 ++++--- .../asset/artwork/pictograms/system/error.svg | 15 ++++--- .../artwork/pictograms/system/information.svg | 15 ++++--- .../pictograms/system/notification.svg | 15 ++++--- .../artwork/pictograms/system/padlock.svg | 15 ++++--- .../artwork/pictograms/system/success.svg | 15 ++++--- .../artwork/pictograms/system/system.svg | 15 ++++--- .../artwork/pictograms/system/warning.svg | 15 ++++--- src/core/asset/artwork/system.svg | 15 ++++--- tool/generate/pictogram.js | 41 ++++++++++++++++++- tool/tool.js | 35 ++++++++++++++++ 65 files changed, 634 insertions(+), 373 deletions(-) diff --git a/package.json b/package.json index 02e97f428..1bb31d992 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "deploy": "node tool/tool.js deploy", "standalone": "node tool/tool.js standalone", "changelog": "node tool/tool.js changelog", + "pictogram-converter": "node tool/tool.js pictogram-converter", "serve": "browser-sync start --server --port 8080 --startPath example/" }, "files": [ diff --git a/src/core/asset/artwork/dark.svg b/src/core/asset/artwork/dark.svg index 5754b1fd2..e4d335c29 100644 --- a/src/core/asset/artwork/dark.svg +++ b/src/core/asset/artwork/dark.svg @@ -1,11 +1,14 @@ - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/light.svg b/src/core/asset/artwork/light.svg index 5a301fe27..fbc3d161f 100644 --- a/src/core/asset/artwork/light.svg +++ b/src/core/asset/artwork/light.svg @@ -1,11 +1,14 @@ - + - - + + - - + + - + + + + \ No newline at end of file diff --git a/src/core/asset/artwork/pictograms/buildings/city-hall.svg b/src/core/asset/artwork/pictograms/buildings/city-hall.svg index 7e645005d..b5e8e426c 100644 --- a/src/core/asset/artwork/pictograms/buildings/city-hall.svg +++ b/src/core/asset/artwork/pictograms/buildings/city-hall.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/buildings/factory.svg b/src/core/asset/artwork/pictograms/buildings/factory.svg index 4ff7fd2dd..4f492a017 100644 --- a/src/core/asset/artwork/pictograms/buildings/factory.svg +++ b/src/core/asset/artwork/pictograms/buildings/factory.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/buildings/house.svg b/src/core/asset/artwork/pictograms/buildings/house.svg index c2553ad8a..76f68258e 100644 --- a/src/core/asset/artwork/pictograms/buildings/house.svg +++ b/src/core/asset/artwork/pictograms/buildings/house.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + \ No newline at end of file diff --git a/src/core/asset/artwork/pictograms/buildings/nuclear-plant.svg b/src/core/asset/artwork/pictograms/buildings/nuclear-plant.svg index 3e0329b3a..e50438e31 100644 --- a/src/core/asset/artwork/pictograms/buildings/nuclear-plant.svg +++ b/src/core/asset/artwork/pictograms/buildings/nuclear-plant.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/buildings/school.svg b/src/core/asset/artwork/pictograms/buildings/school.svg index 9fdb0e2db..80cbe9ec8 100644 --- a/src/core/asset/artwork/pictograms/buildings/school.svg +++ b/src/core/asset/artwork/pictograms/buildings/school.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/application.svg b/src/core/asset/artwork/pictograms/digital/application.svg index f8325865f..e5552bf64 100644 --- a/src/core/asset/artwork/pictograms/digital/application.svg +++ b/src/core/asset/artwork/pictograms/digital/application.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/avatar.svg b/src/core/asset/artwork/pictograms/digital/avatar.svg index 51ce8ce30..b74037d2b 100644 --- a/src/core/asset/artwork/pictograms/digital/avatar.svg +++ b/src/core/asset/artwork/pictograms/digital/avatar.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/calendar.svg b/src/core/asset/artwork/pictograms/digital/calendar.svg index efa6a792d..d68be627c 100644 --- a/src/core/asset/artwork/pictograms/digital/calendar.svg +++ b/src/core/asset/artwork/pictograms/digital/calendar.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/coding.svg b/src/core/asset/artwork/pictograms/digital/coding.svg index ad89e7936..cbc85c586 100644 --- a/src/core/asset/artwork/pictograms/digital/coding.svg +++ b/src/core/asset/artwork/pictograms/digital/coding.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/data-visualization.svg b/src/core/asset/artwork/pictograms/digital/data-visualization.svg index 3f9319172..906567a00 100644 --- a/src/core/asset/artwork/pictograms/digital/data-visualization.svg +++ b/src/core/asset/artwork/pictograms/digital/data-visualization.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/in-progress.svg b/src/core/asset/artwork/pictograms/digital/in-progress.svg index b8d8381ef..f409ff18b 100644 --- a/src/core/asset/artwork/pictograms/digital/in-progress.svg +++ b/src/core/asset/artwork/pictograms/digital/in-progress.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/internet.svg b/src/core/asset/artwork/pictograms/digital/internet.svg index 549c17104..ee11b87c9 100644 --- a/src/core/asset/artwork/pictograms/digital/internet.svg +++ b/src/core/asset/artwork/pictograms/digital/internet.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/mail-send.svg b/src/core/asset/artwork/pictograms/digital/mail-send.svg index 9d98e866b..4bece7f8b 100644 --- a/src/core/asset/artwork/pictograms/digital/mail-send.svg +++ b/src/core/asset/artwork/pictograms/digital/mail-send.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/digital/search.svg b/src/core/asset/artwork/pictograms/digital/search.svg index 92b63de65..893dccb93 100644 --- a/src/core/asset/artwork/pictograms/digital/search.svg +++ b/src/core/asset/artwork/pictograms/digital/search.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/contract.svg b/src/core/asset/artwork/pictograms/document/contract.svg index 6f2bfde2e..146d5e676 100644 --- a/src/core/asset/artwork/pictograms/document/contract.svg +++ b/src/core/asset/artwork/pictograms/document/contract.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/document-add.svg b/src/core/asset/artwork/pictograms/document/document-add.svg index 9f8ba5790..dc6641781 100644 --- a/src/core/asset/artwork/pictograms/document/document-add.svg +++ b/src/core/asset/artwork/pictograms/document/document-add.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/document-download.svg b/src/core/asset/artwork/pictograms/document/document-download.svg index 42ea8201c..f88d088ad 100644 --- a/src/core/asset/artwork/pictograms/document/document-download.svg +++ b/src/core/asset/artwork/pictograms/document/document-download.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/document-signature.svg b/src/core/asset/artwork/pictograms/document/document-signature.svg index c11e83f5a..6e83f743e 100644 --- a/src/core/asset/artwork/pictograms/document/document-signature.svg +++ b/src/core/asset/artwork/pictograms/document/document-signature.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/document.svg b/src/core/asset/artwork/pictograms/document/document.svg index 2fbfddf7c..fd232083c 100644 --- a/src/core/asset/artwork/pictograms/document/document.svg +++ b/src/core/asset/artwork/pictograms/document/document.svg @@ -10,18 +10,18 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/driving-licence.svg b/src/core/asset/artwork/pictograms/document/driving-licence.svg index ac8640d78..4f2ac39db 100644 --- a/src/core/asset/artwork/pictograms/document/driving-licence.svg +++ b/src/core/asset/artwork/pictograms/document/driving-licence.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/national-identity-card.svg b/src/core/asset/artwork/pictograms/document/national-identity-card.svg index ddcb4cd07..711b7a36b 100644 --- a/src/core/asset/artwork/pictograms/document/national-identity-card.svg +++ b/src/core/asset/artwork/pictograms/document/national-identity-card.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/passport.svg b/src/core/asset/artwork/pictograms/document/passport.svg index 0820fb36f..880c0083c 100644 --- a/src/core/asset/artwork/pictograms/document/passport.svg +++ b/src/core/asset/artwork/pictograms/document/passport.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/tax-stamp.svg b/src/core/asset/artwork/pictograms/document/tax-stamp.svg index 742cb5378..1caa08f38 100644 --- a/src/core/asset/artwork/pictograms/document/tax-stamp.svg +++ b/src/core/asset/artwork/pictograms/document/tax-stamp.svg @@ -10,14 +10,14 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/document/vehicle-registration.svg b/src/core/asset/artwork/pictograms/document/vehicle-registration.svg index 637ff8bb0..4b54b3f1e 100644 --- a/src/core/asset/artwork/pictograms/document/vehicle-registration.svg +++ b/src/core/asset/artwork/pictograms/document/vehicle-registration.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/environment.svg b/src/core/asset/artwork/pictograms/environment/environment.svg index 0db3c0f01..cb955f995 100644 --- a/src/core/asset/artwork/pictograms/environment/environment.svg +++ b/src/core/asset/artwork/pictograms/environment/environment.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/food.svg b/src/core/asset/artwork/pictograms/environment/food.svg index 07783b4cd..b095c4008 100644 --- a/src/core/asset/artwork/pictograms/environment/food.svg +++ b/src/core/asset/artwork/pictograms/environment/food.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + \ No newline at end of file diff --git a/src/core/asset/artwork/pictograms/environment/grocery.svg b/src/core/asset/artwork/pictograms/environment/grocery.svg index 3e78bf0e2..bf4326561 100644 --- a/src/core/asset/artwork/pictograms/environment/grocery.svg +++ b/src/core/asset/artwork/pictograms/environment/grocery.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + \ No newline at end of file diff --git a/src/core/asset/artwork/pictograms/environment/human-cooperation.svg b/src/core/asset/artwork/pictograms/environment/human-cooperation.svg index 3f4f54b7d..567511297 100644 --- a/src/core/asset/artwork/pictograms/environment/human-cooperation.svg +++ b/src/core/asset/artwork/pictograms/environment/human-cooperation.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/leaf.svg b/src/core/asset/artwork/pictograms/environment/leaf.svg index 7c60559a5..fff358a34 100644 --- a/src/core/asset/artwork/pictograms/environment/leaf.svg +++ b/src/core/asset/artwork/pictograms/environment/leaf.svg @@ -10,19 +10,19 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/moon.svg b/src/core/asset/artwork/pictograms/environment/moon.svg index 14aec933e..51ed8eef9 100644 --- a/src/core/asset/artwork/pictograms/environment/moon.svg +++ b/src/core/asset/artwork/pictograms/environment/moon.svg @@ -10,20 +10,20 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/mountain.svg b/src/core/asset/artwork/pictograms/environment/mountain.svg index d2747e35a..8946234fb 100644 --- a/src/core/asset/artwork/pictograms/environment/mountain.svg +++ b/src/core/asset/artwork/pictograms/environment/mountain.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/sun.svg b/src/core/asset/artwork/pictograms/environment/sun.svg index 1f44531bb..1d2805bc3 100644 --- a/src/core/asset/artwork/pictograms/environment/sun.svg +++ b/src/core/asset/artwork/pictograms/environment/sun.svg @@ -10,17 +10,17 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/environment/tree.svg b/src/core/asset/artwork/pictograms/environment/tree.svg index 14be32188..f000d2d4c 100644 --- a/src/core/asset/artwork/pictograms/environment/tree.svg +++ b/src/core/asset/artwork/pictograms/environment/tree.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/health/health.svg b/src/core/asset/artwork/pictograms/health/health.svg index e24140efd..9f5e6c1a7 100644 --- a/src/core/asset/artwork/pictograms/health/health.svg +++ b/src/core/asset/artwork/pictograms/health/health.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/health/hospital.svg b/src/core/asset/artwork/pictograms/health/hospital.svg index 485b9f7e8..0a5360112 100644 --- a/src/core/asset/artwork/pictograms/health/hospital.svg +++ b/src/core/asset/artwork/pictograms/health/hospital.svg @@ -10,19 +10,19 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/health/vaccine.svg b/src/core/asset/artwork/pictograms/health/vaccine.svg index fe405ca6f..c90ec3c00 100644 --- a/src/core/asset/artwork/pictograms/health/vaccine.svg +++ b/src/core/asset/artwork/pictograms/health/vaccine.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/health/virus.svg b/src/core/asset/artwork/pictograms/health/virus.svg index 7881830b9..5c4ee276e 100644 --- a/src/core/asset/artwork/pictograms/health/virus.svg +++ b/src/core/asset/artwork/pictograms/health/virus.svg @@ -10,17 +10,17 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/institutions/firefighter.svg b/src/core/asset/artwork/pictograms/institutions/firefighter.svg index d892c94c9..a08294352 100644 --- a/src/core/asset/artwork/pictograms/institutions/firefighter.svg +++ b/src/core/asset/artwork/pictograms/institutions/firefighter.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/institutions/gendarmerie.svg b/src/core/asset/artwork/pictograms/institutions/gendarmerie.svg index a73f6f260..e8a1283dd 100644 --- a/src/core/asset/artwork/pictograms/institutions/gendarmerie.svg +++ b/src/core/asset/artwork/pictograms/institutions/gendarmerie.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/institutions/justice.svg b/src/core/asset/artwork/pictograms/institutions/justice.svg index 0f4c06f19..cd562abdf 100644 --- a/src/core/asset/artwork/pictograms/institutions/justice.svg +++ b/src/core/asset/artwork/pictograms/institutions/justice.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/institutions/money.svg b/src/core/asset/artwork/pictograms/institutions/money.svg index 061cf2c12..e3b78b7d4 100644 --- a/src/core/asset/artwork/pictograms/institutions/money.svg +++ b/src/core/asset/artwork/pictograms/institutions/money.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/institutions/police.svg b/src/core/asset/artwork/pictograms/institutions/police.svg index d62590bcf..8ae57ef7f 100644 --- a/src/core/asset/artwork/pictograms/institutions/police.svg +++ b/src/core/asset/artwork/pictograms/institutions/police.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/leisure/book.svg b/src/core/asset/artwork/pictograms/leisure/book.svg index 684df79c0..db94b5143 100644 --- a/src/core/asset/artwork/pictograms/leisure/book.svg +++ b/src/core/asset/artwork/pictograms/leisure/book.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/leisure/community.svg b/src/core/asset/artwork/pictograms/leisure/community.svg index 3cf3c247c..65cf683df 100644 --- a/src/core/asset/artwork/pictograms/leisure/community.svg +++ b/src/core/asset/artwork/pictograms/leisure/community.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/leisure/culture.svg b/src/core/asset/artwork/pictograms/leisure/culture.svg index e14c2a3ab..d4ed776fe 100644 --- a/src/core/asset/artwork/pictograms/leisure/culture.svg +++ b/src/core/asset/artwork/pictograms/leisure/culture.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/leisure/digital-art.svg b/src/core/asset/artwork/pictograms/leisure/digital-art.svg index 9785ae273..e191c3678 100644 --- a/src/core/asset/artwork/pictograms/leisure/digital-art.svg +++ b/src/core/asset/artwork/pictograms/leisure/digital-art.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/leisure/paint.svg b/src/core/asset/artwork/pictograms/leisure/paint.svg index d73b1152f..b2a43431c 100644 --- a/src/core/asset/artwork/pictograms/leisure/paint.svg +++ b/src/core/asset/artwork/pictograms/leisure/paint.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/map/airport.svg b/src/core/asset/artwork/pictograms/map/airport.svg index ceb422b0e..3dbc43030 100644 --- a/src/core/asset/artwork/pictograms/map/airport.svg +++ b/src/core/asset/artwork/pictograms/map/airport.svg @@ -10,11 +10,11 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/map/location-france.svg b/src/core/asset/artwork/pictograms/map/location-france.svg index 1dab4c690..8d3ddc084 100644 --- a/src/core/asset/artwork/pictograms/map/location-france.svg +++ b/src/core/asset/artwork/pictograms/map/location-france.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/map/luggage.svg b/src/core/asset/artwork/pictograms/map/luggage.svg index a826817b1..a2445facc 100644 --- a/src/core/asset/artwork/pictograms/map/luggage.svg +++ b/src/core/asset/artwork/pictograms/map/luggage.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/map/map.svg b/src/core/asset/artwork/pictograms/map/map.svg index d04a7edf1..8d1f63aa1 100644 --- a/src/core/asset/artwork/pictograms/map/map.svg +++ b/src/core/asset/artwork/pictograms/map/map.svg @@ -10,13 +10,13 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/connection-lost.svg b/src/core/asset/artwork/pictograms/system/connection-lost.svg index 92049204e..549d1885d 100644 --- a/src/core/asset/artwork/pictograms/system/connection-lost.svg +++ b/src/core/asset/artwork/pictograms/system/connection-lost.svg @@ -10,19 +10,19 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/error.svg b/src/core/asset/artwork/pictograms/system/error.svg index ce77e3190..8f0d846dc 100644 --- a/src/core/asset/artwork/pictograms/system/error.svg +++ b/src/core/asset/artwork/pictograms/system/error.svg @@ -10,19 +10,19 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/information.svg b/src/core/asset/artwork/pictograms/system/information.svg index f324a9347..5ad090d2c 100644 --- a/src/core/asset/artwork/pictograms/system/information.svg +++ b/src/core/asset/artwork/pictograms/system/information.svg @@ -10,16 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/notification.svg b/src/core/asset/artwork/pictograms/system/notification.svg index 19d8c84bf..d08ad1571 100644 --- a/src/core/asset/artwork/pictograms/system/notification.svg +++ b/src/core/asset/artwork/pictograms/system/notification.svg @@ -10,12 +10,12 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/padlock.svg b/src/core/asset/artwork/pictograms/system/padlock.svg index 5103d4793..ea89c9f32 100644 --- a/src/core/asset/artwork/pictograms/system/padlock.svg +++ b/src/core/asset/artwork/pictograms/system/padlock.svg @@ -10,17 +10,17 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/success.svg b/src/core/asset/artwork/pictograms/system/success.svg index 121858e73..bbdc7d53e 100644 --- a/src/core/asset/artwork/pictograms/system/success.svg +++ b/src/core/asset/artwork/pictograms/system/success.svg @@ -10,18 +10,18 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/system.svg b/src/core/asset/artwork/pictograms/system/system.svg index 1fe74cca8..5e0ffc821 100644 --- a/src/core/asset/artwork/pictograms/system/system.svg +++ b/src/core/asset/artwork/pictograms/system/system.svg @@ -10,13 +10,16 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/pictograms/system/warning.svg b/src/core/asset/artwork/pictograms/system/warning.svg index 3b595b175..b75aba4c8 100644 --- a/src/core/asset/artwork/pictograms/system/warning.svg +++ b/src/core/asset/artwork/pictograms/system/warning.svg @@ -10,21 +10,24 @@ fill: #000091; } - + - - + + - - + + - + + + + diff --git a/src/core/asset/artwork/system.svg b/src/core/asset/artwork/system.svg index d66e92bc7..1aa24c6bb 100644 --- a/src/core/asset/artwork/system.svg +++ b/src/core/asset/artwork/system.svg @@ -1,11 +1,14 @@ - + - - + + - - + + - + + + + diff --git a/tool/generate/pictogram.js b/tool/generate/pictogram.js index 7c933f519..37dcb02fa 100644 --- a/tool/generate/pictogram.js +++ b/tool/generate/pictogram.js @@ -2,6 +2,7 @@ const fs = require('fs'); const path = require('path'); const root = require('../utilities/root'); const { createFile } = require('../utilities/file'); +const log = require('../utilities/log'); const generatePictogram = async (dir) => { let sass = '$pictogram-config: (\n'; @@ -30,4 +31,42 @@ const generatePictogram = async (dir) => { createFile(jsonPath, JSON.stringify(json)); }; -module.exports = { generatePictogram }; +const generateNewPictogram = async (dir) => { + _parseFolder(dir); +}; + +const _parseFolder = (mainPath, subPath = '') => { + const dir = `${mainPath}/${subPath}`; + log(38, `${dir}`); + const files = fs.readdirSync(dir); + files.forEach((file) => { + const stat = fs.statSync(`${dir}/${file}`); + if (stat.isDirectory()) { + _parseFolder(mainPath, `${subPath}/${file}`); + } else { + if (stat.isFile() && path.extname(file) === '.svg') { + _replaceOldStructure(`${dir}/${file}`); + } + } + }); +}; + +const _replaceOldStructure = (path) => { + log(38, `${path}`); + const svg = fs.readFileSync(`${path}`, 'utf8'); + const newSvg = replaceOldStructureSVG(svg); + fs.writeFileSync(`${path}`, newSvg); +}; + +const replaceOldStructureSVG = (svg) => { + const classes = [...svg.matchAll(//g, ` \n`); + } + return newSvg; +}; + +module.exports = { generatePictogram, generateNewPictogram, replaceOldStructureSVG }; diff --git a/tool/tool.js b/tool/tool.js index 9b7a8d320..f94ae67dd 100755 --- a/tool/tool.js +++ b/tool/tool.js @@ -8,6 +8,7 @@ const buildRouting = require('./generate/routing'); const { deployFavicons, deployFiles, deployRobots } = require('./build/copy'); const { test } = require('./test/test'); const standalone = require('./build/standalone'); +const { generateNewPictogram } = require('./generate/pictogram'); /** * Build @@ -293,6 +294,34 @@ const changelogHandler = async (argv) => { await changelog.build(); }; +/** + * Pictogram converter + * Permet de transformer l'ancienne structure des pictogrammes avec des en une structure avec des et + */ +const newPictogramBuilder = (yargs) => { + return yargs + .usage('Usage: $0 -p [path/to/svg]') + .example( + '$0 -p [path/to/svg]', + 'convertit les pictogrammes en une structure avec des et ' + ) + .option('path', { + alias: '-p', + describe: 'chemin vers le dossier contenant les pictogrammes', + type: 'string' + }); +}; + +const newPictogramHandler = async (argv) => { + const settings = { + path: argv.path + }; + + generateNewPictogram(settings.path || './src/core/asset/artwork'); + // const pictogram = new PictogramConverter(settings.path || `${root}/src/pictograms`); + // await pictogram.build(); +}; + yargs .scriptName('tool') .command( @@ -331,5 +360,11 @@ yargs changelogBuilder, changelogHandler ) + .command( + 'pictogram-converter', + 'transforme les pictogrammes en une structure avec des et ', + newPictogramBuilder, + newPictogramHandler + ) .help() .argv; From ea2a40589584a83b35846e4b0e927bd1369a9f70 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Tue, 25 Jun 2024 14:22:46 +0200 Subject: [PATCH 4/6] Update src/core/asset/artwork/pictograms/system/technical-error.svg Co-authored-by: Cailliaud --- src/core/asset/artwork/pictograms/system/technical-error.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/asset/artwork/pictograms/system/technical-error.svg b/src/core/asset/artwork/pictograms/system/technical-error.svg index 55d4586f3..62d02b2aa 100644 --- a/src/core/asset/artwork/pictograms/system/technical-error.svg +++ b/src/core/asset/artwork/pictograms/system/technical-error.svg @@ -55,7 +55,7 @@ c0,0.55231,0.44769,1,1,1h12l0.11658-0.00671C32.61401,45.93549,33,45.51282,33,45c0-0.55231-0.44769-1-1-1H20z"/> - + From 9ae40c16d4774e89a48ca6dbbc0669440b73552a Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Tue, 25 Jun 2024 14:25:11 +0200 Subject: [PATCH 5/6] fix(tool): clean --- tool/tool.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tool/tool.js b/tool/tool.js index f94ae67dd..d59dadaf3 100755 --- a/tool/tool.js +++ b/tool/tool.js @@ -318,8 +318,6 @@ const newPictogramHandler = async (argv) => { }; generateNewPictogram(settings.path || './src/core/asset/artwork'); - // const pictogram = new PictogramConverter(settings.path || `${root}/src/pictograms`); - // await pictogram.build(); }; yargs From 26784f35fa608e5b9b9ead593e8c50cf0d19bb04 Mon Sep 17 00:00:00 2001 From: Keryan SANIE Date: Tue, 25 Jun 2024 15:19:08 +0200 Subject: [PATCH 6/6] Update tool/generate/pictogram.js Co-authored-by: Baptiste.z --- tool/generate/pictogram.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tool/generate/pictogram.js b/tool/generate/pictogram.js index 37dcb02fa..5004ea5bf 100644 --- a/tool/generate/pictogram.js +++ b/tool/generate/pictogram.js @@ -36,7 +36,7 @@ const generateNewPictogram = async (dir) => { }; const _parseFolder = (mainPath, subPath = '') => { - const dir = `${mainPath}/${subPath}`; + const dir = `${mainPath}${subPath}`; log(38, `${dir}`); const files = fs.readdirSync(dir); files.forEach((file) => {